From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 17 Apr 2013 08:04:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3d4d3e383197d4c3f218c7d7322e84db34939a7e;p=cubeextranet.git

---

diff --git a/images/ws/white/studiofrance/favicon/favicon-ios-114.png b/images/ws/white/studiofrance/favicon/favicon-ios-114.png
new file mode 100644
index 000000000..21d127e55
Binary files /dev/null and b/images/ws/white/studiofrance/favicon/favicon-ios-114.png differ
diff --git a/images/ws/white/studiofrance/favicon/favicon-ios-144.png b/images/ws/white/studiofrance/favicon/favicon-ios-144.png
new file mode 100644
index 000000000..818207c9d
Binary files /dev/null and b/images/ws/white/studiofrance/favicon/favicon-ios-144.png differ
diff --git a/images/ws/white/studiofrance/favicon/favicon-ios-57.png b/images/ws/white/studiofrance/favicon/favicon-ios-57.png
new file mode 100644
index 000000000..6444cbc43
Binary files /dev/null and b/images/ws/white/studiofrance/favicon/favicon-ios-57.png differ
diff --git a/images/ws/white/studiofrance/favicon/favicon-ios-72.png b/images/ws/white/studiofrance/favicon/favicon-ios-72.png
new file mode 100644
index 000000000..e6338e390
Binary files /dev/null and b/images/ws/white/studiofrance/favicon/favicon-ios-72.png differ
diff --git a/images/ws/white/studiofrance/favicon/favicon.ico b/images/ws/white/studiofrance/favicon/favicon.ico
new file mode 100644
index 000000000..310d78374
Binary files /dev/null and b/images/ws/white/studiofrance/favicon/favicon.ico differ
diff --git a/images/ws/white/studiofrance/favicon/favicon.png b/images/ws/white/studiofrance/favicon/favicon.png
new file mode 100644
index 000000000..3cf89a5b4
Binary files /dev/null and b/images/ws/white/studiofrance/favicon/favicon.png differ
diff --git a/images/ws/white/studiofrance/logo.png b/images/ws/white/studiofrance/logo.png
new file mode 100644
index 000000000..7a2e45354
Binary files /dev/null and b/images/ws/white/studiofrance/logo.png differ
diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index fb8a3fc6e..1e5543d57 100644
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -89,8 +89,9 @@ class commonAjax {
 
 		if (!is_null($utilisateur) && $utilisateur->enabled) {
 			$mail = new cubeMail();
+			$mail->charset = 'UTF-8';
 			$mail->from = FROM_NAME . '<' . FROM_EMAIL . '>';
-			$mail->bcc = FROM_EMAIL;
+			$mail->bcc = MAIL_BCC;
 			$mail->subject = '[' . EMAIL_SUBJECT . '] ' . __('Récupération de vos identifiants');
 			$mail->to = $utilisateur->prenom . ' ' . $utilisateur->nom . '<' . $utilisateur->email . '>';
 			$body = __('Bonjour,') . "\r\n\r\n";
diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index 5483c3c1c..dee603750 100644
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -2,6 +2,14 @@
 
 class commonPage {
 
+	public static function logo(){
+		
+		if(THEME){
+			return cubeMedia::image(IMG . '/white/'.THEME.'/logo.png');
+		}
+		return cubeMedia::image(IMG . '/logo.png');
+	}
+	
 	public static function header($args) {
 		global $js;
 		global $core;
@@ -16,7 +24,7 @@ class commonPage {
 		$res .= '<div id="header">';
 		$res .= '<div class="content">';
 		// Le logo avec le lien de retour à l'accueil
-		$res .= '<div id="logo"><a href="' . SITE_PATH . '">' . cubeMedia::image(IMG . '/logo.png') . '</a></div>';
+		$res .= '<div id="logo"><a href="' . SITE_PATH . '">' . self::logo() . '</a></div>';
 		if ($core->user) {
 			$search = self::search($args);
 
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 8547b6dc5..d279e7f2c 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -502,7 +502,6 @@ class commonUrl {
 
 	public static function hashFile($path) {
 		$path = trim($path, '/');
-		fb($path);
 		return sha1('!!//' . $path . '||--');
 	}
 
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 3bb5b0c15..aeae00700 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -50,9 +50,7 @@ define('MINIMIZE_JS',false);
 define('JOURNEE', 8);
 define('TAUX_JOURNALIER', 500);
 define('AVAILABLE_LANGS', 'fr,en');
-// Les emails au départ de l'interface seront systématiquement envoyés
-// en copie cachée à cet e-mail
-define('MAIL_BCC', 'contact@cubedesigners.com');
+
 // Zend
 define('ZEND', dirname(__FILE__) . "/ZendFramework");
 define('ZEND_VERSION', '1.11.10');
diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 100e65dee..20824fa27 100644
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -2,8 +2,14 @@
 
 $dev = stristr($_SERVER['HTTP_HOST'], 'dev.');
 $extranet = stristr($_SERVER['HTTP_HOST'], 'cubedesigners.com');
-$ws = stristr($_SERVER['HTTP_HOST'], 'fluidbook.com');
+$ws = !$extranet;
 
+$theme = false;
+if ($_SERVER['HTTP_HOST'] == 'workshop.studio-france.com') {
+	$theme = 'studiofrance';
+}
+
+define('THEME', $theme);
 define('DEV', $dev);
 
 // Définition des variables dans l'environnement de production
@@ -28,7 +34,7 @@ if ($ws) {
 	define('MODE', 'extranet');
 }
 
-define('STATIC_SERVER', 'http://static.' . $_SERVER['HTTP_HOST'] . WEBROOT);
+define('STATIC_SERVER', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT);
 
 define('CSS_PATH', WEBROOT . '/style/' . MODE);
 define('STYLE', CSS_PATH);
@@ -37,7 +43,12 @@ define('SYSSTYLE', ROOT . '/style/' . MODE);
 define('SYSIMG', ROOT . '/images/' . MODE);
 define('IMG', WEBROOT . '/images/' . MODE);
 
-$faviconroot=IMG.'/favicon';
+if (THEME) {
+	$faviconroot = IMG . '/white/' . THEME . '/favicon';
+} else {
+	$faviconroot = IMG . '/favicon';
+}
+
 
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);
 define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');
diff --git a/inc/prepend.php b/inc/prepend.php
index ae98d3b78..04246f928 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -11,21 +11,34 @@ require_once(dirname(__FILE__) . '/commons/_common.php');
 // Zend framework and associated frameworks
 set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/ZendFramework');
 require_once 'Zend/Loader/Autoloader.php';
-$loader=Zend_Loader_Autoloader::getInstance();
+$loader = Zend_Loader_Autoloader::getInstance();
 $loader->registerNamespace('CubeIT_');
 
+
 if ($ws) {
 	define('GA', 'UA-4339912-7');
-	define('TITLE', 'Fuidbook Workshop');
-
-	define('FROM_EMAIL', 'tech@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'));
+	define('MAIL_BCC', 'tech@fluidbook.com');
+	if (!THEME) {
+		define('TITLE', 'Fuidbook Workshop');
+		define('FROM_EMAIL', 'tech@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 (THEME == 'studiofrance') {
+		define('TITLE', 'studiofrance, agence de communication - Workshop');
+		define('FROM_EMAIL', 'workshop@studio-france.com');
+		define('FROM_NAME', 'Studiofrance');
+		define('EMAIL_SUBJECT', 'Studiofrance');
+		define('TEAM_EMAIL', 'workshop@studio-france.com');
+		define('TEAM_NAME', __("L'équipe Studiofrance"));
+		define('RAPPEL', __('Rappel des identifiants de connexion au Workshop Studio-France'));
+		define('ASK_IDENT', __('Vous avez demandé la récupération de votre mot de passe sur le Workshop Studio-France'));
+	}
 } elseif ($extranet) {
+	define('MAIL_BCC', 'contact@cubedesigners.com');
 	define('GA', 'UA-4339912-4');
 	define('TITLE', 'Extranet Cubedesigners');
 
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 6aa2cb0d0..455c7edf5 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -288,7 +288,7 @@ class wsAjax extends cubeAjax {
 
 		if (!wsDroits::admin()) {
 			if ($book->status < 1) {
-				$popup = commonAjax::form('downbook/' . $book_id . '/' . $version, __('Téléchargement du Fluidbook'), wsUrl::valideDownload($book_id, $version), __('Télécharger'), 2, '', '', true);
+				$popup = commonAjax::form('downbook/' . $book_id . '/' . $version, __('Téléchargement de la publication'), wsUrl::valideDownload($book_id, $version), __('Télécharger'), 2, '', '', true);
 
 				$x->addOpenPopup($popup);
 				return;
@@ -311,7 +311,7 @@ class wsAjax extends cubeAjax {
 			commonDroits::error();
 		}
 		if (!isset($_POST['dir'])) {
-			$popup = commonAjax::form('instbook/' . $book_id . '/' . $server, __('Installation du Fluidbook'), wsUrl::formInstall($book, $server), __('Installer'), 2, '', '', true);
+			$popup = commonAjax::form('instbook/' . $book_id . '/' . $server, __('Installation de la publication'), wsUrl::formInstall($book, $server), __('Installer'), 2, '', '', true);
 			$x->addOpenPopup($popup);
 			return;
 		}
@@ -819,7 +819,7 @@ class wsAjax extends cubeAjax {
 
 		$mail->body = $body;
 		$mail->to = $revendeur->email;
-		$mail->bcc = 'tech@fluidbook.com';
+		$mail->bcc = MAIL_BCC;
 		$mail->send();
 	}
 
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 5d93dae08..213cff4f4 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -24,8 +24,8 @@ class wsUrl {
 			$filtres[] = new commonFiltre(__('Administrateur'), 'admin_book', $settings['filtres']);
 			$filtres[] = new commonFiltre(__('Revendeur'), 'revendeur_book', $settings['filtres']);
 		}
-		$res = commonPage::barre($filtres, 'filtreBooks', 'books', $shortcuts, wsDroits::admin());
-		$res .= commonPage::tMain(null, wsDroits::admin());
+		$res = commonPage::barre($filtres, 'filtreBooks', 'books', $shortcuts, wsDroits::creation());
+		$res .= commonPage::tMain(null, wsDroits::creation());
 		$res .= commonPage::bh();
 		$res .= '<div id="listeBooks">';
 		$res .= self::listeBooks();
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index fa9ccf6c2..2eb782e06 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -89,7 +89,7 @@ class wsThemeParametres extends wsParametres {
 
 		/* Book */
 		$this->fields['bookShadeColor'] = array('type' => 'couleurAlpha', 'default' => '66000000', 'editable' => true,
-			'label' => __("Couleur de l'ombre sous le fluidbook"));
+			'label' => __("Couleur de l'ombre sous la publication"));
 		$this->fields['shadeAlpha'] = array('type' => 'integer', 'default' => 100, 'editable' => true,
 			'label' => __('Transparence des ombres et reflets sur les pages'),
 			'min' => 0, 'max' => 100);
@@ -122,7 +122,7 @@ class wsThemeParametres extends wsParametres {
 		$this->fields['bookmarkStarEnabledColor'] = array('type' => 'couleur', 'default' => 'ff7700', 'editable' => true,
 			'label' => __("Couleur de l'étoile activée"));
 
-		$this->forms['book'] = array('label' => __('Personnalisation du fluidbook'),
+		$this->forms['book'] = array('label' => __('Personnalisation de la publication'),
 			'fieldsnames' => array('pageReflection', 'shadeAlpha',
 				'|', 'usePageEdges', 'pageEdgeColor', 'pageEdgeThickness',
 				'|', 'bookShadeColor',