(no commit message)

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 69bdc7385632ef60f5b9c10b30e1183a6179809e..d1bc3ec5cf9966fefe5d47485f5af49db7ed07f2 100644 (file)
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -92,18 +92,18 @@ class commonAjax {
 \r
                if (!is_null($utilisateur)) {\r
                        $mail = new cubeMail();\r
-                       $mail->from = 'contact@cubedesigners.com';\r
-                       $mail->bcc = 'contact@cubedesigners.com';\r
-                       $mail->subject = '[' . __('Extranet Cubedesigners') . '] ' . __('Récupération de vos identifiants');\r
+                       $mail->from = FROM_NAME . '<' . FROM_EMAIL . '>';\r
+                       $mail->bcc = FROM_EMAIL;\r
+                       $mail->subject = '[' . EMAIL_SUBJECT . '] ' . __('Récupération de vos identifiants');\r
                        $mail->to = $utilisateur->prenom . ' ' . $utilisateur->nom . '<' . $utilisateur->email . '>';\r
                        $body = __('Bonjour,') . "\r\n\r\n";\r
-                       $body .= __('Vous avez demandé la récupération de votre mot de passe sur notre extranet.') . "\r\n";\r
+                       $body .= __('Vous avez demandé la récupération de votre mot de passe sur ') . APP_ARTICLE . "\r\n";\r
                        $body .= __('Voici toutes les informations vous permettant de vous y connecter à nouveau :') . "\r\n\r\n";\r
-                       $body .= __('Adresse') . ' : http://extranet.cubedesigners.com/' . "\r\n";\r
+                       $body .= __('Adresse') . ' : http://' . $_SERVER['HTTP_HOST'] . '/' . "\r\n";\r
                        $body .= __('Identifiant') . ' : ' . $utilisateur->email . "\r\n";\r
                        $body .= __('Mot de passe') . ' : ' . $utilisateur->password . "\r\n\r\n";\r
                        $body .= __('Cordialement,') . "\r\n";\r
-                       $body .= __("L'Equipe Cubedesigners");\r
+                       $body .= TEAM_NAME;\r
                        $mail->body = $body;\r
                        $ok = $mail->send();\r
                        $message = $ok?__('Vos identifiants vous ont été envoyé par e-mail'):__("Une erreur s'est produite lors de l'envoi de vos identifiants");\r
@@ -203,6 +203,122 @@ class commonAjax {
                $dao->supprime($path);\r
                $x->addContent('listeFichiers', extranetUrl::listeFichiers());\r
        }\r
+\r
+       public static function formDashboard($args, &$x)\r
+       {\r
+               commonAjax::form('saveDashboard', __('Ajouter un élément au dashboard'), extranetUrl::formDashboard($args));\r
+       }\r
+\r
+       public static function saveDashboard($args, &$x)\r
+       {\r
+               global $core;\r
+\r
+               $c = $core->con->openCursor('dashboard');\r
+               $c->site = MODE;\r
+               $c->nom = $_POST['nom'];\r
+               if ($_POST['dashboard_id'] == 'new') {\r
+                       $c->rubrique = $_POST['rubrique'];\r
+                       $c->equipier = $core->user->utilisateur_id;\r
+                       $c->settings = serialize($core->user->getSettings($_POST['rubrique']));\r
+                       $r = $core->con->select('SELECT MAX(dashboard_id) AS dashboard_id FROM dashboard');\r
+                       $c->dashboard_id = $r->dashboard_id + 1;\r
+                       $c->insert();\r
+               } else {\r
+                       $c->update('WHERE dashboard_id=\'' . $_POST['dashboard_id'] . '\'');\r
+               }\r
+               $x->addRedirection(SITE_PATH);\r
+       }\r
+\r
+       public static function pageDashboard($args, &$x)\r
+       {\r
+               $settings = self::getDashboardSettings($args[1]);\r
+               $settings['page'] = $args[2];\r
+               $r = self::saveDashboardSettings($args[1], $settings);\r
+               $x->addContent('dashboard_' . $args[1], commonUrl::displayDashboard($r));\r
+       }\r
+\r
+       public static function parPageDashboard($args, &$x)\r
+       {\r
+               $settings = self::getDashboardSettings($args[1]);\r
+               $settings['par_page'] = $_POST['par_page'];\r
+               $settings['page'] = 1;\r
+               $r = self::saveDashboardSettings($args[1], $settings);\r
+               $x->addContent('dashboard_' . $args[1], commonUrl::displayDashboard($r));\r
+       }\r
+\r
+       public static function sortDashboard($args, &$x)\r
+       {\r
+               $settings = self::getDashboardSettings($args[1]);\r
+               if ($settings['orderby'] == $args[2]) {\r
+                       $settings['sens'] = ($settings['sens'] == 'ASC')?'DESC':'ASC';\r
+               } else {\r
+                       $settings['orderby'] = $args[2];\r
+                       $settings['sens'] = 'ASC';\r
+               }\r
+               $r = self::saveDashboardSettings($args[1], $settings);\r
+               $x->addContent('dashboard_' . $args[1], commonUrl::displayDashboard($r));\r
+       }\r
+\r
+       public static function saveDashboardSettings($dashboard, $settings)\r
+       {\r
+               global $core;\r
+\r
+               $settings['page'] = $settings['page']?$settings['page']:1;\r
+\r
+               if ($settings['par_page'] > 0) {\r
+                       $settings['limit'] = array(($settings['page']-1) * $settings['par_page'], $settings['par_page']);\r
+               } else {\r
+                       $settings['limit'] = null;\r
+               }\r
+\r
+               $c = $core->con->openCursor('dashboard');\r
+               $c->settings = serialize($settings);\r
+               $c->update('WHERE dashboard_id=' . $dashboard);\r
+               return $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');\r
+       }\r
+\r
+       public static function getDashboardSettings($dashboard)\r
+       {\r
+               global $core;\r
+               $r = $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');\r
+               return unserialize($r->settings);\r
+       }\r
+\r
+       public static function delDashboard($args, &$x)\r
+       {\r
+               global $core;\r
+               $r = $core->con->execute('DELETE FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\' AND equipier=\'' . $core->user->utilisateur_id . '\'');\r
+               $x->addReplace('dashboard_' . $args[1], '');\r
+       }\r
+\r
+       public static function reloadDashboards($args, &$x)\r
+       {\r
+               $x->addContent('dash', commonUrl::listeDashboard(array()));\r
+       }\r
+\r
+       public static function orderDashboards($args, &$x)\r
+       {\r
+               global $core;\r
+               $c = $core->con->openCursor('dashboard');\r
+               $i = 1;\r
+               foreach($_GET['dashboard'] as $id) {\r
+                       $c->sort = $i;\r
+                       $c->update('WHERE dashboard_id=\'' . $core->con->escape($id) . '\'');\r
+                       $i++;\r
+               }\r
+       }\r
+\r
+       public static function toggleDashboard($args, &$x)\r
+       {\r
+               global $core;\r
+\r
+               $r = $core->con->select('SELECT state FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');\r
+               $new = ($r->state == '1')?'0':'1';\r
+\r
+               $c = $core->con->openCursor('dashboard');\r
+               $c->state = $new;\r
+               $c->update('WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 0078485eb55773b238205f2b6bc82a4d08f7fc4a..1c25dd1edf6a33307768c3484dca9715d0271bbc 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -42,30 +42,14 @@ if ($local) {
        define('AS3_SOURCES', '/home/ws/sources');\r
 }\r
 \r
-define('FLASH_SOURCES', ROOT . '/swf/');\r
-\r
 if ($ws) {\r
        define('MODE', 'ws');\r
-       define('GA', 'UA-4339912-5');\r
-       define('TITLE', 'Fuidbook Workshop');\r
-\r
-       define('FROM_EMAIL', 'workshop@fluidbook.com');\r
-       define('FROM_NAME', 'Fluidbook Workshop');\r
-       define('EMAIL_SUBJECT', 'Fluidbook Workshop');\r
-       define('TEAM_EMAIL', 'team@fluidbook.com');\r
-       define('RAPPEL', 'Rappel des identifiants de connexion au Fluidbook Workshop');\r
 } elseif ($extranet) {\r
        define('MODE', 'extranet');\r
-       define('GA', 'UA-4339912-4');\r
-       define('TITLE', 'Extranet Cubedesigners');\r
-\r
-       define('FROM_EMAIL', 'extranet@cubedesigners.com');\r
-       define('FROM_NAME', 'Extranet Cubedesigners');\r
-       define('EMAIL_SUBJECT', 'Extranet Cubedesigners');\r
-       define('TEAM_EMAIL', 'team@cubedesigners.com');\r
-       define('RAPPEL', 'Rappel des identifiants de connexion à l\'extranet Cubedesigners');\r
 }\r
 \r
+define('FLASH_SOURCES', ROOT . '/swf/');\r
+\r
 if (DEV) {\r
        define('STATIC_SERVER', 'http://devstatic.ws.fluidbook.com' . WEBROOT);\r
 } else {\r

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index d08ec5c06bfc93faf35915140c5117edbc4ed05f..a663a748a0d3c8a919d8bc77cb498896af88c9dd 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -550,120 +550,7 @@ class extranetAjax {
                $core->sauvePreferencesUtilisateur();\r
        }\r
 \r
-       public static function formDashboard($args, &$x)\r
-       {\r
-               commonAjax::form('saveDashboard', __('Ajouter un élément au dashboard'), extranetUrl::formDashboard($args));\r
-       }\r
-\r
-       public static function saveDashboard($args, &$x)\r
-       {\r
-               global $core;\r
-\r
-               $c = $core->con->openCursor('dashboard');\r
-               $c->nom = $_POST['nom'];\r
-               if ($_POST['dashboard_id'] == 'new') {\r
-                       $c->rubrique = $_POST['rubrique'];\r
-                       $c->equipier = $core->user->utilisateur_id;\r
-                       $c->settings = serialize($core->user->getSettings($_POST['rubrique']));\r
-                       $r = $core->con->select('SELECT MAX(dashboard_id) AS dashboard_id FROM dashboard');\r
-                       $c->dashboard_id = $r->dashboard_id + 1;\r
-                       $c->insert();\r
-               } else {\r
-                       $c->update('WHERE dashboard_id=\'' . $_POST['dashboard_id'] . '\'');\r
-               }\r
-               $x->addRedirection(SITE_PATH);\r
-       }\r
-\r
-       public static function pageDashboard($args, &$x)\r
-       {\r
-               $settings = self::getDashboardSettings($args[1]);\r
-               $settings['page'] = $args[2];\r
-               $r = self::saveDashboardSettings($args[1], $settings);\r
-               $x->addContent('dashboard_' . $args[1], extranetUrl::displayDashboard($r));\r
-       }\r
-\r
-       public static function parPageDashboard($args, &$x)\r
-       {\r
-               $settings = self::getDashboardSettings($args[1]);\r
-               $settings['par_page'] = $_POST['par_page'];\r
-               $settings['page'] = 1;\r
-               $r = self::saveDashboardSettings($args[1], $settings);\r
-               $x->addContent('dashboard_' . $args[1], extranetUrl::displayDashboard($r));\r
-       }\r
-\r
-       public static function sortDashboard($args, &$x)\r
-       {\r
-               $settings = self::getDashboardSettings($args[1]);\r
-               if ($settings['orderby'] == $args[2]) {\r
-                       $settings['sens'] = ($settings['sens'] == 'ASC')?'DESC':'ASC';\r
-               } else {\r
-                       $settings['orderby'] = $args[2];\r
-                       $settings['sens'] = 'ASC';\r
-               }\r
-               $r = self::saveDashboardSettings($args[1], $settings);\r
-               $x->addContent('dashboard_' . $args[1], extranetUrl::displayDashboard($r));\r
-       }\r
-\r
-       public static function saveDashboardSettings($dashboard, $settings)\r
-       {\r
-               global $core;\r
-\r
-               $settings['page'] = $settings['page']?$settings['page']:1;\r
-\r
-               if ($settings['par_page'] > 0) {\r
-                       $settings['limit'] = array(($settings['page']-1) * $settings['par_page'], $settings['par_page']);\r
-               } else {\r
-                       $settings['limit'] = null;\r
-               }\r
-\r
-               $c = $core->con->openCursor('dashboard');\r
-               $c->settings = serialize($settings);\r
-               $c->update('WHERE dashboard_id=' . $dashboard);\r
-               return $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');\r
-       }\r
 \r
-       public static function getDashboardSettings($dashboard)\r
-       {\r
-               global $core;\r
-               $r = $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');\r
-               return unserialize($r->settings);\r
-       }\r
-\r
-       public static function delDashboard($args, &$x)\r
-       {\r
-               global $core;\r
-               $r = $core->con->execute('DELETE FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\' AND equipier=\'' . $core->user->utilisateur_id . '\'');\r
-               $x->addReplace('dashboard_' . $args[1], '');\r
-       }\r
-\r
-       public static function reloadDashboards($args, &$x)\r
-       {\r
-               $x->addContent('dash', extranetUrl::listeDashboard(array()));\r
-       }\r
-\r
-       public static function orderDashboards($args, &$x)\r
-       {\r
-               global $core;\r
-               $c = $core->con->openCursor('dashboard');\r
-               $i = 1;\r
-               foreach($_GET['dashboard'] as $id) {\r
-                       $c->sort = $i;\r
-                       $c->update('WHERE dashboard_id=\'' . $core->con->escape($id) . '\'');\r
-                       $i++;\r
-               }\r
-       }\r
-\r
-       public static function toggleDashboard($args, &$x)\r
-       {\r
-               global $core;\r
-\r
-               $r = $core->con->select('SELECT state FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');\r
-               $new = ($r->state == '1')?'0':'1';\r
-\r
-               $c = $core->con->openCursor('dashboard');\r
-               $c->state = $new;\r
-               $c->update('WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');\r
-       }\r
 \r
        public static function getAdresseForDevis($args, &$x)\r
        {\r

diff --git a/inc/prepend.php b/inc/prepend.php
index d84715e9a652d787acdac94b4028ce5a3992a87e..b5dd8f0e4a6f5def84285970a5d4234c83843ace 100644 (file)
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -6,6 +6,30 @@ require_once(dirname(__FILE__) . '/cube/_common.php');
 // Inclusion des classes communes\r
 require_once(dirname(__FILE__) . '/commons/_common.php');\r
 \r
+if ($ws) {\r
+       define('GA', 'UA-4339912-5');\r
+       define('TITLE', 'Fuidbook Workshop');\r
+\r
+       define('FROM_EMAIL', 'workshop@fluidbook.com');\r
+       define('FROM_NAME', 'Fluidbook Workshop');\r
+       define('EMAIL_SUBJECT', 'Fluidbook Workshop');\r
+       define('TEAM_EMAIL', 'team@fluidbook.com');\r
+       define('TEAM_NAME', __("L'équipe Fluidbook"));\r
+       define('RAPPEL', __('Rappel des identifiants de connexion au Fluidbook Workshop'));\r
+       define('ASK_IDENT', __('Vous avez demandé la récupération de votre mot de passe sur le Fluidbook Workshop'));\r
+} elseif ($extranet) {\r
+       define('GA', 'UA-4339912-4');\r
+       define('TITLE', 'Extranet Cubedesigners');\r
+\r
+       define('FROM_EMAIL', 'extranet@cubedesigners.com');\r
+       define('FROM_NAME', 'Extranet Cubedesigners');\r
+       define('EMAIL_SUBJECT', 'Extranet Cubedesigners');\r
+       define('TEAM_EMAIL', 'team@cubedesigners.com');\r
+       define('TEAM_NAME', __("L'équipe Cubedesigners"));\r
+       define('RAPPEL', __('Rappel des identifiants de connexion à l\'extranet Cubedesigners'));\r
+       define('ASK_IDENT', __("Vous avez demandé la récupération de votre mot de passe sur l'extranet Cubedesigners"));\r
+}\r
+\r
 $GLOBALS['ajaxClasses'][] = 'commonAjax';\r
 require_once(dirname(__FILE__) . '/' . MODE . '/_common.php');\r
 \r
@@ -14,4 +38,5 @@ if (isset($_POST['q'])) {
 } elseif (!isset($_SERVER['HTTP_X_REQUESTED_WITH']) || $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest') {\r
        $_SESSION['q'] = null;\r
 }\r
+\r
 ?>
\ No newline at end of file