From 06bc5806697e19a5a8bbefa83e47ea64b358cfe7 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 14 Jan 2014 10:15:23 +0000
Subject: [PATCH]

---
 inc/commons/class.common.ajax.php  |   2 +-
 inc/commons/class.common.tools.php |   2 +-
 inc/config.inc.php                 | 126 +++++++++++++++--------------
 3 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 3a78a19f9..7396c2953 100644
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -393,7 +393,7 @@ SVN : svn+ssh://svn@svn.cubedesigners.com/projects/$svn";
 			$mail->addTo($t);
 		}
 		$mail->setSubject($_POST['subject']);
-		$mail->setBodyHtmlFromZip($_FILES['src']['tmp_name'], ROOT . '/mailer/' . microtime());
+		$mail->setBodyHtmlFromZip($_FILES['src']['tmp_name'], '/mailer/' . time());
 		$transport = new CubeIT_Mail_Transport_Mailjet("ca110b35f8735c223d69c9987c2ac47d", 'b289d0acb08e0fe56ce98ccf0dd1ed8b');
 		$mail->send($transport);
 	}
diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 4b88cd9db..9a08d8eac 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -914,7 +914,7 @@ class commonTools {
 	}
 
 	public static function mailer() {
-		commonDroits::min(2);
+		commonDroits::min(1);
 		global $core;
 		$res = commonPage::barre();
 		$res .= commonPage::tMain();
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 051f77af2..0476a8b05 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -1,62 +1,64 @@
-<?php
-
-define('DB_DRIVER', 'mysql');
-define('DB_ENGINE', 'MyISAM');
-
-define('ROOT', dirname(__FILE__) . '/..');
-
-define('WEBROOT', '');
-define('SITE_PATH', WEBROOT . '/');
-define('FONT_PATH', ROOT . '/fluidbook/fonts/');
-define('FTPROOT', '/home/extranet/ftp/');
-define('WINDOWS', false);
-define('CONVERTER_PATH', '/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/scour');
-define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');
-define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc');
-define('AS3_SOURCES', '/home/as/sources/as/as3');
-define('AS3_FLUIDBOOK_SOURCES', '/home/as/sources/fluidbook');
-define('PHONEGAP_PLUGINS', '/home/as/sources/phonegap-plugins');
-
-define('MONITOR_PERFS', true);
-
-define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player');
-define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws');
-// Workshop
-define('THEMES', WEBROOT . '/fluidbook/themes/');
-define('ICONS', WEBROOT . '/fluidbook/icones/');
-define('WS_STATS', 'http://stats.fluidbook.com/');
-define('WS_FILES', ROOT . '/fluidbook');
-define('WS_BOOKS', WS_FILES . '/books');
-define('WS_COLLECTIONS', WS_FILES . '/collections');
-define('WS_DOCS', WS_FILES . '/docs');
-define('WS_ICONS', WS_FILES . '/icones');
-define('WS_THEMES', WS_FILES . '/themes');
-define('WS_CACHE', WS_FILES . '/cache');
-define('WS_COMPILE_ASSETS', WS_FILES . '/compile');
-define('WS_SOUNDS', WS_FILES . '/sounds');
-define('WS_TOOLS', WS_FILES . '/tools');
-define('WS_SHM', '/dev/shm');
-
-define('WORKER_PREFIX', 'worker.');
-
-define('CACHE', ROOT . '/cache');
-
-define('SESSION_LIFETIME', 3600 * 24 * 10);
-define('L10N', dirname(__FILE__) . '/../l10n');
-
-define('JS_PATH', WEBROOT . '/js');
-define('JS', JS_PATH);
-define('MINIMIZE_JS', false);
-
-define('JOURNEE', 8);
-define('TAUX_JOURNALIER', 500);
-define('AVAILABLE_LANGS', 'fr,en');
-
-// Zend
-define('ZEND', dirname(__FILE__) . "/ZendFramework");
-define('ZEND_VERSION', '1.11.10');
-// Timezone
-define('TIMEZONE', 'UTC');
-
-define('CUBE_SEARCH_LIMIT_CHARS', 3);
-?>
\ No newline at end of file
+<?php
+
+define('DB_DRIVER', 'mysql');
+define('DB_ENGINE', 'MyISAM');
+
+define('ROOT', dirname(__FILE__) . '/..');
+
+define('WEBROOT', '');
+define('SITE_PATH', WEBROOT . '/');
+define('FONT_PATH', ROOT . '/fluidbook/fonts/');
+define('FTPROOT', '/home/extranet/ftp/');
+define('WINDOWS', false);
+define('CONVERTER_PATH', '/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/scour');
+define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');
+define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc');
+define('AS3_SOURCES', '/home/as/sources/as/as3');
+define('AS3_FLUIDBOOK_SOURCES', '/home/as/sources/fluidbook');
+define('PHONEGAP_PLUGINS', '/home/as/sources/phonegap-plugins');
+
+define('MONITOR_PERFS', true);
+
+define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player');
+define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws');
+// Workshop
+define('THEMES', WEBROOT . '/fluidbook/themes/');
+define('ICONS', WEBROOT . '/fluidbook/icones/');
+define('WS_STATS', 'http://stats.fluidbook.com/');
+define('WS_FILES', ROOT . '/fluidbook');
+define('WS_BOOKS', WS_FILES . '/books');
+define('WS_COLLECTIONS', WS_FILES . '/collections');
+define('WS_DOCS', WS_FILES . '/docs');
+define('WS_ICONS', WS_FILES . '/icones');
+define('WS_THEMES', WS_FILES . '/themes');
+define('WS_CACHE', WS_FILES . '/cache');
+define('WS_COMPILE_ASSETS', WS_FILES . '/compile');
+define('WS_SOUNDS', WS_FILES . '/sounds');
+define('WS_TOOLS', WS_FILES . '/tools');
+define('WS_SHM', '/dev/shm');
+
+define('WORKER_PREFIX', 'worker.');
+
+define('CACHE', ROOT . '/cache');
+
+define('SESSION_LIFETIME', 3600 * 24 * 10);
+define('L10N', dirname(__FILE__) . '/../l10n');
+
+define('JS_PATH', WEBROOT . '/js');
+define('JS', JS_PATH);
+define('MINIMIZE_JS', false);
+
+define('JOURNEE', 8);
+define('TAUX_JOURNALIER', 500);
+define('AVAILABLE_LANGS', 'fr,en');
+
+// Zend
+define('ZEND', dirname(__FILE__) . "/ZendFramework");
+define('ZEND_VERSION', '1.11.10');
+// Timezone
+define('TIMEZONE', 'UTC');
+
+define('CUBE_SEARCH_LIMIT_CHARS', 3);
+
+
+define('PUBLIC_PATH', realpath(dirname(__FILE__) . '/..'));
-- 
2.39.5