Changeset 119

Timestamp:

03/29/2009 03:17:58 PM (3 years ago)

Author:

amir

Message:

Cleaned up the code allowing to edit and post translation.

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (4 diffs)
• transposh_admin.php (modified) (2 diffs)
• transposh_db.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/transposh.php

@@ -238 +238 @@
         $home_url_quoted = preg_replace("/\//", "\\/", $home_url_quoted);
 
-        $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translator();
+        $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translation_allowed();
 
         if($wp_rewrite->using_permalinks() && get_option(ENABLE_PERMALINKS_REWRITE))
@@ -478 +478 @@
  */
 function add_transposh_css() {
-        global $plugin_url, $wp_query;
-        if (!isset($wp_query->query_vars[LANG_PARAM]))
-        {
+        global $plugin_url;
+        
+        if(!is_translation_allowed())
+        {
+                //translation not allowed - no need for the transposh.css       
                 return;
         }
-
-        $lang = $wp_query->query_vars[LANG_PARAM];
-        $editable_langs = get_option(EDITABLE_LANGS);
-
-        if(strpos($editable_langs, $lang) === FALSE)
-        {
-                //not an editable language - no need for any css.
-                return;
-        }
-
         //include the transposh.css
         wp_enqueue_style("transposh","$plugin_url/transposh.css",array(),'1.0.1');
@@ -505 +497 @@
         global $plugin_url, $wp_query, $lang, $home_url,  $enable_auto_translate;
 
-        if (!isset($wp_query->query_vars[LANG_PARAM]))
-        {
+        if(!is_translation_allowed())
+        {
+                //translation not allowed - no need for any js. 
                 return;
         }
-        $lang = $wp_query->query_vars[LANG_PARAM];
-        $editable_langs = get_option(EDITABLE_LANGS);
-
-        if(strpos($editable_langs, $lang) === FALSE)
-        {
-                //not an editable language - no need for any js.
-                return;
-        }
-
+        
         $is_edit_param_enabled = $wp_query->query_vars[EDIT_PARAM];
-
         if (!$is_edit_param_enabled && ! $enable_auto_translate)
         {
-                //TODO: check permission later - for now just make sure we don't load the
-                //js code when it is not needed
+                //Not in any translation mode - no need for any js.
                 return;
         }
@@ -548 +531 @@
 }
 
+
+/**
+ * Determine if the currently selected language (taken from the query parameters) is in the admin's list 
+ * of editable languages and the current user is allowed to translate. 
+ *  
+ * @return TRUE if translation allowed otherwise FALSE
+ */
+function is_translation_allowed()
+{
+        global $wp_query;
+
+        if(!is_translator())
+        {
+                return FALSE;
+        }
+        
+        if (!isset($wp_query->query_vars[LANG_PARAM]))
+        {
+                return FALSE;
+        }
+        
+        $lang = $wp_query->query_vars[LANG_PARAM];
+        return is_editable_lang($lang);
+}
+
+/**
+ * Determine if the given language in on the list of editable languages
+ * @return TRUE if editable othewise FALSE
+ */
+function is_editable_lang($lang)
+{
+        $editable_langs = get_option(EDITABLE_LANGS);
+
+        if(strpos($editable_langs, $lang) === FALSE)
+        {
+                //not an editable language
+                return FALSE;
+        }
+        
+        return TRUE;
+}
+
 //Register callbacks
 add_filter('query_vars', 'parameter_queryvars' );

trunk/WordPress/plugin/transposh/transposh_admin.php

@@ -140 +140 @@
         $langs = get_option(EDITABLE_LANGS);
 
-        if(strstr($langs, $code))
+        if(strpos($langs, $code) !== FALSE)
         {
                 return 'checked="checked"';
@@ -155 +155 @@
 {
         $langs = get_option(VIEWABLE_LANGS);
-        if(strstr($langs, $code))
+        if(strpos($langs, $code) !== FALSE)
         {
                 return 'checked="checked"';

trunk/WordPress/plugin/transposh/transposh_db.php

@@ -118 +118 @@
         }
 
-        //Check that use is allowed to translate
-        if(!is_translator())
+        //Check that user is allowed to translate this language
+        if(!is_translator() || !is_editable_lang($lang))
         {
                 logger("Unauthorized translation attempt " . $_SERVER['REMOTE_ADDR'] , 1);
+                header("HTTP/1.0 401 Unauthorized translation");
+                exit;
         }