wip #1077 @6

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 3f465449fab10808c51e3aea6089f249282bc51b..016e79577e2bf0ad0f101a58997ccdc36ae8e49a 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -713,74 +713,6 @@ class commonTools {
 
        }
 
-       public static function phonegap() {
-               $res = commonPage::barre();
-               $res .= commonPage::tMain();
-               $res .= commonPage::bh();
-               $res .= '<form id="urlDecoder" method="post">';
-               $res .= '<table class="liste">';
-               $res .= '<tr><th colspan="2"><strong>' . __('Générer une application Phonegap') . '</strong></th></tr>';
-               $res .= '<tr><td>' . __("Titre de l'application") . '</td><td>' . form::field('title', 30, 64) . '</td></tr>';
-               $res .= '<tr><td>' . __("Description de l'application") . '</td><td>' . form::textarea('description', 25, 5) . '</td></tr>';
-               $res .= '<tr><td>' . __('Package') . '</td><td>' . form::field('package', 30, 64) . '</td></tr>';
-               $res .= '<tr><td>' . __('Version') . '</td><td>' . form::field('version', 30, 64) . '</td></tr>';
-               $res .= '</table>';
-               $res .= '</form>';
-               $res .= '</div>';
-               $res .= commonPage::bf();
-               $res .= commonPage::bMain();
-               return $res;
-       }
-
-       public static function secureSWF() {
-               global $core;
-               commonDroits::min(1);
-
-               if (isset($_FILES) && isset($_FILES["file"])) {
-
-                       $tmp = cubeFiles::tempdir();
-                       if (!file_exists($tmp)) {
-                               mkdir($tmp, 0777, true);
-                       }
-
-                       $t = $_FILES['file']['tmp_name'];
-                       move_uploaded_file($t, $t . '.swf');
-
-                       $secure = new cubeCommandLine('secureSWF');
-                       $secure->setPath(CONVERTER_PATH);
-                       $secure->setArg(null, $t . '.swf');
-                       $secure->setArg(null, $tmp);
-
-                       $secure->execute();
-                       //fb($secure->commande);
-                       //fb($secure->output);
-
-                       $e = explode(DIRECTORY_SEPARATOR, $t);
-
-                       $result = $tmp . '/' . array_pop($e) . '.swf';
-                       cubeHTTP::downloadFile($result, $_FILES['file']['name']);
-
-                       `rm -rf $tmp`;
-                       unlink($t . '.swf');
-               }
-
-
-               $res = commonPage::barre();
-               $res .= commonPage::tMain();
-               $res .= commonPage::bh();
-               $res .= '<form action="" method="post" class="notajax" enctype="multipart/form-data">';
-               $res .= '<table class="liste">';
-               $res .= '<tr><th><strong>' . __('Sécuriser un SWF') . '</strong></th></tr>';
-               $res .= '<tr><td>' . __('Veuillez charger le fichier flash') . '</td></tr>';
-               $res .= '<tr class="odd"><td><input type="file" name="file" /></td></tr>';
-               $res .= '<tr><td class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Sécuriser le flash')) . '</a></td></td>';
-               $res .= '</table>';
-               $res .= '</form>';
-               $res .= '</div>';
-               $res .= commonPage::bf();
-               $res .= commonPage::bMain();
-               return $res;
-       }
 
        public static function csr() {
                commonDroits::min(1);
@@ -940,7 +872,7 @@ class commonTools {
                $opt['adapter'] = 'pdo_mysql';
                $opt['params']['charset'] = 'utf8';
                $opt['params']['adapterNamespace'] = 'CubeIT_Db_Adapter';
-               $opt['params']['unix_socket'] = trim(DB_HOST, ':');
+               $opt['params']['host'] = DB_HOST;
                $opt['params']['username'] = DB_USER;
                $opt['params']['password'] = DB_PASSWORD;
                $opt['params']['dbname'] = DB_NAME;

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index cf344266a27a715f005267ad4a1e11a6bfe09de9..8d009afc811a80dfec99297c22fcfded66997331 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -162,6 +162,8 @@ class commonUrl {
        public static function autocomplete($args) {\r
                global $core;\r
 \r
+               fb('!!!!');\r
+\r
                if (isset($_GET['q'])) {\r
                        $args[2] = $_GET['q'];\r
                }\r

diff --git a/inc/extranet/Controlleur/class.extranet.tools.php b/inc/extranet/Controlleur/class.extranet.tools.php
index c281d5c2a03401b0e28f3c617c396bbb2efaabd3..8152a6fc14bb49f38e10fef5bcbd94bf24ad2fe8 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.tools.php
+++ b/inc/extranet/Controlleur/class.extranet.tools.php
@@ -66,7 +66,6 @@ class extranetTools {
                        wsTools::encodeWebVideos($original);
                }
 
-
                $loop = isset($_GET['loop']) ? $_GET['loop'] : 0;
                $autoplay = isset($_GET['autoplay']) ? $_GET['autoplay'] : 0;
                $controls = isset($_GET['controls']) ? $_GET['controls'] : 1;

diff --git a/inc/prepend.php b/inc/prepend.php
index e735031219c8fdb049b86c5b03f1057548d27ff4..319fa94c47345ffe0b060295087e0efd4e4a6674 100644 (file)
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -20,10 +20,6 @@ require_once 'Zend/Loader/Autoloader.php';
 $loader = Zend_Loader_Autoloader::getInstance();\r
 $loader->registerNamespace('CubeIT_');\r
 \r
-require_once 'ChromeLogger/ChromePhp.php';\r
-//ChromePhp::getInstance()->setEnabled();\r
-\r
-\r
 if ($ws) {\r
        define('GA', 'UA-4339912-7');\r
        define('MAIL_BCC', 'tech@fluidbook.com');\r

diff --git a/index.php b/index.php
index cddfc9e29cff57203ed3e9a57887eff3a1b5c71e..423adcd4844dd60f2d3c13a500d0e826cfd98c30 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,6 +1,12 @@
 <?php
 
+require_once 'inc/ZendFramework/ChromeLogger/ChromePhp.php';
+ChromePhp::getInstance()->setEnabled();
+ChromePhp::log('!!');
+
 require_once(dirname(__FILE__) . '/inc/prepend.php');
+
+ChromePhp::log($_SERVER);
 ob_start();
 
 header('Access-Control-Allow-Origin: *');