Changeset 103

Timestamp:

03/26/2009 09:52:04 AM (3 years ago)

Author:

amir

Message:

Some more refactoring and cleanup.

Location:

trunk/WordPress/plugin/transposh

Files:

• globals.php (added)
• parser.php (modified) (3 diffs)
• transposh.php (modified) (7 diffs)
• transposh_widget.php (modified) (5 diffs)

trunk/WordPress/plugin/transposh/parser.php

@@ -26 +26 @@
 require_once("logging.php");
 require_once("constants.php");
-
-//The language to which the current page will be translated to.
-$lang;
+require_once("globals.php");
 
 //The html page which starts contains the content being translated
@@ -45 +43 @@
 $tr_mark = 0;
 
-//Is the current use is in edit mode.
-$is_edit_mode = FALSE;
-
 //Segment identifier within tags (span/img) mainly for use by js code on the client
 $segment_id = 0;
@@ -56 +51 @@
 //Is current position within the channel tag, i.e. RSS feed
 $is_in_channel = FALSE;
-
-//Indicates whether automatic translation (i.e. google) is enabled for this page
-$enable_auto_translate;
 
 /*

trunk/WordPress/plugin/transposh/transposh.php

@@ -29 +29 @@
 require_once("logging.php");
 require_once("constants.php");
+require_once("globals.php");
 require_once("transposh_db.php");
 require_once("parser.php");
@@ -34 +35 @@
 require_once("transposh_admin.php");
 
-//
-// Global variables
-//
-
-//Home url of the blog
-$home_url;
-
-//Home url of the blog - already quoted and ready for regex
-$home_url_quoted;
-
-//The url pointing to the base of the plugin
-$plugin_url;
-
 //Error message displayed for the admin in case of failure
 $admin_msg;
@@ -110 +98 @@
 function process_anchor_tag($start, $end)
 {
-        global $home_url, $home_url_quoted, $lang, $is_edit_mode, $wp_rewrite;
+        global $home_url, $home_url_quoted, $lang, $is_edit_mode, $enable_permalinks_rewrite;
 
         $href = get_attribute($start, $end, 'href');
@@ -125 +113 @@
         }
 
-        $use_params = FALSE;
+        $use_params = !$enable_permalinks_rewrite;
 
         //Only use params if permalinks are not enabled.
         //don't fix links pointing to real files as it will cause that the
         //web server will not be able to locate them
-        if(!$wp_rewrite->using_permalinks() ||
-        stripos($href, '/wp-admin') !== FALSE   ||
-        stripos($href, '/wp-content') !== FALSE ||
-        stripos($href, '/wp-login') !== FALSE   ||
-        stripos($href, '/.php') !== FALSE)
+        if(stripos($href, '/wp-admin') !== FALSE   ||
+           stripos($href, '/wp-content') !== FALSE ||
+           stripos($href, '/wp-login') !== FALSE   ||
+           stripos($href, '/.php') !== FALSE)
         {
                 $use_params = TRUE;
@@ -153 +140 @@
  * param use_params_only - use only parameters as modifiers, i.e. not permalinks
  */
-function rewrite_url_lang_param($url, $lang, $is_edit, $use_params_only)
-{
-        global $home_url, $home_url_quoted;
-
-        if(!get_option(ENABLE_PERMALINKS_REWRITE))
+function rewrite_url_lang_param($url, $lang, $is_edit, $use_params_only=FALSE)
+{
+        global $home_url, $home_url_quoted, $enable_permalinks_rewrite;
+
+        if(!$enable_permalinks_rewrite)
         {
                 //override the use only params - admin configured system to not touch permalinks
@@ -233 +220 @@
 function init_global_vars()
 {
-        global $home_url, $home_url_quoted, $plugin_url, $enable_auto_translate;
+        global $home_url, $home_url_quoted, $plugin_url, $enable_auto_translate, 
+              $enable_permalinks_rewrite, $wp_rewrite;
 
         $home_url = get_option('home');
@@ -243 +231 @@
 
         $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translator();
+        
+        if($wp_rewrite->using_permalinks() && get_option(ENABLE_PERMALINKS_REWRITE))
+        {
+                $enable_permalinks_rewrite = TRUE;
+        }
 }
 

trunk/WordPress/plugin/transposh/transposh_widget.php

@@ -35 +35 @@
                 logger("Enter " . __METHOD__, 4);
 
-                global $wp_rewrite;
-
                 $ref=getenv('HTTP_REFERER');
                 $lang = $_POST[LANG_PARAM];
@@ -45 +43 @@
                 if($lang != "none")
                 {
-                        $use_params_only = !$wp_rewrite->using_permalinks();
                         $is_edit = $_POST[EDIT_PARAM];
-
-                        $ref = rewrite_url_lang_param($ref, $lang, $is_edit, $use_params_only);
+                        $ref = rewrite_url_lang_param($ref, $lang, $is_edit);
                 }
 
@@ -83 +79 @@
 {
         logger("Enter " . __METHOD__, 4);
-        global $languages, $wp_query, $wp_rewrite, $plugin_url;
+        global $languages, $wp_query, $plugin_url;
         extract($args);
 
@@ -109 +105 @@
             echo "<div style=\"text-align: left;\" class=\"" . NO_TRANSLATE_CLASS . "\" >";
 
-            $using_permalinks = $wp_rewrite->using_permalinks();
-
-                        foreach($languages as $code => $lang2)
+            foreach($languages as $code => $lang2)
                         {
                                 list($language,$flag) = explode (",",$lang2);
@@ -122 +116 @@
                                    ($is_translator && strstr($editable_langs, $code)))
                                 {
-                //$page_url = cleanup_url($page_url);
-                                        $page_url2 = rewrite_url_lang_param($page_url, $code, $is_edit, !$using_permalinks);
+                                $page_url2 = rewrite_url_lang_param($page_url, $code, $is_edit);
 
                                         echo "<a href=\"" . $page_url2 . "\">".