Changeset 488

Timestamp:

08/07/2010 02:45:58 AM (18 months ago)

Author:

ofer

Message:

Moved to static classes in utils and constants to minimize chances of namespace collisions

Location:

trunk/WordPress/plugin/transposh

Files:

• core/constants.php (modified) (1 diff)
• core/parser.php (modified) (2 diffs)
• core/utils.php (modified) (1 diff)
• transposh.php (modified) (12 diffs)
• widgets/flags/tpw_flags.php (modified) (1 diff)
• widgets/flags/tpw_flags_css.php (modified) (1 diff)
• widgets/flagslist/tpw_list_with_flags.php (modified) (1 diff)
• widgets/flagslist/tpw_list_with_flags_css.php (modified) (1 diff)
• wp/transposh_3rdparty.php (modified) (4 diffs)
• wp/transposh_admin.php (modified) (3 diffs)
• wp/transposh_ajax.php (modified) (1 diff)
• wp/transposh_db.php (modified) (2 diffs)
• wp/transposh_options.php (modified) (3 diffs)
• wp/transposh_postpublish.php (modified) (3 diffs)
• wp/transposh_widget.php (modified) (5 diffs)

trunk/WordPress/plugin/transposh/core/constants.php

@@ -32 +32 @@
 define('ONLY_THISLANGUAGE_CLASS', 'only_thislanguage');
 
+/**
+ * Holds our arrays staticly to reduce chance of namespace collision
+ */
+class transposh_consts {
+
 //Supported languages, new languages can be added here
 //the array directs from language code to - English Name, Native name, flag
-$languages = array(
-    'en' => 'English,English,us',
-    'af' => 'Afrikaans,Afrikaans,za',
-    'sq' => 'Albanian,Shqip,al',
-    'ar' => 'Arabic,العرؚية,sa',
-    'hy' => 'Armenian,Հայերեն,am',
-    'az' => 'Azerbaijani,azərbaycan dili,az',
-    'eu' => 'Basque,euskara,basque',
-    'be' => 'Belarusian,Беларуская,by',
-    'bg' => 'Bulgarian,БългарскО,bg',
-    'ca' => 'Catalan,Català ,catalonia',
-    'zh' => 'Chinese (Simplified),äž­æ–‡(简䜓),cn',
-    'zh-tw' => 'Chinese (Traditional),äž­æ–‡(挢字),tw',
-    'hr' => 'Croatian,Hrvatski,hr',
-    'cs' => 'Czech,čeština,cz',
-    'da' => 'Danish,dansk,dk',
-    'nl' => 'Dutch,Nederlands,nl',
-    'et' => 'Estonian,Eesti keel,ee',
-    'fi' => 'Finnish,Suomi,fi',
-    'fr' => 'French,Français,fr',
-    'gl' => 'Galician,Galego,galicia',
-    'ka' => 'Georgian,ქართული,ge',
-    'de' => 'German,Deutsch,de',
-    'el' => 'Greek,ΕλληΜικά,gr',
-    'ht' => 'Haitian,Kreyòl ayisyen,ht',
-    'he' => 'Hebrew,עבךית,il',
-    'hi' => 'Hindi,à€¹à€¿à€šà¥à€Šà¥€; à€¹à€¿à€‚à€Šà¥€,in',
-    'hu' => 'Hungarian,magyar,hu',
-    'is' => 'Icelandic,íslenska,is',
-    'id' => 'Indonesian,Bahasa Indonesia,id',
-    'ga' => 'Irish,Gaeilge,ie',
-    'it' => 'Italian,Italiano,it',
-    'ja' => 'Japanese,日本語,jp',
-    'ko' => 'Korean,우늬말,kr',
-    'lv' => 'Latvian,latviešu valoda,lv',
-    'lt' => 'Lithuanian,lietuvių kalba,lt',
-    'mk' => 'Macedonian,ЌакеЎПМскО јазОк,mk',
-    'ms' => 'Malay,bahasa Melayu,my',
-    'mt' => 'Maltese,Malti,mt',
-    'no' => 'Norwegian,Norsk,no',
-    'fa' => 'Persian,فارسی,ir',
-    'pl' => 'Polish,Polski,pl',
-    'pt' => 'Portuguese,Português,pt',
-    'ro' => 'Romanian,Română,ro',
-    'ru' => 'Russian,РусскОй,ru',
-    'sr' => 'Serbian,српскО језОк,rs',
-    'sk' => 'Slovak,slovenčina,sk',
-    'sl' => 'Slovene,slovenščina,sl', //slovenian
-    'es' => 'Spanish,Español,es',
-    'sw' => 'Swahili,Kiswahili,ke',
-    'sv' => 'Swedish,svenska,se',
-    'tl' => 'Tagalog,Tagalog,ph', // fhilipino
-    'th' => 'Thai,àž àž²àž©àž²à¹„àž—àž¢,th',
-    'tr' => 'Turkish,TÌrkçe,tr',
-    'uk' => 'Ukrainian,УкраїМська,ua',
-    'ur' => 'Urdu,اردو,pk',
-    'vi' => 'Vietnamese,Tiếng Việt,vn',
-    'cy' => 'Welsh,Cymraeg,wales',
-    'yi' => 'Yiddish,יי֎דיש,europeanunion'
-);
-
+    public static $languages = array(
+        'en' => 'English,English,us',
+        'af' => 'Afrikaans,Afrikaans,za',
+        'sq' => 'Albanian,Shqip,al',
+        'ar' => 'Arabic,العرؚية,sa',
+        'hy' => 'Armenian,Հայերեն,am',
+        'az' => 'Azerbaijani,azərbaycan dili,az',
+        'eu' => 'Basque,euskara,basque',
+        'be' => 'Belarusian,Беларуская,by',
+        'bg' => 'Bulgarian,БългарскО,bg',
+        'ca' => 'Catalan,Català ,catalonia',
+        'zh' => 'Chinese (Simplified),äž­æ–‡(简䜓),cn',
+        'zh-tw' => 'Chinese (Traditional),äž­æ–‡(挢字),tw',
+        'hr' => 'Croatian,Hrvatski,hr',
+        'cs' => 'Czech,čeština,cz',
+        'da' => 'Danish,dansk,dk',
+        'nl' => 'Dutch,Nederlands,nl',
+        'et' => 'Estonian,Eesti keel,ee',
+        'fi' => 'Finnish,Suomi,fi',
+        'fr' => 'French,Français,fr',
+        'gl' => 'Galician,Galego,galicia',
+        'ka' => 'Georgian,ქართული,ge',
+        'de' => 'German,Deutsch,de',
+        'el' => 'Greek,ΕλληΜικά,gr',
+        'ht' => 'Haitian,Kreyòl ayisyen,ht',
+        'he' => 'Hebrew,עבךית,il',
+        'hi' => 'Hindi,à€¹à€¿à€šà¥à€Šà¥€; à€¹à€¿à€‚à€Šà¥€,in',
+        'hu' => 'Hungarian,magyar,hu',
+        'is' => 'Icelandic,íslenska,is',
+        'id' => 'Indonesian,Bahasa Indonesia,id',
+        'ga' => 'Irish,Gaeilge,ie',
+        'it' => 'Italian,Italiano,it',
+        'ja' => 'Japanese,日本語,jp',
+        'ko' => 'Korean,우늬말,kr',
+        'lv' => 'Latvian,latviešu valoda,lv',
+        'lt' => 'Lithuanian,lietuvių kalba,lt',
+        'mk' => 'Macedonian,ЌакеЎПМскО јазОк,mk',
+        'ms' => 'Malay,bahasa Melayu,my',
+        'mt' => 'Maltese,Malti,mt',
+        'no' => 'Norwegian,Norsk,no',
+        'fa' => 'Persian,فارسی,ir',
+        'pl' => 'Polish,Polski,pl',
+        'pt' => 'Portuguese,Português,pt',
+        'ro' => 'Romanian,Română,ro',
+        'ru' => 'Russian,РусскОй,ru',
+        'sr' => 'Serbian,српскО језОк,rs',
+        'sk' => 'Slovak,slovenčina,sk',
+        'sl' => 'Slovene,slovenščina,sl', //slovenian
+        'es' => 'Spanish,Español,es',
+        'sw' => 'Swahili,Kiswahili,ke',
+        'sv' => 'Swedish,svenska,se',
+        'tl' => 'Tagalog,Tagalog,ph', // fhilipino
+        'th' => 'Thai,àž àž²àž©àž²à¹„àž—àž¢,th',
+        'tr' => 'Turkish,TÌrkçe,tr',
+        'uk' => 'Ukrainian,УкраїМська,ua',
+        'ur' => 'Urdu,اردو,pk',
+        'vi' => 'Vietnamese,Tiếng Việt,vn',
+        'cy' => 'Welsh,Cymraeg,wales',
+        'yi' => 'Yiddish,יי֎דיש,europeanunion'
+    );
 //Language which are read from right to left (rtl)
-$rtl_languages = array('ar', 'he', 'fa', 'ur', 'yi');
-
+    public static $rtl_languages = array('ar', 'he', 'fa', 'ur', 'yi');
 //Google supported languages
 //(got using - var langs =''; jQuery.each(google.language.Languages,function(){if (google.language.isTranslatable(this)) {langs += this +'|'}}); console.log(langs); - fixed for our codes)
 //@updated 2010-Jul-01 (hy,az,eu,ka,ur)
 //$google_languages = array('en', 'af', 'sq', 'ar', 'hy', 'az', 'eu', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'ka', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'ur', 'vi', 'cy', 'yi');
-$google_languages = array('en', 'af', 'sq', 'ar', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'vi', 'cy', 'yi');
-$google_proxied_languages = array('hy','az','eu','ka','ur');
+    public static $google_languages = array('en', 'af', 'sq', 'ar', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'vi', 'cy', 'yi');
+    public static $google_proxied_languages = array('hy', 'az', 'eu', 'ka', 'ur');
 //Bing supported languages
 //(got this using Microsoft.Translator.GetLanguages() - fixed to match our codes)
 //@updated 2010-Jun-30
-$bing_languages = array('en', 'ar', 'bg', 'zh', 'zh-tw', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'de', 'el', 'ht', 'he', 'hu', 'it', 'ja', 'ko', 'lv', 'lt', 'no', 'pl', 'pt', 'ro', 'ru', 'sk', 'sl', 'es', 'sv', 'th', 'tr');
+    public static $bing_languages = array('en', 'ar', 'bg', 'zh', 'zh-tw', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'de', 'el', 'ht', 'he', 'hu', 'it', 'ja', 'ko', 'lv', 'lt', 'no', 'pl', 'pt', 'ro', 'ru', 'sk', 'sl', 'es', 'sv', 'th', 'tr');
+
+
+}
 
 //Define the new capability that will be assigned to roles - translator

