Changeset 15973 for trunk/inc

Timestamp:

02/10/12 22:38:54 (4 months ago)

Author:

Alexander Trofimov

Message:

Editor object + new WYSIWYG editor

Location:

trunk/inc

Files:

• classes/BxDolEditor.php (added)
• classes/BxDolEditorQuery.php (added)
• classes/BxDolForm.php (modified) (2 diffs)
• classes/BxDolLanguages.php (modified) (1 diff)
• utils.inc.php (modified) (1 diff)

trunk/inc/classes/BxDolForm.php

@@ -113 +113 @@
  * - html - display visual editor of certain type, for textarea field type only.
  *      - 0 - no visual editor, leave textarea field as it is.
- *      - 1 - micro visual editor.
- *      - 2 - default visual editor.
- *      - 3 - mini visual editor.
+ *      - 1 - standard(default) visual editor, see @BxDolEditor.
+ *      - 2 - full visual editor, see @BxDolEditor.
+ *      - 3 - mini visual editor, see @BxDolEditor.
  * - attrs - serialized array of additional input attributes.
  * - attrs_tr - serialized array of additional attributes for the whole input row.
@@ -218 +218 @@
  *      - html - use visual editor or not.
  *          - 0 - no visual editor, leave textarea field as it is.
- *          - 1 - micro visual editor.
- *          - 2 - default visual editor.
- *          - 3 - mini visual editor.
+ *          - 1 - standard(default) visual editor, see @BxDolEditor.
+ *          - 2 - full visual editor, see @BxDolEditor.
+ *          - 3 - mini visual editor, see @BxDolEditor.
  *      - checker_func
  *          Can be used here: Length, Preg, Avail 

trunk/inc/classes/BxDolLanguages.php

@@ -80 +80 @@
 
         return (int)$iId;
+    }
+
+    /**
+     * It tries to match current language with provided languages array, if nothing is found $sFallbackLanguage is returned.
+     * @param $aLangs - array of languages, example: array('ru' => 1, 'kg' => 1);
+     * @param $sFallbackLanguage - language to return of nothis is found
+     * @return language code string
+     */
+    function detectLanguageFromArray($aLangs, $sFallbackLanguage = 'en') {
+        return isset($aLangs[$GLOBALS['sCurrentLanguage']]) ? $GLOBALS['sCurrentLanguage'] : $sFallbackLanguage;
     }
 

trunk/inc/utils.inc.php

@@ -1035 +1035 @@
     if (BX_ESCAPE_STR_APOS == $iQuoteType) {
         $aUnits["'"] = "\\'";
+        $aUnits['<script'] = "<scr' + 'ipt";
+        $aUnits['</script>'] = "</scr' + 'ipt>";
     } elseif (BX_ESCAPE_STR_QUOTE == $iQuoteType) {
         $aUnits['"'] = '\\"';
+        $aUnits['<script'] = '<scr" + "ipt';
+        $aUnits['</script>'] = '</scr" + "ipt>';
     } else {
         $aUnits['"'] = '&quote;';
         $aUnits["'"] = '&apos;';
+        $aUnits["<"] = '&lt;';
+        $aUnits[">"] = '&gt;';
     }
     return str_replace(array_keys($aUnits), array_values($aUnits), $mixedInput);