From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 7 Jan 2011 18:09:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9b2a3955ab88b42327518f3877fb3e8ea1f2dfc9;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index b7668a617..663df2c8f 100644
--- a/importWs.php
+++ b/importWs.php
@@ -203,7 +203,7 @@ if ($langues) {
 	$trad = array();
 	$r = $core->con->select('SELECT * FROM ws.lang_trad,ws.lang_ord WHERE lang_trad.idlt=lang_ord.idlt');
 	while ($r->fetch()) {
-		$idl = $r->idl;
+		$idl =getLangCode($r->idl);
 		if (!isset($trad[$idl])) {
 			$trad[$idl] = array();
 		}
@@ -212,16 +212,12 @@ if ($langues) {
 
 	$r = $core->con->select('SELECT * FROM ws.lang');
 	while ($r->fetch()) {
-		ksort($trad[$r->idl]);
+		ksort($trad[$idl]);
 		$textes = new wsLangueTextes();
-		$textes->textes = $trad[$r->idl];
+		$textes->textes = $trad[$idl];
 		$c = $core->con->openCursor('langues');
 		$c->lang_id = $r->idl;
-		$c->nom = $r->idn;
-		$c->nsis_lang = $r->instlang;
-		$c->public = $r->active;
-		$c->embeded = $r->embed;
-		$c->traductions = json_encode($trad[$r->idl]);
+		$c->traductions = json_encode(getLangCode($r->idl));
 		$c->insert();
 	}
 }
@@ -341,6 +337,14 @@ function oldIconesToColor($iid, &$parametres)
 	return 1;
 }
 
+function getLangCode($lang){
+	$lang=strtolower($lang);
+	if($lang=='cz'){
+		$lang='cs';
+	}
+	return $lang
+}
+
 function getWsUser($oldid)
 {
 	global $ws2ext;
diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 42d01d70b..0984c9ded 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -547,6 +547,8 @@ class wsFlash extends cubeFlashGateway {
 		if (isset($this->args['book_id'])) {
 			$dao = new wsDAOBook($core->con);
 			$book = $dao->selectById($this->args['book_id']);
+			$book->traductions=wsLang::checkTranslations($book->traductions);
+			fb($book->traductions);
 			if ($book->traductions != array()) {
 				$bookLang = $this->xml->addChild('book_lang', json_encode($book->traductions));
 			}
@@ -556,17 +558,14 @@ class wsFlash extends cubeFlashGateway {
 		$langs = $dao->selectAll();
 
 		foreach($langs as $lang) {
+			$nom = cubeLang::getNameByCode($lang->lang_id, $core->user->lang);
 			$l = $this->xml->addChild('lang', json_encode($lang->traductions));
 			$l->addAttribute('id', $lang->lang_id);
-			$l->addAttribute('nom', $lang->nom);
-			$l->addAttribute('embeded', $lang->embeded);
-			$l->addAttribute('public', $lang->public);
+			$l->addAttribute('nom', $nom);
 			if ((isset($bookLang) && isset($book) && $book->lang == $lang->lang_id)) {
 				$l->addAttribute('selected', '1');
 				$bookLang->addAttribute('id', $lang->lang_id);
-				$bookLang->addAttribute('nom', $lang->nom . ' (' . __('modifié') . ')');
-				$bookLang->addAttribute('embeded', $lang->embeded);
-				$bookLang->addAttribute('public', $lang->public);
+				$bookLang->addAttribute('nom', $nom . ' (' . __('modifié') . ')');
 			}
 		}
 	}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ec732856b..087d6bd0d 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -114,10 +114,10 @@ class wsUrl {
 		$res .= extranetPage::tMain(null, false);
 
 		$res .= extranetPage::bh();
-		$res .= '<form action="changeLang" method="post">';
+		$res .= '<form action="changeLang" method="post" class="submitonchange">';
 		$res .= '<table class="liste">';
 		$res .= '<tr><td class="center">' . __('Sélectionnez la langue à configurer') . ' : ' . form::combo('lang', $langs, $args[1]) . ' </td></tr>';
-		$res .= '<tr class="odd"><td class="right"><a href="#" class="submit">' . $core->typo->Ajouter('OK') . '</a></td></tr>';
+		//$res .= '<tr class="odd"><td class="right"><a href="#" class="submit">' . $core->typo->Ajouter('OK') . '</a></td></tr>';
 		$res .= '</table>';
 		$res .= '</form>';
 		$res .= extranetPage::bf();
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index d2fda521e..f5492fc89 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -322,7 +322,7 @@ class wsDAOBook extends extranetDAO {
 	{
 		$c = $this->con->openCursor('books');
 		$c->lang = $base;
-		$c->traductions = json_encode(json_decode($traductions, false));
+		$c->traductions = json_encode(json_decode($traductions, true));
 		$c->changedate = TIME;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 	}
@@ -518,7 +518,7 @@ class wsDAOBook extends extranetDAO {
 		$flexLight->addVariable('datas', $book->parametres->toStandardObject(), false, true, 'JSONObject');
 		$flexLight->addVariable('id', $book_id, false, true, 'uint');
 
-		$flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions), false, true, 'JSONObject');
+		$flex->addVariable('traductions', $book->traductions, false, true, 'JSONObject');
 		$flex->addVariable('chapters', $book->chapters, false, true, 'JSONObject');
 		$flex->addVariable('extras', '<extras>' . $book->extras . '</extras>', false, true, 'XML');
 		$flex->addVariable('numerotation', $book->numerotation, false, true, 'String');
diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index 9ee5b1b4b..3f432c0f1 100644
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -3,7 +3,7 @@ class wsDAOLang extends extranetDAO {
 	protected function singleton($r)
 	{
 		$lang = new wsLang();
-		$lang->lang_id = $r->lang_id;
+		$lang->lang_id = mb_strtolower($r->lang_id);
 		$lang->font = $r->font;
 		$lang->charset = $r->charset;
 
@@ -13,12 +13,7 @@ class wsDAOLang extends extranetDAO {
 			$lang->traductions = json_decode($r->traductions, true);
 		}
 
-		foreach($lang->traductions as $k => $v) {
-			if (is_int($k)) {
-				$lang->traductions = wsLang::getTraductionWithId($lang->traductions);
-			}
-			break;
-		}
+		$lang->traductions=wsLang::checkTranslations($lang->traductions);
 		return $lang;
 	}
 
@@ -30,7 +25,7 @@ class wsDAOLang extends extranetDAO {
 
 	public function selectAll()
 	{
-		$r = $this->con->select('SELECT * FROM langues ORDER BY public DESC,(CHAR_LENGTH(lang_id)=2) DESC');
+		$r = $this->con->select('SELECT * FROM langues WHERE CHAR_LENGTH(lang_id)=2');
 		return $this->factory($r);
 	}
 
diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 074a879e3..8c3c8ea77 100644
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -9,10 +9,8 @@ class wsBook extends cubeMetier {
 
 	protected $proprietaire;
 	protected $proprietaire_id;
-
-	//protected $facturable;
-	//protected $facturable_id;
-
+	// protected $facturable;
+	// protected $facturable_id;
 	protected $hash;
 	protected $compteur_visites;
 
@@ -41,7 +39,7 @@ class wsBook extends cubeMetier {
 			throw new Exception($msg);
 		}
 
-		$classic = array('chapters', 'traductions');
+		$classic = array('chapters');
 
 		if (in_array($varname, $classic)) {
 			if (is_array($this->$varname) || is_object($this->$varname)) {
@@ -54,6 +52,17 @@ class wsBook extends cubeMetier {
 			}
 			return $this->$varname;
 		}
+		if ($varname == 'traductions') {
+			if (is_array($this->$varname) || is_object($this->$varname)) {
+				return $this->$varname;
+			}
+			if ($this->$varname == '') {
+				$this->$varname = array();
+			} else {
+				$this->$varname = json_decode($this->$varname, true);
+			}
+			return $this->$varname;
+		}
 		if ($varname == 'parametres') {
 			if ($this->parametres instanceof wsBookParametres) {
 				return $this->parametres;
diff --git a/inc/ws/Metier/class.ws.lang.php b/inc/ws/Metier/class.ws.lang.php
index e87db0e2d..6c97af661 100644
--- a/inc/ws/Metier/class.ws.lang.php
+++ b/inc/ws/Metier/class.ws.lang.php
@@ -78,6 +78,17 @@ class wsLang extends cubeMetier {
 		}
 		return $res;
 	}
+
+	public static function checkTranslations($traductions)
+	{
+		foreach($traductions as $k => $v) {
+			if (is_int($k)) {
+				$traductions = wsLang::getTraductionWithId($traductions);
+			}
+			break;
+		}
+		return $traductions;
+	}
 }
 
 ?>
\ No newline at end of file