trunk/WordPress/plugin/transposh/core/parser.php

@@ -484 +484 @@
         // Use base64 encoding to make that when the page is translated (i.e. update_translation) we
         // get back exactlly the same string without having the client decode/encode it in anyway.
-        $span = '<span class ="' . SPAN_PREFIX . '" id="' . SPAN_PREFIX . $this->segment_id . '" data-token="' . base64_url_encode($original_text) . '" data-source="'.$source.'"';
+        $span = '<span class ="' . SPAN_PREFIX . '" id="' . SPAN_PREFIX . $this->segment_id . '" data-token="' . transposh_utils::base64_url_encode($original_text) . '" data-source="'.$source.'"';
         // those are needed for on the fly image creation / hidden elements translations
         if ($this->is_edit_mode || $for_hidden_element) {
@@ -673 +673 @@
                         if (($this->is_edit_mode || ($this->is_auto_translate && $translated_text == null)) && $ep->inbody) {
                             // prevent duplicate translation (title = text)
-                            if (strpos($e->innertext, base64_url_encode($ep->phrase)) === false) {
+                            if (strpos($e->innertext, transposh_utils::base64_url_encode($ep->phrase)) === false) {
                                 //no need to translate span the same hidden phrase more than once
                                 if (!in_array($ep->phrase, $hidden_phrases)) {

trunk/WordPress/plugin/transposh/core/utils.php

@@ -27 +27 @@
 
 /**
- * Remove from url any language (or editing) params that were added for our use.
- * Return the scrubed url
+ * This is a static class to reduce chance of namespace collisions with other plugins
  */
-function cleanup_url($url, $home_url, $remove_host = false) {
-
-    $parsedurl = @parse_url($url);
-    //cleanup previous lang & edit parameter from url
-
-    if (isset($parsedurl['query'])) {
-        $params = explode('&', $parsedurl['query']);
-        foreach ($params as $key => $param) {
-            if (stripos($param, LANG_PARAM) === 0) unset($params[$key]);
-            if (stripos($param, EDIT_PARAM) === 0) unset($params[$key]);
-        }
-    }
-    // clean the query
-    unset($parsedurl['query']);
-    if (isset($params) && $params) {
-        $parsedurl['query'] = implode('&', $params);
-    }
-
-    //cleanup lang identifier in permalinks
-    //remove the language from the url permalink (if in start of path, and is a defined language)
-    $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
-    logger("home: $home_path " . $parsedurl['path'], 5);
-    if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
-        logger("homein!: $home_path", 5);
-        $parsedurl['path'] = substr($parsedurl['path'], strlen($home_path));
-        $gluebackhome = true;
-    }
-
-    if (strlen($parsedurl['path']) > 2) {
-        $secondslashpos = strpos($parsedurl['path'], "/", 1);
-        if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
-        $prevlang = substr($parsedurl['path'], 1, $secondslashpos - 1);
-        if (isset($GLOBALS['languages'][$prevlang])) {
-            logger("prevlang: " . $prevlang, 4);
-            $parsedurl['path'] = substr($parsedurl['path'], $secondslashpos);
-        }
-    }
-    if ($gluebackhome) $parsedurl['path'] = $home_path . $parsedurl['path'];
-    if ($remove_host) {
-        unset($parsedurl['scheme']);
-        unset($parsedurl['host']);
-    }
-    $url = glue_url($parsedurl);
-    if (!$url) return '/';
-    return $url;
-}
-
-/**
- * Update the given url to include language params.
- * @param string $url - Original URL to rewrite
- * @param string $lang - Target language code
- * @param boolean $is_edit - should url indicate editing
- * @param boolean $use_params_only - only use paramaters and avoid permalinks
- */
+class transposh_utils {
+
+    /**
+     * Remove from url any language (or editing) params that were added for our use.
+     * Return the scrubed url
+     */
+    public static function cleanup_url($url, $home_url, $remove_host = false) {
+
+        $parsedurl = @parse_url($url);
+        //cleanup previous lang & edit parameter from url
+
+        if (isset($parsedurl['query'])) {
+            $params = explode('&', $parsedurl['query']);
+            foreach ($params as $key => $param) {
+                if (stripos($param, LANG_PARAM) === 0) unset($params[$key]);
+                if (stripos($param, EDIT_PARAM) === 0) unset($params[$key]);
+            }
+        }
+        // clean the query
+        unset($parsedurl['query']);
+        if (isset($params) && $params) {
+            $parsedurl['query'] = implode('&', $params);
+        }
+
+        //cleanup lang identifier in permalinks
+        //remove the language from the url permalink (if in start of path, and is a defined language)
+        $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
+        logger("home: $home_path " . $parsedurl['path'], 5);
+        if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
+            logger("homein!: $home_path", 5);
+            $parsedurl['path'] = substr($parsedurl['path'], strlen($home_path));
+            $gluebackhome = true;
+        }
+
+        if (strlen($parsedurl['path']) > 2) {
+            $secondslashpos = strpos($parsedurl['path'], "/", 1);
+            if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
+            $prevlang = substr($parsedurl['path'], 1, $secondslashpos - 1);
+            if (isset(transposh_consts::$languages[$prevlang])) {
+                logger("prevlang: " . $prevlang, 4);
+                $parsedurl['path'] = substr($parsedurl['path'], $secondslashpos);
+            }
+        }
+        if ($gluebackhome) $parsedurl['path'] = $home_path . $parsedurl['path'];
+        if ($remove_host) {
+            unset($parsedurl['scheme']);
+            unset($parsedurl['host']);
+        }
+        $url = transposh_utils::glue_url($parsedurl);
+        if (!$url) return '/';
+        return $url;
+    }
+
+    /**
+     * Update the given url to include language params.
+     * @param string $url - Original URL to rewrite
+     * @param string $lang - Target language code
+     * @param boolean $is_edit - should url indicate editing
+     * @param boolean $use_params_only - only use paramaters and avoid permalinks
+     */
 // Should send a transposh interface to here TODO - enable permalinks rewrite
 // TODO - Should be able to not write default language for url (done with empty lang?)
-function rewrite_url_lang_param($url, $home_url, $enable_permalinks_rewrite, $lang, $is_edit, $use_params_only=FALSE) {
-    logger("rewrite old url: $url, permalinks: $enable_permalinks_rewrite, lang: $lang, is_edit: $is_edit, home_url: $home_url", 5);
-
-    $newurl = str_replace('&', '&', $url);
-    $newurl = html_entity_decode($newurl, ENT_NOQUOTES);
-    $parsedurl = parse_url($newurl);
-
-    // if we are dealing with some other url, we won't touch it!
-    if (isset($parsedurl['host']) && !($parsedurl['host'] == parse_url($home_url, PHP_URL_HOST))) {
+    public static function rewrite_url_lang_param($url, $home_url, $enable_permalinks_rewrite, $lang, $is_edit, $use_params_only=FALSE) {
+        logger("rewrite old url: $url, permalinks: $enable_permalinks_rewrite, lang: $lang, is_edit: $is_edit, home_url: $home_url", 5);
+
+        $newurl = str_replace('&', '&', $url);
+        $newurl = html_entity_decode($newurl, ENT_NOQUOTES);
+        $parsedurl = parse_url($newurl);
+
+        // if we are dealing with some other url, we won't touch it!
+        if (isset($parsedurl['host']) && !($parsedurl['host'] == parse_url($home_url, PHP_URL_HOST))) {
+            return $url;
+        }
+
+        //remove prev lang and edit params - from query string - reserve other params
+        if (isset($parsedurl['query'])) {
+            $params = explode('&', $parsedurl['query']);
+            foreach ($params as $key => $param) {
+                if (stripos($param, LANG_PARAM) === 0) unset($params[$key]);
+                if (stripos($param, EDIT_PARAM) === 0) unset($params[$key]);
+            }
+        }
+        // clean the query
+        unset($parsedurl['query']);
+
+        // remove the language from the url permalink (if in start of path, and is a defined language)
+        $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
+        logger("home: $home_path " . $parsedurl['path'], 5);
+        if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
+            logger("homein!: $home_path", 5);
+            $parsedurl['path'] = substr($parsedurl['path'], strlen($home_path));
+            $gluebackhome = true;
+        }
+        if (strlen($parsedurl['path']) > 2) {
+            $secondslashpos = strpos($parsedurl['path'], "/", 1);
+            if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
+            $prevlang = substr($parsedurl['path'], 1, $secondslashpos - 1);
+            if (isset(transposh_consts::$languages[$prevlang])) {
+                logger("prevlang: " . $prevlang, 4);
+                $parsedurl['path'] = substr($parsedurl['path'], $secondslashpos);
+            }
+        }
+
+        // override the use only params - admin configured system to not touch permalinks
+        if (!$enable_permalinks_rewrite) {
+            $use_params_only = TRUE;
+        }
+
+        //$params ="";
+        if ($is_edit) {
+            $params[edit] = EDIT_PARAM . '=1';
+        }
+
+        if ($use_params_only && $lang) {
+            $params['lang'] = LANG_PARAM . "=$lang";
+        } else {
+            if ($lang) {
+                if (!$parsedurl['path']) $parsedurl['path'] = "/";
+                $parsedurl['path'] = "/" . $lang . $parsedurl['path'];
+            }
+        }
+        if ($gluebackhome) $parsedurl['path'] = $home_path . $parsedurl['path'];
+
+        // insert params to url
+        if (isset($params) && $params) {
+            $parsedurl['query'] = implode('&', $params);
+            logger("params: $params", 4);
+        }
+
+        // more cleanups
+        //$url = preg_replace("/&$/", "", $url);
+        //$url = preg_replace("/\?$/", "", $url);
+        //    $url = htmlentities($url, ENT_NOQUOTES);
+        $url = transposh_utils::glue_url($parsedurl);
+        logger("new url: $url", 5);
         return $url;
     }
 
-    //remove prev lang and edit params - from query string - reserve other params
-    if (isset($parsedurl['query'])) {
-        $params = explode('&', $parsedurl['query']);
-        foreach ($params as $key => $param) {
-            if (stripos($param, LANG_PARAM) === 0) unset($params[$key]);
-            if (stripos($param, EDIT_PARAM) === 0) unset($params[$key]);
-        }
-    }
-    // clean the query
-    unset($parsedurl['query']);
-
-    // remove the language from the url permalink (if in start of path, and is a defined language)
-    $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
-    logger("home: $home_path " . $parsedurl['path'], 5);
-    if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
-        logger("homein!: $home_path", 5);
-        $parsedurl['path'] = substr($parsedurl['path'], strlen($home_path));
-        $gluebackhome = true;
-    }
-    if (strlen($parsedurl['path']) > 2) {
-        $secondslashpos = strpos($parsedurl['path'], "/", 1);
-        if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
-        $prevlang = substr($parsedurl['path'], 1, $secondslashpos - 1);
-        if (isset($GLOBALS['languages'][$prevlang])) {
-            logger("prevlang: " . $prevlang, 4);
-            $parsedurl['path'] = substr($parsedurl['path'], $secondslashpos);
-        }
-    }
-
-    // override the use only params - admin configured system to not touch permalinks
-    if (!$enable_permalinks_rewrite) {
-        $use_params_only = TRUE;
-    }
-
-    //$params ="";
-    if ($is_edit) {
-        $params[edit] = EDIT_PARAM . '=1';
-    }
-
-    if ($use_params_only && $lang) {
-        $params['lang'] = LANG_PARAM . "=$lang";
-    } else {
-        if ($lang) {
-            if (!$parsedurl['path']) $parsedurl['path'] = "/";
-            $parsedurl['path'] = "/" . $lang . $parsedurl['path'];
-        }
-    }
-    if ($gluebackhome) $parsedurl['path'] = $home_path . $parsedurl['path'];
-
-    // insert params to url
-    if (isset($params) && $params) {
-        $parsedurl['query'] = implode('&', $params);
-        logger("params: $params", 4);
-    }
-
-    // more cleanups
-    //$url = preg_replace("/&$/", "", $url);
-    //$url = preg_replace("/\?$/", "", $url);
-    //    $url = htmlentities($url, ENT_NOQUOTES);
-    $url = glue_url($parsedurl);
-    logger("new url: $url", 5);
-    return $url;
-}
-
-function get_language_from_url($url, $home_url) {
-
-    $parsedurl = @parse_url($url);
-
-    //option 1, lanaguage is in the query ?lang=xx
-    if (isset($parsedurl['query'])) {
-        $params = explode('&', $parsedurl['query']);
-        foreach ($params as $key => $param) {
-            if (stripos($param, LANG_PARAM) === 0) {
-                $langa = explode("=", $params[$key]);
-                return ($langa[1]);
-            }
-        }
-    }
-
-    // option 2, language is in permalink
-    // cleanup lang identifier in permalinks
-    // remove the language from the url permalink (if in start of path, and is a defined language)
-    $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
+    public static function get_language_from_url($url, $home_url) {
+
+        $parsedurl = @parse_url($url);
+
+        //option 1, lanaguage is in the query ?lang=xx
+        if (isset($parsedurl['query'])) {
+            $params = explode('&', $parsedurl['query']);
+            foreach ($params as $key => $param) {
+                if (stripos($param, LANG_PARAM) === 0) {
+                    $langa = explode("=", $params[$key]);
+                    return ($langa[1]);
+                }
+            }
+        }
+
+        // option 2, language is in permalink
+        // cleanup lang identifier in permalinks
+        // remove the language from the url permalink (if in start of path, and is a defined language)
+        $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
 //    logger ("home: $home_path ".$parsedurl['path'],5);
-    if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
+        if ($home_path && strpos($parsedurl['path'], $home_path) === 0) {
 //        logger ("homein!: $home_path",5);
-        $parsedurl['path'] = substr($parsedurl['path'], strlen($home_path));
+            $parsedurl['path'] = substr($parsedurl['path'], strlen($home_path));
 //        $gluebackhome = true;
-    }
-
-    if (strlen($parsedurl['path']) > 2) {
-        $secondslashpos = strpos($parsedurl['path'], "/", 1);
-        if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
-        $prevlang = substr($parsedurl['path'], 1, $secondslashpos - 1);
-        if (isset($GLOBALS['languages'][$prevlang])) {
-            //logger ("prevlang: ".$prevlang,4);
-            //$parsedurl['path'] = substr($parsedurl['path'],$secondslashpos);
-            return $prevlang;
-        }
-    }
-    return false;
-}
-
-/**
- * glue a parse_url array back to a url
- * @param array $parsed url_parse style array
- * @return combined url
- */
-function glue_url($parsed) {
-    if (!is_array($parsed)) {
+        }
+
+        if (strlen($parsedurl['path']) > 2) {
+            $secondslashpos = strpos($parsedurl['path'], "/", 1);
+            if (!$secondslashpos) $secondslashpos = strlen($parsedurl['path']);
+            $prevlang = substr($parsedurl['path'], 1, $secondslashpos - 1);
+            if (isset(transposh_consts::$languages[$prevlang])) {
+                //logger ("prevlang: ".$prevlang,4);
+                //$parsedurl['path'] = substr($parsedurl['path'],$secondslashpos);
+                return $prevlang;
+            }
+        }
         return false;
     }
 
-    $uri = isset($parsed['scheme']) ? $parsed['scheme'] . ':' . ((strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '';
-    $uri .= isset($parsed['user']) ? $parsed['user'] . (isset($parsed['pass']) ? ':' . $parsed['pass'] : '') . '@' : '';
-    $uri .= isset($parsed['host']) ? $parsed['host'] : '';
-    $uri .= isset($parsed['port']) ? ':' . $parsed['port'] : '';
-
-    if (isset($parsed['path'])) {
-        $uri .= ( substr($parsed['path'], 0, 1) == '/') ?
-                $parsed['path'] : ((!empty($uri) ? '/' : '' ) . $parsed['path']);
-    }
-
-    $uri .= isset($parsed['query']) ? '?' . $parsed['query'] : '';
-    $uri .= isset($parsed['fragment']) ? '#' . $parsed['fragment'] : '';
-
-    return $uri;
-}
-
-/**
- * Encode a string as base 64 while avoiding characters which should be avoided
- * in uri, e.g. + is interpeted as a space.
- */
-function base64_url_encode($input) {
-    return strtr(base64_encode($input), '+/=', '-_,');
-}
-
-/**
- * Decode a string previously decoded with base64_url_encode
- */
-function base64_url_decode($input) {
-    return base64_decode(strtr($input, '-_,', '+/='));
-}
-
-/**
- * Function to translate a given url permalink to a target language
- * TODO - check params
- * @param string $href
- * @param string $home_url
- * @param string $target_language
- * @param function $fetch_translation_func
- * @return string translated url permalink
- */
-function translate_url($href, $home_url, $target_language, $fetch_translation_func) {
-    // todo - check query part... sanitize
-    if (strpos($href, '?') !== false) {
-        list ($href, $querypart) = explode('?', $href);
-        $querypart = '?' . $querypart;
-    }
-    $href = substr($href, strlen($home_url));
-    $parts = explode('/', $href);
-    foreach ($parts as $part) {
-        if (!$part) continue;
-        list($translated_text, $old_source) = call_user_func_array($fetch_translation_func, array($part, $target_language));
-        if ($translated_text)
-                $url .= '/' . str_replace(' ', '-', $translated_text);
-        else {
-            // now the same attempt with '-' replaced to ' '
-            list($translated_text, $old_source) = call_user_func_array($fetch_translation_func, array(str_replace('-', ' ', $part), $target_language));
-            //logger ($part. ' '.str_replace('-', ' ', $part).' '.$translated_text);
+    /**
+     * glue a parse_url array back to a url
+     * @param array $parsed url_parse style array
+     * @return combined url
+     */
+    public static function glue_url($parsed) {
+        if (!is_array($parsed)) {
+            return false;
+        }
+
+        $uri = isset($parsed['scheme']) ? $parsed['scheme'] . ':' . ((strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '';
+        $uri .= isset($parsed['user']) ? $parsed['user'] . (isset($parsed['pass']) ? ':' . $parsed['pass'] : '') . '@' : '';
+        $uri .= isset($parsed['host']) ? $parsed['host'] : '';
+        $uri .= isset($parsed['port']) ? ':' . $parsed['port'] : '';
+
+        if (isset($parsed['path'])) {
+            $uri .= ( substr($parsed['path'], 0, 1) == '/') ?
+                    $parsed['path'] : ((!empty($uri) ? '/' : '' ) . $parsed['path']);
+        }
+
+        $uri .= isset($parsed['query']) ? '?' . $parsed['query'] : '';
+        $uri .= isset($parsed['fragment']) ? '#' . $parsed['fragment'] : '';
+
+        return $uri;
+    }
+
+    /**
+     * Encode a string as base 64 while avoiding characters which should be avoided
+     * in uri, e.g. + is interpeted as a space.
+     */
+    public static function base64_url_encode($input) {
+        return strtr(base64_encode($input), '+/=', '-_,');
+    }
+
+    /**
+     * Decode a string previously decoded with base64_url_encode
+     */
+    public static function base64_url_decode($input) {
+        return base64_decode(strtr($input, '-_,', '+/='));
+    }
+
+    /**
+     * Function to translate a given url permalink to a target language
+     * TODO - check params
+     * @param string $href
+     * @param string $home_url
+     * @param string $target_language
+     * @param function $fetch_translation_func
+     * @return string translated url permalink
+     */
+    public static function translate_url($href, $home_url, $target_language, $fetch_translation_func) {
+        // todo - check query part... sanitize
+        if (strpos($href, '?') !== false) {
+            list ($href, $querypart) = explode('?', $href);
+            $querypart = '?' . $querypart;
+        }
+        $href = substr($href, strlen($home_url));
+        $parts = explode('/', $href);
+        foreach ($parts as $part) {
+            if (!$part) continue;
+            list($translated_text, $old_source) = call_user_func_array($fetch_translation_func, array($part, $target_language));
             if ($translated_text)
                     $url .= '/' . str_replace(' ', '-', $translated_text);
-            else $url .= '/' . $part;
-        }
-    }
-    if (substr($href, strlen($href) - 1) == '/') $url.='/';
-    return $home_url . $url . $querypart;
-}
-
-/**
- * From a given translated url, tries to get the original URL
- * @param string $href
- * @param string $home_url
- * @param string $target_language
- * @param function $fetch_translation_func
- * @return string
- */
-function get_original_url($href, $home_url, $target_language, $fetch_translation_func) {
-    $href = substr($href, strlen($home_url));
-    $url = urldecode($href);
-    $url = (($pos = strpos($url, '?')) ? substr($url, 0, $pos) : $url);
-    $parts = explode('/', $url);
-    foreach ($parts as $part) {
-        if (!$part) continue;
-        // don't attempt for lang or numbers
-        if ($part == $target_language || is_numeric($part)) {
-            $url2 .= '/' . $part;
-            continue;
-        }
-
-        // we attempt to find an original text
-        $original_text = call_user_func_array($fetch_translation_func, array($part, $target_language));
-        if (!$original_text) {
-            // if the part has dashes we attempt to resolve original without them
-            if ($part != str_replace('-', ' ', $part)) {
-                $original_text = call_user_func_array($fetch_translation_func, array(str_replace('-', ' ', $part), $target_language));
-            }
-        }
-        // we'll add it if we have it
-        if ($original_text)
-                $url2 .= '/' . strtolower(str_replace(' ', '-', $original_text));
-        else $url2 .= '/' . $part;
-    }
-    // TODO: Consider sanitize_title_with_dashes
-    // TODO : need to handle params....
-    //logger(substr($url,strlen($url)-1));
-    //if (substr($url,strlen($url)-1) == '/') $url2 .= '/';
-    //$url2 = rtrim($url2,'/');
-    //logger ("$href $url $url2");
-    //$href = $this->home_url.$url2;
-    if (substr($href, strlen($href) - 1) == '/') $url2.='/';
-    return $home_url . $url2;
-}
-
-/**
- * Function to display a flag
- * @param string $path path to flag images
- * @param string $flag the flag (normally iso code)
- * @param string $language the name of the lanaguage
- * @param boolean $css using css code?
- * @return string Html with flag
- */
-function display_flag($path, $flag, $language, $css = false) {
-    if (!$css) {
-        return "<img src=\"$path/$flag.png\" title=\"$language\" alt=\"$language\"/>";
-    } else {
-        return "<span title=\"$language\" class=\"trf trf-{$flag}\"></span>";
-    }
-}
-
-/**
- * determine which language out of an available set the user prefers most
- * adapted from php documentation page
- * @param array $available_languages array with language-tag-strings (must be lowercase) that are available
- * @param string $default_lang Language that will be default (first in available languages if not provided)
- * @param string $http_accept_language a HTTP_ACCEPT_LANGUAGE string (read from $_SERVER['HTTP_ACCEPT_LANGUAGE'] if left out)
- * @return string
- */
-function prefered_language($available_languages, $default_lang="auto", $http_accept_language="auto") {
-    // if $http_accept_language was left out, read it from the HTTP-Header
-    if ($http_accept_language == "auto")
-            $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-
-    // standard  for HTTP_ACCEPT_LANGUAGE is defined under
-    // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
-    // pattern to find is therefore something like this:
-    //    1#( language-range [ ";" "q" "=" qvalue ] )
-    // where:
-    //    language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
-    //    qvalue         = ( "0" [ "." 0*3DIGIT ] )
-    //            | ( "1" [ "." 0*3("0") ] )
-    preg_match_all("/([[:alpha:]]{1,8})(-([[:alpha:]|-]{1,8}))?" .
-            "(\s*;\s*q\s*=\s*(1\.0{0,3}|0\.\d{0,3}))?\s*(,|$)/i",
-            $http_accept_language, $hits, PREG_SET_ORDER);
-
-    // default language (in case of no hits) is the first in the array
-    if ($default_lang == 'auto') $bestlang = $available_languages[0]; else
-            $bestlang = $default_lang;
-    $bestqval = 0;
-
-    foreach ($hits as $arr) {
-        // read data from the array of this hit
-        $langprefix = strtolower($arr[1]);
-        if (!empty($arr[3])) {
-            $langrange = strtolower($arr[3]);
-            $language = $langprefix . "-" . $langrange;
-        }
-        else $language = $langprefix;
-        $qvalue = 1.0;
-        if (!empty($arr[5])) $qvalue = floatval($arr[5]);
-
-        // find q-maximal language
-        if (in_array($language, $available_languages) && ($qvalue > $bestqval)) {
-            $bestlang = $language;
-            $bestqval = $qvalue;
-        }
-        // if no direct hit, try the prefix only but decrease q-value by 10% (as http_negotiate_language does)
-        else if (in_array($languageprefix, $available_languages) && (($qvalue * 0.9) > $bestqval)) {
-            $bestlang = $languageprefix;
-            $bestqval = $qvalue * 0.9;
-        }
-    }
-    return $bestlang;
+            else {
+                // now the same attempt with '-' replaced to ' '
+                list($translated_text, $old_source) = call_user_func_array($fetch_translation_func, array(str_replace('-', ' ', $part), $target_language));
+                //logger ($part. ' '.str_replace('-', ' ', $part).' '.$translated_text);
+                if ($translated_text)
+                        $url .= '/' . str_replace(' ', '-', $translated_text);
+                else $url .= '/' . $part;
+            }
+        }
+        if (substr($href, strlen($href) - 1) == '/') $url.='/';
+        return $home_url . $url . $querypart;
+    }
+
+    /**
+     * From a given translated url, tries to get the original URL
+     * @param string $href
+     * @param string $home_url
+     * @param string $target_language
+     * @param function $fetch_translation_func
+     * @return string
+     */
+    public static function get_original_url($href, $home_url, $target_language, $fetch_translation_func) {
+        $href = substr($href, strlen($home_url));
+        $url = urldecode($href);
+        $url = (($pos = strpos($url, '?')) ? substr($url, 0, $pos) : $url);
+        $parts = explode('/', $url);
+        foreach ($parts as $part) {
+            if (!$part) continue;
+            // don't attempt for lang or numbers
+            if ($part == $target_language || is_numeric($part)) {
+                $url2 .= '/' . $part;
+                continue;
+            }
+
+            // we attempt to find an original text
+            $original_text = call_user_func_array($fetch_translation_func, array($part, $target_language));
+            if (!$original_text) {
+                // if the part has dashes we attempt to resolve original without them
+                if ($part != str_replace('-', ' ', $part)) {
+                    $original_text = call_user_func_array($fetch_translation_func, array(str_replace('-', ' ', $part), $target_language));
+                }
+            }
+            // we'll add it if we have it
+            if ($original_text)
+                    $url2 .= '/' . strtolower(str_replace(' ', '-', $original_text));
+            else $url2 .= '/' . $part;
+        }
+        // TODO: Consider sanitize_title_with_dashes
+        // TODO : need to handle params....
+        //logger(substr($url,strlen($url)-1));
+        //if (substr($url,strlen($url)-1) == '/') $url2 .= '/';
+        //$url2 = rtrim($url2,'/');
+        //logger ("$href $url $url2");
+        //$href = $this->home_url.$url2;
+        if (substr($href, strlen($href) - 1) == '/') $url2.='/';
+        return $home_url . $url2;
+    }
+
+    /**
+     * Function to display a flag
+     * @param string $path path to flag images
+     * @param string $flag the flag (normally iso code)
+     * @param string $language the name of the lanaguage
+     * @param boolean $css using css code?
+     * @return string Html with flag
+     */
+    public static function display_flag($path, $flag, $language, $css = false) {
+        if (!$css) {
+            return "<img src=\"$path/$flag.png\" title=\"$language\" alt=\"$language\"/>";
+        } else {
+            return "<span title=\"$language\" class=\"trf trf-{$flag}\"></span>";
+        }
+    }
+
+    /**
+     * determine which language out of an available set the user prefers most
+     * adapted from php documentation page
+     * @param array $available_languages array with language-tag-strings (must be lowercase) that are available
+     * @param string $default_lang Language that will be default (first in available languages if not provided)
+     * @param string $http_accept_language a HTTP_ACCEPT_LANGUAGE string (read from $_SERVER['HTTP_ACCEPT_LANGUAGE'] if left out)
+     * @return string
+     */
+    public static function prefered_language($available_languages, $default_lang="auto", $http_accept_language="auto") {
+        // if $http_accept_language was left out, read it from the HTTP-Header
+        if ($http_accept_language == "auto")
+                $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+
+        // standard  for HTTP_ACCEPT_LANGUAGE is defined under
+        // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+        // pattern to find is therefore something like this:
+        //    1#( language-range [ ";" "q" "=" qvalue ] )
+        // where:
+        //    language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
+        //    qvalue         = ( "0" [ "." 0*3DIGIT ] )
+        //            | ( "1" [ "." 0*3("0") ] )
+        preg_match_all("/([[:alpha:]]{1,8})(-([[:alpha:]|-]{1,8}))?" .
+                "(\s*;\s*q\s*=\s*(1\.0{0,3}|0\.\d{0,3}))?\s*(,|$)/i",
+                $http_accept_language, $hits, PREG_SET_ORDER);
+
+        // default language (in case of no hits) is the first in the array
+        if ($default_lang == 'auto') $bestlang = $available_languages[0]; else
+                $bestlang = $default_lang;
+        $bestqval = 0;
+
+        foreach ($hits as $arr) {
+            // read data from the array of this hit
+            $langprefix = strtolower($arr[1]);
+            if (!empty($arr[3])) {
+                $langrange = strtolower($arr[3]);
+                $language = $langprefix . "-" . $langrange;
+            }
+            else $language = $langprefix;
+            $qvalue = 1.0;
+            if (!empty($arr[5])) $qvalue = floatval($arr[5]);
+
+            // find q-maximal language
+            if (in_array($language, $available_languages) && ($qvalue > $bestqval)) {
+                $bestlang = $language;
+                $bestqval = $qvalue;
+            }
+            // if no direct hit, try the prefix only but decrease q-value by 10% (as http_negotiate_language does)
+            else if (in_array($languageprefix, $available_languages) && (($qvalue * 0.9) > $bestqval)) {
+                $bestlang = $languageprefix;
+                $bestqval = $qvalue * 0.9;
+            }
+        }
+        return $bestlang;
+    }
+
 }
 ?>

trunk/WordPress/plugin/transposh/transposh.php

@@ -199 +199 @@
         $parse->prefetch_translate_func = array(&$this->database, 'prefetch_translations');
         $parse->url_rewrite_func = array(&$this, 'rewrite_url');
-        $parse->dir_rtl = (in_array($this->target_language, $GLOBALS['rtl_languages']));
+        $parse->dir_rtl = (in_array($this->target_language, transposh_consts::$rtl_languages));
         $parse->lang = $this->target_language;
         $parse->default_lang = $this->options->is_default_language($this->target_language);
@@ -239 +239 @@
         logger(substr($_SERVER['SCRIPT_FILENAME'], -11), 4);
         if (substr($_SERVER['SCRIPT_FILENAME'], -11) == 'wp-load.php') {
-            $this->target_language = get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url);
+            $this->target_language = transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url);
         }
 
@@ -333 +333 @@
 
         // make themes that support rtl - go rtl http://wordpress.tv/2010/05/01/yoav-farhi-right-to-left-themes-sf10
-        if (in_array($this->target_language, $GLOBALS['rtl_languages'])) {
+        if (in_array($this->target_language, transposh_consts::$rtl_languages)) {
             global $wp_locale;
             $wp_locale->text_direction = 'rtl';
@@ -351 +351 @@
                 if (isset($_COOKIE['TR_LNG']) && $this->options->get_widget_allow_set_default_language()) {
                     if ($_COOKIE['TR_LNG'] != $this->target_language) {
-                        $url = rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, $_COOKIE['TR_LNG'], $this->edit_mode);
+                        $url = transposh_utils::rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, $_COOKIE['TR_LNG'], $this->edit_mode);
                         if ($this->options->is_default_language($_COOKIE['TR_LNG']))
-                                $url = cleanup_url($_SERVER["REQUEST_URI"], $this->home_url);
+                                $url = transposh_utils::cleanup_url($_SERVER["REQUEST_URI"], $this->home_url);
                         logger("redirected to $url because of cookie", 4);
                         wp_redirect($url);
@@ -359 +359 @@
                     }
                 } else {
-                    $bestlang = prefered_language(explode(',', $this->options->get_viewable_langs()), $this->options->get_default_language());
+                    $bestlang = transposh_utils::prefered_language(explode(',', $this->options->get_viewable_langs()), $this->options->get_default_language());
                     // we won't redirect if we should not, or this is a presumable bot
                     if ($bestlang && $bestlang != $this->target_language && $this->options->get_enable_detect_language() && !(preg_match("#(bot|yandex|validator|google|jeeves|spider|crawler|slurp)#si", $_SERVER['HTTP_USER_AGENT']))) {
-                        $url = rewrite_url_lang_param($_SERVER['REQUEST_URI'], $this->home_url, $this->enable_permalinks_rewrite, $bestlang, $this->edit_mode);
+                        $url = transposh_utils::rewrite_url_lang_param($_SERVER['REQUEST_URI'], $this->home_url, $this->enable_permalinks_rewrite, $bestlang, $this->edit_mode);
                         if ($this->options->is_default_language($bestlang))
-                                $url = cleanup_url($_SERVER['REQUEST_URI'], $this->home_url);
+                                $url = transposh_utils::cleanup_url($_SERVER['REQUEST_URI'], $this->home_url);
                         logger("redirected to $url because of bestlang", 4);
                         wp_redirect($url);
@@ -381 +381 @@
                 add_action('posts_where_request', array(&$this, 'posts_where_request'));
             }
-            if (get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url) && !get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url)) {
-                wp_redirect(rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), false)); //."&stop=y");
+            if (transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url) && !transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url)) {
+                wp_redirect(transposh_utils::rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), false)); //."&stop=y");
                 exit;
             }
