From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 26 Sep 2012 12:13:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=700df2b1664a56e17c3340552f83520e80e545de;p=cubeextranet.git

---

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 9ce572d3c..db507d667 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -393,6 +393,56 @@ class commonTools {
 		return $res;
 	}
 
+	public static function secureSWF() {
+		global $core;
+		commonDroits::min(1);
+
+		if (isset($_FILES) && isset($_FILES["file"])) {
+
+			$tmp = cubeFiles::tempdir();
+			if (!file_exists($tmp)) {
+				mkdir($tmp, 0777, true);
+			}
+
+			$t = $_FILES['file']['tmp_name'];
+			move_uploaded_file($t, $t . '.swf');
+
+			$secure = new cubeCommandLine('secureSWF');
+			$secure->setPath(CONVERTER_PATH);
+			$secure->setArg(null, $t . '.swf');
+			$secure->setArg(null, $tmp);
+
+			$secure->execute();
+			//fb($secure->commande);
+			//fb($secure->output);
+
+			$e = explode(DIRECTORY_SEPARATOR, $t);
+
+			$result = $tmp . '/' . array_pop($e) . '.swf';
+			cubeHTTP::downloadFile($result, $_FILES['file']['name']);
+
+			`rm -rf $tmp`;
+			unlink($t . '.swf');
+		}
+
+
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
+		$res.='<form action="" method="post" class="notajax" enctype="multipart/form-data">';
+		$res.='<table class="liste">';
+		$res.='<tr><th><strong>' . __('Sécuriser un SWF') . '</strong></th></tr>';
+		$res.='<tr><td>' . __('Veuillez charger le fichier flash') . '</td></tr>';
+		$res.='<tr class="odd"><td><input type="file" name="file" /></td></tr>';
+		$res.='<tr><td class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Sécuriser le flash')) . '</a></td></td>';
+		$res.='</table>';
+		$res.='</form>';
+		$res .= '</div>';
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
+		return $res;
+	}
+
 	public static function csr() {
 		commonDroits::min(1);
 		global $core;
@@ -460,7 +510,7 @@ class commonTools {
 		$zip->setArg('X');
 		$zip->setArg(null, '.');
 		$zip->execute();
-		
+
 		cubeHTTP::downloadFile($tmpfile, 'csr.zip');
 	}
 
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 5dcb05457..95bca2d50 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -83,15 +83,22 @@ class wsBookParametres extends wsParametres {
 		$this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire verticale'), 'grade' => 3);
 		$this->fields['centerBook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Centrer la publication sur les couvertures'), 'grade' => 2);
 		$this->forms['3d_mode'] = array('label' => __('Options de visualisation'),
-			'fieldsnames' => array('visualisationMode','antialiasReading', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));
+			'fieldsnames' => array('visualisationMode', 'antialiasReading', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));
 
 
 		$this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
 		$this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran'));
-		$this->fields['help'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'aide"));
 		$this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 5);
 		$this->forms['general'] = array('label' => __('Fonctionnalités générales'),
 			'fieldsnames' => array('bookmark', 'fullscreen', 'help', 'navOrder', 'pages', 'width', 'height'));
+		//.
+		//
+		
+		$this->fields['help'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'aide"));
+		$this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage"));
+		$this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes"));
+		$this->forms['help'] = array('label' => __('Aide'),
+			'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime'));
 		// .
 		// 		
 		$this->fields['indexAutoScroll'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le scroll automatique'));
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 250d9d3df..44a551749 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -78,7 +78,11 @@ class wsHTML5Link {
 	}
 
 	public function getHTMLContainer() {
-		return '<div class="link" id="l_' . $this->id . '">' . $this->getHTMLContent() . '</div>';
+		return '<div class="' . $this->getHTMLContainerClass() . '" id="l_' . $this->id . '">' . $this->getHTMLContent() . '</div>';
+	}
+
+	public function getHTMLContainerClass() {
+		return 'link';
 	}
 
 	public function getHTMLContent() {
@@ -98,12 +102,12 @@ class wsHTML5Link {
 	}
 
 	public function getCSSContainer() {
-		
-		if($this->page%2==1){
+
+		if ($this->page % 2 == 1) {
 			$this->page--;
 			$this->left+=$this->compiler->width;
 		}
-		
+
 		$css = '#l_' . $this->id . '{';
 		$css.='left:' . $this->left * $this->compiler->getCssScale() . 'px;top:' . $this->top * $this->compiler->getCssScale() . 'px;';
 		$css.='width:' . $this->width * $this->compiler->getCssScale() . 'px;height:' . $this->height * $this->compiler->getCssScale() . 'px;';
@@ -161,7 +165,11 @@ class normalLink extends wsHTML5Link {
 }
 
 class contentLink extends wsHTML5Link {
-	
+
+	public function getHTMLContainerClass() {
+		return 'link contentLink';
+	}
+
 }
 
 class webLink extends normalLink {
@@ -301,9 +309,11 @@ class actionLink extends internalLink {
 }
 
 class basketLink extends contentLink {
+
 	public function getCSS() {
 		return 'background-color:#fff;';
 	}
+
 }
 
 class colorLink extends contentLink {
@@ -348,6 +358,7 @@ class multimediaLink extends wsHTML5Link {
 		$alt = $this->alternative == '' ? '' : '<img src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $w . '" height="' . $h . '" />';
 		return $alt;
 	}
+
 }
 
 class webVideoPopupLink extends videoPopupLink {