From a43ccb296d20bb0fffc5508f1aa2d656ebf6667c Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 18 Feb 2013 11:00:07 +0000
Subject: [PATCH]

---
 inc/config.inc.php                         |  1 +
 inc/ws/Controlleur/class.ws.ajax.php       | 40 +++++++++++++-
 inc/ws/Controlleur/class.ws.url.php        | 30 ++++++++---
 inc/ws/DAO/class.ws.dao.book.php           | 28 ++++++++++
 inc/ws/DAO/class.ws.dao.collection.php     |  4 +-
 inc/ws/DAO/class.ws.dao.document.php       | 18 ++++++-
 inc/ws/Metier/class.ws.book.parametres.php |  5 +-
 js/extranet.js                             |  4 +-
 js/ws.js                                   | 63 ++++++++++++++++++----
 style/ws/style.css                         | 16 ++++++
 10 files changed, 181 insertions(+), 28 deletions(-)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index a7a9d78ac..3bb5b0c15 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -45,6 +45,7 @@ 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);
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 65798305e..f99138abc 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -196,12 +196,50 @@ class wsAjax extends cubeAjax {
 	public static function saveCollection($args, &$x) {
 		global $core;
 		$dao = new wsDAOCollection($core->con);
-		$dao->sauve($_POST);
+		$dao->sauve($_POST, $core->user->utilisateur_id);
 
 		$x->addClosePopup();
 		$x->addContent('listeCollections', wsUrl::listeCollections());
 	}
 
+	public static function saveCollectionComposition($args, &$x) {
+		global $core;
+		$dao = new wsDAOCollection($core->con);
+
+		$save = array('nom' => $_POST['nom'],
+			'collection_id' => $_POST['collection_id']);
+
+		$datas = array();
+		foreach ($_POST['group'] as $gid => $group) {
+			if ($gid && $gid == '_new') {
+				continue;
+			}
+
+			if (isset($group['publications'])) {
+				$publications = array();
+				foreach ($group['publications'] as $pid => $publication) {
+					$publication = array('id' => $publication['id'], 'label' => $publication['label'], 'online' => isset($publication['online']));
+					$publications[] = $publication;
+				}
+				$group['publications'] = $publications;
+			} else {
+				$group['publications'] = array($dao->_emptyPublication);
+			}
+
+			$datas[] = $group;
+		}
+		if (count($datas) == 0) {
+			$datas = $dao->_emptyCollection();
+		}
+		
+		fb($datas);
+		
+		$save['datas'] = $datas;
+		$dao->sauve($save);
+
+		//$x->addReload();
+	}
+
 	public static function changeBookProprietaire($args, &$x) {
 		return self::_changeProprietaire('book', $args[1], $_POST['proprietaire'], $x);
 	}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index bb7fd0c6f..231f6cc78 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -207,6 +207,7 @@ class wsUrl {
 		global $core;
 		commonDroits::min(1);
 		cubePage::ui('Sortable');
+		cubePage::autocomplete();
 		//cubePage::checkbox();
 
 		$dao = new wsDAOCollection($core->con);
@@ -229,8 +230,16 @@ class wsUrl {
 	public static function collectionEdit($collection) {
 		global $core;
 
-		$res = '<ul>';
-		$res.='<h1>Gestion de la collection &laquo; ' . $collection->nom . ' &raquo; <em># ' . $collection->collection_id . '</em></h1>';
+		$res = '<h1>Gestion de la collection &laquo; ' . $collection->nom . ' &raquo; <em># ' . $collection->collection_id . '</em></h1>';
+		$res.='<form method="post" action="saveCollectionComposition">';
+		$res.='<table class="max">';
+		$res.='<tr><td class="min nowrap">#</td><td>' . form::hidden('collection_id', $collection->collection_id) . $collection->collection_id . '</td></tr>';
+		$res.='<tr><td class="min nowrap">' . __('Nom de la collection') . '</td><td>' . form::field('nom', 20, 64, $collection->nom) . '</td></tr>';
+
+		$res.='</table>';
+		$res.='<h3>Composition</h3>';
+		$res .= '<ul>';
+
 
 		$dao = new wsDAOCollection($core->con);
 		$books = $dao->getPublications($collection->collection_id);
@@ -240,16 +249,18 @@ class wsUrl {
 
 		foreach ($datas as $gid => $group) {
 			$class = 'group';
-			if ($gid == 'new_') {
+			if ($gid && $gid == 'new_') {
 				$class.=' empty';
 			}
-			$res.='<li class="group">';
+			$res.='<li class="' . $class . '">';
 			$res.='<div class="g">';
 			$res.='<a href="#" class="move"></a>';
 			$g = 'group[' . $gid . ']';
 			$res.=__('Nom du groupe') . ' ' . form::field(array($g . '[label]'), 20, 64, $group['label']);
+			$res.='<a href="#" class="delete"></a>';
 			$res.='</div>';
 			$res.='<ul>';
+			$res.='<li style="height:2px;"></li>';
 			foreach ($group['publications'] as $pid => $publication) {
 				$p = $g . '[publication][' . $pid . ']';
 				$res.='<li class="publication"><div>';
@@ -261,17 +272,20 @@ class wsUrl {
 				}
 				$res.='<a href="#" class="move"></a>';
 				$res.=mb_strtoupper($book->lang);
-				$res.='<span class="id"># ' . form::field($p . '[id]', 20, 64, $publication['id']) . '</span>';
-				$res.='<span class="label">' . __('Label') . ' ' . form::field($p . '[label]', 20, 64, $publication['label']) . '</span>';
+				$res.='<span class="id"># ' . form::field(array($p . '[s]'), 64, 256, trim($publication['id'] . ' - ' . $book->nom, ' -'), 'publication_id') . form::hidden(array($p . '[id]'), $publication['id']) . '</span>';
+				$res.='<span class="label">' . __('Label') . ' ' . form::field(array($p . '[label]'), 20, 64, $publication['label']) . '</span>';
 				$res.='<a href="#" class="delete"></a>';
 				$res.='<a href="#" class="add"></a>';
-				$res.='<span class="online">' . form::checkbox($p . '[online]', '1', $publication['online']) . '</span>';
+				$res.='<span class="online">' . form::checkbox(array($p . '[online]'), '1', $publication['online']) . '</span>';
 				$res.='</div></li>';
 			}
 			$res.='</ul>';
 			$res.='</li>';
 		}
 		$res.='</ul>';
+		$res.='<a href="#" class="submit right">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>';
+		$res.='</form>';
+		$res.='<p class="clear"></p>';
 		return $res;
 	}
 
@@ -279,7 +293,7 @@ class wsUrl {
 		global $core;
 
 		cubePage::truePopup();
-		cubePage::autocomplete();
+		
 		$droits = wsDroits::getDroits();
 
 		commonDroits::min(3);
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index da4a168d9..f0fbdaace 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -612,6 +612,34 @@ class wsDAOBook extends commonDAO {
 			}
 			$parametres->$k = $v;
 		}
+
+		$ip = array();
+		if (isset($parametres->stats_exclude_ip) && trim($parametres->stats_exclude_ip) != '') {
+			$list = $parametres->stats_exclude_ip;
+			$list = str_replace("\r", "\n", $list);
+			$e = explode("\n", $list);
+			foreach ($e as $i) {
+				$i = trim($i);
+				if ($i == '') {
+					continue;
+				}
+				$long = ip2long($i);
+				if ($long !== false) {
+					$ip[] = $long;
+				}
+			}
+		}
+
+		$file = '/home/stats/www/exclude/' . $book_id;
+		
+		if (count($ip)) {
+			file_put_contents($file, implode(',', $ip));
+			chmod($file, 0777);
+			chown($file, 'stats');
+		} else if (file_exists($file)) {
+			unlink($file);
+		}
+
 		$c = $this->con->openCursor('books');
 		$c->nom = $parametres->title;
 		$c->parametres = serialize($parametres);
diff --git a/inc/ws/DAO/class.ws.dao.collection.php b/inc/ws/DAO/class.ws.dao.collection.php
index d8080918e..8e7f98cff 100644
--- a/inc/ws/DAO/class.ws.dao.collection.php
+++ b/inc/ws/DAO/class.ws.dao.collection.php
@@ -26,7 +26,7 @@ class wsDAOCollection extends commonDAO {
 		return $collection;
 	}
 
-	protected function _emptyCollection() {
+	public function _emptyCollection() {
 		return array($this->_emptyGroup());
 	}
 
@@ -34,7 +34,7 @@ class wsDAOCollection extends commonDAO {
 		return array('label' => '', 'publications' => array($this->_emptyPublication()));
 	}
 
-	protected function _emptyPublication() {
+	public function _emptyPublication() {
 		return array('id' => '', 'label' => '', 'online' => false);
 	}
 
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index fc147da9b..55d98f1ca 100644
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -111,8 +111,8 @@ class wsDAODocument extends commonDAO {
 
 	public function setLinksAndRulers($book_id, $links, $rulers, $comments = '', $user = 0) {
 		$daoBook = new wsDAOBook($this->con);
-		$pages = $daoBook->getPagesOfBook($book_id,false);
-		
+		$pages = $daoBook->getPagesOfBook($book_id, false);
+
 		if (is_array($links)) {
 			$links = json_encode($links);
 		}
@@ -140,6 +140,18 @@ class wsDAODocument extends commonDAO {
 		$links = array();
 		$rulers = array();
 
+		foreach ($pages as $p) {
+			if (!isset($links[$p['document_id']])) {
+				$links[$p['document_id']] = array();
+				$rulers[$p['document_id']] = array();
+			}
+			
+			if (!isset($links[$p['document_id']][$p['document_page']])) {
+				$links[$p['document_id']][$p['document_page']] = array();
+				$rulers[$p['document_id']][$p['document_page']] = array();
+			}
+		}
+
 		foreach ($t as $page => $tt) {
 			if (!is_int($page)) {
 				continue;
@@ -166,6 +178,8 @@ class wsDAODocument extends commonDAO {
 			}
 		}
 
+		fb($links);
+
 		foreach ($links as $document_id => $dummy) {
 			wsLinks::setDocumentLinks($document_id, json_encode($links[$document_id]), json_encode($rulers[$document_id]), $user, $comments, TIME);
 		}
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 3309e972a..fb4528a49 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -69,7 +69,7 @@ class wsBookParametres extends wsParametres {
 		$this->fields['friendWidth'] = array('type' => 'integer', 'default' => 319, 'editable' => true, 'label' => __('Largeur du menu'), 'grade' => 5);
 		$this->fields['friendHeight'] = array('type' => 'integer', 'default' => 500, 'editable' => true, 'label' => __('Largeur du menu'), 'grade' => 5);
 		$this->forms['share'] = array('label' => __('Fonctions de partage'),
-			'fieldsnames' => array('share','|','email_title', 'email_body', 'email_editable', 'askAcknowledge', '|',
+			'fieldsnames' => array('share', '|', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', '|',
 				'facebook_title', 'facebook_description', 'facebook_image', 'twitter_description', '|',
 				'friend', 'facebook', 'twitter', 'googleplus', 'linkedin', 'viadeo', '|', 'customSharer', '|', 'friendWidth', 'friendHeight'));
 		// .
@@ -176,10 +176,11 @@ class wsBookParametres extends wsParametres {
 		// .
 		$this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques Fluidbook'), 'grade' => 3);
 		$this->fields['stats_score'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher les scores dans les rapports'), 'grade' => 5);
+		$this->fields['stats_exclude_ip'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Exclure les IP suivantes des statistiques'), 'grade' => 3, 'hint' => sprintf(__('Indiquer une adresse ip de la forme %s par ligne'), 'www.xxx.yyy.zzz'));
 		$this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10);
 		$this->fields['googleAnalyticsCustom'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics personnalisé'));
 		$this->forms['stats'] = array('label' => __('Statistiques'),
-			'fieldsnames' => array('stats', 'stats_score', '|', 'googleAnalytics', 'googleAnalyticsCustom'));
+			'fieldsnames' => array('stats', 'stats_score', 'stats_exclude_ip', '|', 'googleAnalytics', 'googleAnalyticsCustom'));
 
 		$this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1);
 		$this->fields['displayChaptersLine'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche une ligne entre le label et le numéro de page"), 'grade' => 5);
diff --git a/js/extranet.js b/js/extranet.js
index f5beba03b..c6cb669dd 100644
--- a/js/extranet.js
+++ b/js/extranet.js
@@ -3,7 +3,7 @@ FIRST_LOAD = true;
 function load_extranet() {
 
 	if ($("#devisAdresse #client_nom").length > 0) {
-		$("#devisAdresse #client_nom").autocomplete(SITE_PATH + 'autocomplete/client', {
+		$("#devisAdresse #client_nom").autocompletej(SITE_PATH + 'autocomplete/client', {
 			cacheLength: 0,
 			maxItemsToShow: 15,
 			onFindValue: findClient,
@@ -13,7 +13,7 @@ function load_extranet() {
 
 
 	if ($("#factureAdresse #projet_nom").length > 0) {
-		$("#factureAdresse #projet_nom").autocomplete(SITE_PATH + 'autocomplete/projet', {
+		$("#factureAdresse #projet_nom").autocompletej(SITE_PATH + 'autocomplete/projet', {
 			cacheLength: 0,
 			maxItemsToShow: 15,
 			onFindValue: findProjet,
diff --git a/js/ws.js b/js/ws.js
index a1c76a2b9..93b895b85 100644
--- a/js/ws.js
+++ b/js/ws.js
@@ -10,24 +10,64 @@ function load_ws_once() {
 	});
 
 	if ($("#collection").length > 0) {
-		$("#collection>ul").sortable({
-			cancel: 'h3,input',
+		$("#collection>form>ul").sortable({
+			cancel: 'h1',
 			axis: 'y',
 			handle: '.move'
 		});
 
-		$("#collection>ul ul").sortable({
-			cancel: 'h3,input',
-			axis: 'y',
-			handle: '.move',
-			connectWith: '#collection>ul ul'
+
+		$("#collection>form>ul a.delete").click(function() {
+			$(this).parents('li:first').remove();
+		});
+
+		$("#collection>form>ul>li").each(function() {
+			initGroup($(this));
+		});
+
+
+		var newCounter = 1;
+
+		$("#newGroup").click(function() {
+			var g = $(".group.empty").clone();
+			var html = g.get(0).outerHTML;
+			html = html.replace(/new_/gi, "new_" + newCounter);
+			g = $(html);
+			$(g).removeClass('empty');
+			$("#collection>form>ul").append(g);
+
+			initGroup(g);
+
+			newCounter++;
+			return false;
+		});
+	}
+}
+
+function initGroup(group) {
+	$(group).find("ul").sortable({
+		cancel: 'h1',
+		axis: 'y',
+		handle: '.move',
+		connectWith: '#collection>form>ul ul'
+	});
+
+	try {
+		$('.publication_id').autocompletej(SITE_PATH + 'autocomplete/book', {
+			cacheLength: 0,
+			maxItemsToShow: 15,
+			onFindValue: findBook,
+			onItemSelect: findBook
 		});
+	} catch (err) {
+		fb(err);
 	}
+
 }
 
 function load_ws() {
 	if ($("#book_nom").length) {
-		$("#book_nom").autocomplete(SITE_PATH + 'autocomplete/book', {
+		$("#book_nom").autocompletej(SITE_PATH + 'autocomplete/book', {
 			cacheLength: 0,
 			maxItemsToShow: 15,
 			onFindValue: findBook,
@@ -36,7 +76,7 @@ function load_ws() {
 	}
 
 	if ($("#book_proprietaire").length) {
-		$("#book_proprietaire").autocomplete(SITE_PATH + 'autocomplete/wsuser', {
+		$("#book_proprietaire").autocompletej(SITE_PATH + 'autocomplete/wsuser', {
 			cacheLength: 0,
 			maxItemsToShow: 15,
 			onFindValue: findProprietaire,
@@ -46,7 +86,7 @@ function load_ws() {
 
 
 	if ($("#ws_admin_nom").length > 0) {
-		$("#ws_admin_nom").autocomplete(SITE_PATH + 'autocomplete/wsadmin', {
+		$("#ws_admin_nom").autocompletej(SITE_PATH + 'autocomplete/wsadmin', {
 			cacheLength: 0,
 			maxItemsToShow: 15,
 			onFindValue: findWSAdmin,
@@ -101,10 +141,11 @@ function findProprietaire(li) {
 }
 
 function findBook(li) {
+
 	var book = li.selectValue.split(' - ');
 	if (book.length <= 1) {
 		return;
 	}
 	var book_id = parseInt(book[0]);
-	$("#book").val(book_id);
+	$(this.input).next('input[type="hidden"]:first').val(book_id);
 }
\ No newline at end of file
diff --git a/style/ws/style.css b/style/ws/style.css
index b68df4486..7f044f3fd 100644
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -593,11 +593,23 @@ th.stats_col{
 	padding:5px;
 }
 
+#collection .min.nowrap{
+	padding:0 15px 0 0;
+}
+
 #collection h1{
 	margin:5px 0 10px;
 	padding:0;
 }
 
+#collection .group.empty{
+	display:none;
+}
+
+#collection .g{
+	padding:2px 6px;
+}
+
 #collection h3{margin:10px 0 10px 0 !important;}
 #collection .group,
 #collection .publication{
@@ -654,4 +666,8 @@ th.stats_col{
 #collection input,
 #collection select{
 	width:auto;
+}
+
+#collection .submit{
+	float:right;
 }
\ No newline at end of file
-- 
2.39.5