@@ -548 +548 @@
         );
         if ($this->edit_mode) $script_params['edit'] = 1;
-        if (in_array($this->target_language, $GLOBALS['bing_languages']))
+        if (in_array($this->target_language, transposh_consts::$bing_languages))
                 $script_params['msn'] = 1;
-        if (in_array($this->target_language, $GLOBALS['google_languages']))
+        if (in_array($this->target_language, transposh_consts::$google_languages))
                 $script_params['google'] = 1;
-        if (function_exists('curl_init') && in_array($this->target_language, $GLOBALS['google_proxied_languages']))
+        if (function_exists('curl_init') && in_array($this->target_language, transposh_consts::$google_proxied_languages))
                 $script_params['tgp'] = 1;
         if ($this->options->get_widget_progressbar())
@@ -627 +627 @@
         // first cut home
         if ($this->options->get_enable_url_translate()) {
-            $href = translate_url($href, $this->home_url, $this->target_language, array(&$this->database, 'fetch_translation'));
-        }
-        $href = rewrite_url_lang_param($href, $this->home_url, $this->enable_permalinks_rewrite, $this->target_language, $this->edit_mode, $use_params);
+            $href = transposh_utils::translate_url($href, $this->home_url, $this->target_language, array(&$this->database, 'fetch_translation'));
+        }
+        $href = transposh_utils::rewrite_url_lang_param($href, $this->home_url, $this->enable_permalinks_rewrite, $this->target_language, $this->edit_mode, $use_params);
         logger("rewritten: $href", 4);
         return $href;
