\n"._('Si le lien n\'est pas cliquable, copiez-collez le dans votre navigateur.')."
\n"; $body .= "
\n\n\n\n"; + $body .= '
'._('si cet email contient des liens non cliquables copiez/collez ces liens dans votre navigateur.').'
';
+ $body .= "\n"; $body .= '
' . _('phraseanet::signature automatique des notifications par mail, infos a l\'url suivante') . "
\n";
$body .= '\n";
$body = '' . $body . '';
@@ -258,7 +259,7 @@ class mail
$mail->ConfirmReadingTo = $reading_confirm_to;
}
- $mail->MsgHTML(strip_tags($body, '- '));
+ $mail->MsgHTML(strip_tags($body, '-$stmt = $conn->prepare($sql); -$usr_id = $session->get_usr_id(); -$stmt->execute(array(':usr_id' => $usr_id, ':usr_id_bis' => $usr_id, ':usr_id_sub' => $usr_id)); -$rs = $stmt->fetchAll(PDO::FETCH_ASSOC); -$stmt->closeCursor(); - -$sselid = null; -$o = 0; -$out = ''; - +' . - '
')); foreach ($files as $f) { diff --git a/lib/classes/module/console/fileConfigCheck.class.php b/lib/classes/module/console/fileConfigCheck.class.php index 1174b48f47..efab242c14 100644 --- a/lib/classes/module/console/fileConfigCheck.class.php +++ b/lib/classes/module/console/fileConfigCheck.class.php @@ -143,7 +143,7 @@ class module_console_fileConfigCheck extends Command private function checkParse(OutputInterface $output) { - if (!$this->configuration->getConfigurations()) + if (!$this->configuration) { throw new \Exception("Unable to load configurations\n"); } @@ -163,7 +163,7 @@ class module_console_fileConfigCheck extends Command { try { - $this->configuration->getConfiguration(); + $this->configuration; } catch (\Exception $e) { @@ -178,15 +178,8 @@ class module_console_fileConfigCheck extends Command { $configuration = Core\Configuration::build(); - try - { - $configuration->getConfiguration(); - } - catch (\Exception $e) - { - throw new \Exception(sprintf("Check get selected environment from file\n"), null, $e); - } - $output->writeln("Get Selected Environment from file OK "); + $env = $configuration->getEnvironnement(); + $output->writeln("Get Selected Environment from file : ".$env." "); return; } diff --git a/lib/classes/module/console/fileEnsureDevSetting.class.php b/lib/classes/module/console/fileEnsureDevSetting.class.php new file mode 100644 index 0000000000..e3596c54a3 --- /dev/null +++ b/lib/classes/module/console/fileEnsureDevSetting.class.php @@ -0,0 +1,920 @@ +setDescription('Ensure development settings'); + + $this->addArgument('conf', InputArgument::OPTIONAL, 'The file to check', null); + $this->addOption('strict', 's', InputOption::VALUE_NONE, 'Wheter to fail on alerts or not'); + + return $this; + } + + public function execute(InputInterface $input, OutputInterface $output) + { + $specifications = new \Alchemy\Phrasea\Core\Configuration\ApplicationSpecification(); + + $environnement = $input->getArgument('conf'); + + $this->configuration = \Alchemy\Phrasea\Core\Configuration::build($specifications, $environnement); + + if (!$this->configuration->isInstalled()) + { + $output->writeln(sprintf("\nPhraseanet is not installed\n")); + } + + $this->checkParse($output); + $output->writeln(sprintf("Will Ensure Production Settings on%s ", $this->configuration->getEnvironnement())); + + $this->runTests($output); + + $retval = $this->errors; + if ($input->getOption('strict')) + { + $retval += $this->alerts; + } + + if ($retval > 0) + { + $output->writeln("\nSome errors found in your conf "); + } + else + { + $output->writeln("\nYour dev settings are setted correctly ! Enjoy "); + } + $output->writeln('End'); + + return $retval; + } + + private function runTests(OutputInterface $output) + { + foreach ($this->testSuite as $test) + { + $display = ""; + switch ($test) + { + case 'checkPhraseanetScope' : + $display = "Phraseanet Configuration"; + break; + case 'checkDatabaseScope' : + $display = "Database"; + break; + case 'checkTeamplateEngineService' : + $display = "Template Engine"; + break; + case 'checkOrmService' : + $display = "ORM"; + break; + case 'checkCacheService' : + $display = "Cache"; + break; + case 'checkOpcodeCacheService' : + $display = "Opcode"; + break; + default: + throw new \Exception('Unknown test'); + break; + } + + $output->writeln(sprintf("\n||| %s", mb_strtoupper($display))); + + call_user_func(array($this, $test), $output); + } + } + + private function checkParse(OutputInterface $output) + { + + if (!$this->configuration->getConfigurations()) + { + throw new \Exception("Unable to load configurations\n"); + } + if (!$this->configuration->getConnexions()) + { + throw new \Exception("Unable to load connexions\n"); + } + if (!$this->configuration->getServices()) + { + throw new \Exception("Unable to load services\n"); + } + + return; + } + + private function checkCacheService(OutputInterface $output) + { + $cache = $this->configuration->getCache(); + + + if ($this->probeCacheService($output, $cache)) + { + if ($this->recommendedCacheService($output, $cache, true)) + { + $work_message = 'Works ! '; + } + else + { + $work_message = 'Cache server recommended '; + $this->alerts++; + } + } + else + { + $work_message = 'Failed - could not connect ! '; + $this->errors++; + } + + $verification = sprintf("\t--> Verify%s : %s", 'MainCache', $work_message); + + + $this->printConf($output, "\t" . 'service', $cache, false, $verification); + $this->verifyCacheOptions($output, $cache); + } + + private function checkOpcodeCacheService(OutputInterface $output) + { + $cache = $this->configuration->getOpcodeCache(); + + + if ($this->probeCacheService($output, $cache)) + { + if ($this->recommendedCacheService($output, $cache, false)) + { + $work_message = 'Works ! '; + } + else + { + $work_message = 'No cache required '; + $this->errors++; + } + } + else + { + $work_message = 'Failed - could not connect ! '; + $this->errors++; + } + + $verification = sprintf("\t--> Verify%s : %s", 'OpcodeCache', $work_message); + + + $this->printConf($output, "\t" . 'service', $cache, false, $verification); + $this->verifyCacheOptions($output, $cache); + } + + private function checkPhraseanetScope(OutputInterface $output) + { + $required = array('servername', 'maintenance', 'debug', 'display_errors', 'database'); + + $phraseanet = $this->configuration->getPhraseanet(); + + foreach ($phraseanet->all() as $conf => $value) + { + switch ($conf) + { + default: + $this->alerts++; + $this->printConf($output, $conf, $value, false, 'Not recognized '); + break; + case 'servername': + $url = $value; + $required = array_diff($required, array($conf)); + + $parseUrl = parse_url($url); + + if (empty($url)) + { + $message = "should not be empty "; + $this->errors++; + } + elseif ($url == 'http://sub.domain.tld/') + { + $this->alerts++; + $message = "may be wrong "; + } + elseif (!filter_var($url, FILTER_VALIDATE_URL)) + { + $message = "not valid "; + $this->errors++; + } + else + { + $message = "OK "; + } + $this->printConf($output, $conf, $value, false, $message); + break; + case 'maintenance': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== false) + { + $message = 'Should be true '; + $this->errors++; + } + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'debug': + case 'display_errors': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== true) + { + $message = 'Should be true '; + $this->errors++; + } + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'database': + $required = array_diff($required, array($conf)); + try + { + $service = $this->configuration->getConnexion($value); + if ($this->verifyDatabaseConnexion($service)) + { + $message = 'OK '; + } + else + { + $message = 'Connection not available '; + $this->errors++; + } + } + catch (\Exception $e) + { + $message = 'Unknown connection '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); + break; + } + } + + if (count($required) > 0) + { + $output->writeln(sprintf('Miss required keys %s ', implode(', ', $required))); + $this->errors++; + } + return; + } + + private function checkDatabaseScope(OutputInterface $output) + { + $connexionName = $this->configuration->getPhraseanet()->get('database'); + $connexion = $this->configuration->getConnexion($connexionName); + + try + { + if ($this->verifyDatabaseConnexion($connexion)) + { + $work_message = 'Works ! '; + } + else + { + $work_message = 'Failed - could not connect ! '; + $this->errors++; + } + } + catch (\Exception $e) + { + + $work_message = 'Failed - could not connect ! '; + $this->errors++; + } + + $output->writeln(sprintf("\t--> Verify connection%s : %s", $connexionName, $work_message)); + + $required = array('driver'); + + if (!$connexion->has('driver')) + { + $output->writeln("\nConnection has no driver "); + $this->errors++; + } + elseif ($connexion->get('driver') == 'pdo_mysql') + { + $required = array('driver', 'dbname', 'charset', 'password', 'user', 'port', 'host'); + } + elseif ($connexion->get('driver') == 'pdo_sqlite') + { + $required = array('driver', 'path', 'charset'); + } + else + { + $output->writeln("\nYour driver is not managed "); + $this->errors++; + } + + foreach ($connexion->all() as $conf => $value) + { + switch ($conf) + { + default: + $this->alerts++; + $this->printConf($output, $conf, $value, false, 'Not recognized '); + break; + case 'charset': + $required = array_diff($required, array($conf)); + $message = 'OK '; + if ($value !== 'UTF8') + { + $message = 'Not recognized '; + $this->alerts++; + } + $this->printConf($output, $conf, $value, false, $message); + break; + case 'path': + $required = array_diff($required, array($conf)); + $message = is_writable(dirname($value)) ? 'OK ' : 'Not writeable '; + $this->printConf($output, $conf, $value, false, $message); + break; + case 'dbname': + case 'user': + case 'host': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if (!is_scalar($value)) + { + $message = 'Should be scalar '; + $this->errors++; + } + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'port': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if (!ctype_digit($value)) + { + $message = 'Should be ctype_digit '; + $this->errors++; + } + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'password': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if (!is_scalar($value)) + { + $message = 'Should be scalar '; + $this->errors++; + } + + $value = '***********'; + $this->printConf($output, $conf, $value, false, $message); + break; + case 'driver': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== 'pdo_mysql') + { + $message = 'MySQL recommended '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); + break; + } + } + + if (count($required) > 0) + { + $output->writeln(sprintf('Miss required keys %s ', implode(', ', $required))); + $this->errors++; + } + + return; + } + + protected function verifyDatabaseConnexion(\Symfony\Component\DependencyInjection\ParameterBag\ParameterBag $connexion) + { + try + { + $config = new \Doctrine\DBAL\Configuration(); + $conn = \Doctrine\DBAL\DriverManager::getConnection($connexion->all(), $config); + return true; + } + catch (\Exception $e) + { + + } + + return false; + } + + private function checkTeamplateEngineService(OutputInterface $output) + { + $templateEngineName = $this->configuration->getTemplating(); + $configuration = $this->configuration->getService($templateEngineName); + + try + { + Core\Service\Builder::create(\bootstrap::getCore(), $templateEngineName, $configuration); + $work_message = 'Works ! '; + } + catch (\Exception $e) + { + $work_message = 'Failed - could not load template engine ! '; + $this->errors++; + } + + $output->writeln(sprintf("\t--> Verify Template engine%s : %s", $templateEngineName, $work_message)); + + if (!$configuration->has('type')) + { + $output->writeln("\nConfiguration has no type "); + $this->errors++; + } + elseif ($configuration->get('type') == 'TemplateEngine\\Twig') + { + $required = array('debug', 'charset', 'strict_variables', 'autoescape', 'optimizer'); + } + else + { + $output->writeln("\nYour type is not managed "); + $this->errors++; + } + + + + foreach ($configuration->all() as $conf => $value) + { + switch ($conf) + { + case 'type': + $message = 'OK '; + + if ($value !== 'TemplateEngine\\Twig') + { + $message = 'Not recognized '; + $this->alerts++; + } + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'options': + $message = 'OK '; + + if (!is_array($value)) + { + $message = 'Should be array '; + $this->errors++; + } + + $this->printConf($output, $conf, 'array()', false, $message); + break; + default: + $this->alerts++; + $this->printConf($output, $conf, 'unknown', false, 'Not recognized '); + break; + } + } + + foreach ($configuration->get('options') as $conf => $value) + { + switch ($conf) + { + case 'debug'; + case 'strict_variables'; + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== true) + { + $message = 'Should be false '; + $this->errors++; + } + + $this->printConf($output, "\t" . $conf, $value, false, $message); + break; + case 'autoescape'; + case 'optimizer'; + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== true) + { + $message = 'Should be true '; + $this->errors++; + } + + $this->printConf($output, "\t" . $conf, $value, false, $message); + break; + case 'charset'; + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== 'utf-8') + { + $message = 'Not recognized '; + $this->alerts++; + } + + $this->printConf($output, "\t" . $conf, $value, false, $message); + break; + default: + $this->alerts++; + $this->printConf($output, "\t" . $conf, $value, false, 'Not recognized '); + break; + } + } + + if (count($required) > 0) + { + $output->writeln(sprintf('Miss required keys %s ', implode(', ', $required))); + $this->errors++; + } + + return; + } + + private function checkOrmService(OutputInterface $output) + { + $ormName = $this->configuration->getOrm(); + $configuration = $this->configuration->getService($ormName); + + try + { + $service = Core\Service\Builder::create(\bootstrap::getCore(), $ormName, $configuration); + $work_message = 'Works ! '; + } + catch (\Exception $e) + { + $work_message = 'Failed - could not connect ! '; + $this->errors++; + } + + $output->writeln(sprintf("\t--> Verify ORM engine%s : %s", $ormName, $work_message)); + + + + if (!$configuration->has('type')) + { + $output->writeln("\nConfiguration has no type "); + $this->errors++; + } + elseif ($configuration->get('type') == 'Orm\\Doctrine') + { + $required = array('debug', 'dbal', 'cache'); + } + else + { + $output->writeln("\nYour type is not managed "); + $this->errors++; + } + + + + foreach ($configuration->all() as $conf => $value) + { + switch ($conf) + { + case 'type': + $message = $value == 'Orm\\Doctrine' ? 'OK ' : 'Not recognized '; + $this->printConf($output, $conf, $value, false, $message); + break; + case 'options': + $message = 'OK '; + + if (!is_array($value)) + { + $message = 'Should be array '; + $this->errors++; + } + + $this->printConf($output, $conf, 'array()', false, $message); + break; + default: + $this->alerts++; + $this->printConf($output, $conf, 'unknown', false, 'Not recognized '); + break; + } + } + + + foreach ($configuration->get('options') as $conf => $value) + { + switch ($conf) + { + case 'log': + $message = 'OK '; + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'cache': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if (!is_array($value)) + { + $message = 'Should be Array '; + $this->errors++; + } + + $this->printConf($output, $conf, 'array()', false, $message); + + $required_caches = array('query', 'result', 'metadata'); + foreach ($value as $name => $cache_type) + { + $required_caches = array_diff($required_caches, array($name)); + + foreach ($cache_type as $key_cache => $value_cache) + { + switch ($key_cache) + { + case 'service': + if ($this->probeCacheService($output, $value_cache)) + { + $server = $name === 'result'; + if ($this->recommendedCacheService($output, $value_cache, $server)) + { + $work_message = 'Works ! '; + } + else + { + $this->errors++; + $work_message = 'No cache required '; + } + } + else + { + $work_message = 'Failed - could not connect ! '; + $this->errors++; + } + + $verification = sprintf("\t--> Verify%s : %s", $name, $work_message); + + + $this->printConf($output, "\t" . $key_cache, $value_cache, false, $verification); + $this->verifyCacheOptions($output, $value_cache); + break; + default: + $this->alerts++; + $this->printConf($output, "\t" . $key_cache, $value_cache, false, 'Not recognized '); + break; + } + if (!isset($cache_type['service'])) + { + $output->writeln('Miss service for %s ', $cache_type); + $this->errors++; + } + } + } + + if (count($required_caches) > 0) + { + $output->writeln(sprintf('Miss required caches %s ', implode(', ', $required_caches))); + $this->errors++; + } + break; + case 'debug': + $required = array_diff($required, array($conf)); + $message = 'OK '; + + if ($value !== true) + { + $message = 'Should be true '; + $this->errors++; + } + + $this->printConf($output, $conf, $value, false, $message); + break; + case 'dbal': + $required = array_diff($required, array($conf)); + try + { + $connexion = $this->configuration->getConnexion($value); + $this->verifyDatabaseConnexion($connexion); + $message = 'OK '; + } + catch (\Exception $e) + { + $message = 'Failed '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); + break; + default: + $this->alerts++; + $this->printConf($output, $conf, $value, false, 'Not recognized '); + break; + } + } + + if (count($required) > 0) + { + $output->writeln(sprintf('Miss required keys %s ', implode(', ', $required))); + $this->errors++; + } + + return; + } + + protected function verifyCacheOptions(OutputInterface $output, $ServiceName) + { + try + { + $conf = $this->configuration->getService($ServiceName); + + $Service = Core\Service\Builder::create( + \bootstrap::getCore(), $ServiceName, $conf + ); + } + catch (\Exception $e) + { + return false; + } + + $required_options = array(); + + switch ($Service->getType()) + { + default: + break; + case 'memcache': + $required_options = array('host', 'port'); + break; + } + + if ($required_options) + { + foreach ($conf->get('options') as $conf => $value) + { + switch ($conf) + { + case 'host'; + $required_options = array_diff($required_options, array($conf)); + $message = 'OK '; + + if (!is_scalar($value)) + { + $message = 'Should be scalar '; + $this->errors++; + } + + $this->printConf($output, "\t\t" . $conf, $value, false, $message); + break; + case 'port'; + $required_options = array_diff($required_options, array($conf)); + $message = 'OK '; + + if (!ctype_digit($value)) + { + $message = 'Not recognized '; + $this->alerts++; + } + + $this->printConf($output, "\t\t" . $conf, $value, false, $message); + break; + default: + $this->alerts++; + $this->printConf($output, "\t\t" . $conf, $value, false, 'Not recognized '); + break; + } + } + } + + if (count($required_options) > 0) + { + $output->writeln(sprintf('Miss required keys %s ', implode(', ', $required_options))); + $this->errors++; + } + } + + protected function probeCacheService(OutputInterface $output, $ServiceName) + { + try + { + $originalConfiguration = $this->configuration->getService($ServiceName); + + $Service = Core\Service\Builder::create( + \bootstrap::getCore(), $ServiceName, $originalConfiguration + ); + } + catch (\Exception $e) + { + return false; + } + + if ($Service->getDriver()->isServer()) + { + switch ($Service->getType()) + { + default: + return false; + break; + case 'memcache': + if (!@memcache_connect($Service->getHost(), $Service->getPort())) + { + return false; + } + break; + } + } + + return true; + } + + protected function recommendedCacheService(OutputInterface $output, $ServiceName, $server) + { + try + { + $originalConfiguration = $this->configuration->getService($ServiceName); + + $Service = Core\Service\Builder::create( + \bootstrap::getCore(), $ServiceName, $originalConfiguration + ); + } + catch (\Exception $e) + { + return false; + } + + return $Service->getType() === 'array'; + } + + private function printConf($output, $scope, $value, $scopage = false, $message = '') + { + if (is_array($value)) + { + foreach ($value as $key => $val) + { + if ($scopage) + $key = $scope . ":" . $key; + $this->printConf($output, $key, $val, $scopage, ''); + } + } + elseif (is_bool($value)) + { + if ($value === false) + { + $value = 'false'; + } + elseif ($value === true) + { + $value = 'true'; + } + $output->writeln(sprintf("\t%s: %s %s", $scope, $value, $message)); + } + elseif (!empty($value)) + { + $output->writeln(sprintf("\t%s: %s %s", $scope, $value, $message)); + } + } + +} diff --git a/lib/classes/module/console/fileEnsureProductionSetting.class.php b/lib/classes/module/console/fileEnsureProductionSetting.class.php index b9ed08de2f..66200366f3 100644 --- a/lib/classes/module/console/fileEnsureProductionSetting.class.php +++ b/lib/classes/module/console/fileEnsureProductionSetting.class.php @@ -44,6 +44,7 @@ class module_console_fileEnsureProductionSetting extends Command , 'checkOpcodeCacheService' ); protected $errors = 0; + protected $alerts = 0; public function __construct($name = null) { @@ -52,6 +53,7 @@ class module_console_fileEnsureProductionSetting extends Command $this->setDescription('Ensure production settings'); $this->addArgument('conf', InputArgument::OPTIONAL, 'The file to check', null); + $this->addOption('strict', 's', InputOption::VALUE_NONE, 'Wheter to fail on alerts or not'); return $this; } @@ -74,8 +76,23 @@ class module_console_fileEnsureProductionSetting extends Command $this->runTests($output); + $retval = $this->errors; + if ($input->getOption('strict')) + { + $retval += $this->alerts; + } + + if ($retval > 0) + { + $output->writeln("\nSome errors found in your conf "); + } + else + { + $output->writeln("\nYour production settings are setted correctly ! Enjoy "); + } $output->writeln('End'); - return 0; + + return $retval; } private function runTests(OutputInterface $output) @@ -112,15 +129,6 @@ class module_console_fileEnsureProductionSetting extends Command call_user_func(array($this, $test), $output); } - if ($this->errors) - { - $output->writeln("\nSome errors found in your conf "); - } - else - { - $output->writeln("\nYour production settings are setted correctly ! Enjoy "); - } - return $this->errors; } private function checkParse(OutputInterface $output) @@ -156,6 +164,7 @@ class module_console_fileEnsureProductionSetting extends Command else { $work_message = 'Cache server recommended '; + $this->alerts++; } } else @@ -185,6 +194,7 @@ class module_console_fileEnsureProductionSetting extends Command else { $work_message = 'Opcode recommended '; + $this->alerts++; } } else @@ -211,6 +221,7 @@ class module_console_fileEnsureProductionSetting extends Command switch ($conf) { default: + $this->alerts++; $this->printConf($output, $conf, $value, false, 'Not recognized '); break; case 'servername': @@ -226,6 +237,7 @@ class module_console_fileEnsureProductionSetting extends Command } elseif ($url == 'http://sub.domain.tld/') { + $this->alerts++; $message = "may be wrong "; } elseif (!filter_var($url, FILTER_VALIDATE_URL)) @@ -235,6 +247,7 @@ class module_console_fileEnsureProductionSetting extends Command } elseif ($parseUrl["scheme"] !== "https") { + $this->alerts++; $message = "should be https "; } else @@ -247,7 +260,14 @@ class module_console_fileEnsureProductionSetting extends Command case 'debug': case 'display_errors': $required = array_diff($required, array($conf)); - $message = $value ? 'Should be false ' : 'OK '; + $message = 'OK '; + + if ($value !== false) + { + $message = 'Should be false '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); break; case 'database': @@ -335,11 +355,17 @@ class module_console_fileEnsureProductionSetting extends Command switch ($conf) { default: + $this->alerts++; $this->printConf($output, $conf, $value, false, 'Not recognized '); break; case 'charset': $required = array_diff($required, array($conf)); - $message = $value == 'UTF8' ? 'OK ' : 'Not recognized '; + $message = 'OK '; + if ($value !== 'UTF8') + { + $message = 'Not recognized '; + $this->alerts++; + } $this->printConf($output, $conf, $value, false, $message); break; case 'path': @@ -351,23 +377,50 @@ class module_console_fileEnsureProductionSetting extends Command case 'user': case 'host': $required = array_diff($required, array($conf)); - $message = is_scalar($value) ? 'OK ' : 'Should be scalar '; + $message = 'OK '; + + if (!is_scalar($value)) + { + $message = 'Should be scalar '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); break; case 'port': $required = array_diff($required, array($conf)); - $message = ctype_digit($value) ? 'OK ' : 'Should be scalar '; + $message = 'OK '; + + if (!ctype_digit($value)) + { + $message = 'Should be ctype_digit '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); break; case 'password': $required = array_diff($required, array($conf)); - $message = is_scalar($value) ? 'OK ' : 'Should be scalar '; + $message = 'OK '; + + if (!is_scalar($value)) + { + $message = 'Should be scalar '; + $this->errors++; + } + $value = '***********'; $this->printConf($output, $conf, $value, false, $message); break; case 'driver': $required = array_diff($required, array($conf)); - $message = $value === 'pdo_mysql' ? 'OK ' : 'MySQL recommended '; + $message = 'OK '; + + if ($value !== 'pdo_mysql') + { + $message = 'MySQL recommended '; + $this->errors++; + } $this->printConf($output, $conf, $value, false, $message); break; } @@ -410,7 +463,7 @@ class module_console_fileEnsureProductionSetting extends Command } catch (\Exception $e) { - $work_message = 'Failed - could not connect ! '; + $work_message = 'Failed - could not load template engine ! '; $this->errors++; } @@ -438,14 +491,29 @@ class module_console_fileEnsureProductionSetting extends Command switch ($conf) { case 'type': - $message = $value == 'TemplateEngine\\Twig' ? 'OK ' : 'Not recognized '; + $message = 'OK '; + + if($value !== 'TemplateEngine\\Twig') + { + $message = 'Not recognized '; + $this->alerts++; + } + $this->printConf($output, $conf, $value, false, $message); break; case 'options': - $message = is_array($value) ? 'OK ' : 'Should be array '; + $message = 'OK '; + + if (!is_array($value)) + { + $message = 'Should be array '; + $this->errors++; + } + $this->printConf($output, $conf, 'array()', false, $message); break; default: + $this->alerts++; $this->printConf($output, $conf, 'unknown', false, 'Not recognized '); break; } @@ -458,21 +526,43 @@ class module_console_fileEnsureProductionSetting extends Command case 'debug'; case 'strict_variables'; $required = array_diff($required, array($conf)); - $message = $value == false ? 'OK ' : 'Should be false '; + $message = 'OK '; + + if ($value !== false) + { + $message = 'Should be false '; + $this->errors++; + } + $this->printConf($output, "\t" . $conf, $value, false, $message); break; case 'autoescape'; case 'optimizer'; $required = array_diff($required, array($conf)); - $message = $value == true ? 'OK ' : 'Should be true '; + $message = 'OK '; + + if ($value !== true) + { + $message = 'Should be true '; + $this->errors++; + } + $this->printConf($output, "\t" . $conf, $value, false, $message); break; case 'charset'; $required = array_diff($required, array($conf)); - $message = $value == 'utf-8' ? 'OK ' : 'Not recognized '; + $message = 'OK '; + + if ($value !== 'utf-8') + { + $message = 'Not recognized '; + $this->alerts++; + } + $this->printConf($output, "\t" . $conf, $value, false, $message); break; default: + $this->alerts++; $this->printConf($output, "\t" . $conf, $value, false, 'Not recognized '); break; } @@ -533,10 +623,18 @@ class module_console_fileEnsureProductionSetting extends Command $this->printConf($output, $conf, $value, false, $message); break; case 'options': - $message = is_array($value) ? 'OK ' : 'Should be array '; + $message = 'OK '; + + if (!is_array($value)) + { + $message = 'Should be array '; + $this->errors++; + } + $this->printConf($output, $conf, 'array()', false, $message); break; default: + $this->alerts++; $this->printConf($output, $conf, 'unknown', false, 'Not recognized '); break; } @@ -548,12 +646,26 @@ class module_console_fileEnsureProductionSetting extends Command switch ($conf) { case 'log': - $message = $value == false ? 'OK ' : 'Should be deactivated '; + $message = 'OK '; + + if ($value !== false) + { + $message = 'Should be deactivated '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); break; case 'cache': $required = array_diff($required, array($conf)); - $message = is_array($value) ? 'OK ' : 'Should be Array '; + $message = 'OK '; + + if (!is_array($value)) + { + $message = 'Should be Array '; + $this->errors++; + } + $this->printConf($output, $conf, 'array()', false, $message); $required_caches = array('query', 'result', 'metadata'); @@ -575,6 +687,7 @@ class module_console_fileEnsureProductionSetting extends Command } else { + $this->alerts++; if ($server) { $work_message = 'Cache server recommended '; @@ -598,6 +711,7 @@ class module_console_fileEnsureProductionSetting extends Command $this->verifyCacheOptions($output, $value_cache); break; default: + $this->alerts++; $this->printConf($output, "\t" . $key_cache, $value_cache, false, 'Not recognized '); break; } @@ -617,7 +731,14 @@ class module_console_fileEnsureProductionSetting extends Command break; case 'debug': $required = array_diff($required, array($conf)); - $message = $value == false ? 'OK ' : 'Should be false '; + $message = 'OK '; + + if ($value !== false) + { + $message = 'Should be false '; + $this->errors++; + } + $this->printConf($output, $conf, $value, false, $message); break; case 'dbal': @@ -636,6 +757,7 @@ class module_console_fileEnsureProductionSetting extends Command $this->printConf($output, $conf, $value, false, $message); break; default: + $this->alerts++; $this->printConf($output, $conf, $value, false, 'Not recognized '); break; } @@ -684,15 +806,30 @@ class module_console_fileEnsureProductionSetting extends Command { case 'host'; $required_options = array_diff($required_options, array($conf)); - $message = is_scalar($value) ? 'OK ' : 'Should be scalar '; + $message = 'OK '; + + if (!is_scalar($value)) + { + $message = 'Should be scalar '; + $this->errors++; + } + $this->printConf($output, "\t\t" . $conf, $value, false, $message); break; case 'port'; $required_options = array_diff($required_options, array($conf)); - $message = ctype_digit($value) ? 'OK ' : 'Not recognized '; + $message = 'OK '; + + if (!ctype_digit($value)) + { + $message = 'Not recognized '; + $this->alerts++; + } + $this->printConf($output, "\t\t" . $conf, $value, false, $message); break; default: + $this->alerts++; $this->printConf($output, "\t\t" . $conf, $value, false, 'Not recognized '); break; } @@ -729,7 +866,7 @@ class module_console_fileEnsureProductionSetting extends Command return false; break; case 'memcache': - if (!memcache_connect($Service->getHost(), $Service->getPort())) + if (!@memcache_connect($Service->getHost(), $Service->getPort())) { return false; } diff --git a/lib/classes/module/report/activity.class.php b/lib/classes/module/report/activity.class.php index 368b34dadb..c81b080c82 100644 --- a/lib/classes/module/report/activity.class.php +++ b/lib/classes/module/report/activity.class.php @@ -453,7 +453,6 @@ class module_report_activity extends module_report $this->result[$i]['total'] += 1; $total['tot_dl'] += 1; - } $nb_row = $i + 1; @@ -479,7 +478,7 @@ class module_report_activity extends module_report * @param string $on choose the field on what you want the result * @return array */ - public function getConnexionBase($tab = false, $on= "") + public function getConnexionBase($tab = false, $on = "") { //default group on user column if (empty($on)) @@ -577,7 +576,7 @@ class module_report_activity extends module_report * @param array $tab config for the html table * @return array */ - public function getDetailDownload($tab = false, $on="") + public function getDetailDownload($tab = false, $on = "") { empty($on) ? $on = "user" : ""; //by default always report on user @@ -638,19 +637,37 @@ class module_report_activity extends module_report foreach ($rs as $row) { $user = $row[$on]; - if (($save_user != $user) && !is_null($user)) + if (($save_user != $user) && !is_null($user) && !empty($user)) + { + if ($i >= 0) + { + if (($this->result[$i]['nbprev'] + $this->result[$i]['nbdoc']) == 0 || ($this->result[$i]['poiddoc'] + $this->result[$i]['poidprev']) == 0) + { + unset($this->result[$i]); + } + + if (isset($this->result[$i]['poiddoc']) && isset($this->result[$i]['poidprev'])) + { + $this->result[$i]['poiddoc'] = p4string::format_octets($this->result[$i]['poiddoc']); + $this->result[$i]['poidprev'] = p4string::format_octets($this->result[$i]['poidprev']); + } + } + + $i++; + + $this->result[$i]['nbprev'] = 0; + $this->result[$i]['poidprev'] = 0; + $this->result[$i]['nbdoc'] = 0; + $this->result[$i]['poiddoc'] = 0; + } + //doc info if ($row['final'] == 'document' && !is_null($user) && !is_null($row['usrid'])) { $this->result[$i]['nbdoc'] = (!is_null($row['nb']) ? $row['nb'] : 0); - $this->result[$i]['poiddoc'] = (!is_null($row['poid']) ? - p4string::format_octets($row['poid']) : 0); - if (!isset($this->result[$i]['nbprev'])) - $this->result[$i]['nbprev'] = 0; - if (!isset($this->result[$i]['poidprev'])) - $this->result[$i]['poidprev'] = 0; + $this->result[$i]['poiddoc'] = (!is_null($row['poid']) ? $row['poid'] : 0); $this->result[$i]['user'] = empty($row[$on]) ? "" . _('report:: non-renseigne') . "" : $row[$on]; $total['nbdoc'] += $this->result[$i]['nbdoc']; @@ -658,26 +675,25 @@ class module_report_activity extends module_report $this->result[$i]['usrid'] = $row['usrid']; } //preview info - if ($row['final'] == 'preview' && + if (($row['final'] == 'preview' || $row['final'] == 'thumbnail') && !is_null($user) && !is_null($row['usrid'])) { - if (!isset($this->result[$i]['nbdoc'])) - $this->result[$i]['nbdoc'] = 0; - if (!isset($this->result[$i]['poiddoc'])) - $this->result[$i]['poiddoc'] = 0; - $this->result[$i]['nbprev'] = (!is_null($row['nb']) ? $row['nb'] : 0); - $this->result[$i]['poidprev'] = (!is_null($row['poid']) ? - p4string::format_octets($row['poid']) : 0); + + $this->result[$i]['nbprev'] += (!is_null($row['nb']) ? $row['nb'] : 0); + $this->result[$i]['poidprev'] += (!is_null($row['poid']) ? $row['poid'] : 0); + $this->result[$i]['user'] = empty($row[$on]) ? "" . _('report:: non-renseigne') . "" : $row[$on]; - $total['nbprev'] += $this->result[$i]['nbprev']; + $total['nbprev'] += (!is_null($row['nb']) ? $row['nb'] : 0); $total['poidprev'] += (!is_null($row['poid']) ? $row['poid'] : 0); $this->result[$i]['usrid'] = $row['usrid']; } + $save_user = $user; } - + + unset($this->result[$i]); $nb_row = $i + 1; $this->total = $nb_row; @@ -756,7 +772,7 @@ class module_report_activity extends module_report } catch (Exception $e) { - + } } elseif ($value == "size") diff --git a/lib/classes/patch/320h.class.php b/lib/classes/patch/320h.class.php new file mode 100644 index 0000000000..1d4866eabf --- /dev/null +++ b/lib/classes/patch/320h.class.php @@ -0,0 +1,66 @@ +release; + } + + public function require_all_upgrades() + { + return true; + } + + /** + * + * @return Array + */ + function concern() + { + return $this->concern; + } + + function apply(base &$appbox) + { + $sql = 'DELETE FROM basusr WHERE actif = "0"'; + + $stmt = $appbox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + + return true; + } + +} diff --git a/lib/classes/patch/360.class.php b/lib/classes/patch/360.class.php index 231fcc3524..186e1427c5 100644 --- a/lib/classes/patch/360.class.php +++ b/lib/classes/patch/360.class.php @@ -59,7 +59,7 @@ class patch_360 implements patchInterface foreach ($tables as $table) { - $sql = 'TRUNCATE ' . $table; + $sql = 'DELETE FROM ' . $table; $stmt = $appbox->get_connection()->prepare($sql); $stmt->execute(); $stmt->closeCursor(); diff --git a/lib/classes/patch/3602.class.php b/lib/classes/patch/3602.class.php index f707bfb2c4..619ab62a73 100644 --- a/lib/classes/patch/3602.class.php +++ b/lib/classes/patch/3602.class.php @@ -54,13 +54,19 @@ class patch_3602 implements patchInterface function apply(base &$databox) { + try + { + $sql = 'ALTER TABLE `metadatas` DROP INDEX `unique`'; - $sql = 'ALTER TABLE `metadatas` DROP INDEX `unique`'; - - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $stmt->closeCursor(); - + $stmt = $databox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + } + catch(\PDOException $e) + { + + } + return true; } diff --git a/lib/classes/record/Interface.class.php b/lib/classes/record/Interface.class.php index 5583384643..69678b155b 100644 --- a/lib/classes/record/Interface.class.php +++ b/lib/classes/record/Interface.class.php @@ -95,8 +95,6 @@ interface record_Interface public function set_binary_status($status); - public function get_reg_name(); - public function get_hd_file(); public function delete(); diff --git a/lib/classes/record/adapter.class.php b/lib/classes/record/adapter.class.php index 177348f54a..bd8d3323d1 100644 --- a/lib/classes/record/adapter.class.php +++ b/lib/classes/record/adapter.class.php @@ -140,8 +140,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface const CACHE_GROUPING = 'grouping'; const CACHE_STATUS = 'status'; - protected static $_regfields; - /** * * @param$base_id @@ -895,16 +893,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface */ public function get_title($highlight = false, searchEngine_adapter $searchEngine = null) { - $sbas_id = $this->get_sbas_id(); - $record_id = $this->get_record_id(); - - if ($this->is_grouping()) - { - $regfield = self::getRegFields($sbas_id, $this->get_caption()); - - return $regfield['regname']; - } - $title = ''; $appbox = appbox::get_instance(\bootstrap::getCore()); $session = $appbox->get_session(); @@ -944,98 +932,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface return $title; } - public function get_description() - { - - if (!$this->is_grouping()) - throw new \Exception('This record is not a story'); - - $regfield = self::getRegFields($this->get_sbas_id(), $this->get_caption()); - - return $regfield['regdesc']; - } - - /** - * - * @param $sbas_id - * @param caption_record $desc - * @return - */ - protected static function getRegFields($sbas_id, caption_record $desc) - { - if (!self::$_regfields) - self::load_regfields(); - - $arrayRegFields = self::$_regfields[$sbas_id]; - - $array = array(); - - foreach ($arrayRegFields as $k => $f) - { - $array[$f] = $k; - } - - $fields = array(); - $fields["regname"] = ""; - $fields["regdesc"] = ""; - $fields["regdate"] = ""; - - foreach ($desc->get_fields() as $caption_field) - { - /* @var $caption_field caption_field */ - $meta_struct_id = $caption_field->get_meta_struct_id(); - if (array_key_exists($meta_struct_id, $array)) - { - $fields[$array[$meta_struct_id]] = $caption_field->get_serialized_values(); - } - } - - return $fields; - } - - /** - * get databox reg fields - * - * @todo change this shit - * @return array - */ - protected static function load_regfields() - { - $appbox = appbox::get_instance(\bootstrap::getCore()); - self::$_regfields = array(); - foreach ($appbox->get_databoxes() as $databox) - { - self::$_regfields[$databox->get_sbas_id()] = self::searchRegFields($databox->get_meta_structure()); - } - - return self::$_regfields; - } - - /** - * - * @param databox_descriptionStructure $meta_struct - * @return - */ - protected function searchRegFields(databox_descriptionStructure $meta_struct) - { - $fields = null; - $fields["regname"] = ""; - $fields["regdesc"] = ""; - $fields["regdate"] = ""; - - foreach ($meta_struct as $meta) - { - if ($meta->is_regname()) - $fields["regname"] = $meta->get_id(); - elseif ($meta->is_regdesc()) - $fields["regdesc"] = $meta->get_id(); - elseif ($meta->is_regdate()) - $fields['regdate'] = $meta->get_id(); - } - - return $fields; - } - /** * * @return media_subdef @@ -1487,42 +1383,6 @@ class record_adapter implements record_Interface, cache_cacheableInterface return $this; } - /** - * - * @return string - */ - public function get_reg_name() - { - if (!$this->is_grouping()) - { - return false; - } - - $balisename = ''; - - $struct = $this->databox->get_structure(); - - if ($sxe = simplexml_load_string($struct)) - { - $z = $sxe->xpath('/record/description'); - if ($z && is_array($z)) - { - foreach ($z[0] as $ki => $vi) - { - if ($vi['regname'] == '1') - { - $balisename = $ki; - break; - } - } - } - } - $regname = ''; - if ($sxe = simplexml_load_string($this->get_xml())) - $regname = (string) $sxe->description->$balisename; - - return $regname; - } /** * diff --git a/lib/classes/searchEngine/adapter/phrasea/engine.class.php b/lib/classes/searchEngine/adapter/phrasea/engine.class.php index c410c6e498..55983f3d75 100644 --- a/lib/classes/searchEngine/adapter/phrasea/engine.class.php +++ b/lib/classes/searchEngine/adapter/phrasea/engine.class.php @@ -631,7 +631,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract return array(); $rs = $res['results']; $res = array_shift($rs); - if (!$res['xml']) + if (! isset($res['xml'])) return array(); $sxe = simplexml_load_string($res['xml']); @@ -645,7 +645,8 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract { $val[] = str_replace(array('[[em]]', '[[/em]]'), array('', ''), (string) $value); } - $val = implode(' '.$field['separator'].' ', $val); + $separator = $field['separator'] ? $field['separator'][0] : ''; + $val = implode(' '.$separator.' ', $val); } else { diff --git a/lib/classes/set/order.class.php b/lib/classes/set/order.class.php index 9eb0014cba..c81e43e67a 100644 --- a/lib/classes/set/order.class.php +++ b/lib/classes/set/order.class.php @@ -222,14 +222,26 @@ class set_order extends set_abstract $core = \bootstrap::getCore(); $em = $core->getEntityManager(); - $repository = $em->getRepository('\Entities\Basket'); - + + $Basket = null; /* @var $repository \Repositories\BasketRepository */ - $Basket = $repository->findUserBasket($this->ssel_id, $core->getAuthenticatedUser(), false); + if($this->ssel_id) + { + $repository = $em->getRepository('\Entities\Basket'); + + try + { + $Basket = $repository->findUserBasket($this->ssel_id, $core->getAuthenticatedUser(), false); + } + catch(\Exception $e) + { + $Basket = null; + } + } if(!$Basket) { - $Basket = new Basket(); + $Basket = new \Entities\Basket(); $Basket->setName(sprintf(_('Commande du %s'), $this->created_on->format('Y-m-d'))); $Basket->setOwner($this->user); $Basket->setPusher($core->getAuthenticatedUser()); @@ -265,16 +277,15 @@ class set_order extends set_abstract $sbas_id = phrasea::sbasFromBas($basrec['base_id']); $record = new record_adapter($sbas_id, $basrec['record_id']); - $BasketElement = new BasketElement(); + $BasketElement = new \Entities\BasketElement(); $BasketElement->setRecord($record); $BasketElement->setBasket($Basket); $Basket->addBasketElement($BasketElement); $em->persist($BasketElement); - - $em->merge($Basket); - + + $params = array( ':usr_id' => $session->get_usr_id() , ':order_id' => $this->id diff --git a/lib/classes/setup.class.php b/lib/classes/setup.class.php index a35f90b03f..742941c4c6 100644 --- a/lib/classes/setup.class.php +++ b/lib/classes/setup.class.php @@ -607,18 +607,16 @@ class setup if ($Core->getCache()->isServer()) { $stats = $Core->getCache()->getStats(); - + + echo ' - ' . sprintf(_('setup::Serveur actif sur %s'), $registry->get('GV_cache_server_host') . ':' . $registry->get('GV_cache_server_port')) . '
'; + echo ""; + foreach ($stats as $name => $stat) { - echo '
"; } else { @@ -643,9 +641,9 @@ class setup } if ($found > 1) - $constraints[] = new Setup_Constraint('Multiple opcode caches', false, 'Many opcode cache load is forbidden', true); + $constraints[] = new Setup_Constraint('Multiple opcode caches', false, _('Many opcode cache load is forbidden'), true); if ($found === 0) - $constraints[] = new Setup_Constraint('No opcode cache', false, 'No opcode cache were detected. Phraseanet strongly recommends the use of XCache or APC.', false); + $constraints[] = new Setup_Constraint('No opcode cache', false, _('No opcode cache were detected. Phraseanet strongly recommends the use of XCache or APC.'), false); return new Setup_ConstraintsIterator($constraints); } diff --git a/lib/classes/sphinx/configuration.class.php b/lib/classes/sphinx/configuration.class.php index 92d9d43607..cbd3b40972 100644 --- a/lib/classes/sphinx/configuration.class.php +++ b/lib/classes/sphinx/configuration.class.php @@ -67,15 +67,17 @@ class sphinx_configuration $defaults = array( 'sbas' => self::OPT_ALL_SBAS - , 'libstemmer' => array(self::OPT_LIBSTEMMER_NONE) + , 'libstemmer' => array(self::OPT_LIBSTEMMER_NONE) , 'enable_star' => self::OPT_ENABLE_STAR_ON - , 'min_prefix_len' => self::OPT_MIN_PREFIX_LEN + , 'min_prefix_len' => self::OPT_MIN_PREFIX_LEN , 'min_infix_len' => self::OPT_MIN_INFIX_LEN , 'charset_tables' => array() ); $options = array_merge($defaults, $options); + $options['charset_tables'] = array_unique($options['charset_tables']); + $lb = phrasea::sbas_params(); $conf = ''; @@ -439,7 +441,7 @@ class sphinx_configuration path = /var/sphinx/datas/docs_realtime_' . $serialized . ' -' . $charset_abstract . ' + ' . $charset_abstract . ' rt_field = value # rt_field = meta_struct_id @@ -593,6 +595,9 @@ searchd # optional, default is 256 # max_filters = 512 + + compat_sphinxql_magics = 0 + } '; diff --git a/lib/classes/sphinxrt.class.php b/lib/classes/sphinxrt.class.php index a8c5b354ce..28deccec5a 100644 --- a/lib/classes/sphinxrt.class.php +++ b/lib/classes/sphinxrt.class.php @@ -81,7 +81,7 @@ class sphinxrt if ($rt_id) { $this->connection->beginTransaction(); - $sql = "DELETE FROM " . $rt_id . " WHERE id = " . (int) $id . ""; + $sql = "DELETE FROM " . $rt_id . " WHERE id = " . (int) $id . ""; $stmt = $this->connection->prepare($sql); $stmt->execute(); $stmt->closeCursor(); @@ -99,14 +99,13 @@ class sphinxrt $cl = new SphinxClient(); if ($cl->Status() === false) - return $this; $cl->SetServer($registry->get('GV_sphinx_host'), (int) $registry->get('GV_sphinx_port')); $cl->SetConnectTimeout(1); - $status = strrev($status); + $status = strrev($status); $new_stat = array(); for ($i = 4; $i < strlen($status); $i++) { @@ -122,20 +121,18 @@ class sphinxrt return $this; } - public function replace_in_metas($rt_id, $meta_id, $tag_id, $record_id, $sbas_id, $coll_id, $grouping, $type, Array $content, DateTime $created) + public function replace_in_metas($rt_id, $meta_id, $tag_id, $record_id, $sbas_id, $coll_id, $grouping, $type, $content, DateTime $created) { - $crc_sbas_tag = crc32($sbas_id . '_' . $tag_id); - $crc_sbas_coll = crc32($sbas_id . '_' . $coll_id); + $crc_sbas_tag = crc32($sbas_id . '_' . $tag_id); + $crc_sbas_coll = crc32($sbas_id . '_' . $coll_id); $crc_sbas_record = crc32($sbas_id . '_' . $record_id); - $crc_type = crc32($type); + $crc_type = crc32($type); $this->connection->beginTransaction(); -// foreach ($content as $value) -// { - $sql = "REPLACE INTO " . $rt_id . " VALUES ( + $sql = "REPLACE INTO " . $rt_id . " VALUES ( '" . (int) $meta_id . "' - ,'" . str_replace("'", "\'", implode(' ', $content)) . "' + ,'" . str_replace("'", "\'", $content) . "' ,'" . (int) $tag_id . "' ," . (int) $record_id . " ," . (int) $sbas_id . " @@ -149,7 +146,6 @@ class sphinxrt ," . (int) $created->format('U') . " )"; $stmt = $this->connection->prepare($sql); $stmt->execute(); -// } $stmt->closeCursor(); @@ -160,9 +156,9 @@ class sphinxrt public function replace_in_documents($rt_id, $record_id, $value, $sbas_id, $coll_id, $grouping, $type, DateTime $created) { - $crc_sbas_coll = crc32($sbas_id . '_' . $coll_id); + $crc_sbas_coll = crc32($sbas_id . '_' . $coll_id); $crc_sbas_record = crc32($sbas_id . '_' . $record_id); - $crc_type = crc32($type); + $crc_type = crc32($type); $this->connection->beginTransaction(); diff --git a/lib/conf.d/_GV_template.inc b/lib/conf.d/_GV_template.inc index 7a5a950a50..bb69235ff5 100644 --- a/lib/conf.d/_GV_template.inc +++ b/lib/conf.d/_GV_template.inc @@ -10,8 +10,10 @@ $GV_sit = md5(time() . '--' . mt_rand(1000000, 9999999)); include_once dirname(__FILE__) . "/../../lib/classes/User/Interface.class.php"; include_once dirname(__FILE__) . "/../../lib/classes/User/Adapter.class.php"; -$lngs = User_Adapter::avLanguages(); + +$lngs = User_Adapter::avLanguages(); $avLanguages = array(); + foreach ($lngs as $lng => $locales) { foreach ($locales as $loc => $locname) @@ -20,28 +22,47 @@ foreach ($lngs as $lng => $locales) } } -$eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance(\bootstrap::getCore()), bootstrap::getCore()); +$Core = \bootstrap::getCore(); + +$extractDateFields = function(\Alchemy\Phrasea\Core $Core) { + $date_sort_fields = array(''=>''); + if ($Core->getConfiguration()->isInstalled()) + { + $ProdHelper = new Alchemy\Phrasea\Helper\Prod($Core, Symfony\Component\HttpFoundation\Request::createFromGlobals()); + $datas = $ProdHelper->get_search_datas(); + foreach ($datas['dates'] as $date) + { + $date_sort_fields[$date['fieldname']] = $date['fieldname']; + } + } + return $date_sort_fields; +}; + +$date_sort_fields = $extractDateFields($Core); + + +$eventsmanager = eventsmanager_broker::getInstance(appbox::get_instance($Core), $Core); $PHP_CONF = array( - 'output_buffering' => '4096' //INI_ALL - , 'memory_limit' => '1024M' //INI_ALL - , 'error_reporting' => '6143' //INI_ALL - , 'default_charset' => 'UTF-8' //INI_ALL - , 'session.use_cookies' => '1' //INI_ALL - , 'session.use_only_cookies' => '1' //INI_ALL - , 'session.auto_start' => '0' //INI_ALL - , 'session.hash_function' => '1' //INI_ALL - , 'session.hash_bits_per_character' => '6' //INI_ALL - , 'allow_url_fopen' => 'on' //INI_ALL - , 'display_errors' => 'off' //INI_ALL - , 'display_startup_errors' => 'off' //INI_ALL - , 'log_errors' => 'off' //INI_ALL + 'output_buffering' => '4096' //INI_ALL + , 'memory_limit' => '1024M' //INI_ALL + , 'error_reporting' => '6143' //INI_ALL + , 'default_charset' => 'UTF-8' //INI_ALL + , 'session.use_cookies' => '1' //INI_ALL + , 'session.use_only_cookies' => '1' //INI_ALL + , 'session.auto_start' => '0' //INI_ALL + , 'session.hash_function' => '1' //INI_ALL + , 'session.hash_bits_per_character' => '6' //INI_ALL + , 'allow_url_fopen' => 'on' //INI_ALL + , 'display_errors' => 'off' //INI_ALL + , 'display_startup_errors' => 'off' //INI_ALL + , 'log_errors' => 'off' //INI_ALL ); -$PHP_REQ = array( - 'safe_mode' => 'off' - , 'file_uploads' => '1' - , 'magic_quotes_runtime' => 'off' //INI_ALL - , 'magic_quotes_gpc' => 'off' //INI_PER_DIR -- just for check +$PHP_REQ = array( + 'safe_mode' => 'off' + , 'file_uploads' => '1' + , 'magic_quotes_runtime' => 'off' //INI_ALL + , 'magic_quotes_gpc' => 'off' //INI_PER_DIR -- just for check ); $youtube_console_url = 'https://code.google.com/apis/console/'; @@ -57,472 +78,452 @@ $dailymotion_callback = '/prod/bridge/callback/dailymotion/'; $create_api_dailymotion = 'http://www.dailymotion.com/profile/developer'; $GV = array( - array( - 'section' => _('GV::section:: Serveur HTTP'), - 'vars' => array( - array( - 'type' => 'timezone', - 'name' => 'GV_timezone', - 'comment' => _('reglages:: Timezone de l\'installation'), - 'default' => 'Europe/Paris', - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_sit', - 'comment' => _('reglages:: Nom de linstallation'), - 'default' => $GV_sit, - 'readonly' => true, - 'required' => true - ), - array( - 'type' => 'enum', - 'name' => 'GV_default_lng', - 'comment' => _('reglages:: Langue par defaut'), - 'default' => 'fr_FR', - 'available' => $avLanguages, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_STATIC_URL', - 'end_slash' => false, - 'comment' => _('reglages:: URL statique (optionnel)'), - 'default' => '', - 'required' => false - ) - ) - ), array( - 'section' => _('GV::section:: Etat de maintenance'), - 'rolled' => true, - 'vars' => array( - array( - 'type' => 'text', - 'name' => 'GV_message', - 'comment' => _('reglages:: Message a diffuser aux utilisateurs'), - 'default' => "May the force be with you" - ), - array( - 'type' => 'boolean', - 'name' => 'GV_message_on', - 'comment' => _('reglages:: activation du message a diffuser aux utilistaeurs'), - 'default' => false - ), - array( - 'type' => 'boolean', - 'name' => 'GV_log_errors', - 'comment' => _('reglages:: logguer les erreurs'), - 'default' => false - ) - ) - ), array( - 'section' => _('GV::section:: Connectivite aux webservices'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_google_api', - 'comment' => _('reglages:: Utiliser els google apis'), - 'default' => true, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_i18n_service', - 'comment' => _('reglages:: Service phrasea de localisation'), - 'default' => 'http://localization.webservice.alchemyasp.com/', - 'end_slash' => true, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_bitly_user', - 'comment' => _('reglages:: Nom d\'utilisateur pour l\'api bit.ly'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_bitly_key', - 'comment' => _('reglages:: ccle d\'api pour l\'api bit.ly'), - 'default' => '', - ), - array( - 'type' => 'boolean', - 'name' => 'GV_captchas', - 'comment' => _('reglages:: Utilisation de l\'api recpatcha'), - 'default' => false, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_captcha_public_key', - 'comment' => _('reglages:: clef publique recaptcha'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_captcha_private_key', - 'comment' => _('reglages:: clef privee recaptcha'), - 'default' => '' - ) - ) - ), array( - 'section' => _('GV::section:: Connectivite a Youtube'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_youtube_api', - 'comment' => sprintf(_('reglages:: Utiliser l\'api youtube, voir %s,- Statistics given by `' . $name . '`
'; - echo '- ' . sprintf(_('setup::Serveur actif sur %s'), $registry->get('GV_cache_server_host') . ':' . $registry->get('GV_cache_server_port')) . '
'; - echo ""; - foreach ($stat as $key => $value) - { - echo "
"; + echo "" . $key . " " . $value . " " . $name . " " . $stat . "
mettre la callback a WEBSITE_URL/prod/bridge/callback/youtube'), $youtube_console_url), - 'default' => false, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_youtube_client_id', - 'comment' => _('reglages:: Youtube client id'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_youtube_client_secret', - 'comment' => _('reglages:: Youtube clientsecret'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_youtube_dev_key', - 'comment' => sprintf(_('reglages:: Youtube cle developpeur, voir %s'), $dashboard_youtube), - 'default' => '' - ) - ) - ), array( - 'section' => _('GV::section:: Connectivite a FlickR'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_flickr_api', - 'comment' => sprintf(_('reglages:: Utiliser l api flickr, voir %s, puis set la callback a %s'), $create_api_flickr, $flickr_callback), - 'default' => false, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_flickr_client_id', - 'comment' => _('reglages:: FlickR client id'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_flickr_client_secret', - 'comment' => _('reglages:: FlickR client secret'), - 'default' => '' - ) - ) - ), array( - 'section' => _('GV::section:: Connectivite a Dailymotion'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_dailymotion_api', - 'comment' => sprintf(_('reglages:: Utiliser l api dailymotion, voir %s, puis set la callback a %s'), $create_api_dailymotion, $dailymotion_callback), - 'default' => false, - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_dailymotion_client_id', - 'comment' => _('reglages:: dailymotion client id'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_dailymotion_client_secret', - 'comment' => _('reglages:: dailymotion client secret'), - 'default' => '' - ) - ) - ), array( - 'section' => _('GV::section:: Gestionnaire d\'evenements'), - 'vars' => array( - array( - 'type' => 'enum_multi', - 'name' => 'GV_events', - 'default'=>null, - 'comment' => _('reglages:: Evenements'), - 'available'=> $eventsmanager->list_all('event'), - 'default'=> array_keys($eventsmanager->list_all('event')) - ), - array( - 'type' => 'enum_multi', - 'name' => 'GV_notifications', - 'default'=>null, - 'comment' => _('reglages:: Notifications'), - 'available'=> $eventsmanager->list_all('notify'), - 'default'=> array_keys($eventsmanager->list_all('notify')) - ) - ) - ), array( - 'section' => _('GV::section:: Stockage des documents'), - 'vars' => array( - array( - 'type' => 'string', - 'name' => 'GV_appletAllowedFileExt', - 'comment' => _('reglages:: extensions de fichier autorisees en upload, separees par des virgules. * pour autoriser tous les fichiers'), - 'default' => 'jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2', - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_base_datapath_web', - 'end_slash' => true, - 'comment' => _('reglages:: dossier de stockage des vignettes publiees en acces direct'), - 'default'=>'', - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_base_datapath_noweb', - 'end_slash' => true, - 'comment' => _('reglages:: dossier de stockage des fichiers proteges de l\'acces direct'), - 'default'=>'', - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_base_dataurl', - 'comment' => _('reglages:: point de montage des vignettes publiees en acces direct'), - 'default' => 'web', - 'end_slash' => false, - 'required' => true - ) - ) + array( + 'section' => _('GV::section:: Serveur HTTP'), + 'vars' => array( + array( + 'type' => 'timezone', + 'name' => 'GV_timezone', + 'comment' => _('reglages:: Timezone de l\'installation'), + 'default' => 'Europe/Paris', + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_sit', + 'comment' => _('reglages:: Nom de linstallation'), + 'default' => $GV_sit, + 'readonly' => true, + 'required' => true + ), + array( + 'type' => 'enum', + 'name' => 'GV_default_lng', + 'comment' => _('reglages:: Langue par defaut'), + 'default' => 'fr_FR', + 'available' => $avLanguages, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_STATIC_URL', + 'end_slash' => false, + 'comment' => _('reglages:: URL statique (optionnel)'), + 'default' => '', + 'required' => false + ) ) -// , array( -// 'section' => _('GV::section:: Serveurs de cache'), -// 'vars' => array( -// array( -// 'type' => 'boolean', -// 'name' => 'GV_use_cache', -// 'comment' => _('reglages:: Utiliser un serveur de cache'), -// 'default' => false, -// 'required' => true -// ), -// array( -// 'type' => 'enum', -// 'name' => 'GV_cache_server_type', -// 'comment' => _('reglages:: Utiliser un serveur de cache'), -// 'default' => '', -// 'available' => array(''=>_('Aucun'),'redis' => 'Redis', 'memcached' => 'Memcached') -// ), -// array( -// 'type' => 'string', -// 'name' => 'GV_cache_server_host', -// 'comment' => _('setup:: Hote du Serveur de cache'), -// 'default' => '127.0.0.1', -// 'required' => false -// ), -// array( -// 'type' => 'integer', -// 'name' => 'GV_cache_server_port', -// 'comment' => _('reglages:: port du serveur de cache'), -// 'default' => 11211 -// ) -// ) -// ) - ,array( - 'section' => _('GV::section:: Serveur Sphinx'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_sphinx', - 'comment' => _('Utiliser Sphinx'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_sphinx_host', - 'comment' => _('reglages:: de l\'adresse du serveur sphinx'), - 'default' => '127.0.0.1' - ), - array( - 'type' => 'integer', - 'name' => 'GV_sphinx_port', - 'comment' => _('reglages:: port du serveur sphinx'), - 'default' => 9306 - ), - array( - 'type' => 'string', - 'name' => 'GV_sphinx_rt_host', - 'comment' => _('reglages:: de l\'adresse du serveur RT sphinx'), - 'default' => '127.0.0.1' - ), - array( - 'type' => 'integer', - 'name' => 'GV_sphinx_rt_port', - 'comment' => _('reglages:: port du serveur RT sphinx'), - 'default' => 9308 - ) - ) - ), array( - 'section' => _('GV::section:: Executables externes'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_modxsendfile', - 'comment' => _('reglages:: mod_xsendfileapache active'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_X_Accel_Redirect', - 'comment' => _('reglages:: Path en acces pour X-Accel-Redirect (NginX Uniquement)'), - 'default' => '', - 'end_slash' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_X_Accel_Redirect_mount_point', - 'comment' => _('reglages:: Point de montage pour X-Accel-Redirect (NginX Uniquement)'), - 'default' => 'noweb', - 'end_slash' => false - ), - array( - 'type' => 'boolean', - 'name' => 'GV_h264_streaming', - 'comment' => _('reglages:: activation du stream h264 via mod_token - attention, necessite les modules apache mod_h264_streaming et mod_auth_token'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_mod_auth_token_directory', - 'end_slash' => true, - 'comment' => _('reglages:: point de montage du dossier protege via auth_token'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_mod_auth_token_directory_path', - 'end_slash' => false, - 'comment' => _('reglages:: path complet du dossier protege via auth_token'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_mod_auth_token_passphrase', - 'comment' => _('reglages:: passphrase du mod_auth_token (definie dans le fichier de configuration apache)'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_cli', - 'comment' => _('reglages:: executable PHP CLI'), - 'default'=>'', - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_PHP_INI', - 'comment' => _('reglages:: path du php.ini specifique (vide si non utilise)'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_imagick', - 'default'=>'', - 'comment' => _('reglages:: chemin de l\'executable convert'), - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_pathcomposite', - 'default'=>'', - 'comment' => _('reglages:: chemin de l\'executable composite'), - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_exiftool', - 'default'=>'', - 'comment' => _('reglages:: chemin de l\'executable exiftools'), - 'required' => true - ), - array( - 'type' => 'string', - 'name' => 'GV_swf_extract', - 'comment' => _('reglages:: chemin de l\'executable swfextract'), - 'default' => '', - 'required' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_pdf2swf', - 'comment' => _('reglages:: chemin de l\'executable pdf2swf'), - 'default' => '', - 'required' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_swf_render', - 'comment' => _('reglages:: chemin de l\'executable swfrender'), - 'default' => '', - 'required' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_unoconv', - 'comment' => _('reglages:: chemin de l\'executable unoconv'), - 'default' => '', - 'required' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_ffmpeg', - 'comment' => _('reglages:: chemin de l\'executable FFmpeg'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_mp4box', - 'comment' => _('reglages:: chemin de l\'executable MP4Box'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_mplayer', - 'comment' => _('reglages:: chemin de l\'executable Mplayer'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_pdftotext', - 'comment' => _('reglages:: chemin de l\'executable pdftotext (xpdf)'), - 'default' => '' - ), - array( - 'type' => 'integer', - 'name' => 'GV_pdfmaxpages', - 'comment' => _('reglages:: nombre maximum de page a extraire (PDF)'), - 'default' => 5 - ) - ) - ), array( - 'section' => _('GV::section:: Repertoires utilitaires'), - 'vars' => array( - array( - 'type' => 'string', - 'name' => 'GV_filesOwner', - 'comment' => _('reglages:: proprietaire des fichiers'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_filesGroup', - 'comment' => _('reglages:: groupes des fichiers'), - 'default' => '' - ) - ) - ), array( - 'section' => _('GV::section:: Configuration principale'), - 'vars' => array( + ), array( + 'section' => _('GV::section:: Etat de maintenance'), + 'rolled' => true, + 'vars' => array( + array( + 'type' => 'text', + 'name' => 'GV_message', + 'comment' => _('reglages:: Message a diffuser aux utilisateurs'), + 'default' => "May the force be with you" + ), + array( + 'type' => 'boolean', + 'name' => 'GV_message_on', + 'comment' => _('reglages:: activation du message a diffuser aux utilistaeurs'), + 'default' => false + ), + array( + 'type' => 'boolean', + 'name' => 'GV_log_errors', + 'comment' => _('reglages:: logguer les erreurs'), + 'default' => false + ) + ) + ), array( + 'section' => _('GV::section:: Connectivite aux webservices'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_google_api', + 'comment' => _('reglages:: Utiliser els google apis'), + 'default' => true, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_i18n_service', + 'comment' => _('reglages:: Service phrasea de localisation'), + 'default' => 'http://localization.webservice.alchemyasp.com/', + 'end_slash' => true, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_bitly_user', + 'comment' => _('reglages:: Nom d\'utilisateur pour l\'api bit.ly'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_bitly_key', + 'comment' => _('reglages:: ccle d\'api pour l\'api bit.ly'), + 'default' => '', + ), + array( + 'type' => 'boolean', + 'name' => 'GV_captchas', + 'comment' => _('reglages:: Utilisation de l\'api recpatcha'), + 'default' => false, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_captcha_public_key', + 'comment' => _('reglages:: clef publique recaptcha'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_captcha_private_key', + 'comment' => _('reglages:: clef privee recaptcha'), + 'default' => '' + ) + ) + ), array( + 'section' => _('GV::section:: Connectivite a Youtube'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_youtube_api', + 'comment' => sprintf(_('reglages:: Utiliser l\'api youtube, voir %s,
mettre la callback a WEBSITE_URL/prod/bridge/callback/youtube'), $youtube_console_url), + 'default' => false, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_youtube_client_id', + 'comment' => _('reglages:: Youtube client id'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_youtube_client_secret', + 'comment' => _('reglages:: Youtube clientsecret'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_youtube_dev_key', + 'comment' => sprintf(_('reglages:: Youtube cle developpeur, voir %s'), $dashboard_youtube), + 'default' => '' + ) + ) + ), array( + 'section' => _('GV::section:: Connectivite a FlickR'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_flickr_api', + 'comment' => sprintf(_('reglages:: Utiliser l api flickr, voir %s, puis set la callback a %s'), $create_api_flickr, $flickr_callback), + 'default' => false, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_flickr_client_id', + 'comment' => _('reglages:: FlickR client id'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_flickr_client_secret', + 'comment' => _('reglages:: FlickR client secret'), + 'default' => '' + ) + ) + ), array( + 'section' => _('GV::section:: Connectivite a Dailymotion'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_dailymotion_api', + 'comment' => sprintf(_('reglages:: Utiliser l api dailymotion, voir %s, puis set la callback a %s'), $create_api_dailymotion, $dailymotion_callback), + 'default' => false, + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_dailymotion_client_id', + 'comment' => _('reglages:: dailymotion client id'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_dailymotion_client_secret', + 'comment' => _('reglages:: dailymotion client secret'), + 'default' => '' + ) + ) + ), array( + 'section' => _('GV::section:: Gestionnaire d\'evenements'), + 'vars' => array( + array( + 'type' => 'enum_multi', + 'name' => 'GV_events', + 'default' => null, + 'comment' => _('reglages:: Evenements'), + 'available' => $eventsmanager->list_all('event'), + 'default' => array_keys($eventsmanager->list_all('event')) + ), + array( + 'type' => 'enum_multi', + 'name' => 'GV_notifications', + 'default' => null, + 'comment' => _('reglages:: Notifications'), + 'available' => $eventsmanager->list_all('notify'), + 'default' => array_keys($eventsmanager->list_all('notify')) + ) + ) + ), array( + 'section' => _('GV::section:: Stockage des documents'), + 'vars' => array( + array( + 'type' => 'string', + 'name' => 'GV_appletAllowedFileExt', + 'comment' => _('reglages:: extensions de fichier autorisees en upload, separees par des virgules. * pour autoriser tous les fichiers'), + 'default' => 'jpg,jpeg,bmp,tif,gif,png,pdf,doc,odt,mpg,mpeg,mov,avi,xls,flv,mp3,mp2', + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_base_datapath_web', + 'end_slash' => true, + 'comment' => _('reglages:: dossier de stockage des vignettes publiees en acces direct'), + 'default' => '', + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_base_datapath_noweb', + 'end_slash' => true, + 'comment' => _('reglages:: dossier de stockage des fichiers proteges de l\'acces direct'), + 'default' => '', + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_base_dataurl', + 'comment' => _('reglages:: point de montage des vignettes publiees en acces direct'), + 'default' => 'web', + 'end_slash' => false, + 'required' => true + ) + ) + ) + , array( + 'section' => _('GV::section:: Serveur Sphinx'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_sphinx', + 'comment' => _('Utiliser Sphinx'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_sphinx_host', + 'comment' => _('reglages:: de l\'adresse du serveur sphinx'), + 'default' => '127.0.0.1' + ), + array( + 'type' => 'integer', + 'name' => 'GV_sphinx_port', + 'comment' => _('reglages:: port du serveur sphinx'), + 'default' => 9306 + ), + array( + 'type' => 'string', + 'name' => 'GV_sphinx_rt_host', + 'comment' => _('reglages:: de l\'adresse du serveur RT sphinx'), + 'default' => '127.0.0.1' + ), + array( + 'type' => 'integer', + 'name' => 'GV_sphinx_rt_port', + 'comment' => _('reglages:: port du serveur RT sphinx'), + 'default' => 9308 + ) + ) + ) + , array( + 'section' => _('Phrasea Engine'), + 'vars' => array( + array( + 'type' => 'enum', + 'name' => 'GV_phrasea_sort', + 'comment' => _('Default results sort'), + 'default' => '', + 'available' => $date_sort_fields + ) + ) + ), array( + 'section' => _('GV::section:: Executables externes'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_modxsendfile', + 'comment' => _('reglages:: mod_xsendfileapache active'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_X_Accel_Redirect', + 'comment' => _('reglages:: Path en acces pour X-Accel-Redirect (NginX Uniquement)'), + 'default' => '', + 'end_slash' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_X_Accel_Redirect_mount_point', + 'comment' => _('reglages:: Point de montage pour X-Accel-Redirect (NginX Uniquement)'), + 'default' => 'noweb', + 'end_slash' => false + ), + array( + 'type' => 'boolean', + 'name' => 'GV_h264_streaming', + 'comment' => _('reglages:: activation du stream h264 via mod_token - attention, necessite les modules apache mod_h264_streaming et mod_auth_token'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_mod_auth_token_directory', + 'end_slash' => true, + 'comment' => _('reglages:: point de montage du dossier protege via auth_token'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_mod_auth_token_directory_path', + 'end_slash' => false, + 'comment' => _('reglages:: path complet du dossier protege via auth_token'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_mod_auth_token_passphrase', + 'comment' => _('reglages:: passphrase du mod_auth_token (definie dans le fichier de configuration apache)'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_cli', + 'comment' => _('reglages:: executable PHP CLI'), + 'default' => '', + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_PHP_INI', + 'comment' => _('reglages:: path du php.ini specifique (vide si non utilise)'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_imagick', + 'default' => '', + 'comment' => _('reglages:: chemin de l\'executable convert'), + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_pathcomposite', + 'default' => '', + 'comment' => _('reglages:: chemin de l\'executable composite'), + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_exiftool', + 'default' => '', + 'comment' => _('reglages:: chemin de l\'executable exiftools'), + 'required' => true + ), + array( + 'type' => 'string', + 'name' => 'GV_swf_extract', + 'comment' => _('reglages:: chemin de l\'executable swfextract'), + 'default' => '', + 'required' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_pdf2swf', + 'comment' => _('reglages:: chemin de l\'executable pdf2swf'), + 'default' => '', + 'required' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_swf_render', + 'comment' => _('reglages:: chemin de l\'executable swfrender'), + 'default' => '', + 'required' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_unoconv', + 'comment' => _('reglages:: chemin de l\'executable unoconv'), + 'default' => '', + 'required' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_ffmpeg', + 'comment' => _('reglages:: chemin de l\'executable FFmpeg'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_mp4box', + 'comment' => _('reglages:: chemin de l\'executable MP4Box'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_mplayer', + 'comment' => _('reglages:: chemin de l\'executable Mplayer'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_pdftotext', + 'comment' => _('reglages:: chemin de l\'executable pdftotext (xpdf)'), + 'default' => '' + ), + array( + 'type' => 'integer', + 'name' => 'GV_pdfmaxpages', + 'comment' => _('reglages:: nombre maximum de page a extraire (PDF)'), + 'default' => 5 + ) + ) + ), array( + 'section' => _('GV::section:: Repertoires utilitaires'), + 'vars' => array( + array( + 'type' => 'string', + 'name' => 'GV_filesOwner', + 'comment' => _('reglages:: proprietaire des fichiers'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_filesGroup', + 'comment' => _('reglages:: groupes des fichiers'), + 'default' => '' + ) + ) + ), array( + 'section' => _('GV::section:: Configuration principale'), + 'vars' => array( // array( // 'type' => 'boolean', // 'name' => 'GV_logobeforebas', @@ -530,33 +531,33 @@ $GV = array( // 'default' => false, // 'required' => true // ), - array( - 'type' => 'string', - 'name' => 'GV_adminMail', - 'comment' => _('reglages:: email de l\'administrateur'), - 'default' => 'support@alchemy.fr' - ), - array( - 'type' => 'boolean', - 'name' => 'GV_view_bas_and_coll', - 'comment' => _('reglages:: Afficher le nom des bases et des collections'), - 'default' => true, - 'required' => true - ), - array( - 'type' => 'boolean', - 'name' => 'GV_choose_export_title', - 'comment' => _('reglages:: activer le choix du nom de fichier a l\'export'), - 'default' => false, - 'required' => true - ), - array( - 'type' => 'enum', - 'name' => 'GV_default_export_title', - 'comment' => _('reglages:: choix par defaut des noms de fichier a l\'export'), - 'default' => 'support@alchemy.fr', - 'available' => array('title' => 'Titre du document', 'original' => 'Nom original') - ), + array( + 'type' => 'string', + 'name' => 'GV_adminMail', + 'comment' => _('reglages:: email de l\'administrateur'), + 'default' => 'support@alchemy.fr' + ), + array( + 'type' => 'boolean', + 'name' => 'GV_view_bas_and_coll', + 'comment' => _('reglages:: Afficher le nom des bases et des collections'), + 'default' => true, + 'required' => true + ), + array( + 'type' => 'boolean', + 'name' => 'GV_choose_export_title', + 'comment' => _('reglages:: activer le choix du nom de fichier a l\'export'), + 'default' => false, + 'required' => true + ), + array( + 'type' => 'enum', + 'name' => 'GV_default_export_title', + 'comment' => _('reglages:: choix par defaut des noms de fichier a l\'export'), + 'default' => 'support@alchemy.fr', + 'available' => array('title' => 'Titre du document', 'original' => 'Nom original') + ), // array( // 'type' => 'boolean', // 'name' => 'GV_ArchiveSorted', @@ -564,19 +565,19 @@ $GV = array( // 'default' => true, // 'required' => true // ), - array( - 'type' => 'enum', - 'name' => 'GV_social_tools', - 'comment' => _('reglages:: Active les partages Facebook et Twitter'), - 'available' => array('none' => 'Disabled', 'publishers' => 'Publishers', 'all' => 'Activated'), - 'default' => 'none', - 'required' => false - ) - ) - ), array( - 'section' => _('GV::section:: Page d\'accueil'), - 'rolled' => true, - 'vars' => array( + array( + 'type' => 'enum', + 'name' => 'GV_social_tools', + 'comment' => _('reglages:: Active les partages Facebook et Twitter'), + 'available' => array('none' => 'Disabled', 'publishers' => 'Publishers', 'all' => 'Activated'), + 'default' => 'none', + 'required' => false + ) + ) + ), array( + 'section' => _('GV::section:: Page d\'accueil'), + 'rolled' => true, + 'vars' => array( // array( // 'type' => 'boolean', // 'name' => 'GV_find_password', @@ -584,78 +585,78 @@ $GV = array( // 'default' => true, // 'required' => true // ), - array( - 'type' => 'enum', - 'name' => 'GV_home_publi', - 'comment' => _('reglages:: presentation sur la home'), - 'default' => 'COOLIRIS', - 'available' => array('DISPLAYx1' => 'slideshow', 'SCROLL' => 'Bandeau defilant', 'COOLIRIS' => 'Cooliris'), - 'required' => true - ) - ) - ), array( - 'section' => _('GV::section:: Moteur de recherche'), - 'rolled' => true, - 'vars' => array( - array( - 'type' => 'integer', - 'name' => 'GV_min_letters_truncation', - 'comment' => _('reglages:: Nombre minimal de lettre avec la troncature (Recherche)'), - 'default' => 1 - ), - array( - 'type' => 'string', - 'name' => 'GV_defaultQuery', - 'comment' => _('reglages:: Question par defaut'), - 'default' => 'all' - ), - array( - 'type' => 'enum', - 'name' => 'GV_defaultQuery_type', - 'comment' => _('reglages:: type de document cherches par defaut e l\'ouverture du site'), - 'available' => array('0' => 'Documents', '1' => 'Regroupements'), - 'default' => '0' - ) - ) - ), array( - 'section' => _('GV::section:: Report'), - 'rolled' => true, - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_anonymousReport', - 'comment' => _('reglages:: report anonyme (masque les infos concernant les utilisateurs)'), - 'default' => false, - 'required' => true - ) - ) - ), array( - 'section' => _('GV::section:: Modules supplementaires'), - 'rolled' => true, - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_thesaurus', - 'comment' => _('reglages:: Activation de l\'outil thesaurus'), - 'default' => true - ), array( - 'type' => 'boolean', - 'name' => 'GV_multiAndReport', - 'comment' => _('reglages:: Activation du Mode MultiDOC'), - 'default' => true - ), array( - 'type' => 'boolean', - 'name' => 'GV_seeOngChgDoc', - 'comment' => _('reglages:: Substitution de HD d\'un record '), - 'default' => false - ), array( - 'type' => 'boolean', - 'name' => 'GV_seeNewThumb', - 'comment' => _('reglages:: Substitution de thumbnail d\'un record'), - 'default' => false - ) - ) + array( + 'type' => 'enum', + 'name' => 'GV_home_publi', + 'comment' => _('reglages:: presentation sur la home'), + 'default' => 'COOLIRIS', + 'available' => array('DISPLAYx1' => 'slideshow', 'SCROLL' => 'Bandeau defilant', 'COOLIRIS' => 'Cooliris'), + 'required' => true + ) ) + ), array( + 'section' => _('GV::section:: Moteur de recherche'), + 'rolled' => true, + 'vars' => array( + array( + 'type' => 'integer', + 'name' => 'GV_min_letters_truncation', + 'comment' => _('reglages:: Nombre minimal de lettre avec la troncature (Recherche)'), + 'default' => 1 + ), + array( + 'type' => 'string', + 'name' => 'GV_defaultQuery', + 'comment' => _('reglages:: Question par defaut'), + 'default' => 'all' + ), + array( + 'type' => 'enum', + 'name' => 'GV_defaultQuery_type', + 'comment' => _('reglages:: type de document cherches par defaut e l\'ouverture du site'), + 'available' => array('0' => 'Documents', '1' => 'Regroupements'), + 'default' => '0' + ) + ) + ), array( + 'section' => _('GV::section:: Report'), + 'rolled' => true, + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_anonymousReport', + 'comment' => _('reglages:: report anonyme (masque les infos concernant les utilisateurs)'), + 'default' => false, + 'required' => true + ) + ) + ), array( + 'section' => _('GV::section:: Modules supplementaires'), + 'rolled' => true, + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_thesaurus', + 'comment' => _('reglages:: Activation de l\'outil thesaurus'), + 'default' => true + ), array( + 'type' => 'boolean', + 'name' => 'GV_multiAndReport', + 'comment' => _('reglages:: Activation du Mode MultiDOC'), + 'default' => true + ), array( + 'type' => 'boolean', + 'name' => 'GV_seeOngChgDoc', + 'comment' => _('reglages:: Substitution de HD d\'un record '), + 'default' => false + ), array( + 'type' => 'boolean', + 'name' => 'GV_seeNewThumb', + 'comment' => _('reglages:: Substitution de thumbnail d\'un record'), + 'default' => false + ) + ) + ) // , array( // 'section' => _('GV::section:: Authentification LDAP'), // 'rolled' => true, @@ -734,243 +735,242 @@ $GV = array( // ) // ) // ) - , array( - 'section' => _('GV::section:: Envois de mails'), - 'vars' => array( + , array( + 'section' => _('GV::section:: Envois de mails'), + 'vars' => array( // array( // 'type' => 'boolean', // 'name' => 'GV_exportmail', // 'comment' => _('reglages:: Activation de l\'export par mail'), // 'default' => true // ), - array( - 'type' => 'string', - 'name' => 'GV_defaulmailsenderaddr', - 'comment' => _('reglages:: Expediteur mail par defaut'), - 'default' => 'phraseanet@example.com' - ), - array( - 'type' => 'boolean', - 'name' => 'GV_smtp', - 'comment' => _('reglages:: Utilisation d\'un serveur SMTP'), - 'default' => false - ), - array( - 'type' => 'boolean', - 'name' => 'GV_smtp_auth', - 'comment' => _('reglages:: Activation de l\'authentification smtp'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_smtp_host', - 'comment' => _('reglages:: Hote SMTP'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_smtp_port', - 'comment' => _('reglages:: Port SMTP'), - 'default' => '' - ), - array( - 'type' => 'boolean', - 'name' => 'GV_smtp_secure', - 'comment' => _('reglages:: Utiliser une conenction SSL'), - 'default' => false - ), - array( - 'type' => 'string', - 'name' => 'GV_smtp_user', - 'comment' => _('reglages:: User SMTP'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_smtp_password', - 'comment' => _('reglages:: Mot de passe SMTP'), - 'default' => '' - ) - ) - ), array( - 'section' => _('GV::section:: Exports FTP'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_activeFTP', - 'comment' => _('reglages:: active la possibilite d\'exports FTP ou non (onglet dans multiexports)'), - 'default' => false - ), - array( - 'type' => 'boolean', - 'name' => 'GV_ftp_for_user', - 'comment' => _('reglages:: Donne ou non export FTP aux utilisateurs ou e l\'admin uniquement'), - 'default' => false - ) - ) - ), array( - 'section' => _('GV::section:: Configuration du client'), - 'vars' => array( -// array( -// 'type' => 'enum', -// 'name' => 'GV_bandeauHome', -// 'comment' => _('reglages:: Affichage par defaut de la home du client'), -// 'available' => array('QUERY' => _('Question'), 'PUBLI' => _('Publications'), 'HELP' => _('Aide')), -// 'default' => 'QUERY' -// ), - array( - 'type' => 'integer', - 'name' => 'GV_ong_search', - 'comment' => _('reglages:: position de l\'onglet de recherche'), - 'default' => 1 - ), - array( - 'type' => 'integer', - 'name' => 'GV_ong_advsearch', - 'comment' => _('reglages:: position de l\'onglet de recherche avancee'), - 'default' => 2 - ), - array( - 'type' => 'integer', - 'name' => 'GV_ong_topics', - 'comment' => _('reglages:: position de l\'onglet des topics'), - 'default' => 0 - ), - array( - 'type' => 'integer', - 'name' => 'GV_ong_actif', - 'comment' => _('reglages:: numero de l\'onglet actif'), - 'default' => 1 - ), - array( - 'type' => 'enum', - 'name' => 'GV_client_render_topics', - 'comment' => _('reglages:: rendu des topics'), - 'available' => array('tree' => 'Arbres', 'popups' => 'Menus deroulants'), - 'default' => 'tree' - ), + array( + 'type' => 'string', + 'name' => 'GV_defaulmailsenderaddr', + 'comment' => _('reglages:: Expediteur mail par defaut'), + 'default' => 'phraseanet@example.com' + ), + array( + 'type' => 'boolean', + 'name' => 'GV_smtp', + 'comment' => _('reglages:: Utilisation d\'un serveur SMTP'), + 'default' => false + ), + array( + 'type' => 'boolean', + 'name' => 'GV_smtp_auth', + 'comment' => _('reglages:: Activation de l\'authentification smtp'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_smtp_host', + 'comment' => _('reglages:: Hote SMTP'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_smtp_port', + 'comment' => _('reglages:: Port SMTP'), + 'default' => '' + ), + array( + 'type' => 'boolean', + 'name' => 'GV_smtp_secure', + 'comment' => _('reglages:: Utiliser une conenction SSL'), + 'default' => false + ), + array( + 'type' => 'string', + 'name' => 'GV_smtp_user', + 'comment' => _('reglages:: User SMTP'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_smtp_password', + 'comment' => _('reglages:: Mot de passe SMTP'), + 'default' => '' + ) + ) + ), array( + 'section' => _('GV::section:: Exports FTP'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_activeFTP', + 'comment' => _('reglages:: active la possibilite d\'exports FTP ou non (onglet dans multiexports)'), + 'default' => false + ), + array( + 'type' => 'boolean', + 'name' => 'GV_ftp_for_user', + 'comment' => _('reglages:: Donne ou non export FTP aux utilisateurs ou e l\'admin uniquement'), + 'default' => false + ) + ) + ), array( + 'section' => _('GV::section:: Configuration du client'), + 'vars' => array( + array( + 'type' => 'integer', + 'name' => 'GV_download_max', + 'comment' => _('Maximum megabytes allowed in download (if request is bigger, then mail is still available)'), + 'default' => 120 + ), + array( + 'type' => 'integer', + 'name' => 'GV_ong_search', + 'comment' => _('reglages:: position de l\'onglet de recherche'), + 'default' => 1 + ), + array( + 'type' => 'integer', + 'name' => 'GV_ong_advsearch', + 'comment' => _('reglages:: position de l\'onglet de recherche avancee'), + 'default' => 2 + ), + array( + 'type' => 'integer', + 'name' => 'GV_ong_topics', + 'comment' => _('reglages:: position de l\'onglet des topics'), + 'default' => 0 + ), + array( + 'type' => 'integer', + 'name' => 'GV_ong_actif', + 'comment' => _('reglages:: numero de l\'onglet actif'), + 'default' => 1 + ), + array( + 'type' => 'enum', + 'name' => 'GV_client_render_topics', + 'comment' => _('reglages:: rendu des topics'), + 'available' => array('tree' => 'Arbres', 'popups' => 'Menus deroulants'), + 'default' => 'tree' + ), // array( // 'type' => 'boolean', // 'name' => 'GV_grp_preview_list', // 'comment' => _('reglages:: Voir les elements d\'un reportage sans Thumbnail (fenetre de preview)'), // 'default' => false // ), - array( - 'type' => 'boolean', - 'name' => 'GV_rollover_reg_preview', - 'comment' => _('reglages:: Voir le rollover sur les regroupements (fenetre de preview)'), - 'default' => true - ), - array( - 'type' => 'boolean', - 'name' => 'GV_rollover_chu', - 'comment' => _('reglages:: Voir le rollover sur les elements du chutier'), - 'default' => true - ), - array( - 'type' => 'enum', - 'name' => 'GV_client_coll_ckbox', - 'comment' => _('reglages:: Presentation des collections'), - 'default' => 'checkbox', - 'available' => array('popup' => 'Menu deroulant', 'checkbox' => 'case a cocher') - ), - array( - 'type' => 'boolean', - 'name' => 'GV_viewSizeBaket', - 'comment' => _('reglages:: Voir taille HD total des doc d\'un chutiers'), - 'default' => true - ), - array( - 'type' => 'boolean', - 'name' => 'GV_clientAutoShowProposals', - 'comment' => _('reglages:: Afficher automatiquement l\'onglet des propositions s\'il y\'en a'), - 'default' => true - ), - array( - 'type' => 'boolean', - 'name' => 'GV_needAuth2DL', - 'comment' => _('reglages:: Il est necessaire d\'etre connecte pour pouvoir telecharger en compte invite'), - 'default' => true - ) - ) - ), array( - 'section' => _('GV::section:: Parametrage de l\'inscription'), - 'vars' => array( - array( - 'type' => 'boolean', - 'name' => 'GV_autoselectDB', - 'comment' => _('reglages:: A true, cette option descative le choix de selection des bases sur lesquelles on s\'inscrit, et l\'inscription se fait sur toutes les bases ou jai le droit de m\'inscrire'), - 'default' => true - ), - array( - 'type' => 'boolean', - 'name' => 'GV_autoregister', - 'comment' => _('reglages:: Activation de l\'autoinscription'), - 'default' => false - ) - ) - ), array( - 'section' => _('GV::section:: Configuration du push'), - 'vars' => array( - array( - 'type' => 'integer', - 'name' => 'GV_validation_reminder', - 'comment' => _('reglages:: Nombre de jour avant la fin de la validation pour envoie de mail de rappel'), - 'default' => 2 - ), + array( + 'type' => 'boolean', + 'name' => 'GV_rollover_reg_preview', + 'comment' => _('reglages:: Voir le rollover sur les regroupements (fenetre de preview)'), + 'default' => true + ), + array( + 'type' => 'boolean', + 'name' => 'GV_rollover_chu', + 'comment' => _('reglages:: Voir le rollover sur les elements du chutier'), + 'default' => true + ), + array( + 'type' => 'enum', + 'name' => 'GV_client_coll_ckbox', + 'comment' => _('reglages:: Presentation des collections'), + 'default' => 'checkbox', + 'available' => array('popup' => 'Menu deroulant', 'checkbox' => 'case a cocher') + ), + array( + 'type' => 'boolean', + 'name' => 'GV_viewSizeBaket', + 'comment' => _('reglages:: Voir taille HD total des doc d\'un chutiers'), + 'default' => true + ), + array( + 'type' => 'boolean', + 'name' => 'GV_clientAutoShowProposals', + 'comment' => _('reglages:: Afficher automatiquement l\'onglet des propositions s\'il y\'en a'), + 'default' => true + ), + array( + 'type' => 'boolean', + 'name' => 'GV_needAuth2DL', + 'comment' => _('reglages:: Il est necessaire d\'etre connecte pour pouvoir telecharger en compte invite'), + 'default' => true + ) + ) + ), array( + 'section' => _('GV::section:: Parametrage de l\'inscription'), + 'vars' => array( + array( + 'type' => 'boolean', + 'name' => 'GV_autoselectDB', + 'comment' => _('reglages:: A true, cette option descative le choix de selection des bases sur lesquelles on s\'inscrit, et l\'inscription se fait sur toutes les bases ou jai le droit de m\'inscrire'), + 'default' => true + ), + array( + 'type' => 'boolean', + 'name' => 'GV_autoregister', + 'comment' => _('reglages:: Activation de l\'autoinscription'), + 'default' => false + ) + ) + ), array( + 'section' => _('GV::section:: Configuration du push'), + 'vars' => array( + array( + 'type' => 'integer', + 'name' => 'GV_validation_reminder', + 'comment' => _('reglages:: Nombre de jour avant la fin de la validation pour envoie de mail de rappel'), + 'default' => 2 + ), // array( // 'type' => 'boolean', // 'name' => 'GV_DL_checkit', // 'comment' => _('reglages:: Autorise le telechargement des fichiers pendant le process de validation'), // 'default' => true // ), - array( - 'type' => 'integer', - 'name' => 'GV_val_expiration', - 'comment' => _('reglages:: dure de validite des liens genere pour les validations, si 0 => validite permanente'), - 'default' => 10 - ) - ) - ), array( - 'section' => _('GV::section:: Indexation par les robots'), - 'vars' => array( - array( - 'type' => 'string', - 'name' => 'GV_homeTitle', - 'comment' => _('reglages :: Titre de l\'installation'), - 'default' => 'Phraseanet' - ), - array( - 'type' => 'string', - 'name' => 'GV_metaKeywords', - 'comment' => _('reglages:: Mots clefs pour l\'indexation des robots de moteurs de recherche'), - 'default' => '' - ), - array( - 'type' => 'text', - 'name' => 'GV_metaDescription', - 'comment' => _('reglages :: Description de l\'installation'), - 'default' => '' - ), - array( - 'type' => 'string', - 'name' => 'GV_googleAnalytics', - 'comment' => _('reglages:: identifiant google analytics'), - 'default' => '' - ), - array( - 'type' => 'boolean', - 'name' => 'GV_allow_search_engine', - 'comment' => _('Allow the website to be indexed by search engines like Google'), - 'default' => true - ), - array( - 'type' => 'boolean', - 'name' => 'GV_display_gcf', - 'comment' => _('reglages:: Afficher le bandeau Google Chrome Frame'), - 'default' => true - ) - ) + array( + 'type' => 'integer', + 'name' => 'GV_val_expiration', + 'comment' => _('reglages:: dure de validite des liens genere pour les validations, si 0 => validite permanente'), + 'default' => 10 + ) ) - ) + ), array( + 'section' => _('GV::section:: Indexation par les robots'), + 'vars' => array( + array( + 'type' => 'string', + 'name' => 'GV_homeTitle', + 'comment' => _('reglages :: Titre de l\'installation'), + 'default' => 'Phraseanet' + ), + array( + 'type' => 'string', + 'name' => 'GV_metaKeywords', + 'comment' => _('reglages:: Mots clefs pour l\'indexation des robots de moteurs de recherche'), + 'default' => '' + ), + array( + 'type' => 'text', + 'name' => 'GV_metaDescription', + 'comment' => _('reglages :: Description de l\'installation'), + 'default' => '' + ), + array( + 'type' => 'string', + 'name' => 'GV_googleAnalytics', + 'comment' => _('reglages:: identifiant google analytics'), + 'default' => '' + ), + array( + 'type' => 'boolean', + 'name' => 'GV_allow_search_engine', + 'comment' => _('Allow the website to be indexed by search engines like Google'), + 'default' => true + ), + array( + 'type' => 'boolean', + 'name' => 'GV_display_gcf', + 'comment' => _('reglages:: Afficher le bandeau Google Chrome Frame'), + 'default' => true + ) + ) + ) + ) ?> diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index e3ec3251d1..be5cc8b220 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -5160,30 +5160,6 @@- - -regdate -tinyint(1) unsigned -YES -- - - - -regname -tinyint(1) unsigned -YES -- - - - regdesc -tinyint(1) unsigned -YES -- - - report tinyint(1) unsigned @@ -5261,27 +5237,6 @@required -- -regname -UNIQUE -- -regname -- -regdate -UNIQUE -- -regdate -- regdesc -UNIQUE -- -regdesc -sorter UNIQUE @@ -5826,7 +5781,7 @@results int(11) unsigned -+ YES 0 diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index b483b3fdc4..1602fc3170 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -149,7 +149,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,7 +179,7 @@ - + diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index e2fa5ff18c..f8c5a5ab2a 100755 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -149,7 +149,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,7 +179,7 @@ - + diff --git a/lib/phpunit.xml.dist b/lib/phpunit.xml.dist index 35bbca23e6..262c5f2fb4 100644 --- a/lib/phpunit.xml.dist +++ b/lib/phpunit.xml.dist @@ -9,6 +9,7 @@ stopOnFailure="false" syntaxCheck="true" verbose="false" + bootstrap="unitTest/bootstrap.inc" > +
' . - '' . _('publications:: dernieres publications') . '
-' . - _('publications:: s\'abonner aux publications') . ' ' . - '
' . - '
-
' .
+ '';
-
- if ($itemIsOk)
- $feed .= $item;
- }
-
- $itemIsOk = false;
-
- $sselid = $row['ssel_id'];
- $ord = $row['ord'];
- $o = 0;
- $out = '';
- $neverSeen = '';
- $publisher = $row['usr_prenom'] . ' ' . $row['usr_nom'];
- if ($publisher == ' ')
- $publisher = $row['usr_mail'];
- if ($publisher == '')
- $publisher = 'Unreferenced user';
-
- if ($row['id'] != '')
- $neverSeen = _('publications:: publication non lue');
-
- $item = '';
- $item .= '
' .
+ '';
}
echo '' .
+ '
' . _('publications:: derniere mise a jour') + . ' ' . \phraseadate::getPrettyString($entry->get_updated_on()) . '
'; + + $feed .= '
' . + '' + . $entry->get_title() . + '
' . + '' . + ' ' . \phraseadate::getPrettyString($entry->get_created_on()) . + ' '; + + if ($entry->get_author_email()) + $feed .= ''; + + $feed .= $entry->get_author_name(); + + if ($entry->get_author_email()) + $feed .= ''; + + if ($entry->get_updated_on() > $entry->get_created_on()) + $feed .= '' . _('publications:: derniere mise a jour') + . ' ' . \phraseadate::getPrettyString($entry->get_updated_on()) . '
'; + + $feed .= '
';
+
+
+ if (trim($entry->get_subtitle()) != '')
{
- if ($sselid !== null)
- {
-
-
-
- $item .= '
' . $out;
- $item .= '
' .
- '' .
- '';
+
+ $feed .= '
';
- if ($itemIsOk)
- $feed .= $item;
+ $feed .= '' .
- '
' . _('publications:: derniere mise a jour') . ' ' . $row['updater'] . '
'; - - $item .= '
' . - '' . $row['name'] . - ' ' . $neverSeen . '
' . - '' . - ' ' . $row['pub_date'] . - ' '; - - if ($row['usr_mail'] != '') - $item .= ''; - - $item .= $publisher; - - if ($row['usr_mail'] != '') - $item .= ''; - - if ($row['dateC1'] != $row['dateC2']) - $item .= '' . _('publications:: derniere mise a jour') . ' ' . $row['updater'] . '
'; - - $item .= '
';
-
-
- if (trim(str_replace($RN, '', $row['descript'])) != '')
- {
- $row['descript'] = str_replace($RN, '
', $row['descript']); - $item .= '' . $row['descript']; - } - $item .= '
';
+ $feed .= '' . nl2br($entry->get_subtitle());
}
+ $feed .= '', $row['descript']); - $item .= '' . $row['descript']; - } - $item .= '
';
- $ord = $row['ord'];
- $statOk = true;
- if ($row['public'] == 1 && $row['pub_restrict'] == 1)
+
+ foreach ($entry->get_content() as $Feed_item)
{
- $statOk = false;
-
- try
- {
- $connsbas = connection::getPDOConnection($row['sbas_id']);
-
- $sql = 'SELECT record_id FROM record WHERE ((status ^ ' . $row['mask_xor'] . ') & ' . $row['mask_and'] . ')=0
- AND record_id = :record_id';
- $stmt = $connsbas->prepare($sql);
- $stmt->execute(array(':record_id' => $row['record_id']));
- $statOk = ($stmt->rowCount() > 0);
- $stmt->closeCursor();
- }
- catch (Exception $e)
- {
-
- }
- }
-
-
- $layoutmode = $user->getPrefs('view');
-
- if ($statOk)
- {
- $record = new record_adapter($row["sbas_id"], $row["record_id"]);
- $sbas_id = phrasea::sbasFromBas($row['base_id']);
-
- $captionXML = $record->get_xml();
+ /* @var $Feed_item \Feed_Entry_Item */
+ $record = $Feed_item->get_record();
$thumbnail = $record->get_thumbnail();
- $title = $record->get_title();
- $exifinfos = $record->get_technical_infos();
- $caption = $twig->render('common/caption.html', array('view' => 'internal_publi', 'record' => $record));
+ $title = $record->get_title();
+ $caption = $twig->render(
+ 'common/caption.html', array('view' => 'internal_publi', 'record' => $record)
+ );
- $o++;
- $itemIsOk = true;
- $bottom = 0;
- $right = 10;
- $left = 0;
- $top = 10;
-
-
- if (trim($preview) != '')
- $preview = " ";
+ $preview = " ";
$docType = $record->get_type();
$isVideo = ($docType == 'video');
$isAudio = ($docType == 'audio');
$isImage = ($docType == 'image');
- $isDocument = ($docType == 'document');
$duration = '';
@@ -232,11 +126,11 @@ foreach ($rs as $row)
if ($ratio > 1)
{
- $cw = min(((int) $th_size - 30), $thumbnail->get_width());
- $ch = $cw / $ratio;
- $pv = floor(($th_size - $ch) / 2);
- $ph = floor(($th_size - $cw) / 2);
- $imgStyle = 'xwidth:' . $cw . 'px;xpadding:' . $pv . 'px ' . $ph . 'px;';
+ $cw = min(((int) $th_size - 30), $thumbnail->get_width());
+ $ch = $cw / $ratio;
+ $pv = floor(($th_size - $ch) / 2);
+ $ph = floor(($th_size - $cw) / 2);
+ $imgStyle = 'width:' . $cw . 'px;xpadding:' . $pv . 'px ' . $ph . 'px;';
}
else
{
@@ -246,64 +140,51 @@ foreach ($rs as $row)
$pv = floor(($th_size - $ch) / 2);
$ph = floor(($th_size - $cw) / 2);
- $imgStyle = 'xheight:' . $ch . 'px;xpadding:' . $pv . 'px ' . $ph . 'px;';
+ $imgStyle = 'height:' . $ch . 'px;xpadding:' . $pv . 'px ' . $ph . 'px;';
}
+ $feed .= "
get_sbas_id() . "\"
+ id='IMGT_" . $record->get_serialize_key() . "_PUB_" . $entry->get_id()
+ . "' class='IMGT diapo'
+ onclick=\"openPreview('FEED','" . $Feed_item->get_ord() . "','" . $entry->get_id() . "');\">";
+
+ $feed .= '\n
";
+
+ $feed .= '
";
}
-}
-
-if (isset($item))
-{
- $item .= ' ';
+ $feed .= "
';
+
+ $feed .= "";
+
+ $feed .= $title;
+
+ $feed .= "
\n";
+
+ $feed .= '| ";
+
+ $feed .= $duration . " |
';
+ $feed .= '';
+ $feed .= '
";
+ $feed .= "
";
- $ident = $row["base_id"] . "_" . $row["record_id"];
-
-
- $out .= "| '; + + $feed .= " | \n"; + + $feed .= "\n"; + + $feed .= $preview; + + $feed .= " | "; + $feed .= "
";
-
- $out .= '\n
";
-
- $out .= '
";
+ $feed .= "';
- $out .= "
';
-
- $out .= "";
-
- $out .= $title; //$data['title'];
-
- $out .= "
\n";
-
- $out .= '| ";
-
- $out .= $duration . " |
';
- $out .= '';
- $out .= '
";
- $out .= "
";
-
-
- $out .= "| '; - - $out .= " | \n"; - - $out .= "\n"; - - $out .= $preview; - - $out .= " | "; - $out .= "
' . $out;
- $item .= '
' .
- '' . $feed . '
';
-$sql = 'DELETE FROM sselnew WHERE usr_id = :usr_id AND ssel_id IN (SELECT ssel_id FROM ssel WHERE public="1")';
-$stmt = $conn->prepare($sql);
-$stmt->execute(array(':usr_id' => $usr_id));
-$stmt->closeCursor();
diff --git a/www/client/index.php b/www/client/index.php
index 5dafe03272..4045b09716 100644
--- a/www/client/index.php
+++ b/www/client/index.php
@@ -56,7 +56,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
-
+
+
@@ -231,17 +239,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
}
foreach ($user->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll)
{
- if ($showbases)
- {
- $options .= '
get('GV_view_bas_and_coll'))
{
- if ($registry->get('GV_view_bas_and_coll'))
- {
?>
@@ -434,28 +427,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
'' .
'
';
}
- }
- }
- if ($sxe->description)
- {
- foreach ($sxe->description->children() as $f => $field)
- {
- if ($field['type'] == 'date' && $field['searchclient'] == '1')
- {
- $dateFilters .= '| ' . - $f . ' | |
| ' . _('phraseanet::time:: de') . - ' | ' . - _('phraseanet::time:: a') . - ' |
| ' . - '' . - ' | ' . - '' . - ' |
get_collections() as $coll)
+ foreach ($user->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll)
{
$s = "checked";
echo '';
@@ -497,7 +468,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
get('GV_thesaurus'))
{
?>
@@ -576,7 +546,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
-
-
+