Changeset 28862

Timestamp:

Jun 29, 2014, 11:13:14 PM (10 years ago)

Author:

mistic100

Message:

update regexes

Location:

extensions/plugin_lang_analysis

Files:

• include/functions.inc.php (modified) (6 diffs)
• main.inc.php (modified) (2 diffs)

extensions/plugin_lang_analysis/include/functions.inc.php

@@ -103 +103 @@
   {
     // l10n
-    if (preg_match_all('#l10n\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})#', $line, $matches))
+    if (preg_match_all('#l10n\\(\s*["\']{1}(.*?)["\']{1}\s*[,)]{1}#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -111 +111 @@
     }
     // translate
-    if (preg_match_all('#\{(?:\\\\{0,1})(?:["\']{1})(.*?)(?:\\\\{0,1})(?:["\']{1})\|(?:@{0,1})translate#', $line, $matches))
+    if (preg_match_all('#\\{\\\\{0,1}["\']{1}(.*?)\\\\{0,1}["\']{1}\\|@?translate#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -119 +119 @@
     }
     // translate_dec
-    if (preg_match_all('#translate_dec:(?:\\\\{0,1})(?:["\']{1})(.*?)(?:\\\\{0,1})(?:["\']{1}):(?:\\\\{0,1})(?:["\']{1})(.*?)(?:\\\\{0,1})(?:["\']{1})}#', $line, $matches))
+    if (preg_match_all('#translate_dec:\\\\{0,1}["\']{1}(.*?)\\\\{0,1}["\']{1}:\\\\{0,1}["\']{1}(.*?)\\\\{0,1}["\']{1}}#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -128 +128 @@
     }
     // l10n_dec on one line
-    if (preg_match_all('#l10n_dec\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})(?:\s*),(?:\s*)(?:["\']{1})(.*?)(?:["\']{1})#', $line, $matches))
+    if (preg_match_all('#l10n_dec\\(\s*["\']{1}(.*?)["\']{1}\s*,\s*["\']{1}(.*?)["\']{1}#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)
@@ -146 +146 @@
       }
       
-      if (preg_match_all('#l10n_dec\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})(?:\s*),(?:\s*)(?:["\']{1})(.*?)(?:["\']{1})#', $three_lines, $matches))
+      if (preg_match_all('#l10n_dec\\(\s*["\']{1}(.*?)["\']{1}\s*,\s*["\']{1}(.*?)["\']{1}#', $three_lines, $matches))
       {
         for ($j=0; $j<count($matches[1]); ++$j)
@@ -156 +156 @@
     }
     // l10n_args
-    if (preg_match_all('#get_l10n_args\((?:\s*)(?:["\']{1})(.*?)(?:["\']{1})#', $line, $matches))
+    if (preg_match_all('#get_l10n_args\\(\s*["\']{1}(.*?)["\']{1}\s*[,)]{1}#', $line, $matches))
     {
       for ($j=0; $j<count($matches[1]); ++$j)

extensions/plugin_lang_analysis/main.inc.php

@@ -18 +18 @@
 global $conf;
 
-defined('PLA_ID') or define('PLA_ID', basename(dirname(__FILE__)));
+define('PLA_ID',    basename(dirname(__FILE__)));
 define('PLA_PATH' , PHPWG_PLUGINS_PATH . PLA_ID . '/');
 define('PLA_ADMIN', get_root_url() . 'admin.php?page=plugin-' . PLA_ID);
@@ -31 +31 @@
 }
 
-function pla_add_menu_item($content, &$smarty)
+function pla_add_menu_item($content)
 {
-  $search = 'href="{$U_UPDATES}">{\'Updates\'|@translate}</a></li>';
+  $search = '{\'Updates\'|@translate}</a></li>';
   $add = '<li><a class="icon-language" href="'.PLA_ADMIN.'">Plugin Language Analysis</a></li>';
   return str_replace($search, $search."\n".$add, $content);
 }
-
-?>