From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 30 May 2017 17:13:41 +0000 (+0000)
Subject: #1388
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=40686fa1996e53a215b3afa7e6f93911bcef90cc;p=cubeextranet.git

#1388
---

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 7f678cf95..f5533b08f 100644
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -299,6 +299,7 @@ class commonAjax {
 	}
 
 	public static function syncftp($args, &$x) {
+		set_time_limit(0);
 		commonDroits::min(5);
 		$u = parse_url('ftp://' . ltrim($_POST['dest'], '/'));
 		if (!isset($u['port'])) {
@@ -307,6 +308,8 @@ class commonAjax {
 
 		$commandes = array(
 			'set ftp:ssl-allow false',
+			'set net:reconnect-interval-base 5',
+			'set net:max-retries 2',
 			'set ftp:passive-mode ' . $_POST['mode'],
 			'mkdir -p ' . $u['path'],
 			'cd ' . $u['path'],
@@ -316,12 +319,13 @@ class commonAjax {
 
 		//$lftp->setManualArg( . '> mirror -Rv ' . $package);
 
-		$lftp = new cubeCommandLine('lftp');
+		$lftp = new CubeIT_CommandLine('lftp');
 		$lftp->setArg('u', $u['user'] . ',' . $u['pass']);
 		$lftp->setArg('p', $u['port']);
 		$lftp->setArg('e', implode(';', $commandes));
 		$lftp->setArg(null, $u['host']);
 		$lftp->execute();
+		$lftp->debug();
 
 		$x->addValue('res', utf8_encode($lftp->output));
 	}
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 3675113dc..8513e965c 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -429,6 +429,7 @@ class wsExporter {
 		$lftp->setArg('e', implode(';', $commandes));
 		$lftp->setArg(null, $u['host']);
 		$lftp->execute();
+		$lftp->debug();
 	}
 
 	protected function _rsync($src, $dest, $erase = false, $chown = null) {
diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index fa1f5a5b8..12cd687b7 100644
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -221,7 +221,6 @@ class wsLinks {
 		$rulers = array();
 
 		foreach ($documents as $d) {
-			echo $d . "\n";
 			if (is_null($time)) {
 				$lr = self::getDocumentLastLinks($d);
 			} else {
diff --git a/inc/ws/Util/html5/menus/class.ws.html5.compiler.php b/inc/ws/Util/html5/menus/class.ws.html5.compiler.php
index 1a45b4a6f..81f9c6cec 100644
--- a/inc/ws/Util/html5/menus/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/menus/class.ws.html5.compiler.php
@@ -24,6 +24,7 @@ class wsHTML5Compiler {
 		'js/libs/jquery/jquery.hashchange.js',
 		'js/libs/jquery/jquery.scrollto.js',
 		'js/libs/jquery/jquery.localscroll.js',
+		'js/libs/jquery/perfect-scrollbar.jquery.js',
 		'js/libs/gsap/TweenMax.js',
 		'js/libs/gsap/jquery.gsap.js',
 		'js/libs/gal/gal.js',
@@ -1160,7 +1161,6 @@ class wsHTML5Compiler {
 		$res[] = $shade;
 
 		// SVG
-
 		$res[] = 'svg .fill-c-menu-back{fill:' . wsHTML5::colorToCSS($this->theme->parametres->couleurB) . ';}';
 		$res[] = 'svg .fill-c-menu-text{fill:' . wsHTML5::colorToCSS($this->theme->parametres->subTextColor) . ';}';
 
@@ -1248,18 +1248,12 @@ class wsHTML5Compiler {
 
 		$lessVariables['menu-background'] = $menuColor->toCSS();
 		$lessVariables['menu-text'] = $menuTextColor;
+		$lessVariables['menu-field-background'] = wsHTML5::colorToCSS($this->theme->parametres->subFieldColor);
+		$lessVariables['menu-field-text'] = wsHTML5::colorToCSS($this->theme->parametres->subTextFieldColor);
 
 		$menuMultiply = $menuColor->multiply($menuColor);
 		$menuMultiply2 = $menuMultiply->multiply($menuColor);
 
-		# View
-		$res[] = '.portrait .mview{width:' . $w . ';min-height:' . $h . '}';
-		$res[] = '.landscape .mview{width:' . $w2 . ';min-height:' . $h . '}';
-		$res[] = '.mview{background-color:' . $menuColor->toCSS() . ';color:' . $menuTextColor . ';}';
-
-		# Inner View
-		$res[] .= '#innerView>div{background-color:' . $menuColor->toCSS() . ';color:' . $menuTextColor . ';}';
-		$res[] .= 'form input[type="text"],form input[type="email"]{background-color:' . wsHTML5::colorToCSS($this->theme->parametres->subFieldColor) . ';color:' . wsHTML5::colorToCSS($this->theme->parametres->subTextFieldColor) . ';}';
 
 		// Archives
 		if ($this->book->parametres->externalArchivesBack) {
@@ -1267,20 +1261,6 @@ class wsHTML5Compiler {
 			$res[] = '.mview.archives{background-image:url("../images/' . $this->book->parametres->externalArchivesBack . '");}';
 		}
 
-		# Chapters (menu lists)
-		$top = $menuColor->setAlpha(0.5)->toCSS();
-		$bottom = $menuMultiply->setAlpha(0.5)->toCSS();
-		$border = $menuMultiply2->setAlpha(0.5)->toCSS();
-
-		$chapters = "ul.chapters a.level-1,ul.chapters a.level0,ul.chapters a.level1,ul.chapters a.level2,ul.chapters a.level3{
-	background-image: -moz-linear-gradient(top, $top 0%, $bottom 100%); /* FF3.6+ */
-	background-image: -webkit-linear-gradient(top, $top 0%,$bottom 100%); /* Chrome10+,Safari5.1+ */
-	background-image: -o-linear-gradient(top, $top 0%,rgba(0,0,0,0.5) 100%); /* Opera 11.10+ */
-	background-image: -ms-linear-gradient(top, $top 0%,$bottom 100%); /* IE10+ */
-	background-image: linear-gradient(top bottom, $top 0%,$bottom 100%); /* W3C */
-	border-bottom:1px solid $border;
-}";
-		$res[] = $chapters;
 		# Index
 		$ratio = $this->width / $this->height;
 		$thumbh = round(100 / $ratio);