Changeset 15706 for trunk/inc

Timestamp:

11/28/11 04:20:04 (6 months ago)

Author:

Anton Lesnikov

Message:

1. Minor improvements in Grid Engine.
2. Grid based Studio -> Polyglot -> Keys manager.

Location:

trunk/inc

Files:

• classes/BxDolLanguagesQuery.php (modified) (2 diffs)
• languages.inc.php (modified) (4 diffs)

trunk/inc/classes/BxDolLanguagesQuery.php

@@ -29 +29 @@
      */
     static function getInstance() {
-        if(!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
-            bx_import('BxTemplMenu');
+        if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolLanguagesQuery();
-        }
 
         return $GLOBALS['bxDolClasses'][__CLASS__];
@@ -66 +64 @@
                 $sWhereClause .= $this->prepare(" AND `tl`.`Name`=?", $aParams['value']);
                 break;
+            case 'default':
+                $aMethod['name'] = 'getRow';
+                $sWhereClause .= $this->prepare(" AND `tl`.`Name`=?", $this->getParam('lang_default'));
+                break;
             case 'active':
                 $sWhereClause = " AND `tl`.`Enabled`='1'";

trunk/inc/languages.inc.php

@@ -325 +325 @@
 
     $sKey = bx_process_input($sKey);
-    $sString = bx_process_input($mixedString);
+    $mixedString = bx_process_input($mixedString);
 
     $oDb = BxDolLanguagesQuery::getInstance();
@@ -350 +350 @@
     }
 
-    return true;
+    return $iKeyId;
 }
 
@@ -368 +368 @@
 }
 
-function updateLanguageStringById($iKeyId, $sString, $iLangId = 0, $bRecompile = true) {
+function updateLanguageStringById($iKeyId, $mixedString, $iLangId = 0, $bRecompile = true) {
     $iKeyId = (int)$iKeyId;
-    $sString = bx_process_input($sString);
+    $mixedString = bx_process_input($mixedString);
     $iLangId = (int)$iLangId;
 
@@ -380 +380 @@
 
     foreach($aLanguages as $aLanguage) {
-        if(!$oDb->updateString($iKeyId, $aLanguage['id'], $sString))
-            return false;
-
-        if($bRecompile)
+        $sString = '';
+        if(is_string($mixedString))
+            $sString = $mixedString;
+        else if(is_array($mixedString))
+            $sString = $mixedString[$aLanguage['id']];
+
+        if($oDb->updateString($iKeyId, $aLanguage['id'], $sString) && $bRecompile)
             compileLanguage($aLanguage['id']);
     }