(no commit message)

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 518b400cde478b0e8192c8c1d3da7a6809be99ea..71e96f112a5d3ece2550384ef4ac0824094aa5e0 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -7,7 +7,7 @@ class commonUrl {
                $args = cubePage::getArgs($args);\r
                // Si l'utilisateur n'est pas connecté, on affiche le formulaire\r
                // de login\r
-               if ($args[0] != 'stats' && (is_null($core->user) || !$core->user)) {\r
+               if ((!isset($args[0]) || $args[0] != 'stats') && (is_null($core->user) || !$core->user)) {\r
                        $args = array('login');\r
                } else {\r
                        if (isset($args[0]) && $args[0] == 'login') {\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 4a2ac00dd78ffdcad0427172024aad4f5141a453..02a5642a43e6faa1232c44a649cceb9e6c181d95 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -826,7 +826,7 @@ html{height:100%}' . "\n";
 \r
                $book_id = $e[0];\r
 \r
-               $wmode = $wmode != '' ? $wmode : 'default';\r
+               $wmode = (isset($wmode) && $wmode != '') ? $wmode : 'default';\r
 \r
                self::checkDocumentVersionOfBook($book_id);\r
                wsSecureSWF::checkProtectedSWF();\r

diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index f63ca2302c94bc7d27e720f7f49e2a72d0466f8a..16411b2397ab49888cb8be5a2cda4c518cd9ab06 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -1,7 +1,8 @@
 <?php\r
+\r
 class wsDAOLang extends commonDAO {\r
-       protected function singleton($r)\r
-       {\r
+\r
+       protected function singleton($r) {\r
                $lang = new wsLang();\r
                $lang->lang_id = mb_strtolower($r->lang_id);\r
                $lang->font = $r->font;\r
@@ -22,26 +23,31 @@ class wsDAOLang extends commonDAO {
                return $lang;\r
        }\r
 \r
-       public function selectById($lang_id)\r
-       {\r
+       public function selectById($lang_id) {\r
                $r = $this->con->select('SELECT * FROM langues WHERE lang_id=\'' . $this->con->escape($lang_id) . '\'');\r
                return $this->singleton($r);\r
        }\r
 \r
-       public function selectAll()\r
-       {\r
+       public function selectAll() {\r
                $r = $this->con->select('SELECT * FROM langues');\r
                return $this->factory($r);\r
        }\r
 \r
-       public function sauve($data)\r
-       {\r
+       public function sauve($data) {\r
                $c = $this->con->openCursor('langues');\r
                $c->lang_id = $data['lang_id'];\r
                $c->font = $data['font'];\r
                $c->charset = $data['charset'];\r
                $c->nsis = $data['nsis'];\r
-               $c->traductions = json_encode($data['traductions']);\r
+               $traductions = array();\r
+               foreach ($data['traductions'] as $msgid => $text) {\r
+                       if (substr($msgid, 0, 4) == 'B64_') {\r
+                               $msgid = base64_decode(substr($msgid, 4));\r
+                       }\r
+                       $traductions[$msgid] = $text;\r
+               }\r
+\r
+               $c->traductions = json_encode($traductions);\r
                $r = $this->con->select('SELECT * FROM langues WHERE lang_id=\'' . $this->con->escape($c->lang_id) . '\'');\r
                if (!$r->count()) {\r
                        $c->insert();\r
@@ -51,6 +57,7 @@ class wsDAOLang extends commonDAO {
 \r
                return $this->selectById($c->lang_id);\r
        }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 0daec3afd77722073f83cc4edb2d4d5c4f068cf1..388b515c126bc595664123183bd4f4bf92ce7b4b 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -618,11 +618,13 @@ class wsDocument extends cubeMetier {
                        $svglog[] = "Evaluate xpath query " . $q;\r
                        $svglog[] = 'Give ' . $list->length . ' results';\r
                        $svglog[] = 'Deleting Nodes in ' . print_r($list, true);\r
-                       foreach ($list as $node) {\r
+                       if (count($list)) {\r
+                               foreach ($list as $node) {\r
 \r
-                               /* @var $node DOMNode */\r
-                               $parent = $node->parentNode;\r
-                               $parent->removeChild($node);\r
+                                       /* @var $node DOMNode */\r
+                                       $parent = $node->parentNode;\r
+                                       $parent->removeChild($node);\r
+                               }\r
                        }\r
                }\r
 \r