Changeset 141

Timestamp:

03/30/2009 07:47:52 PM (3 years ago)

Author:

amir

Message:

Enable auto translation without requiring to the user to be a translator.

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (6 diffs)
• transposh_db.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/transposh.php

@@ -64 +64 @@
 
         if (($wp_query->query_vars[EDIT_PARAM] == "1" || $wp_query->query_vars[EDIT_PARAM] == "true") &&
-             is_translation_allowed())
+             is_editing_permitted())
         {
                 $is_edit_mode = TRUE;
@@ -338 +338 @@
         global $plugin_url;
         
-        if(!is_translation_allowed())
+        if(!is_editing_permitted() && !is_auto_translate_permitted())
         {
                 //translation not allowed - no need for the transposh.css       
@@ -355 +355 @@
         global $plugin_url, $wp_query, $lang, $home_url,  $enable_auto_translate;
 
-        if(!is_translation_allowed())
+        $enable_auto_translate = is_auto_translate_permitted();
+        if(!is_editing_permitted() && !$enable_auto_translate)
         {
                 //translation not allowed - no need for any js. 
@@ -362 +363 @@
         
         $is_edit_param_enabled = $wp_query->query_vars[EDIT_PARAM];
-        $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translation_allowed();
         
         if (!$is_edit_param_enabled && !$enable_auto_translate)
@@ -398 +398 @@
  * @return TRUE if translation allowed otherwise FALSE
  */
-function is_translation_allowed()
+function is_editing_permitted()
 {
         global $wp_query;
@@ -433 +433 @@
 }
 
+
+/**
+ * Determine if the currently selected language (taken from the query parameters) is in the admin's list 
+ * of editable languages and that automatic translation has been enabled.
+ * Note that any user can auto translate. i.e. ignore permissions.  
+ *  
+ * @return TRUE if automatic translation allowed otherwise FALSE
+ */
+function is_auto_translate_permitted()
+{
+        global $wp_query;
+
+        if(!get_option(ENABLE_AUTO_TRANSLATE))
+        {
+                return FALSE;
+        }
+        
+        if (!isset($wp_query->query_vars[LANG_PARAM]))
+        {
+                return FALSE;
+        }
+        
+        $lang = $wp_query->query_vars[LANG_PARAM];
+        return is_editable_lang($lang);
+}
 /**
  * Callback from parser allowing to overide the global setting of url rewriting using permalinks.

trunk/WordPress/plugin/transposh/transposh_db.php

@@ -122 +122 @@
         header("Transposh: version_". DB_VERSION);
         
-        //Check that user is allowed to translate this language
-        if(!is_translator() || !is_editable_lang($lang))
+        //Check permissions, first the lanugage must be on the edit list. Then either the user
+        //is a translator or automatic translation if it is enabled. 
+        if(!(is_editable_lang($lang) && 
+            (is_translator() || ($source == 1 && get_option(ENABLE_AUTO_TRANSLATE)))))
         {
                 logger("Unauthorized translation attempt " . $_SERVER['REMOTE_ADDR'] , 1);