@@ -724 +724 @@
      */
     function add_comment_meta_settings($post_id) {
-        if (get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url))
-                add_comment_meta($post_id, 'tp_language', get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), true);
+        if (transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url))
+                add_comment_meta($post_id, 'tp_language', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), true);
     }
 
@@ -735 +735 @@
      */
     function comment_post_redirect_filter($url) {
-        $lang = get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url);
+        $lang = transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url);
         if ($lang) {
-            $url = rewrite_url_lang_param($url, $this->home_url, $this->enable_permalinks_rewrite, $lang, $this->edit_mode);
+            $url = transposh_utils::rewrite_url_lang_param($url, $this->home_url, $this->enable_permalinks_rewrite, $lang, $this->edit_mode);
         }
         return $url;
@@ -766 +766 @@
         $lang = get_post_meta($id, 'tp_language', true);
         if ($lang) {
-            logger($_SERVER['REQUEST_URI']);
             if (strpos($_SERVER['REQUEST_URI'], 'wp-admin/edit') !== false) {
                 logger('iamhere?' . strpos($_SERVER['REQUEST_URI'], 'wp-admin/edit'));
                 $plugpath = parse_url($this->transposh_plugin_url, PHP_URL_PATH);
-                list($langeng, $langorig, $langflag) = explode(',', $GLOBALS['languages'][$lang]);
-                $text = display_flag("$plugpath/img/flags", $langflag, $langorig, false) . ' ' . $text;
+                list($langeng, $langorig, $langflag) = explode(',', transposh_consts::$languages[$lang]);
+                $text = transposh_utils::display_flag("$plugpath/img/flags", $langflag, $langorig, false) . ' ' . $text;
             } else {
                 $text = "<span lang =\"$lang\">" . $text . "</span>";
@@ -788 +787 @@
         //We only do this once, and if we have a lang
         $requri = $_SERVER['REQUEST_URI'];
-        $lang = get_language_from_url($requri, $this->home_url);
+        $lang = transposh_utils::get_language_from_url($requri, $this->home_url);
         if ($lang && !$this->got_request) {
             logger('Trying to find original url');
             $this->got_request = true;
             // the trick is to replace the URI and put it back afterwards
-            $_SERVER['REQUEST_URI'] = get_original_url($requri, '', $lang, array($this->database, 'fetch_original'));
+            $_SERVER['REQUEST_URI'] = transposh_utils::get_original_url($requri, '', $lang, array($this->database, 'fetch_original'));
             global $wp;
             $wp->parse_request();

trunk/WordPress/plugin/transposh/widgets/flags/tpw_flags.php

@@ -49 +49 @@
     foreach ($args as $langrecord) {
         echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) .
+        transposh_utils::display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) .
         "</a>";
     }

trunk/WordPress/plugin/transposh/widgets/flags/tpw_flags_css.php

@@ -44 +44 @@
     foreach ($args as $langrecord) {
         echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        display_flag("", $langrecord['flag'], $langrecord['langorig'], true) .
+        transposh_utils::display_flag("", $langrecord['flag'], $langrecord['langorig'], true) .
         "</a>";
     }

trunk/WordPress/plugin/transposh/widgets/flagslist/tpw_list_with_flags.php

@@ -58 +58 @@
     foreach ($args as $langrecord) {
         echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) . "</a>";
+        transposh_utils::display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) . "</a>";
         echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' . "{$langrecord['langorig']}</a><br/>";
     }

