From 3ec8e1d73d94dd0006cd47feedf50f227591f648 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 3 Dec 2010 10:43:26 +0000
Subject: [PATCH]

---
 inc/prepend.php                            |  4 +++-
 inc/ws/Controlleur/class.ws.url.php        | 22 +++++++++++++++++-----
 inc/ws/Metier/class.ws.book.parametres.php |  7 ++++---
 3 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/inc/prepend.php b/inc/prepend.php
index 54d0f7a40..006e28b2b 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -19,8 +19,10 @@ $core = new extranetCore();
 $core->url->registerDefault(array('extranetUrl', 'home'));
 $core->url->register('ajax', 'ajax', '^ajax(.*)$', array('cubeAjax', 'ajax'));
 $core->url->register('cleanDownload', 'cleanDownload', '^cleanDownload$', array('extranetUrl', 'cleanDownload'));
+// Fluidbook Workshop
 $core->url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in'));
-$core->url->register('editbook', 'editbook', '^editbook/(.*)$', array('wsUrl', 'editbook'));
+$core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor'));
+$core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer'));
 
 if (isset($_POST['q'])) {
 	$_SESSION['q'] = $_POST['q']?$_POST['q']:null;
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 974a7d692..a49da9bd2 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -65,8 +65,8 @@ class wsUrl {
 			// $f = $book->facturable;
 			$res .= '<td>' ./* $f .*/ '</td>';
 			$res .= '<td>' . $core->books_status[$book->status] . '</td>';
-			$res .= '<td class="bouton"><a href="' . SITE_PATH . 'voirbook/' . $book->book_id . '_' . $book->hash . '_' . TIME . '/" class="popupFS">' . $btVoir . '</a></td>';
-			$res .= '<td class="bouton"><a class="popupFS" href="' . SITE_PATH . 'editbook/' . $book->book_id . '">' . $btEdit . '</a></td>';
+			$res .= '<td class="bouton"><a href="' . SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash . '/" class="popupFS">' . $btVoir . '</a></td>';
+			$res .= '<td class="bouton"><a class="popupFS" href="' . SITE_PATH . 'editor/' . $book->book_id . '">' . $btEdit . '</a></td>';
 			$res .= '<td class="bouton"><a href="' . SITE_PATH . 'stats/' . $book->book_id . '">' . $btStats . '</a></td>';
 			$res .= '<td class="bouton"><a href="' . SITE_PATH . 'supprimebook/' . $book->book_id . '">' . $btDownload . '</a></td>';
 			$res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="' . __('Ãtes-vous certain de vouloir supprimer cette publication ?') . '">' . $btDel . '</a></td>';
@@ -84,7 +84,7 @@ class wsUrl {
 		return $res;
 	}
 
-	public static function editbook($args)
+	public static function editor($args)
 	{
 		global $core;
 
@@ -94,7 +94,7 @@ class wsUrl {
 		if ($book_id == 'new') {
 			$dao = new wsDAOBook($core->con);
 			$book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang);
-			http::redirect(SITE_PATH . 'editbook/' . $book->book_id);
+			http::redirect(SITE_PATH . 'editor/' . $book->book_id);
 		}
 
 		$res = '<html><head><style type="text/css">';
@@ -119,6 +119,18 @@ html{height:100%}' . "\n";
 		return wsStats::display($bid, $annee, $mois);
 	}
 
+	public static function viewer($args)
+	{
+		$args = cubePage::getArgs($args);
+
+		$e = explode('_', $args[0]);
+		if (count($e) == 2) {
+			$e[] = TIME;
+			http::redirect(SITE_PATH . '/viewer/' . implode('_', $e));
+			exit;
+		}
+	}
+
 	public static function statsxls($args)
 	{
 		$bid = (isset($args[1]))?$args[1]:null;
@@ -149,7 +161,7 @@ html{height:100%}' . "\n";
 	public static function testAS()
 	{
 		global $core;
-		//cubePHP::neverStop();
+		// cubePHP::neverStop();
 		$dao = new wsDAOBook($core->con);
 		header('Content-type: text/plain');
 		ob_clean();
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 0732bdd4a..bb9aa7937 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -38,13 +38,15 @@ class wsBookParametres extends wsParametres {
 		$this->fields['height'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Hauteur'), 'extra' => false, 'grade' => 0);
 		// .
 		$this->fields['twoDmode'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Activer le mode 2D"), 'extra' => false, 'grade' => 1);
+		$this->fields['pagesBaseAngle'] = array('type' => 'integer', 'default' => 2, 'editable' => true, 'label' => __('Angle de base entre les pages'), 'extra' => true, grade => 1,
+			'hint' => __("0 : Publication Ã  plat") . "\n" . __('2 : Valeur par dÃ©faut'), 'min' => 0, 'max' => 20);
 		$this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'impression"), 'extra' => false, 'grade' => 1);
 		$this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le moteur de recherche'), 'extra' => false, 'grade' => 1);
 		$this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'), 'extra' => false, 'grade' => 1);
 		$this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-Ã©cran'), 'extra' => false, 'grade' => 1);
 		$this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site"), 'extra' => false, 'grade' => 1);
 		$this->forms['general'] = array('label' => __('FonctionnalitÃ©s gÃ©nÃ©rales'),
-			'fieldsnames' => array('print', 'search', 'bookmark', 'fullscreen','twoDmode', 'pages', 'width', 'height'));
+			'fieldsnames' => array('print', 'search', 'bookmark', 'fullscreen', 'twoDmode', 'pagesBaseAngle', 'pages', 'width', 'height'));
 		// .
 		$this->fields['first_page_nr'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('La numÃ©rotation dÃ©bute Ã  la page'), 'extra' => false, 'grade' => 1);
 		$this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages Ã  prÃ©charger'), 'extra' => false, 'grade' => 1);
@@ -70,10 +72,9 @@ class wsBookParametres extends wsParametres {
 		$this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques'), 'extra' => false, 'grade' => 1);
 		$this->fields['statsWeborama'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Statistiques Weborama'), 'size' => 10, 'extra' => true, 'grade' => 1);
 		$this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10, 'extra' => true, 'grade' => 1);
-		$this->fields['stats_score']= array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Affiche le score dans les statistiques'), 'extra' => false, 'grade' => 1);
+		$this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Affiche le score dans les statistiques'), 'extra' => false, 'grade' => 1);
 		$this->forms['stats'] = array('label' => __('Statistiques'),
 			'fieldsnames' => array('stats', 'statsWeborama'));
-
 		// .
 		$this->fields['displayChaptersAtStart'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher le sommaire au chargement de la publication"), 'extra' => true, 'grade' => 4);
 		$this->fields['chaptersPosition'] = array('type' => 'combo',
-- 
2.39.5

