diff --git a/application/modules/default/controllers/EvaluationController.php b/application/modules/default/controllers/EvaluationController.php index 4180e3049..71d8d83d9 100644 --- a/application/modules/default/controllers/EvaluationController.php +++ b/application/modules/default/controllers/EvaluationController.php @@ -886,9 +886,10 @@ class EvaluationController extends Zend_Controller_Action ''. ''; - $date = date('Ymd'); - $url = 'https://www.creditsafe.fr/getdata/service/CSFRServices.asmx/GetData?RequestXmlStr='.$req; - $file = APPLICATION_PATH.'/../../data/creditsafe/'.$this->siret.'.xml'; + $date = date('Ymd'); + $url = 'https://www.creditsafe.fr/getdata/service/CSFRServices.asmx/GetData?RequestXmlStr='.$req; + $c = Zend_Registry::get('config'); + $file = $c->profil->path->shared.'/temp/creditsafe/'.$this->siret.'.xml'; try { $client = new Zend_Http_Client($url); diff --git a/application/modules/default/views/default/scripts/giant/retrive.phtml b/application/modules/default/views/default/scripts/giant/retrive.phtml index 567bdedd8..079b58961 100644 --- a/application/modules/default/views/default/scripts/giant/retrive.phtml +++ b/application/modules/default/views/default/scripts/giant/retrive.phtml @@ -30,7 +30,7 @@ if ( empty($this->source) ){ - +

Liste des surveillances

@@ -49,7 +49,7 @@ if ( empty($this->source) ){ Count Event Type Last Change - +
val_siren);?>
@@ -66,7 +66,7 @@ if ( empty($this->source) ){ } endforeach; ?> - + source) ){ ?> action('ret', 'giant',null,array('date_st'=>current($merged_type)[0]->ProviderOrderId)));?> $this->configVal->cache->lifetime,'automatic_serialization' => true); - $backendOptions = array('cache_dir' => '../data/cache/giant/'); + $backendOptions = array('cache_dir' => $c->profil->path->shared . '/giant/'); $cache = Zend_Cache::factory('Output','File',$frontendOptions,$backendOptions); if(($lang = $cache->load('Pays_'.$resultDB['Pays'])) === false) { $lang = 'en'; @@ -112,10 +112,10 @@ if ( empty($this->source) ){ ".count($monitor_type).'

'; - } + } ?> @@ -125,7 +125,7 @@ if ( empty($this->source) ){ echo "

".$name[1]."

"; } //Fin foreach?> - + $this->configVal->cache->lifetime,'automatic_serialization' => true); - $backendOptions = array('cache_dir' => '../data/cache/giant/'); + $backendOptions = array('cache_dir' => $c->profil->path->shared . '/giant/'); $cache = Zend_Cache::factory('Output','File',$frontendOptions,$backendOptions); $result = $cache->load('Pays_'.$pays); return ($result); @@ -89,11 +89,11 @@ Class GiantControllerLib 'lifetime' => $this->configVal->cache->lifetime, 'automatic_serialization' => true ); - $path = '../data/cache/giant/'; + $path = $c->profil->path->shared .'/giant/'; if (!is_dir($path)) mkdir($path, 0777, true) ; //No, create it - $backendOptions = array('cache_dir' => '../data/cache/giant/'); + $backendOptions = array('cache_dir' => $c->profil->path->shared . '/giant/'); $cache = Zend_Cache::factory('Output','File',$frontendOptions,$backendOptions); if(($result = $cache->load('Pays_'.$Pays)) === false) { $rapport = new GiantRechercheController($Pays, $TestIndication); diff --git a/library/Scores/Ws/Client.php b/library/Scores/Ws/Client.php index d0a572ba3..274370ed4 100644 --- a/library/Scores/Ws/Client.php +++ b/library/Scores/Ws/Client.php @@ -126,7 +126,7 @@ class Scores_Ws_Client extends Zend_Soap_Client 'automatic_seralization' => true ); $backend = array( - 'cache_dir' => APPLICATION_PATH . '/../data/cache', + 'cache_dir' => $c->profil->path->shared . '/temp/cache', ); $this->cache = Zend_Cache::factory('Core', 'File', $frontend, $backend); } diff --git a/library/WorldCheck/applicationWC.ini b/library/WorldCheck/applicationWC.ini index 4adff1d27..9edd17f28 100644 --- a/library/WorldCheck/applicationWC.ini +++ b/library/WorldCheck/applicationWC.ini @@ -8,6 +8,6 @@ wsworldcheck.assigneeIdentifier = cnu_so_77 wsworldcheck.response.limit = 200 wsworldcheck.response.start = 0 worldcheck.page.items = 15 -worldcheck.cachedir.path = ../data/cache/ +worldcheck.cachedir.path = "/home/vhosts/data/extranet/temp/cache/" worldcheck.cachedir.name = worldcheck worldcheck.cachedir.lifetime = 86400 \ No newline at end of file diff --git a/scripts/build/configure.php b/scripts/build/configure.php index 73f5f2dca..05f4438d1 100644 --- a/scripts/build/configure.php +++ b/scripts/build/configure.php @@ -61,7 +61,8 @@ if(isset($opts->install)) $dirToCreate = array( $path.'/temp/cache', $path.'/temp/files', - $path.'/temp/pages/file', + $path.'/temp/pages/file/image/logo/q', + $path.'/temp/pages/file/streetview/img/q', $path.'/temp/pages/imgcache', $path.'/temp/sessions', $path.'/temp/wsdl', @@ -102,8 +103,8 @@ if(isset($opts->install)) // Création des liens symboliques pour l'impression passthru('ln -vsf '.APPLICATION_PATH.'/../public/themes '.$c->profil->path->shared.'/temp/pages/themes'); - passthru('ln -vsf '.$c->profil->path->shared.'/persist/streetview '.$c->profil->path->shared.'/temp/pages/file/streetview'); - passthru('ln -vsf '.$c->profil->path->shared.'/persist/logos '.$c->profil->path->shared.'/temp/pages/file/logos'); + passthru('ln -vsf '.$c->profil->path->shared.'/persist/streetview '.$c->profil->path->shared.'/temp/pages/file/streetview/img/q'); + passthru('ln -vsf '.$c->profil->path->shared.'/persist/logos '.$c->profil->path->shared.'/temp/pages/file/image/logo/q'); // Modification des permissions passthru('chown -R www-data: '.APPLICATION_PATH.'/../'); diff --git a/scripts/build/profil/prod-online/application.ini b/scripts/build/profil/prod-online/application.ini index 1808a0a27..9a85240e9 100644 --- a/scripts/build/profil/prod-online/application.ini +++ b/scripts/build/profil/prod-online/application.ini @@ -30,9 +30,6 @@ profil.mail.email.support = support@scores-decisions.com profil.mail.email.supportdev = supportdev@scores-decisions.com profil.mail.email.contact = contact@scores-decisions.com profil.mail.email.production = production@scores-decisions.com -profil.path.cache = APPLICATION_PATH "/../data/cache" -profil.path.files = APPLICATION_PATH "/../data/files" -profil.path.pages = APPLICATION_PATH "/../data/pages" profil.path.shared = "/home/vhosts/extranet/shared" profil.wkhtmltopdf.path = "/usr/local/bin/wkhtmltopdf" profil.db.sdv1.adapter=mysqli diff --git a/scripts/build/profil/staging-online/application.ini b/scripts/build/profil/staging-online/application.ini index 8e3f00109..3db589d59 100644 --- a/scripts/build/profil/staging-online/application.ini +++ b/scripts/build/profil/staging-online/application.ini @@ -30,9 +30,6 @@ profil.mail.email.support = support@scores-decisions.com profil.mail.email.supportdev = supportdev@scores-decisions.com profil.mail.email.contact = contact@scores-decisions.com profil.mail.email.production = production@scores-decisions.com -profil.path.cache = APPLICATION_PATH "/../data/cache" -profil.path.files = APPLICATION_PATH "/../data/files" -profil.path.pages = APPLICATION_PATH "/../data/pages" profil.path.shared = "/home/vhosts/extranet-ng/shared" profil.wkhtmltopdf.path = "/usr/local/bin/wkhtmltopdf" profil.db.sdv1.adapter=mysqli