Changeset 634729

Timestamp:

12/06/2012 07:15:55 AM (13 years ago)

Author:

codestyling

Message:

release 1.99.28

Location:

codestyling-localization/trunk

Files:

• codestyling-localization.php (modified) (10 diffs)
• readme.txt (modified) (2 diffs)

codestyling-localization/trunk/codestyling-localization.php

@@ -4 +4 @@
 Plugin URI: http://www.code-styling.de/english/development/wordpress-plugin-codestyling-localization-en
 Description: You can manage and edit all gettext translation files (*.po/*.mo) directly out of your WordPress Admin Center without any need of an external editor. It automatically detects the gettext ready components like <b>WordPress</b> itself or any <b>Plugin</b> / <b>Theme</b> supporting gettext, is able to scan the related source files and can assists you using <b>Google Translate API</b> or <b>Microsoft Translator API</b> during translation.This plugin supports <b>WordPress MU</b> and allows explicit <b>WPMU Plugin</b> translation too. It newly introduces ignore-case and regular expression search during translation. <b>BuddyPress</b> and <b>bbPress</b> as part of BuddyPress can be translated too. Produces transalation files are 100% compatible to <b>PoEdit</b>.
-Version: 1.99.27
+Version: 1.99.28
 Author: Heiko Rabe
 Author URI: http://www.code-styling.de/english/
@@ -66 +66 @@
 }
 if (!function_exists('plugins_url')) {
-    function plugins_url($plugin) {  return WP_PLUGIN_URL . '/' . plugin_basename($plugin); }
+    function plugins_url($plugin) {  
+        return WP_PLUGIN_URL . $plugin; 
+    }
 } 
 
@@ -92 +94 @@
         define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH.  For back compat.
 
-    define("CSP_PO_PLUGINPATH", "/" . plugin_basename( dirname(__FILE__) ));
+    define("CSP_PO_PLUGINPATH", "/" . dirname(plugin_basename( __FILE__ )));
 
     define('CSP_PO_TEXTDOMAIN', 'codestyling-localization');
@@ -2318 +2320 @@
 }
 
-function csp_try_jquery_document_ready_hardening($script) {
-    $pattern = 'jQuery(document).ready(';
-    if ($pos = stripos($script,$pattern) !== false) {
-        $counter = 0;
-        $startofready = -1;
-        $endofready = -1;
-        for($i=$pos+strlen($pattern); $i < strlen($script); $i++) {
-            switch(substr($script, $i, 1)) {
-                case '{':
-                    $counter++;
-                    if ($counter == 1) {
-                        $startofready = $i;
-                    }
-                    break;
-                case '}';
-                    $counter--;
-                    if ($counter == 0) {
-                        $endofready = $i;
-                        $i = strlen($script);
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-        if ($startofready != -1 && $endofready != -1) {
-            $sub = substr($script, $startofready+1, $endofready-$startofready-2);
-            $script = str_replace($sub, "try{".$sub."}catch(e){csp_self_protection.runtime.push(e.message);}" , $script);
-        }
-    }
-    return $script;
+function csp_try_jquery_document_ready_hardening_pattern($content, $pattern) {
+    $pieces = explode($pattern, $content);
+    if (count($pieces) > 1) {
+        for ($loop=1; $loop<count($pieces); $loop++) {
+            $counter = 0;
+            $startofready = -1;
+            $endofready = -1;
+            $script  = $pieces[$loop];
+            for($i=0; $i < strlen($script); $i++) {
+                switch(substr($script, $i, 1)) {
+                    case '{':
+                        $counter++;
+                        if ($counter == 1) {
+                            $startofready = $i;
+                        }
+                        break;
+                    case '}';
+                        $counter--;
+                        if ($counter == 0) {
+                            $endofready = $i;
+                            $i = strlen($script);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+            if ($startofready != -1 && $endofready != -1) {
+                if ($script[$endofready+1] == ')') $endofready++;
+                $sub = substr($script, $startofready+1, $endofready-$startofready-2);
+                $pieces[$loop] = str_replace($sub, "\ntry{\n".$sub."\n}catch(e){csp_self_protection.runtime.push(e.message);}" , $script);
+            }           
+        }
+    }
+    return implode($pattern, $pieces);
+}
+
+function csp_try_jquery_document_ready_hardening($content) {
+    $script = csp_try_jquery_document_ready_hardening_pattern($content, 'jQuery(document).ready(');
+    return csp_try_jquery_document_ready_hardening_pattern($script, 'jQuery(function()');   
 }
 
@@ -2355 +2366 @@
     'old_handler' => null,
     'messages' => array()
-    
 );
 
@@ -2475 +2485 @@
     $csp_traced_php_errors['messages'][] = "$errname <strong>Error: [$errno] </strong> $errstr <strong>$errfile</strong> on line <strong>$errline</strong>";
     if ($csp_traced_php_errors['old_handler'] != null && !$csp_traced_php_errors['suppress_errors']) {
-        call_user_func($csp_traced_php_errors['old_handler'], $errno, $errstr, $errfile, $errline);
+        return call_user_func($csp_traced_php_errors['old_handler'], $errno, $errstr, $errfile, $errline);
     }
     return $csp_traced_php_errors['suppress_errors'];
@@ -2482 +2492 @@
 function csp_trace_php_errors() {
     global $csp_traced_php_errors;
-    $csp_traced_php_errors['suppress_errors'] = (is_admin() && isset($_REQUEST['page']) && $_REQUEST['page'] == 'codestyling-localization/codestyling-localization.php');
+    
+    $csp_traced_php_errors['suppress_errors'] = (is_admin() && isset($_REQUEST['page']) && ($_REQUEST['page'] == 'codestyling-localization/codestyling-localization.php'));
     if(defined('DOING_AJAX') && DOING_AJAX && isset($_POST['action'])) {
         $actions = array(
@@ -2505 +2516 @@
             'csp_self_protection_result'
         );
-        if (in_array($_POST['action'], $actions)) $csp_traced_php_errors['suppress_errors'] = true;
-    }
+        if (in_array($_POST['action'], $actions))
+            $csp_traced_php_errors['suppress_errors'] = true;
+    }
+    
     if (function_exists('set_error_handler'))
         $csp_traced_php_errors['old_handler'] = set_error_handler("csp_php_error_handler", E_ALL);
@@ -2831 +2844 @@
 }
 function csp_redirect_prototype_js($src, $handle) {
-    $handles = array(
-        'prototype' => 'prototype',
-        'scriptaculous-root' => 'scriptaculous',
-        'scriptaculous-effects' => 'effects'
-    );
-    //load own older versions of the scripts that are working!
-    if (isset($handles[$handle])) {
-        return CSP_PO_BASE_URL.'/js/'.$handles[$handle].'.js';
+    global $wp_version;
+    if (version_compare($wp_version, '3.5-alpha', '>=')) {
+        $handles = array(
+            'prototype'             => 'prototype',
+            'scriptaculous-root'    => 'wp-scriptaculous',
+            'scriptaculous-effects' => 'effects'
+        );
+        //load own older versions of the scripts that are working!
+        if (isset($handles[$handle])) {
+            return CSP_PO_BASE_URL.'/js/'.$handles[$handle].'.js';
+        }
     }
     return $src;
@@ -2845 +2861 @@
 function csp_load_po_edit_admin_page(){
 
-    add_filter('print_scripts_array', 'csp_filter_print_scripts_array');
+    add_filter('print_scripts_array', 'csp_filter_print_scripts_array', 0);
     add_action('admin_enqueue_scripts', 'csp_start_protection', 0);
     add_action('in_admin_footer', 'csp_start_protection', 0);
     add_action('admin_head', 'csp_self_script_protection_head', 9999);
     add_action('admin_print_footer_scripts', 'csp_self_script_protection_footer', 9999);
-    add_filter('script_loader_src', 'csp_redirect_prototype_js', 10, 2);
+    add_filter('script_loader_src', 'csp_redirect_prototype_js', 10, 9999);
 
     wp_enqueue_script( 'thickbox' );

codestyling-localization/trunk/readme.txt

@@ -3 +3 @@
 Tags: gettext, language, translation, poedit, localization, plugin, wpmu, buddypress, bbpress, themes, translator, l10n, i18n, google-translate, microsoft-translate, compatibility, mo, po, po-mo, polyglot
 Requires at least: 2.5
-Tested up to: 3.5-RC1
-Stable tag: 1.99.27
+Tested up to: 3.5-RC2
+Stable tag: 1.99.28
 
 You can manage and edit all gettext translation files (*.po/*.mo) directly out of WordPress Admin Center without any need of an external editor.
@@ -82 +82 @@
 == Changelog ==
 
+= Version 1.99.28 =
+* Bugfix: function missing in very old WordPress versions covered
+* Bugfix: Scripting Guard now detects broken ready handler of injected javascripts
+* Bugfix: redirection of prototype/scriptaculous done only, if WP version >= 3.5-alpha
+
 = Version 1.99.27 = 
 * Bugfix: WordPress version 3.5 starts removing prototype.js and scriptaculous but falls back to google CDN include which brokes JSON requests