Parcourir la source

Merge branch 'master' of bn.git:plabudda/se

Piotr Labudda il y a 8 ans
Parent
commit
968f36c4d9

+ 1 - 1
SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -2655,7 +2655,7 @@ class BiAuditPowiazania {
 			self::saveToLog("Nie wygenerowano plików PDF oraz HTML - problem z utworzeniem katalogu dla ant ({$resultsPart})");
 		} else {
 			copy($xmlFile, $antXmlFile);
-			self::exec("cd /Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree && /opt/local/bin/ant -f build_CRM_PROCES_tree.xml default_db:PROCES_INIT:tree:dita -Duuid=relations-{$id_part}");
+			self::exec("cd /Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree && ant -f build_CRM_PROCES_tree.xml default_db:PROCES_INIT:tree:dita -Duuid=relations-{$id_part}");
 			self::saveToLog("Generuję plik PDF ({$resultsPart})");
 			self::exec("cd \"/Library/Server/Web/Data/Sites/Default/SE/schema/WPS_Functions/default_db/CRM_PROCES_tree/temp/relations-{$id_part}\" && /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita -o pdf -i relations-{$id_part}.ditamap -f pdf");
 			if (file_exists($pdfFile)) {

+ 1 - 1
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1783,7 +1783,7 @@ function INSTALL_GETCOMMANDS_SE_DB_DOMAIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$AD
 
 
 
- $cmd[]['rsh']=' chmod 0755 /Library/Server/Web/Data/Sites/Default/PLIKI/';
+ $cmd[]['rsh']=' chmod 0775 /Library/Server/Web/Data/Sites/Default/PLIKI/';
  $cmd[]['rsh']=' chmod -R +a "_www allow writeattr,readextattr,writeextattr,readsecurity,writesecurity,chown,add_file,add_subdirectory,delete_child,list,search,file_inherit,directory_inherit" /Library/Server/Web/Data/Sites/Default/PLIKI';
 //! TODO te komendy nie działają @2013-10-15 - trzeba ruszyc recznie z GUI
  $cmd[]['rsh']=' sharing -l |grep '.$REMOTE_FOLDER_ROOT.' || sharing -a /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.' -A '.$REMOTE_FOLDER_ROOT.' -s 101' ; //uruchomienie sharingu smb/afp dla udzialu