trunk/WordPress/plugin/transposh/widgets/flagslist/tpw_list_with_flags_css.php

@@ -54 +54 @@
     foreach ($args as $langrecord) {
         echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        display_flag('', $langrecord['flag'], $langrecord['langorig'], false) . '</a>';
+        transposh_utils::display_flag('', $langrecord['flag'], $langrecord['langorig'], false) . '</a>';
         echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' . "{$langrecord['langorig']}</a><br/>";
     }

trunk/WordPress/plugin/transposh/wp/transposh_3rdparty.php

@@ -95 +95 @@
      */
     function bp_uri_filter($uri) {
-        $lang = get_language_from_url($uri, $this->transposh->home_url);
-        $uri = cleanup_url($uri, $this->transposh->home_url);
+        $lang = transposh_utils::get_language_from_url($uri, $this->transposh->home_url);
+        $uri = transposh_utils::cleanup_url($uri, $this->transposh->home_url);
         if ($this->transposh->options->get_enable_url_translate()) {
-            $uri = get_original_url($uri, '', $lang, array($this->transposh->database, 'fetch_original'));
+            $uri = transposh_utils::get_original_url($uri, '', $lang, array($this->transposh->database, 'fetch_original'));
         }
         return $uri;
@@ -110 +110 @@
         // we don't need to modify our own activity stream
         if ($params->type == 'new_translation') return;
-        if (get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url))
-                bp_activity_update_meta($params->id, 'tp_language', get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url));
+        if (transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url))
+                bp_activity_update_meta($params->id, 'tp_language', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url));
     }
 
