wip #1077 @3

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 55b9318d4d9402fb83c49898255df7e634532a77..b44927717979f13ed7348a95e9ed23cb13cf32ca 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -17,11 +17,14 @@ define('DEV', $dev);
 // Définition des variables dans l'environnement de production\r
 //define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
 \r
+$amacord = false;\r
 if ($_SERVER['SERVER_ADDR'] == '91.121.74.76') {\r
+       $amacord = true;\r
        define('DB_HOST', '127.0.0.1');\r
 } else {\r
        define('DB_HOST', 'amarcord.cubedesigners.com');\r
 }\r
+define('AMARCORD', $amacord);\r
 define('SERVER', 'avanger');\r
 \r
 define('DB_NAME', 'extranet');\r

diff --git a/inc/prepend.php b/inc/prepend.php
index 1c546832ddb3be81d12515a0eceadb3c8c50e578..e735031219c8fdb049b86c5b03f1057548d27ff4 100644 (file)
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -1,5 +1,11 @@
 <?php\r
 \r
+if (!isset($_SERVER['SERVER_ADDR'])) {\r
+       if (file_exists("/etc/ip")) {\r
+               $_SERVER['SERVER_ADDR'] = trim(file_get_contents('/etc/ip'));\r
+       }\r
+}\r
+\r
 // Inclusion du fichier de configuration\r
 require_once(dirname(__FILE__) . '/config.inc.php');\r
 // Chargement de la classe cube\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index f17982e60d4e6df94e21c2a1744287b366471538..5012de48ddde50d4394d21372b24850acdb6bb82 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -45,6 +45,7 @@ class wsFlash extends cubeFlashGateway {
                }
                $dao = new wsDAODocument($core->con);
                foreach ($_FILES as $varname => $infos) {
+
                        if ($infos['error']) {
                                continue;
                        }
@@ -104,7 +105,11 @@ class wsFlash extends cubeFlashGateway {
                unset($_SESSION['conversionSessionReload']);
                $session->serialize();
 
-               $php = new cubeCommandLine('php');
+               $executable='php';
+               if(AMARCORD){
+                       $executable='/usr/bin/php5.6';
+               }
+               $php = new cubeCommandLine($executable);
                $php->setPath(CONVERTER_PATH);
                $php->setArg('f', ROOT . '/index.php');
                $php->setManualArg('--');
@@ -116,8 +121,7 @@ class wsFlash extends cubeFlashGateway {
                $php->setNohup(true);
                $php->execute('exec');
 
-               fb($php->commande);
-               fb($php->output);
+               file_put_contents(ROOT . '/../log/processConversionSession.txt', $php->commande . "\n" . $php->output);
 
                $this->xml->addChild('command', html::escapeHTML($php->command));
                exit;

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index b568d4bc37695425b137294aa13979b477d4f8c2..e7d72cc04723787bc5cdd22abf60ef47faffa649 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -800,6 +800,7 @@ class wsDAOBook extends commonDAO {
                $r = $this->con->select('SELECT * FROM book_pages WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
                $tab = array();
                $now = array();
+               $ref = array();
                while ($r->fetch()) {
                        $ref[$r->book_page] = array((int)$r->document_id, (int)$r->document_page);
                }