(no commit message)

diff --git a/inc/ws/Controlleur/_common.php b/inc/ws/Controlleur/_common.php
index b46e6c4da0dd6cc37cd7ca764e6fa104f27f9439..898014015599f225e39ea4eb98dd9eeae70ba86c 100644 (file)
--- a/inc/ws/Controlleur/_common.php
+++ b/inc/ws/Controlleur/_common.php
@@ -5,7 +5,9 @@ $__autoload['wsAjax'] = dirname(__FILE__) . '/class.ws.ajax.php';
 $__autoload['wsUrl'] = dirname(__FILE__) . '/class.ws.url.php';\r
 $__autoload['wsDroits'] = dirname(__FILE__) . '/class.ws.droits.php';\r
 $__autoload['wsConversionSession'] = dirname(__FILE__) . '/class.ws.conversion.session.php';\r
-$__autoload['wsStats']=dirname(__FILE__).'/class.ws.stats.php';\r
-$__autoload['wsServices']=dirname(__FILE__).'/class.ws.services.php';\r
-$__autoload['wsUsersTree']=dirname(__FILE__).'/class.ws.users.tree.php';\r
+$__autoload['wsStats'] = dirname(__FILE__) . '/class.ws.stats.php';\r
+$__autoload['wsServices'] = dirname(__FILE__) . '/class.ws.services.php';\r
+$__autoload['wsUsersTree'] = dirname(__FILE__) . '/class.ws.users.tree.php';\r
+$__autoload['wsSecureSWF'] = dirname(__FILE__) . '/class.ws.secure.swf.php';\r
+\r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.secure.swf.php b/inc/ws/Controlleur/class.ws.secure.swf.php
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 770ffe8d2574410cf5a210b4728fb62b99a41712..6805a0fcc404162ef376e777637f0384b5cf22c7 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -280,6 +280,7 @@ html{height:100%}' . "\n";
                $book_id = $e[0];\r
 \r
                self::checkDocumentVersionOfBook($book_id);\r
+               self::checkProtectedSWF();\r
 \r
                $book = $dao->selectById($book_id);\r
                if ($book->hash != $e[1]) {\r
@@ -371,6 +372,7 @@ html{height:100%}' . "\n";
                        $args[1] = 2964;\r
                }\r
                self::checkDocumentVersionOfBook($args[1]);\r
+               self::checkProtectedSWF();\r
                // cubePHP::neverStop();\r
                $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
@@ -379,6 +381,7 @@ html{height:100%}' . "\n";
                exit;\r
        }\r
 \r
+\r
        protected static function checkDocumentVersionOfBook($book_id)\r
        {\r
                global $core;\r

diff --git a/inc/ws/Metier/class.ws.icone.php b/inc/ws/Metier/class.ws.icone.php
index 9eb184bfd440771280dce20a1fbb96f118c846cc..1e0e4453e243df2d8594864a3d1fd39339af3445 100644 (file)
--- a/inc/ws/Metier/class.ws.icone.php
+++ b/inc/ws/Metier/class.ws.icone.php
@@ -4,7 +4,8 @@ class wsIcone extends cubeMetier {
        public $nom;\r
        public $date;\r
 \r
-       public static $files = array('index', 'normal', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help');\r
+       public static $files = array('index', 'normal', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'normalscreen', 'save', 'archives', 'help', '2d', '3d', 'soundon', 'soundoff');\r
+       public static $display = array('index', 'sommaire', 'print', 'friend', 'bookmark', 'fullscreen', 'save', 'archives', '3d', 'soundon', 'help');\r
 \r
        public function makeImage()\r
        {\r
@@ -21,14 +22,13 @@ class wsIcone extends cubeMetier {
 \r
                $liste = self::$files;\r
 \r
-               foreach($liste as $file) {\r
-                       $image =$root . 'nav-' . $file . '.png';\r
+               foreach($liste as $display) {\r
+                       $image = $root . 'nav-' . $file . '.png';\r
                        $dim = getimagesize($image);\r
                        $mod = max(filemtime($image), $mod);\r
                        $h = max($h, $dim[1]);\r
                        $w += $dim[0];\r
-                               $w += 10;\r
-\r
+                       $w += 10;\r
                }\r
 \r
                $height = $h;\r
@@ -40,7 +40,7 @@ class wsIcone extends cubeMetier {
                imagesavealpha($im, true);\r
                imagealphablending($im, true);\r
                $x = 5;\r
-               foreach($liste as $file) {\r
+               foreach($liste as $display) {\r
                        $image = $root . 'nav-' . $file . '.png';\r
                        $s = imagecreatefrompng($image);\r
                        $w = imagesx($s);\r