@@ -152 +152 @@
         $values = array(
             'user_id' => $bp->loggedin_user->id,
-            'action' => sprintf(__('%s translated a phrase to %s with transposh:', 'buddypress'), bp_core_get_userlink($bp->loggedin_user->id), substr($GLOBALS['languages'][$lang], 0, strpos($GLOBALS['languages'][$lang], ','))),
+            'action' => sprintf(__('%s translated a phrase to %s with transposh:', 'buddypress'), bp_core_get_userlink($bp->loggedin_user->id), substr(transposh_consts::$languages[$lang], 0, strpos(transposh_consts::$languages[$lang], ','))),
             'content' => "Original: <span class=\"no_translate\">$original</span>\nTranslation: <span class=\"no_translate\">$translation</span>",
             'primary_link' => '',
@@ -186 +186 @@
                 $newloc = $orig_url;
                 if ($this->transposh->options->get_enable_url_translate()) {
-                    $newloc = translate_url($newloc, $this->transposh->home_url, $lang, array(&$this->transposh->database, 'fetch_translation'));
+                    $newloc = transposh_utils::translate_url($newloc, $this->transposh->home_url, $lang, array(&$this->transposh->database, 'fetch_translation'));
                 }
-                $newloc = rewrite_url_lang_param($newloc, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $lang, false);
+                $newloc = transposh_utils::rewrite_url_lang_param($newloc, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $lang, false);
                 $sm_page->SetUrl($newloc);
                 $generatorObject->AddElement($sm_page);

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -172 +172 @@
         wp_localize_script('transposh_control', 't_jp', array(
             'post_url' => $this->transposh->post_url,
-            //'msn_langs' => json_encode($GLOBALS['bing_languages']),
-            //'google_lang' => json_encode($GLOBALS['google_languages']),
             'preferred' => $this->transposh->options->get_preferred_translator(),
-            'l10n_print_after' => 't_jp.g_langs = ' . json_encode($GLOBALS['google_languages']) . '; t_jp.m_langs = ' . json_encode($GLOBALS['bing_languages']) . ';'/*
+            'l10n_print_after' => 't_jp.g_langs = ' . json_encode(transposh_consts::$google_languages) . '; t_jp.m_langs = ' . json_encode(transposh_consts::$bing_languages) . ';'/*
                   /* ,
                   'plugin_url' => $this->transposh_plugin_url,
@@ -388 +386 @@
 
         // this is the default language location
-        list ($langname, $langorigname, $flag) = explode(",", $GLOBALS['languages'][$this->transposh->options->get_default_language()]);
+        list ($langname, $langorigname, $flag) = explode(",", transposh_consts::$languages[$this->transposh->options->get_default_language()]);
         echo '<div id="default_lang" style="overflow:auto;padding-bottom:10px;">Default Language (drag another language here to make it default)';
         echo '<ul id="default_list"><li id="' . $this->transposh->options->get_default_language() . '" class="languages">'
-        . display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, $langorigname, false/* $this->transposh->options->get_widget_css_flags() */)
+        . transposh_utils::display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, $langorigname, false/* $this->transposh->options->get_widget_css_flags() */)
         . '<input type="hidden" name="languages[]" value="' . $this->transposh->options->get_default_language() . '" />'
         . '&nbsp;<span class="langname">' . $langorigname . '</span><span class="langname hidden">' . $langname . '</span></li>';
@@ -402 +400 @@
             echo '<li id="' . $langcode . '" class="languages ' . ($this->transposh->options->is_viewable_language($langcode) || $this->transposh->options->is_default_language($langcode) ? "active" : "")
             . (!$this->transposh->options->is_viewable_language($langcode) && $this->transposh->options->is_editable_language($langcode) ? "translateable" : "") . '"><div style="float:left">'
-            . display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, false /* $langorigname,$this->transposh->options->get_widget_css_flags() */)
+            . transposh_utils::display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, false /* $langorigname,$this->transposh->options->get_widget_css_flags() */)
             . '<input type="hidden" name="languages[]" value="' . $langcode . ($this->transposh->options->is_viewable_language($langcode) ? ",v" : ",") . ($this->transposh->options->is_viewable_language($langcode) ? ",t" : ",") . '" />'
             . '&nbsp;<span class="langname">' . $langorigname . '</span><span class="langname hidden">' . $langname . '</span></div>';
