diff --git a/project/Equa_Auth/Equa_Auth.csproj b/project/Equa_Auth/Equa_Auth.csproj index 216e5ed..f7e2495 100644 --- a/project/Equa_Auth/Equa_Auth.csproj +++ b/project/Equa_Auth/Equa_Auth.csproj @@ -24,6 +24,18 @@ prompt 4 + + pdbonly + true + bin\ + + + prompt + 4 + true + true + Sito Web Predefinito/Equa_Auth + pdbonly true @@ -34,7 +46,7 @@ 4 true true - Default Web Site/Equa_Auth + Sito Web Predefinito/Equa_Auth @@ -99,6 +111,11 @@ + + + Web.config + + diff --git a/project/Equa_Auth/Web.EQUA.config b/project/Equa_Auth/Web.EQUA.config new file mode 100644 index 0000000..e850a64 --- /dev/null +++ b/project/Equa_Auth/Web.EQUA.config @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/Equa_Auth/Web.config b/project/Equa_Auth/Web.config index 7c50b75..8e40113 100644 --- a/project/Equa_Auth/Web.config +++ b/project/Equa_Auth/Web.config @@ -10,6 +10,8 @@ + + diff --git a/project/Equa_Auth/bin/Equa_Auth.dll b/project/Equa_Auth/bin/Equa_Auth.dll index fb7eb2c..01d36b9 100644 Binary files a/project/Equa_Auth/bin/Equa_Auth.dll and b/project/Equa_Auth/bin/Equa_Auth.dll differ diff --git a/project/Equa_Auth/obj/EQUA/CSAutoParameterize.parameters.xml b/project/Equa_Auth/obj/EQUA/CSAutoParameterize.parameters.xml new file mode 100644 index 0000000..560a540 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/CSAutoParameterize.parameters.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/project/Equa_Auth/obj/EQUA/CSAutoParameterize/original/Web.config b/project/Equa_Auth/obj/EQUA/CSAutoParameterize/original/Web.config new file mode 100644 index 0000000..cd74d31 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/CSAutoParameterize/original/Web.config @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/Equa_Auth/obj/EQUA/CSAutoParameterize/transformed/Web.config b/project/Equa_Auth/obj/EQUA/CSAutoParameterize/transformed/Web.config new file mode 100644 index 0000000..cd74d31 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/CSAutoParameterize/transformed/Web.config @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/Equa_Auth/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache b/project/Equa_Auth/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..d39fe34 Binary files /dev/null and b/project/Equa_Auth/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/project/Equa_Auth/obj/EQUA/Equa_Auth.csproj.FileListAbsolute.txt b/project/Equa_Auth/obj/EQUA/Equa_Auth.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..4b658f6 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/Equa_Auth.csproj.FileListAbsolute.txt @@ -0,0 +1,8 @@ +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\bin\Equa_Auth.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\bin\Equa_Auth.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\bin\SteamWare.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\bin\Flesk.ViewState.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\bin\ICSharpCode.SharpZipLib.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\obj\EQUA\Equa_Auth.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\obj\EQUA\Equa_Auth.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\XPS\project\Equa_Auth\obj\EQUA\Equa_Auth.csprojResolveAssemblyReference.cache diff --git a/project/Equa_Auth/obj/EQUA/Equa_Auth.csprojResolveAssemblyReference.cache b/project/Equa_Auth/obj/EQUA/Equa_Auth.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..c9c742a Binary files /dev/null and b/project/Equa_Auth/obj/EQUA/Equa_Auth.csprojResolveAssemblyReference.cache differ diff --git a/project/Equa_Auth/obj/EQUA/Equa_Auth.dll b/project/Equa_Auth/obj/EQUA/Equa_Auth.dll new file mode 100644 index 0000000..01d36b9 Binary files /dev/null and b/project/Equa_Auth/obj/EQUA/Equa_Auth.dll differ diff --git a/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.SetParameters.xml b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.SetParameters.xml new file mode 100644 index 0000000..b5e276d --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.SetParameters.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.SourceManifest.xml b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.SourceManifest.xml new file mode 100644 index 0000000..ff4a604 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.SourceManifest.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.deploy-readme.txt b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.deploy-readme.txt new file mode 100644 index 0000000..ebf43c0 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.deploy-readme.txt @@ -0,0 +1,63 @@ + +=========================== +Prerequisites : +-------------------------- +To deploy this Web package, Web Deploy (msdeploy.exe) must be installed on the computer that runs the .cmd file. For information about how to install Web Deploy, see the following URL: +http://go.microsoft.com/?linkid=9278654 +This batch file requires that the package file "Equa_Auth.zip" and optionally provided the parameters file "Equa_Auth.SetParameters.xml" in the same folder or destination folder by environment variable. + +=========================== +Usage: +-------------------------- +{0} [/T|/Y] [/M:ComputerName] [/U:UserName] [/P:Password] [/G:UseTempAgent] [Additional msdeploy.exe flags ...] + + +=========================== +Required Flags: +-------------------------- +/T: + Calls msdeploy.exe with the "-whatif" flag, which simulates deployment. This does not deploy the package. Instead, it creates a report of what will happen when you actually deploy the package. +/Y: + Calls msdeploy.exe without the "-whatif" flag, which deploys the package to the current machine or a destination server. Use /Y after you have verified the output that was generated by using the /T flag. + +Note: Do not use /T and /Y in the same command. + +=========================== +Optional Flags: +-------------------------- + By Default, this script deploy on the current machine where this script is called with current user credential without agent service. Only pass the following value for advance scenario. + +/M: + If this flag is not specified, the package is installed on the computer where the command is run. The Service URL can be in the following format: + https://:8172/MSDeploy.axd + This format requires that IIS 7 be installed on the destination server and that IIS 7 Web Management Service(WMSvc) and Web Deployment Handler be set up. + The service URL can also be in the following format: + http:///MSDeployAgentService + This format requires administrative rights on the destination server, and it requires that Web Deploy Remote Service (MsDepSvc) be installed on the destination server. IIS 7 does not have to be installed on the destination server. + +/U: +/P: +/G: + Specifies that the package is deployed by creating a temporary listener on the destination server. This requires no special installation on the destination server, but it requires you to be an administrator on that server. The default value of this flag is False. + +/A: + Specifies the type of authentication to be used. The possible values are NTLM and Basic. If the wmsvc provider setting is specified, the default authentication type is Basic; otherwise, the default authentication type is NTLM. + +/L + Specifies that the package is deployed to local IISExpress user instance. + +[Additional msdeploy.exe flags] + The msdeploy.exe command supports additional flags. You can include any of these additional flags in the "$(ProjectName).Deploy.cmd" file, and the flags are passed through to msdeploy.exe during execution. + Alternatively, you can specify additional flags by setting the "_MsDeployAdditionalFlags" environment variable. These settings are used by this batch file. + Note: Any flag value that includes an equal sign (=) must be enclosed in double quotation marks, as shown in the following example, which will skip deploying the databases that are included in the package: + "-skip:objectName=dbFullSql" + +=========================== +Environment-Specific Settings: +-------------------------- + + To customize application-specific settings for each deployment environment (for example, the IIS application name, the physical path, and any connection strings), edit the settings in the following file: + "Equa_Auth.SetParameters.xml" +=========================== +For more information on this deploy script visit: http://go.microsoft.com/fwlink/?LinkID=183544 + diff --git a/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.deploy.cmd b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.deploy.cmd new file mode 100644 index 0000000..16f2eb1 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.deploy.cmd @@ -0,0 +1,256 @@ +@rem --------------------------------------------------------------------------------- +@rem Copyright 2008 Microsoft Corporation. All rights reserved. +@rem This is provided as sample to deploy the package using msdeploy.exe +@rem For information about IIS Web Deploy technology, +@rem please visit http://go.microsoft.com/?linkid=9278654 +@rem Note: This batch file assumes the package and setparametsrs.xml are in the same folder with this file +@rem --------------------------------------------------------------------------------- +@if %_echo%!==! echo off +setlocal +@rem --------------------------------------------------------------------------------- +@rem Please Make sure you have Web Deploy install in your machine. +@rem Alternatively, you can explicit set the MsDeployPath to the location it is on your machine +@rem set MSDeployPath="C:\Program Files (x86)\IIS\Microsoft Web Deploy V3\" +@rem --------------------------------------------------------------------------------- + +@rem --------------------------------------------------------------------------------- +@rem if user does not set MsDeployPath environment variable, we will try to retrieve it from registry. +@rem --------------------------------------------------------------------------------- +if "%MSDeployPath%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Microsoft\IIS Extensions\MSDeploy" /s ^| findstr -i "InstallPath"`) do ( +if /I "%%h" == "InstallPath" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +if "%%~dpj" == "%%j" ( +set MSDeployPath=%%j +)))))) + +if not exist "%MSDeployPath%\msdeploy.exe" ( +echo. msdeploy.exe is not found on this machine. Please install Web Deploy before execute the script. +echo. Please visit http://go.microsoft.com/?linkid=9278654 +goto :usage +) + +set RootPath=%~dp0 +if /I "%_DeploySetParametersFile%" == "" ( +set _DeploySetParametersFile=%RootPath%Equa_Auth.SetParameters.xml +) + +set _ArgTestDeploy= +set _ArgDestinationType=auto +set _ArgComputerName= +set _ArgUserName= +set _ArgPassword= +set _ArgEncryptPassword= +set _ArgIncludeAcls=False +set _ArgAuthType= +set _ArgtempAgent= +set _ArgLocalIIS= +set _ArgLocalIISVersion= + + +@rem --------------------------------------------------------------------------------- +@rem Simple Parse the arguments +@rem --------------------------------------------------------------------------------- +:NextArgument +set _ArgCurrentOriginal=%1 +set _ArgCurrent=%~1 + +if /I "%_ArgCurrent%" == "" goto :GetStarted +if /I "%_ArgCurrent%" == "/T" set _ArgTestDeploy=true&goto :ArgumentOK +if /I "%_ArgCurrent%" == "/Y" set _ArgTestDeploy=false&goto :ArgumentOK +if /I "%_ArgCurrent%" == "/L" set _ArgLocalIIS=true&goto :ArgumentOK + +set _ArgFlag=%_ArgCurrent:~0,3% +set _ArgValue=%_ArgCurrent:~3% + +if /I "%_ArgFlag%" == "/M:" set _ArgComputerName=%_ArgValue%&goto :ArgumentOK +if /I "%_ArgFlag%" == "/U:" set _ArgUserName=%_ArgValue%&goto :ArgumentOK +if /I "%_ArgFlag%" == "/P:" set _ArgPassword=%_ArgValue%&goto :ArgumentOK +if /I "%_ArgFlag%" == "/E:" set _ArgEncryptPassword=%_ArgValue%&goto :ArgumentOK +if /I "%_ArgFlag%" == "/I:" set _ArgIncludeAcls=%_ArgValue%&goto :ArgumentOK +if /I "%_ArgFlag%" == "/A:" set _ArgAuthType=%_ArgValue%&goto :ArgumentOK +if /I "%_ArgFlag%" == "/G:" set _ArgtempAgent=%_ArgValue%&goto :ArgumentOK + +@rem Any addition flags, pass through to the msdeploy +set _ArgMsDeployAdditionalFlags=%_ArgMsDeployAdditionalFlags% %_ArgCurrentOriginal% + +:ArgumentOK +shift +goto :NextArgument + +:GetStarted +if /I "%_ArgTestDeploy%" == "" goto :usage +if /I "%_ArgDestinationType%" == "" goto :usage + +set _Destination=%_ArgDestinationType% +if not "%_ArgComputerName%" == "" set _Destination=%_Destination%,computerName='%_ArgComputerName%' +if not "%_ArgUserName%" == "" set _Destination=%_Destination%,userName='%_ArgUserName%' +if not "%_ArgPassword%" == "" set _Destination=%_Destination%,password='%_ArgPassword%' +if not "%_ArgAuthType%" == "" set _Destination=%_Destination%,authtype='%_ArgAuthType%' +if not "%_ArgEncryptPassword%" == "" set _Destination=%_Destination%,encryptPassword='%_ArgEncryptPassword%' +if not "%_ArgIncludeAcls%" == "" set _Destination=%_Destination%,includeAcls='%_ArgIncludeAcls%' +if not "%_ArgtempAgent%" == "" set _Destination=%_Destination%,tempAgent='%_ArgtempAgent%' + +@rem --------------------------------------------------------------------------------- +@rem add -whatif when -T is specified +@rem --------------------------------------------------------------------------------- +if /I "%_ArgTestDeploy%" NEQ "false" ( +set _MsDeployAdditionalFlags=%_MsDeployAdditionalFlags% -whatif +) + +@rem --------------------------------------------------------------------------------- +@rem add flags for IISExpress when -L is specified +@rem --------------------------------------------------------------------------------- + +if /I "%_ArgLocalIIS%" == "true" ( +call :SetIISExpressArguments +) +if /I "%_ArgLocalIIS%" == "true" ( +if not exist "%IISExpressPath%%IISExpressManifest%" ( +echo. IISExpress is not found on this machine. Please install through Web Platform Installer before execute the script. +echo. or remove /L flag +echo. Please visit http://go.microsoft.com/?linkid=9278654 +goto :usage +) +if not exist "%IISExpressUserProfileDirectory%" ( +echo. %IISExpressUserProfileDirectory% is not exists +echo. IISExpress is found on the machine. But the user have run IISExpress at least once. +echo. Please visit http://go.microsoft.com/?linkid=9278654 for detail +goto :usage +) + +set _MsDeployAdditionalFlags=%_MsDeployAdditionalFlags% -appHostConfigDir:%IISExpressUserProfileDirectory% -WebServerDir:"%IISExpressPath%" -webServerManifest:"%IISExpressManifest%" +) + +@rem --------------------------------------------------------------------------------- +@rem pass through the addition msdeploy.exe Flags +@rem --------------------------------------------------------------------------------- +set _MsDeployAdditionalFlags=%_MsDeployAdditionalFlags% %_ArgMsDeployAdditionalFlags% + +@rem --------------------------------------------------------------------------------- +@rem check the existence of the package file +@rem --------------------------------------------------------------------------------- +if not exist "%RootPath%Equa_Auth.zip" ( +echo "%RootPath%Equa_Auth.zip" does not exist. +echo This batch file relies on this deploy source file^(s^) in the same folder. +goto :usage +) + +@rem --------------------------------------------------------------------------------- +@rem Execute msdeploy.exe command line +@rem --------------------------------------------------------------------------------- +call :CheckParameterFile +echo. Start executing msdeploy.exe +echo ------------------------------------------------------- +if not exist "%_DeploySetParametersFile%" ( +echo. "%MSDeployPath%\msdeploy.exe" -source:package='%RootPath%Equa_Auth.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\EQUA\\Package\\PackageTmp\\App_Data$' %_MsDeployAdditionalFlags% +"%MSDeployPath%\msdeploy.exe" -source:package='%RootPath%Equa_Auth.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\EQUA\\Package\\PackageTmp\\App_Data$' %_MsDeployAdditionalFlags% +) else ( +echo. "%MSDeployPath%\msdeploy.exe" -source:package='%RootPath%Equa_Auth.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\EQUA\\Package\\PackageTmp\\App_Data$' -setParamFile:"%RootPath%Equa_Auth.SetParameters.xml" %_MsDeployAdditionalFlags% +"%MSDeployPath%\msdeploy.exe" -source:package='%RootPath%Equa_Auth.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\EQUA\\Package\\PackageTmp\\App_Data$' -setParamFile:"%RootPath%Equa_Auth.SetParameters.xml" %_MsDeployAdditionalFlags% +) +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem Find and set IISExpress argument. +@rem --------------------------------------------------------------------------------- +:SetIISExpressArguments + +if "%IISExpressPath%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Microsoft\IISExpress" /s ^| findstr -i "InstallPath"`) do ( +if /I "%%h" == "InstallPath" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +if "%%~dpj" == "%%j" ( +set IISExpressPath=%%j +)))))) + +if "%IISExpressPath%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\IISExpress" /s ^| findstr -i "InstallPath"`) do ( +if /I "%%h" == "InstallPath" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +if "%%~dpj" == "%%j" ( +set IISExpressPath=%%j +)))))) + +if "%PersonalDocumentFolder%" == "" ( +for /F "usebackq tokens=2*" %%i in (`reg query "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v Personal`) do ( +set PersonalDocumentFolder=%%j +)) + +if "%IISExpressManifest%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Microsoft\IISExpress" /s ^| findstr -i "Manifest"`) do ( +if /I "%%h" == "Manifest" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +set IISExpressManifest=%%j +))))) + +if "%IISExpressManifest%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\IISExpress" /s ^| findstr -i "Manifest"`) do ( +if /I "%%h" == "Manifest" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +set IISExpressManifest=%%j +))))) + +set IISExpressUserProfileDirectory="%PersonalDocumentFolder%\IISExpress\config" + +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem CheckParameterFile -- check if the package's setparamters.xml exists or not +@rem --------------------------------------------------------------------------------- +:CheckParameterFile +echo ========================================================= +if exist "%_DeploySetParametersFile%" ( +echo SetParameters from: +echo "%_DeploySetParametersFile%" +echo You can change IIS Application Name, Physical path, connectionString +echo or other deploy parameters in the above file. +) else ( +echo SetParamterFiles does not exist in package location. +echo Use package embedded defaultValue to deploy. +) +echo ------------------------------------------------------- +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem Usage +@rem --------------------------------------------------------------------------------- +:usage +echo ========================================================= +if not exist "%RootPath%Equa_Auth.deploy-readme.txt" ( +echo Usage:%~nx0 [/T^|/Y] [/M:ComputerName] [/U:userName] [/P:password] [/G:tempAgent] [additional msdeploy flags ...] +echo Required flags: +echo /T Calls msdeploy.exe with the "-whatif" flag, which simulates deployment. +echo /Y Calls msdeploy.exe without the "-whatif" flag, which deploys the package to the current machine or destination server +echo Optional flags: +echo. By Default, this script deploy to the current machine where this script is invoked which will use current user credential without tempAgent. +echo. Only pass these arguments when in advance scenario. +echo /M: Msdeploy destination name of remote computer or proxy-URL. Default is local. +echo /U: Msdeploy destination user name. +echo /P: Msdeploy destination password. +echo /G: Msdeploy destination tempAgent. True or False. Default is false. +echo /A: specifies the type of authentication to be used. The possible values are NTLM and Basic. If the wmsvc provider setting is specified, the default authentication type is Basic +otherwise, the default authentication type is NTLM. +echo /L: Deploy to Local IISExpress User Instance. + +echo.[additional msdeploy flags]: note: " is required for passing = through command line. +echo "-skip:objectName=setAcl" "-skip:objectName=dbFullSql" +echo.Alternative environment variable _MsDeployAdditionalFlags is also honored. +echo. +echo. Please make sure MSDeploy is installed in the box http://go.microsoft.com/?linkid=9278654 +echo. +echo In addition, you can change IIS Application Name, Physical path, +echo connectionString and other deploy parameters in the following file: +echo "%_DeploySetParametersFile%" +echo. +echo For more information about this batch file, visit http://go.microsoft.com/fwlink/?LinkID=183544 +) else ( +start notepad "%RootPath%Equa_Auth.deploy-readme.txt" +) +echo ========================================================= +goto :eof diff --git a/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.zip b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.zip new file mode 100644 index 0000000..225de0a Binary files /dev/null and b/project/Equa_Auth/obj/EQUA/Package/Equa_Auth.zip differ diff --git a/project/Equa_Auth/obj/EQUA/TransformWebConfig/original/Web.config b/project/Equa_Auth/obj/EQUA/TransformWebConfig/original/Web.config new file mode 100644 index 0000000..8e40113 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/TransformWebConfig/original/Web.config @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/Equa_Auth/obj/EQUA/TransformWebConfig/transformed/Web.config b/project/Equa_Auth/obj/EQUA/TransformWebConfig/transformed/Web.config new file mode 100644 index 0000000..cd74d31 --- /dev/null +++ b/project/Equa_Auth/obj/EQUA/TransformWebConfig/transformed/Web.config @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/Equa_Auth/obj/EQUA/build.force b/project/Equa_Auth/obj/EQUA/build.force new file mode 100644 index 0000000..e69de29 diff --git a/project/XPS/Web.EQUA.config b/project/XPS/Web.EQUA.config index b452cec..8ec9ed6 100644 --- a/project/XPS/Web.EQUA.config +++ b/project/XPS/Web.EQUA.config @@ -3,7 +3,7 @@ - - - + + @@ -34,9 +34,9 @@ - - - - + \ No newline at end of file diff --git a/project/XPS/Web.config b/project/XPS/Web.config index 3bb2991..a8ca470 100644 --- a/project/XPS/Web.config +++ b/project/XPS/Web.config @@ -132,7 +132,7 @@ - + diff --git a/project/XPS/WebUserControls/mod_elencoComm.ascx.cs b/project/XPS/WebUserControls/mod_elencoComm.ascx.cs index 5399153..6de4b3d 100644 --- a/project/XPS/WebUserControls/mod_elencoComm.ascx.cs +++ b/project/XPS/WebUserControls/mod_elencoComm.ascx.cs @@ -158,6 +158,10 @@ namespace XPS.WebUserControls PrioritaStatoMin = "1"; PrioritaStatoMax = "1"; break; + case modoXPS_Equa.spedizioni: + PrioritaStatoMin = "1"; + PrioritaStatoMax = "1"; + break; case modoXPS_Equa.segreteria: // NON PERMESSO PERO'... PrioritaStatoMin = "1"; @@ -461,6 +465,7 @@ namespace XPS.WebUserControls switch (currMode) { case modoXPS_Equa.magazzino: + case modoXPS_Equa.spedizioni: if (CodStato != 2) answ = false; break; case modoXPS_Equa.segreteria: diff --git a/project/XPS/XPS.csproj b/project/XPS/XPS.csproj index e7d7a5d..783e8d2 100644 --- a/project/XPS/XPS.csproj +++ b/project/XPS/XPS.csproj @@ -103,6 +103,7 @@ + @@ -296,6 +297,13 @@ elencoCommSegr.aspx + + elencoCommSped.aspx + ASPXCodeBehind + + + elencoCommSped.aspx + forceUser.aspx ASPXCodeBehind diff --git a/project/XPS/bin/XPS.dll b/project/XPS/bin/XPS.dll index 2442d23..968f697 100644 Binary files a/project/XPS/bin/XPS.dll and b/project/XPS/bin/XPS.dll differ diff --git a/project/XPS/bin/XPS_data.dll b/project/XPS/bin/XPS_data.dll index e6a7983..1d22581 100644 Binary files a/project/XPS/bin/XPS_data.dll and b/project/XPS/bin/XPS_data.dll differ diff --git a/project/XPS/elencoCommSped.aspx b/project/XPS/elencoCommSped.aspx new file mode 100644 index 0000000..2040b50 --- /dev/null +++ b/project/XPS/elencoCommSped.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" CodeBehind="elencoCommSped.aspx.cs" Inherits="XPS.elencoCommSped" %> +<%@ Register src="WebUserControls/mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %> +<%@ Register src="WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %> + + + + diff --git a/project/XPS/elencoCommSped.aspx.cs b/project/XPS/elencoCommSped.aspx.cs new file mode 100644 index 0000000..c032e13 --- /dev/null +++ b/project/XPS/elencoCommSped.aspx.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using XPS_data; + +namespace XPS +{ + public partial class elencoCommSped : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + mod_elencoComm1.currMode = modoXPS_Equa.spedizioni; + mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore); + } + + void Mod_elencoComm1_eh_selValore(object sender, EventArgs e) + { + SteamWare.memLayer.ML.setSessionVal("returnPage", Request.Url.AbsolutePath); + Response.Redirect("detComm.aspx"); + } + } +} \ No newline at end of file diff --git a/project/XPS/elencoCommSped.aspx.designer.cs b/project/XPS/elencoCommSped.aspx.designer.cs new file mode 100644 index 0000000..043165c --- /dev/null +++ b/project/XPS/elencoCommSped.aspx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XPS { + + + public partial class elencoCommSped { + + /// + /// mod_elencoComm1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::XPS.WebUserControls.mod_elencoComm mod_elencoComm1; + + /// + /// mod_fixCal1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::XPS.WebUserControls.mod_fixCal mod_fixCal1; + } +} diff --git a/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config b/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config index 4b3c947..976e908 100644 --- a/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config +++ b/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config @@ -111,8 +111,8 @@ - - + + @@ -132,7 +132,7 @@ - + diff --git a/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config b/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config index 56c5635..3428353 100644 --- a/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config +++ b/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config @@ -111,8 +111,8 @@ - - + + @@ -132,7 +132,7 @@ - + diff --git a/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache b/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache index 75ba10c..0aa8dd3 100644 Binary files a/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache and b/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/project/XPS/obj/EQUA/Package/XPS.zip b/project/XPS/obj/EQUA/Package/XPS.zip index 4fe38e2..6066c16 100644 Binary files a/project/XPS/obj/EQUA/Package/XPS.zip and b/project/XPS/obj/EQUA/Package/XPS.zip differ diff --git a/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config b/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config index 78ef24f..b0035fd 100644 --- a/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config +++ b/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config @@ -132,7 +132,7 @@ - + diff --git a/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config b/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config index 4b3c947..976e908 100644 --- a/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config +++ b/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config @@ -111,8 +111,8 @@ - - + + @@ -132,7 +132,7 @@ - + diff --git a/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache b/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache index 729fe1d..1130dc7 100644 Binary files a/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache and b/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache differ diff --git a/project/XPS/obj/EQUA/XPS.dll b/project/XPS/obj/EQUA/XPS.dll index 2442d23..968f697 100644 Binary files a/project/XPS/obj/EQUA/XPS.dll and b/project/XPS/obj/EQUA/XPS.dll differ diff --git a/project/XPS/obj/Release/XPS.dll b/project/XPS/obj/Release/XPS.dll index 689d545..640aa8a 100644 Binary files a/project/XPS/obj/Release/XPS.dll and b/project/XPS/obj/Release/XPS.dll differ diff --git a/project/XPST/Web.EQUA.config b/project/XPST/Web.EQUA.config index bcf584d..1f1fb4a 100644 --- a/project/XPST/Web.EQUA.config +++ b/project/XPST/Web.EQUA.config @@ -15,8 +15,8 @@ --> - - + + diff --git a/project/XPST/Web.config b/project/XPST/Web.config index fed3b43..6e2b340 100644 --- a/project/XPST/Web.config +++ b/project/XPST/Web.config @@ -61,7 +61,7 @@ - + @@ -111,6 +111,8 @@ + + @@ -128,7 +130,7 @@ - + @@ -157,7 +159,7 @@ - + diff --git a/project/XPST/WebMasterPages/CompactBCode.Master b/project/XPST/WebMasterPages/CompactBCode.Master index 273f05a..a2db04e 100644 --- a/project/XPST/WebMasterPages/CompactBCode.Master +++ b/project/XPST/WebMasterPages/CompactBCode.Master @@ -11,13 +11,18 @@ - <%----%> + +
diff --git a/project/XPST/WebUserControls/mod_btnComandi.ascx.cs b/project/XPST/WebUserControls/mod_btnComandi.ascx.cs index 5b51da6..343c969 100644 --- a/project/XPST/WebUserControls/mod_btnComandi.ascx.cs +++ b/project/XPST/WebUserControls/mod_btnComandi.ascx.cs @@ -131,6 +131,15 @@ namespace XPST.WebUserControls btn4.Text += string.Format("{0}{1}: {2}", Environment.NewLine, user_std.UtSn.Traduci("emailSent"), emailSent); } } + // se autoconferma nascondo button conferma... + if (memLayer.ML.confReadBool("autoConfCmd")) + { + btn5.Visible = false; + } + else + { + btn5.Visible = true; + } } /// /// carico da tab i comandi ammessi per il barcode... diff --git a/project/XPST/XPST.csproj b/project/XPST/XPST.csproj index d43b216..943db52 100644 --- a/project/XPST/XPST.csproj +++ b/project/XPST/XPST.csproj @@ -107,6 +107,7 @@ + @@ -134,6 +135,13 @@ Default.aspx + + forceUser.aspx + ASPXCodeBehind + + + forceUser.aspx + login.aspx ASPXCodeBehind diff --git a/project/XPST/barcode.aspx.cs b/project/XPST/barcode.aspx.cs index d2627ea..3b93152 100644 --- a/project/XPST/barcode.aspx.cs +++ b/project/XPST/barcode.aspx.cs @@ -98,13 +98,23 @@ public partial class barcode : Flesk.Accelerator.Page //System.Web.UI.Page } break; case tipoAzione.esegui: - if (mod_barcode1.comandoRegistrato.valore != "") + // se ho auto conferma eseguo! + if (memLayer.ML.confReadBool("autoConfCmd")) { - mod_barcode1.txtRich2show = user_std.UtSn.Traduci("pleaseConfirm"); + mod_barcode1.comandoRegistrato.prevCmdIn = mod_barcode1.comandoRegistrato.currCmdIn; + mod_barcode1.comandoRegistrato.currCmdIn = "ok"; + eseguiComando(); } else { - mod_barcode1.txtRich2show = user_std.UtSn.Traduci("codObjUnknown"); + if (mod_barcode1.comandoRegistrato.valore != "") + { + mod_barcode1.txtRich2show = user_std.UtSn.Traduci("pleaseConfirm"); + } + else + { + mod_barcode1.txtRich2show = user_std.UtSn.Traduci("codObjUnknown"); + } } break; case tipoAzione.noAct: diff --git a/project/XPST/bin/XPST.dll b/project/XPST/bin/XPST.dll index edfe5e2..40fc90e 100644 Binary files a/project/XPST/bin/XPST.dll and b/project/XPST/bin/XPST.dll differ diff --git a/project/XPST/bin/XPS_data.dll b/project/XPST/bin/XPS_data.dll index e6a7983..1d22581 100644 Binary files a/project/XPST/bin/XPS_data.dll and b/project/XPST/bin/XPS_data.dll differ diff --git a/project/XPST/forceUser.aspx b/project/XPST/forceUser.aspx new file mode 100644 index 0000000..7605f46 --- /dev/null +++ b/project/XPST/forceUser.aspx @@ -0,0 +1,19 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="forceUser.aspx.cs" Inherits="XPST.forceUser" %> + +<%@ Register src="WebUserControls/mod_login.ascx" tagname="mod_login" tagprefix="uc1" %> + + + + + + + + + + +
+ +
+ + + diff --git a/project/XPST/forceUser.aspx.cs b/project/XPST/forceUser.aspx.cs new file mode 100644 index 0000000..c498cad --- /dev/null +++ b/project/XPST/forceUser.aspx.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace XPST +{ + public partial class forceUser : System.Web.UI.Page + { + protected string _nextPage + { + get + { + string pagina = SteamWare.memLayer.ML.StringSessionObj("nextPage"); + if (pagina == "") + { + pagina = "barcode.aspx"; + } + return pagina; + } + } + + protected void Page_Load(object sender, EventArgs e) + { + mod_login1.modoLogin = SteamWare.loginMode.forceUser; + } + + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + mod_login1.Login_ok += new EventHandler(mod_login1_Login_ok); + mod_login1.Login_Error += new EventHandler(mod_login1_Login_Error); + } + + void mod_login1_Login_Error(object sender, EventArgs e) + { + //Response.Redirect("./unauthorized.aspx"); + } + + void mod_login1_Login_ok(object sender, EventArgs e) + { + Response.Redirect(_nextPage); + } + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + mod_login1.Login_ok -= new EventHandler(mod_login1_Login_ok); + mod_login1.Login_Error -= new EventHandler(mod_login1_Login_Error); + } + } +} \ No newline at end of file diff --git a/project/XPST/forceUser.aspx.designer.cs b/project/XPST/forceUser.aspx.designer.cs new file mode 100644 index 0000000..9655b3b --- /dev/null +++ b/project/XPST/forceUser.aspx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XPST { + + + public partial class forceUser { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// mod_login1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::XPST.WebUserControls.mod_login mod_login1; + } +} diff --git a/project/XPST/obj/Debug/XPST.dll b/project/XPST/obj/Debug/XPST.dll index fc63db3..1c8a350 100644 Binary files a/project/XPST/obj/Debug/XPST.dll and b/project/XPST/obj/Debug/XPST.dll differ diff --git a/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config b/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config index ac46922..20b250e 100644 --- a/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config +++ b/project/XPST/obj/EQUA/CSAutoParameterize/original/Web.config @@ -61,7 +61,7 @@ - + @@ -109,8 +109,10 @@ - - + + + + @@ -128,7 +130,7 @@ - + @@ -157,7 +159,7 @@ - + diff --git a/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config b/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config index e23101d..b392ce5 100644 --- a/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config +++ b/project/XPST/obj/EQUA/CSAutoParameterize/transformed/Web.config @@ -61,7 +61,7 @@ - + @@ -109,8 +109,10 @@ - - + + + + @@ -128,7 +130,7 @@ - + @@ -157,7 +159,7 @@ - + diff --git a/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache b/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache index 630cd94..f0a5ca0 100644 Binary files a/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache and b/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/project/XPST/obj/EQUA/Package/XPST.zip b/project/XPST/obj/EQUA/Package/XPST.zip index 91bd5e2..6dadb24 100644 Binary files a/project/XPST/obj/EQUA/Package/XPST.zip and b/project/XPST/obj/EQUA/Package/XPST.zip differ diff --git a/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config b/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config index dbfd0a3..8ab3c81 100644 --- a/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config +++ b/project/XPST/obj/EQUA/TransformWebConfig/original/Web.config @@ -61,7 +61,7 @@ - + @@ -111,6 +111,8 @@ + + @@ -128,7 +130,7 @@ - + @@ -157,7 +159,7 @@ - + diff --git a/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config b/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config index ac46922..20b250e 100644 --- a/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config +++ b/project/XPST/obj/EQUA/TransformWebConfig/transformed/Web.config @@ -61,7 +61,7 @@ - + @@ -109,8 +109,10 @@ - - + + + + @@ -128,7 +130,7 @@ - + @@ -157,7 +159,7 @@ - + diff --git a/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache b/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache index 4cccf2b..8d0a5df 100644 Binary files a/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache and b/project/XPST/obj/EQUA/XPST.csprojResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/EQUA/XPST.dll b/project/XPST/obj/EQUA/XPST.dll index edfe5e2..40fc90e 100644 Binary files a/project/XPST/obj/EQUA/XPST.dll and b/project/XPST/obj/EQUA/XPST.dll differ diff --git a/project/XPST/obj/Release/XPST.dll b/project/XPST/obj/Release/XPST.dll index 674ba8c..3bfaf6d 100644 Binary files a/project/XPST/obj/Release/XPST.dll and b/project/XPST/obj/Release/XPST.dll differ diff --git a/project/XPS_app.sln b/project/XPS_app.sln index 311424f..c278b51 100644 --- a/project/XPS_app.sln +++ b/project/XPS_app.sln @@ -102,8 +102,8 @@ Global {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Debug|Any CPU.Build.0 = Debug|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|.NET.ActiveCfg = Release|Any CPU - {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|.NET.Build.0 = Release|Any CPU + {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|.NET.ActiveCfg = EQUA|Any CPU + {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|.NET.Build.0 = EQUA|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|Any CPU.ActiveCfg = Release|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|Any CPU.Build.0 = Release|Any CPU {BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.EQUA|Mixed Platforms.ActiveCfg = Release|Any CPU diff --git a/project/XPS_app.suo b/project/XPS_app.suo index 8246723..8ff3a3e 100644 Binary files a/project/XPS_app.suo and b/project/XPS_app.suo differ diff --git a/project/XPS_data/XPS.cs b/project/XPS_data/XPS.cs index 6fed3a4..33dd7db 100644 --- a/project/XPS_data/XPS.cs +++ b/project/XPS_data/XPS.cs @@ -116,6 +116,7 @@ namespace XPS_data public enum modoXPS_Equa { magazzino, + spedizioni, segreteria, produzione, direzione diff --git a/project/XPS_data/bin/Debug/SteamWare.dll b/project/XPS_data/bin/Debug/SteamWare.dll index 6c0f56c..765536a 100644 Binary files a/project/XPS_data/bin/Debug/SteamWare.dll and b/project/XPS_data/bin/Debug/SteamWare.dll differ diff --git a/project/XPS_data/bin/Debug/XPS_data.dll b/project/XPS_data/bin/Debug/XPS_data.dll index 92e1039..0be1410 100644 Binary files a/project/XPS_data/bin/Debug/XPS_data.dll and b/project/XPS_data/bin/Debug/XPS_data.dll differ diff --git a/project/XPS_data/bin/Release/XPS_data.dll b/project/XPS_data/bin/Release/XPS_data.dll index 82e87ce..13b7b07 100644 Binary files a/project/XPS_data/bin/Release/XPS_data.dll and b/project/XPS_data/bin/Release/XPS_data.dll differ diff --git a/project/XPS_data/obj/Debug/XPS_data.dll b/project/XPS_data/obj/Debug/XPS_data.dll index 92e1039..0be1410 100644 Binary files a/project/XPS_data/obj/Debug/XPS_data.dll and b/project/XPS_data/obj/Debug/XPS_data.dll differ diff --git a/project/XPS_data/obj/Release/XPS_data.dll b/project/XPS_data/obj/Release/XPS_data.dll index 82e87ce..13b7b07 100644 Binary files a/project/XPS_data/obj/Release/XPS_data.dll and b/project/XPS_data/obj/Release/XPS_data.dll differ