(no commit message)

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 3a78a19f91a7bf3c30b247f8a265789b0b4e2cca..7396c295304217d79a9e9d20cc048080d5c4659f 100644 (file)
--- 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 4b88cd9db54cf6f03fdd59f3d24b3e2c65f5f0e6..9a08d8eac907627933120e1818d26ef137dc51be 100644 (file)
--- 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 051f77af2f4053cab9d41ef7d9dea227f02fc0c8..0476a8b056318ceacff0054f2ca8a8ba459e0dd9 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -1,62 +1,64 @@
-<?php\r
-\r
-define('DB_DRIVER', 'mysql');\r
-define('DB_ENGINE', 'MyISAM');\r
-\r
-define('ROOT', dirname(__FILE__) . '/..');\r
-\r
-define('WEBROOT', '');\r
-define('SITE_PATH', WEBROOT . '/');\r
-define('FONT_PATH', ROOT . '/fluidbook/fonts/');\r
-define('FTPROOT', '/home/extranet/ftp/');\r
-define('WINDOWS', false);\r
-define('CONVERTER_PATH', '/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/scour');\r
-define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');\r
-define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc');\r
-define('AS3_SOURCES', '/home/as/sources/as/as3');\r
-define('AS3_FLUIDBOOK_SOURCES', '/home/as/sources/fluidbook');\r
-define('PHONEGAP_PLUGINS', '/home/as/sources/phonegap-plugins');\r
-\r
-define('MONITOR_PERFS', true);\r
-\r
-define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player');\r
-define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws');\r
-// Workshop\r
-define('THEMES', WEBROOT . '/fluidbook/themes/');\r
-define('ICONS', WEBROOT . '/fluidbook/icones/');\r
-define('WS_STATS', 'http://stats.fluidbook.com/');\r
-define('WS_FILES', ROOT . '/fluidbook');\r
-define('WS_BOOKS', WS_FILES . '/books');\r
-define('WS_COLLECTIONS', WS_FILES . '/collections');\r
-define('WS_DOCS', WS_FILES . '/docs');\r
-define('WS_ICONS', WS_FILES . '/icones');\r
-define('WS_THEMES', WS_FILES . '/themes');\r
-define('WS_CACHE', WS_FILES . '/cache');\r
-define('WS_COMPILE_ASSETS', WS_FILES . '/compile');\r
-define('WS_SOUNDS', WS_FILES . '/sounds');\r
-define('WS_TOOLS', WS_FILES . '/tools');\r
-define('WS_SHM', '/dev/shm');\r
-\r
-define('WORKER_PREFIX', 'worker.');\r
-\r
-define('CACHE', ROOT . '/cache');\r
-\r
-define('SESSION_LIFETIME', 3600 * 24 * 10);\r
-define('L10N', dirname(__FILE__) . '/../l10n');\r
-\r
-define('JS_PATH', WEBROOT . '/js');\r
-define('JS', JS_PATH);\r
-define('MINIMIZE_JS', false);\r
-\r
-define('JOURNEE', 8);\r
-define('TAUX_JOURNALIER', 500);\r
-define('AVAILABLE_LANGS', 'fr,en');\r
-\r
-// Zend\r
-define('ZEND', dirname(__FILE__) . "/ZendFramework");\r
-define('ZEND_VERSION', '1.11.10');\r
-// Timezone\r
-define('TIMEZONE', 'UTC');\r
-\r
-define('CUBE_SEARCH_LIMIT_CHARS', 3);\r
-?>
\ 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__) . '/..'));