-            if (in_array($langcode, $GLOBALS['google_languages']))
+            if (in_array($langcode, transposh_consts::$google_languages))
                     echo '<img width="16" height="16" alt="g" class="logoicon" title="Language supported by google translate" src="' . $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_IMG . '/googleicon.png"/>';
-            if (in_array($langcode, $GLOBALS['bing_languages']))
+            if (in_array($langcode, transposh_consts::$bing_languages))
                     echo '<img width="16" height="16" alt="b" class="logoicon" title="Language supported by bing translate" src="' . $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_IMG . '/bingicon.png"/>';
-            if (in_array($langcode, $GLOBALS['rtl_languages']))
+            if (in_array($langcode, transposh_consts::$rtl_languages))
                     echo '<img width="16" height="16" alt="r" class="logoicon" title="Language is written from right to left" src="' . $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_IMG . '/rtlicon.png"/>';
             echo '</li>';

trunk/WordPress/plugin/transposh/wp/transposh_ajax.php

@@ -59 +59 @@
 // set the cookie with ajax, no redirect needed
 elseif (isset($_GET['tr_cookie'])) {
-    setcookie('TR_LNG', get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
-    logger('Cookie ' . get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url));
+    setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
+    logger('Cookie ' . transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url));
 }
 // Set our cookie and return (if no js works - or we are in the default language)
 elseif (isset($_GET['tr_cookie_bck'])) {
-    setcookie('TR_LNG', get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
     if ($_SERVER['HTTP_REFERER']) {
         wp_redirect($_SERVER['HTTP_REFERER']);

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -250 +250 @@
         for ($i = 0; $i < $items; $i++) {
             if (isset($_POST["tk$i"])) {
-                $original = base64_url_decode($_POST["tk$i"]);
+                $original = transposh_utils::base64_url_decode($_POST["tk$i"]);
                 //The original content is encoded as base64 before it is sent (i.e. token), after we
                 //decode it should just the same after it was parsed.
@@ -342 +342 @@
 
         $ref = getenv('HTTP_REFERER');
-        $original = base64_url_decode($token);
+        $original = transposh_utils::base64_url_decode($token);
         logger("Inside history for $original ($token)", 4);
 

trunk/WordPress/plugin/transposh/wp/transposh_options.php

@@ -135 +135 @@
     function get_sorted_langs() {
         if (isset($this->options[SORTED_LANGS]))
-                return array_merge(array_flip(explode(",", $this->options[SORTED_LANGS])), $GLOBALS['languages']);
-        return $GLOBALS['languages'];
+                return array_merge(array_flip(explode(",", $this->options[SORTED_LANGS])), transposh_consts::$languages);
+        return transposh_consts::$languages;
     }
 
@@ -208 +208 @@
     function get_default_language() {
         $default = $this->options[DEFAULT_LANG];
-        if (!$GLOBALS['languages'][$default]) {
-            if (defined('WPLANG') && $GLOBALS['languages'][WPLANG]) {
+        if (!transposh_consts::$languages[$default]) {
+            if (defined('WPLANG') && transposh_consts::$languages[WPLANG]) {
                 $default = WPLANG;
             } else {
@@ -329 +329 @@
      */
     function set_default_language($val) {
-        if (!$GLOBALS['languages'][$val]) {
+        if (!transposh_consts::$languages[$val]) {
             $val = "en";
         }

trunk/WordPress/plugin/transposh/wp/transposh_postpublish.php

@@ -63 +63 @@
                 'post' => $_GET['post'],
                 'preferred' => $this->transposh->options->get_preferred_translator(),
-                'l10n_print_after' => 't_jp.g_langs = ' . json_encode($GLOBALS['google_languages']) . '; t_jp.m_langs = ' . json_encode($GLOBALS['bing_languages']) . ';'/*
+                'l10n_print_after' => 't_jp.g_langs = ' . json_encode(transposh_consts::$google_languages) . '; t_jp.m_langs = ' . json_encode(transposh_consts::$bing_languages) . ';'/*
                       'plugin_url' => $this->transposh_plugin_url,
                       'edit' => ($this->edit_mode? '1' : ''),
@@ -120 +120 @@
                 if (!$this->transposh->options->is_default_language($lang) || $this->transposh->options->get_enable_default_translate()) {
                     // There is no point in returning phrases, languages pairs  that cannot be translated
-                    if (in_array($lang, $GLOBALS['bing_languages']) || in_array($lang, $GLOBALS['google_languages'])) {
+                    if (in_array($lang, transposh_consts::$bing_languages) || in_array($lang, transposh_consts::$google_languages)) {
                         list($translation, $source) = $this->transposh->database->fetch_translation($key, $lang);
                         if (!$translation) {
@@ -134 +134 @@
             // only if a languages list was created we'll need to translate this
             if (is_array($json['p'][$key]['l'])) {
-                $json['p'][$key]['t'] = base64_url_encode($key);
+                $json['p'][$key]['t'] = transposh_utils::base64_url_encode($key);
                 $json['length']++;
             }

trunk/WordPress/plugin/transposh/wp/transposh_widget.php

@@ -52 +52 @@
             $lang = $_POST[LANG_PARAM];
             if ($lang == '') {
-                $lang = get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url);
+                $lang = transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url);
             }
             if ($lang == $this->transposh->options->get_default_language() || $lang == "none")
@@ -60 +60 @@
             // first, we might need to get the original url back
             if ($this->transposh->options->get_enable_url_translate()) {
-                $ref = get_original_url($ref, $this->transposh->home_url, get_language_from_url($ref, $this->transposh->home_url), array($this->transposh->database, 'fetch_original'));
+                $ref = transposh_utils::get_original_url($ref, $this->transposh->home_url, transposh_utils::get_language_from_url($ref, $this->transposh->home_url), array($this->transposh->database, 'fetch_original'));
             }
 
             //remove existing language settings.
-            $ref = cleanup_url($ref, $this->transposh->home_url);
+            $ref = transposh_utils::cleanup_url($ref, $this->transposh->home_url);
             logger("cleaned referrer: $ref, lang: $lang", 4);
 
             if ($lang && $this->transposh->options->get_enable_url_translate()) {
                 // and then, we might have to translate it
-                $ref = translate_url($ref, $this->transposh->home_url, $lang, array(&$this->transposh->database, 'fetch_translation'));
+                $ref = transposh_utils::translate_url($ref, $this->transposh->home_url, $lang, array(&$this->transposh->database, 'fetch_translation'));
                 $ref = str_replace(array('%2F', '%3A', '%3B', '%3F', '%3D', '%26'), array('/', ':', ';', '?', '=', '&'), urlencode($ref));
                 logger("translated to referrer: $ref, lang: $lang", 3);
             }
-            $ref = rewrite_url_lang_param($ref, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $lang, $_POST[EDIT_PARAM]);
+            $ref = transposh_utils::rewrite_url_lang_param($ref, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $lang, $_POST[EDIT_PARAM]);
 
             logger("Widget redirect url: $ref", 3);
@@ -171 +171 @@
 
         //remove any language identifier and find the "clean" url, used for posting and calculating urls if needed
-        $clean_page_url = cleanup_url($page_url, $this->transposh->home_url, true);
+        $clean_page_url = transposh_utils::cleanup_url($page_url, $this->transposh->home_url, true);
         // we need this if we are using url translations
         if ($this->transposh->options->get_enable_url_translate() && $calc_url) {
-            $clean_page_url = get_original_url($clean_page_url, '', $this->transposh->target_language, array($this->transposh->database, 'fetch_original'));
+            $clean_page_url = transposh_utils::get_original_url($clean_page_url, '', $this->transposh->target_language, array($this->transposh->database, 'fetch_original'));
         }
         logger("WIDGET: clean page url: $clean_page_url ,orig: $page_url", 4);
@@ -187 +187 @@
                     ($this->transposh->options->is_default_language($code))) {
                 if ($this->transposh->options->get_enable_url_translate() && $calc_url) {
-                    $page_url = translate_url($clean_page_url, '', $code, array(&$this->transposh->database, 'fetch_translation'));
+                    $page_url = transposh_utils::translate_url($clean_page_url, '', $code, array(&$this->transposh->database, 'fetch_translation'));
                 } else {
                     $page_url = $clean_page_url;
@@ -193 +193 @@
                 // clean $code in default lanaguge
                 if ($calc_url)
-                        $page_url = rewrite_url_lang_param($page_url, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, ($code == $this->transposh->options->get_default_language()) ? '' : $code, $this->transposh->edit_mode);
+                        $page_url = transposh_utils::rewrite_url_lang_param($page_url, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, ($code == $this->transposh->options->get_default_language()) ? '' : $code, $this->transposh->edit_mode);
                 $widget_args[] = array(
                     'lang' => $langname,