(no commit message)

diff --git a/importWs.php b/importWs.php
index 66dcfefb4e6adf3938739b7a68cfa21578b85301..58dc13a60ec7d756c6b1be20f565c32c337807a5 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -211,12 +211,14 @@ try {
                        $c->proprietaire = getWsUser($r->proprietaire);\r
                        $c->date = $r->date;\r
                        $c->nom = $r->titre;\r
-                       $c->signature = $r->sigid;\r
+\r
                        $parametres = new wsThemeParametres($theme);\r
                        $parametres->fromRecord($r);\r
                        $c->icones = oldIconesToColor($r->iid, $parametres);\r
                        $c->parametres = serialize($parametres);\r
                        $c->insert();\r
+\r
+                       $signatures[$r->tid] = $r->sigid;\r
                }\r
                $r = $core->con->select('SELECT * FROM ws.theme_user');\r
                $c = $core->con->openCursor('themes_droits');\r
@@ -302,6 +304,7 @@ try {
                        $c->date = $r->date;\r
                        $parametres = new wsBookParametres();\r
                        $parametres->fromRecord($r);\r
+                       $parametres->signature = $signatures[$r->tid];\r
                        $parametres->fromXML(simplexml_load_string('<extras>' . $r->extras . '</extras>'));\r
                        $c->parametres = serialize($parametres);\r
                        $c->insert();\r

diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 2c38f350642fdc70339b18c2bdabff6606e4bf9e..ca1e445c8e945352b5154f54585e470cf4db6472 100644 (file)
--- a/inc/ws/Metier/_common.php
+++ b/inc/ws/Metier/_common.php
@@ -4,7 +4,6 @@ $__autoload['wsParametres'] = dirname(__FILE__) . '/class.ws.parametres.php';
 $__autoload['wsThemeParametres'] = dirname(__FILE__) . '/class.ws.theme.parametres.php';\r
 $__autoload['wsTheme'] = dirname(__FILE__) . '/class.ws.theme.php';\r
 $__autoload['wsBookParametres'] = dirname(__FILE__) . '/class.ws.book.parametres.php';\r
-$__autoload['wsLangueTextes'] = dirname(__FILE__) . '/class.ws.langue.textes.php';\r
 $__autoload['wsDocument'] = dirname(__FILE__) . '/class.ws.document.php';\r
 $__autoload['wsLink'] = dirname(__FILE__) . '/class.ws.link.php';\r
 $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';\r

diff --git a/inc/ws/Metier/class.ws.langue.textes.php b/inc/ws/Metier/class.ws.langue.textes.php
deleted file mode 100644 (file)
index 146498b..0000000
--- a/inc/ws/Metier/class.ws.langue.textes.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php\r
-class wsLangueTextes extends cubeMetier {\r
-       protected $textes;\r
-\r
-       public function __toXML($xml = null)\r
-       {\r
-               if (is_null($xml)) {\r
-                       $xml = simplexml_load_string('<?xml version="1.0" encoding="UTF-8" ?><movie />');\r
-               } elseif (is_string($xml)) {\r
-                       $xml = simplexml_load_string($xml);\r
-               }\r
-               foreach($this->textes as $t) {\r
-                       $xml->addChild('tradText', $t);\r
-               }\r
-               return $xml;\r
-       }\r
-}\r
-\r
-?>
\ No newline at end of file