From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 18 Jan 2011 14:01:43 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5dbb4388614f4fb93093f5e9bec24b3f6d18fba4;p=cubeextranet.git

---

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 69bdc7385..d1bc3ec5c 100644
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -92,18 +92,18 @@ class commonAjax {
 
 		if (!is_null($utilisateur)) {
 			$mail = new cubeMail();
-			$mail->from = 'contact@cubedesigners.com';
-			$mail->bcc = 'contact@cubedesigners.com';
-			$mail->subject = '[' . __('Extranet Cubedesigners') . '] ' . __('Récupération de vos identifiants');
+			$mail->from = FROM_NAME . '<' . FROM_EMAIL . '>';
+			$mail->bcc = FROM_EMAIL;
+			$mail->subject = '[' . EMAIL_SUBJECT . '] ' . __('Récupération de vos identifiants');
 			$mail->to = $utilisateur->prenom . ' ' . $utilisateur->nom . '<' . $utilisateur->email . '>';
 			$body = __('Bonjour,') . "\r\n\r\n";
-			$body .= __('Vous avez demandé la récupération de votre mot de passe sur notre extranet.') . "\r\n";
+			$body .= __('Vous avez demandé la récupération de votre mot de passe sur ') . APP_ARTICLE . "\r\n";
 			$body .= __('Voici toutes les informations vous permettant de vous y connecter à nouveau :') . "\r\n\r\n";
-			$body .= __('Adresse') . ' : http://extranet.cubedesigners.com/' . "\r\n";
+			$body .= __('Adresse') . ' : http://' . $_SERVER['HTTP_HOST'] . '/' . "\r\n";
 			$body .= __('Identifiant') . ' : ' . $utilisateur->email . "\r\n";
 			$body .= __('Mot de passe') . ' : ' . $utilisateur->password . "\r\n\r\n";
 			$body .= __('Cordialement,') . "\r\n";
-			$body .= __("L'Equipe Cubedesigners");
+			$body .= TEAM_NAME;
 			$mail->body = $body;
 			$ok = $mail->send();
 			$message = $ok?__('Vos identifiants vous ont été envoyé par e-mail'):__("Une erreur s'est produite lors de l'envoi de vos identifiants");
@@ -203,6 +203,122 @@ class commonAjax {
 		$dao->supprime($path);
 		$x->addContent('listeFichiers', extranetUrl::listeFichiers());
 	}
+
+	public static function formDashboard($args, &$x)
+	{
+		commonAjax::form('saveDashboard', __('Ajouter un élément au dashboard'), extranetUrl::formDashboard($args));
+	}
+
+	public static function saveDashboard($args, &$x)
+	{
+		global $core;
+
+		$c = $core->con->openCursor('dashboard');
+		$c->site = MODE;
+		$c->nom = $_POST['nom'];
+		if ($_POST['dashboard_id'] == 'new') {
+			$c->rubrique = $_POST['rubrique'];
+			$c->equipier = $core->user->utilisateur_id;
+			$c->settings = serialize($core->user->getSettings($_POST['rubrique']));
+			$r = $core->con->select('SELECT MAX(dashboard_id) AS dashboard_id FROM dashboard');
+			$c->dashboard_id = $r->dashboard_id + 1;
+			$c->insert();
+		} else {
+			$c->update('WHERE dashboard_id=\'' . $_POST['dashboard_id'] . '\'');
+		}
+		$x->addRedirection(SITE_PATH);
+	}
+
+	public static function pageDashboard($args, &$x)
+	{
+		$settings = self::getDashboardSettings($args[1]);
+		$settings['page'] = $args[2];
+		$r = self::saveDashboardSettings($args[1], $settings);
+		$x->addContent('dashboard_' . $args[1], commonUrl::displayDashboard($r));
+	}
+
+	public static function parPageDashboard($args, &$x)
+	{
+		$settings = self::getDashboardSettings($args[1]);
+		$settings['par_page'] = $_POST['par_page'];
+		$settings['page'] = 1;
+		$r = self::saveDashboardSettings($args[1], $settings);
+		$x->addContent('dashboard_' . $args[1], commonUrl::displayDashboard($r));
+	}
+
+	public static function sortDashboard($args, &$x)
+	{
+		$settings = self::getDashboardSettings($args[1]);
+		if ($settings['orderby'] == $args[2]) {
+			$settings['sens'] = ($settings['sens'] == 'ASC')?'DESC':'ASC';
+		} else {
+			$settings['orderby'] = $args[2];
+			$settings['sens'] = 'ASC';
+		}
+		$r = self::saveDashboardSettings($args[1], $settings);
+		$x->addContent('dashboard_' . $args[1], commonUrl::displayDashboard($r));
+	}
+
+	public static function saveDashboardSettings($dashboard, $settings)
+	{
+		global $core;
+
+		$settings['page'] = $settings['page']?$settings['page']:1;
+
+		if ($settings['par_page'] > 0) {
+			$settings['limit'] = array(($settings['page']-1) * $settings['par_page'], $settings['par_page']);
+		} else {
+			$settings['limit'] = null;
+		}
+
+		$c = $core->con->openCursor('dashboard');
+		$c->settings = serialize($settings);
+		$c->update('WHERE dashboard_id=' . $dashboard);
+		return $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');
+	}
+
+	public static function getDashboardSettings($dashboard)
+	{
+		global $core;
+		$r = $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');
+		return unserialize($r->settings);
+	}
+
+	public static function delDashboard($args, &$x)
+	{
+		global $core;
+		$r = $core->con->execute('DELETE FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\' AND equipier=\'' . $core->user->utilisateur_id . '\'');
+		$x->addReplace('dashboard_' . $args[1], '');
+	}
+
+	public static function reloadDashboards($args, &$x)
+	{
+		$x->addContent('dash', commonUrl::listeDashboard(array()));
+	}
+
+	public static function orderDashboards($args, &$x)
+	{
+		global $core;
+		$c = $core->con->openCursor('dashboard');
+		$i = 1;
+		foreach($_GET['dashboard'] as $id) {
+			$c->sort = $i;
+			$c->update('WHERE dashboard_id=\'' . $core->con->escape($id) . '\'');
+			$i++;
+		}
+	}
+
+	public static function toggleDashboard($args, &$x)
+	{
+		global $core;
+
+		$r = $core->con->select('SELECT state FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');
+		$new = ($r->state == '1')?'0':'1';
+
+		$c = $core->con->openCursor('dashboard');
+		$c->state = $new;
+		$c->update('WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 0078485eb..1c25dd1ed 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -42,30 +42,14 @@ if ($local) {
 	define('AS3_SOURCES', '/home/ws/sources');
 }
 
-define('FLASH_SOURCES', ROOT . '/swf/');
-
 if ($ws) {
 	define('MODE', 'ws');
-	define('GA', 'UA-4339912-5');
-	define('TITLE', 'Fuidbook Workshop');
-
-	define('FROM_EMAIL', 'workshop@fluidbook.com');
-	define('FROM_NAME', 'Fluidbook Workshop');
-	define('EMAIL_SUBJECT', 'Fluidbook Workshop');
-	define('TEAM_EMAIL', 'team@fluidbook.com');
-	define('RAPPEL', 'Rappel des identifiants de connexion au Fluidbook Workshop');
 } elseif ($extranet) {
 	define('MODE', 'extranet');
-	define('GA', 'UA-4339912-4');
-	define('TITLE', 'Extranet Cubedesigners');
-
-	define('FROM_EMAIL', 'extranet@cubedesigners.com');
-	define('FROM_NAME', 'Extranet Cubedesigners');
-	define('EMAIL_SUBJECT', 'Extranet Cubedesigners');
-	define('TEAM_EMAIL', 'team@cubedesigners.com');
-	define('RAPPEL', 'Rappel des identifiants de connexion à l\'extranet Cubedesigners');
 }
 
+define('FLASH_SOURCES', ROOT . '/swf/');
+
 if (DEV) {
 	define('STATIC_SERVER', 'http://devstatic.ws.fluidbook.com' . WEBROOT);
 } else {
diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index d08ec5c06..a663a748a 100644
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -550,120 +550,7 @@ class extranetAjax {
 		$core->sauvePreferencesUtilisateur();
 	}
 
-	public static function formDashboard($args, &$x)
-	{
-		commonAjax::form('saveDashboard', __('Ajouter un élément au dashboard'), extranetUrl::formDashboard($args));
-	}
-
-	public static function saveDashboard($args, &$x)
-	{
-		global $core;
-
-		$c = $core->con->openCursor('dashboard');
-		$c->nom = $_POST['nom'];
-		if ($_POST['dashboard_id'] == 'new') {
-			$c->rubrique = $_POST['rubrique'];
-			$c->equipier = $core->user->utilisateur_id;
-			$c->settings = serialize($core->user->getSettings($_POST['rubrique']));
-			$r = $core->con->select('SELECT MAX(dashboard_id) AS dashboard_id FROM dashboard');
-			$c->dashboard_id = $r->dashboard_id + 1;
-			$c->insert();
-		} else {
-			$c->update('WHERE dashboard_id=\'' . $_POST['dashboard_id'] . '\'');
-		}
-		$x->addRedirection(SITE_PATH);
-	}
-
-	public static function pageDashboard($args, &$x)
-	{
-		$settings = self::getDashboardSettings($args[1]);
-		$settings['page'] = $args[2];
-		$r = self::saveDashboardSettings($args[1], $settings);
-		$x->addContent('dashboard_' . $args[1], extranetUrl::displayDashboard($r));
-	}
-
-	public static function parPageDashboard($args, &$x)
-	{
-		$settings = self::getDashboardSettings($args[1]);
-		$settings['par_page'] = $_POST['par_page'];
-		$settings['page'] = 1;
-		$r = self::saveDashboardSettings($args[1], $settings);
-		$x->addContent('dashboard_' . $args[1], extranetUrl::displayDashboard($r));
-	}
-
-	public static function sortDashboard($args, &$x)
-	{
-		$settings = self::getDashboardSettings($args[1]);
-		if ($settings['orderby'] == $args[2]) {
-			$settings['sens'] = ($settings['sens'] == 'ASC')?'DESC':'ASC';
-		} else {
-			$settings['orderby'] = $args[2];
-			$settings['sens'] = 'ASC';
-		}
-		$r = self::saveDashboardSettings($args[1], $settings);
-		$x->addContent('dashboard_' . $args[1], extranetUrl::displayDashboard($r));
-	}
-
-	public static function saveDashboardSettings($dashboard, $settings)
-	{
-		global $core;
-
-		$settings['page'] = $settings['page']?$settings['page']:1;
-
-		if ($settings['par_page'] > 0) {
-			$settings['limit'] = array(($settings['page']-1) * $settings['par_page'], $settings['par_page']);
-		} else {
-			$settings['limit'] = null;
-		}
-
-		$c = $core->con->openCursor('dashboard');
-		$c->settings = serialize($settings);
-		$c->update('WHERE dashboard_id=' . $dashboard);
-		return $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');
-	}
 
-	public static function getDashboardSettings($dashboard)
-	{
-		global $core;
-		$r = $core->con->select('SELECT * FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($dashboard) . '\'');
-		return unserialize($r->settings);
-	}
-
-	public static function delDashboard($args, &$x)
-	{
-		global $core;
-		$r = $core->con->execute('DELETE FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\' AND equipier=\'' . $core->user->utilisateur_id . '\'');
-		$x->addReplace('dashboard_' . $args[1], '');
-	}
-
-	public static function reloadDashboards($args, &$x)
-	{
-		$x->addContent('dash', extranetUrl::listeDashboard(array()));
-	}
-
-	public static function orderDashboards($args, &$x)
-	{
-		global $core;
-		$c = $core->con->openCursor('dashboard');
-		$i = 1;
-		foreach($_GET['dashboard'] as $id) {
-			$c->sort = $i;
-			$c->update('WHERE dashboard_id=\'' . $core->con->escape($id) . '\'');
-			$i++;
-		}
-	}
-
-	public static function toggleDashboard($args, &$x)
-	{
-		global $core;
-
-		$r = $core->con->select('SELECT state FROM dashboard WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');
-		$new = ($r->state == '1')?'0':'1';
-
-		$c = $core->con->openCursor('dashboard');
-		$c->state = $new;
-		$c->update('WHERE dashboard_id=\'' . $core->con->escape($args[1]) . '\'');
-	}
 
 	public static function getAdresseForDevis($args, &$x)
 	{
diff --git a/inc/prepend.php b/inc/prepend.php
index d84715e9a..b5dd8f0e4 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -6,6 +6,30 @@ require_once(dirname(__FILE__) . '/cube/_common.php');
 // Inclusion des classes communes
 require_once(dirname(__FILE__) . '/commons/_common.php');
 
+if ($ws) {
+	define('GA', 'UA-4339912-5');
+	define('TITLE', 'Fuidbook Workshop');
+
+	define('FROM_EMAIL', 'workshop@fluidbook.com');
+	define('FROM_NAME', 'Fluidbook Workshop');
+	define('EMAIL_SUBJECT', 'Fluidbook Workshop');
+	define('TEAM_EMAIL', 'team@fluidbook.com');
+	define('TEAM_NAME', __("L'équipe Fluidbook"));
+	define('RAPPEL', __('Rappel des identifiants de connexion au Fluidbook Workshop'));
+	define('ASK_IDENT', __('Vous avez demandé la récupération de votre mot de passe sur le Fluidbook Workshop'));
+} elseif ($extranet) {
+	define('GA', 'UA-4339912-4');
+	define('TITLE', 'Extranet Cubedesigners');
+
+	define('FROM_EMAIL', 'extranet@cubedesigners.com');
+	define('FROM_NAME', 'Extranet Cubedesigners');
+	define('EMAIL_SUBJECT', 'Extranet Cubedesigners');
+	define('TEAM_EMAIL', 'team@cubedesigners.com');
+	define('TEAM_NAME', __("L'équipe Cubedesigners"));
+	define('RAPPEL', __('Rappel des identifiants de connexion à l\'extranet Cubedesigners'));
+	define('ASK_IDENT', __("Vous avez demandé la récupération de votre mot de passe sur l'extranet Cubedesigners"));
+}
+
 $GLOBALS['ajaxClasses'][] = 'commonAjax';
 require_once(dirname(__FILE__) . '/' . MODE . '/_common.php');
 
@@ -14,4 +38,5 @@ if (isset($_POST['q'])) {
 } elseif (!isset($_SERVER['HTTP_X_REQUESTED_WITH']) || $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest') {
 	$_SESSION['q'] = null;
 }
+
 ?>
\ No newline at end of file