From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 11 Jan 2011 16:49:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ba9ddbe6dd32439f7f410216d7998a97f6ee2e5b;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index 66dcfefb4..58dc13a60 100644
--- a/importWs.php
+++ b/importWs.php
@@ -211,12 +211,14 @@ try {
 			$c->proprietaire = getWsUser($r->proprietaire);
 			$c->date = $r->date;
 			$c->nom = $r->titre;
-			$c->signature = $r->sigid;
+
 			$parametres = new wsThemeParametres($theme);
 			$parametres->fromRecord($r);
 			$c->icones = oldIconesToColor($r->iid, $parametres);
 			$c->parametres = serialize($parametres);
 			$c->insert();
+
+			$signatures[$r->tid] = $r->sigid;
 		}
 		$r = $core->con->select('SELECT * FROM ws.theme_user');
 		$c = $core->con->openCursor('themes_droits');
@@ -302,6 +304,7 @@ try {
 			$c->date = $r->date;
 			$parametres = new wsBookParametres();
 			$parametres->fromRecord($r);
+			$parametres->signature = $signatures[$r->tid];
 			$parametres->fromXML(simplexml_load_string('<extras>' . $r->extras . '</extras>'));
 			$c->parametres = serialize($parametres);
 			$c->insert();
diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 2c38f3506..ca1e445c8 100644
--- 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';
 $__autoload['wsTheme'] = dirname(__FILE__) . '/class.ws.theme.php';
 $__autoload['wsBookParametres'] = dirname(__FILE__) . '/class.ws.book.parametres.php';
-$__autoload['wsLangueTextes'] = dirname(__FILE__) . '/class.ws.langue.textes.php';
 $__autoload['wsDocument'] = dirname(__FILE__) . '/class.ws.document.php';
 $__autoload['wsLink'] = dirname(__FILE__) . '/class.ws.link.php';
 $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';
diff --git a/inc/ws/Metier/class.ws.langue.textes.php b/inc/ws/Metier/class.ws.langue.textes.php
deleted file mode 100644
index 146498b9c..000000000
--- a/inc/ws/Metier/class.ws.langue.textes.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-class wsLangueTextes extends cubeMetier {
-	protected $textes;
-
-	public function __toXML($xml = null)
-	{
-		if (is_null($xml)) {
-			$xml = simplexml_load_string('<?xml version="1.0" encoding="UTF-8" ?><movie />');
-		} elseif (is_string($xml)) {
-			$xml = simplexml_load_string($xml);
-		}
-		foreach($this->textes as $t) {
-			$xml->addChild('tradText', $t);
-		}
-		return $xml;
-	}
-}
-
-?>
\ No newline at end of file