Changeset 1073922

Timestamp:

01/23/2015 07:37:04 AM (11 years ago)

Author:

chsxf

Message:

[Working draft] User-level lang protection

• Added partial support for user-level lang protection under new

workflow

Location:

mqtranslate/trunk

Files:

• mqtranslate.js (modified) (3 diffs)
• mqtranslate.php (modified) (1 diff)
• mqtranslate_configuration.php (modified) (1 diff)
• mqtranslate_core.php (modified) (2 diffs)
• mqtranslate_xhaleera_addons.php (modified) (3 diffs)

mqtranslate/trunk/mqtranslate.js

@@ -680 +680 @@
     var langSwitchWrap=qtrans_ce('ul', {className: 'qtrans-lang-switch-wrap wp-ui-primary'});
     {
-        //var header=w.getElementsByTagName('h2')[0];
-        //header.parentNode.insertBefore(langSwitchWrap, header.nextElementSibling);
         var w=document.getElementsByClassName('wrap')[0];
         var f=w.getElementsByTagName('form')[0];
@@ -694 +692 @@
 {
     var langs=qTranslateConfig.enabled_languages, langNames=qTranslateConfig.language_name, activeLanguage=initial_language;
+    var editableLangs = qTranslateConfig.editable_languages || langs;
+    var visibleLangs = qTranslateConfig.visible_languages || new Array();
     var tabSwitches={};
     var onTabSwitch=[];
@@ -718 +718 @@
     for(var i=0; i<langs.length; ++i)
     {
+        var lang=langs[i];
+        
+        var langName = langNames[lang];
+        var editableIndex = editableLangs.indexOf(lang);
+        if (editableIndex < 0) {
+            if (visibleLangs.indexOf(lang) < 0)
+                continue;
+            langName += ' (Read Only)';
+        }
+        
         //var flags_location=qTranslateConfig.WP_CONTENT_URL+qTranslateConfig.flag_location;
         var flag_location=qTranslateConfig.flag_location;
-        var lang=langs[i];
         var tabSwitch=qtrans_ce ('li', {lang: lang, className: 'qtrans-lang-switch', onclick: switchTab }, target );
         qtrans_ce('img', {src: flag_location+qTranslateConfig.flag[lang]}, tabSwitch);
-        qtrans_ce('span', {innerHTML: langNames[lang]}, tabSwitch);
+        qtrans_ce('span', {innerHTML: langName}, tabSwitch);
         tabSwitches[lang]=tabSwitch;
         if ( activeLanguage == lang )

mqtranslate/trunk/mqtranslate.php

@@ -502 +502 @@
 
 // User-level language protection
-$q_config['ul_lang_protection'] = 1;
+$q_config['ul_lang_protection'] = 0;
 
 // Custom post types modification

mqtranslate/trunk/mqtranslate_configuration.php

@@ -85 +85 @@
         }
     }
+    
+    $config = apply_filters('pre_qtranslate_js', $config);
 ?>
     <script type="text/javascript">

mqtranslate/trunk/mqtranslate_core.php

@@ -983 +983 @@
 */
 
-function qtrans_split($text, $quicktags = true) {
+function qtrans_split($text, $quicktags = true, array &$languageMap = NULL) {
     global $q_config;
     $split_regex = "#(<!--:[a-z]{2}-->|<!--:-->|\[:[a-z]{2}\])#ism";
@@ -995 +995 @@
     foreach($blocks as $block) {
         # detect language tags
-        if(preg_match("#^<!--:([a-z]{2})-->$#ism", $block, $matches)) {
-            $current_language = $matches[1];
-            if(!qtrans_isEnabled($current_language)) $current_language = false;
+        if (preg_match("#^<!--:([a-z]{2})-->$#ism", $block, $matches)) {
+            if (qtrans_isEnabled($matches[1])) {
+                $current_language = $matches[1];
+                if ($languageMap !== NULL)
+                    $languageMap[$current_language] = false;
+            }
+            else
+                $current_language = false;
             continue;
         // detect quicktags
         } elseif($quicktags && preg_match("#^\[:([a-z]{2})\]$#ism", $block, $matches)) {
-            $current_language = $matches[1];
-            if(!qtrans_isEnabled($current_language)) $current_language = false;
+            if (qtrans_isEnabled($matches[1])) {
+                $current_language = $matches[1];
+                if ($languageMap !== NULL)
+                    $languageMap[$current_language] = true;
+            }
+            else
+                $current_language = false;
             continue;
         // detect ending tags
-        } elseif(preg_match("#^<!--:-->$#ism", $block, $matches)) {
+        }
+        elseif (preg_match("#^<!--:-->$#ism", $block, $matches)) {
             $current_language = false;
             continue;
         }
+        
         // correctly categorize text block
-        if($current_language){
+        if ($current_language) {
             $result[$current_language] .= $block;
             $current_language = false;
-        }else{
-            foreach($q_config['enabled_languages'] as $language) {
+        }
+        else {
+            foreach ($q_config['enabled_languages'] as $language)
                 $result[$language] .= $block;
-            }
         }
     }

mqtranslate/trunk/mqtranslate_xhaleera_addons.php

@@ -161 +161 @@
         return;
     
-    $titleMap = array();
-    $contentMap = array();
+    $fields = array('title', 'content', 'excerpt');
+    
+    $containers = array();
+    $maps = array();
     
     $cu = wp_get_current_user();
     if ($cu->has_cap('edit_users') || empty($q_config['ul_lang_protection']))
     {
-        $title = qtrans_split($after->post_title, true, $titleMap);
-        foreach ($title as $k => $v) {
-            if (qtrans_isEmptyContent($v))
-                unset($title[$k]);
-        }
-        $content = qtrans_split($after->post_content, true, $contentMap);
-        foreach ($content as $k => $v) {
-            if (qtrans_isEmptyContent($v))
-                unset($content[$k]);
-        }
-    }
-    else
-    {
-        $titleBeforeMap = array();
-        $titleBefore = qtrans_split($before->post_title, true, $titleBeforeMap);
-        $titleAfter = qtrans_split($after->post_title, true, $titleMap);
-        foreach ($titleAfter as $k => $v) {
-            if (!mqtrans_currentUserCanEdit($k))
-                unset($titleAfter[$k], $titleMap[$k]);
-        }
-        $title = array_merge($titleBefore, $titleAfter);
-        $titleMap = array_merge($titleBeforeMap, $titleMap);
-
-        $contentBeforeMap = array();
-        $contentBefore = qtrans_split($before->post_content, true, $contentBeforeMap);
-        $contentAfter = qtrans_split($after->post_content, true, $contentMap);
-        foreach ($contentAfter as $k => $v) {
-            if (qtrans_isEmptyContent($v) || !mqtrans_currentUserCanEdit($k))
-                unset($contentAfter[$k], $contentMap[$k]);
-        }
-        $content = array_merge($contentBefore, $contentAfter);
-        $contentMap = array_merge($contentBeforeMap, $contentMap);
-    }
-    
-    $data = array('post_title' => qtrans_join($title, $titleMap), 'post_content' => qtrans_join($content, $contentMap));
+        foreach ($fields as $f) {
+            $containers[$f] = qtrans_split($after->{"post_{$f}"}, true, $maps[$f]);
+            foreach ($containers[$f] as $k => $v) {
+                if (qtrans_isEmptyContent($v))
+                    unset($containers[$f]);
+            }
+        }
+    }
+    else
+    {
+        foreach ($fields as $f) {
+            $beforeMap = array();
+            $before = qtrans_split($before->{"post_{$f}"}, true, $beforeMap);
+            $after = qtrans_split($after->{"post_{$f}"}, true, $maps[$f]);
+            foreach ($after as $k => $v) {
+                if (!mqtrans_currentUserCanEdit($k))
+                    unset($after[$k], $maps[$f][$k]);
+            }
+            $containers[$f] = array_merge($before, $after);
+            $maps[$f] = array_merge($beforeMap, $maps[$f]);
+        }
+    }
+    
+    $data = array();
+    foreach ($fields as $f)
+        $data["post_{$f}"] = qtrans_join($containers[$f], $maps[$f]);
     if (get_magic_quotes_gpc())
         $data = stripslashes_deep($data);
@@ -247 +240 @@
                     <label for="ul_lang_protection"><input type="checkbox" name="ul_lang_protection" id="ul_lang_protection" value="1"<?php echo ($q_config['ul_lang_protection'])?' checked="checked"':''; ?>/> <?php _e('Enable user-level language protection', 'mqtranslate'); ?></label>
                     <br />
-                    <small><?php _e('When enabled, this option allows you to select which language is editable on a user-level account basis.', 'mqtranslate') ?></small>
+                    <small><?php _e('When enabled, this option allows you to select which language is editable on a user-level account basis. NOTE: Only post title, content and excerpt are supported at this time.', 'mqtranslate') ?></small>
                 </td>
             </tr>
@@ -268 +261 @@
 }
 
+function mqtrans_preConfigJS($config) {
+    global $q_config;
+    
+    if (empty($q_config['ul_lang_protection']) || current_user_can('edit_users'))
+        return $config;
+    
+    $config['editable_languages'] = array();
+    $config['visible_languages'] = array();
+    foreach ($config['enabled_languages'] as $lang) {
+        if (mqtrans_currentUserCanEdit($lang))
+            $config['editable_languages'][] = $lang;
+        else if (mqtrans_currentUserCanView($lang))
+            $config['visible_languages'][] = $lang;
+    }
+    
+    return $config;
+}
+
 if (!defined('WP_ADMIN'))
     add_filter('get_post_metadata', 'mqtrans_filterPostMetaData', 10, 4);
+
+add_filter('pre_qtranslate_js',             'mqtrans_preConfigJS');
 
 add_action('edit_user_profile',             'mqtrans_userProfile');