From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 13 Jan 2017 18:20:27 +0000 (+0000)
Subject: wip #1077 @6
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=af608454486ca99d1bf8f75c36e7adeb5a7a34e5;p=cubeextranet.git

wip #1077 @6
---

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 3f465449f..016e79577 100644
--- 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 cf344266a..8d009afc8 100644
--- 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) {
 		global $core;
 
+		fb('!!!!');
+
 		if (isset($_GET['q'])) {
 			$args[2] = $_GET['q'];
 		}
diff --git a/inc/extranet/Controlleur/class.extranet.tools.php b/inc/extranet/Controlleur/class.extranet.tools.php
index c281d5c2a..8152a6fc1 100644
--- 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 e73503121..319fa94c4 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -20,10 +20,6 @@ require_once 'Zend/Loader/Autoloader.php';
 $loader = Zend_Loader_Autoloader::getInstance();
 $loader->registerNamespace('CubeIT_');
 
-require_once 'ChromeLogger/ChromePhp.php';
-//ChromePhp::getInstance()->setEnabled();
-
-
 if ($ws) {
 	define('GA', 'UA-4339912-7');
 	define('MAIL_BCC', 'tech@fluidbook.com');
diff --git a/index.php b/index.php
index cddfc9e29..423adcd48 100644
--- 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: *');