Changeset 28969

Timestamp:

Jul 6, 2014, 4:05:05 PM (10 years ago)

Author:

mistic100

Message:

improves regexes parsing plugins metadata

Location:

trunk

Files:

• admin/include/languages.class.php (modified) (2 diffs)
• admin/include/plugins.class.php (modified) (3 diffs)
• admin/include/themes.class.php (modified) (2 diffs)
• include/functions_plugins.inc.php (modified) (1 diff)

trunk/admin/include/languages.class.php

@@ -159 +159 @@
           $plg_data = implode( '', file($path.'/common.lang.php') );
 
-          if ( preg_match("|Language Name: (.*)|", $plg_data, $val) )
+          if (preg_match("|Language Name:\\s*(.+)|", $plg_data, $val))
           {
             $language['name'] = trim( $val[1] );
             $language['name'] = convert_charset($language['name'], 'utf-8', $target_charset);
           }
-          if (preg_match("|Version: (.*)|", $plg_data, $val))
+          if (preg_match("|Version:\\s*([\\w.-]+)|", $plg_data, $val))
           {
             $language['version'] = trim($val[1]);
           }
-          if ( preg_match("|Language URI: (.*)|", $plg_data, $val) )
+          if (preg_match("|Language URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
           {
             $language['uri'] = trim($val[1]);
           }
-          if ( preg_match("|Author: (.*)|", $plg_data, $val) )
+          if (preg_match("|Author:\\s*(.+)|", $plg_data, $val))
           {
             $language['author'] = trim($val[1]);
           }
-          if ( preg_match("|Author URI: (.*)|", $plg_data, $val) )
+          if (preg_match("|Author URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
           {
             $language['author uri'] = trim($val[1]);
@@ -185 +185 @@
             if (is_numeric($extension)) $language['extension'] = $extension;
           }
+
           // IMPORTANT SECURITY !
           $language = array_map('htmlspecialchars', $language);

trunk/admin/include/plugins.class.php

@@ -258 +258 @@
           $plg_data = file_get_contents($path.'/main.inc.php', null, null, 0, 2048);
 
-          if ( preg_match("|Plugin Name: (.*)|", $plg_data, $val) )
+          if (preg_match("|Plugin Name:\\s*(.+)|", $plg_data, $val))
           {
             $plugin['name'] = trim( $val[1] );
           }
-          if (preg_match("|Version: (.*)|", $plg_data, $val))
+          if (preg_match("|Version:\\s*([\\w.-]+)|", $plg_data, $val))
           {
             $plugin['version'] = trim($val[1]);
           }
-          if ( preg_match("|Plugin URI: (.*)|", $plg_data, $val) )
+          if (preg_match("|Plugin URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
           {
             $plugin['uri'] = trim($val[1]);
@@ -274 +274 @@
             $plugin['description'] = trim($desc);
           }
-          elseif ( preg_match("|Description: (.*)|", $plg_data, $val) )
+          elseif (preg_match("|Description:\\s*(.+)|", $plg_data, $val))
           {
             $plugin['description'] = trim($val[1]);
           }
-          if ( preg_match("|Author: (.*)|", $plg_data, $val) )
+          if (preg_match("|Author:\\s*(.+)|", $plg_data, $val))
           {
             $plugin['author'] = trim($val[1]);
           }
-          if ( preg_match("|Author URI: (.*)|", $plg_data, $val) )
+          if (preg_match("|Author URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
           {
             $plugin['author uri'] = trim($val[1]);
@@ -291 +291 @@
             if (is_numeric($extension)) $plugin['extension'] = $extension;
           }
+
           // IMPORTANT SECURITY !
           $plugin = array_map('htmlspecialchars', $plugin);

trunk/admin/include/themes.class.php

@@ -376 +376 @@
             'mobile' => false,
             );
-          $theme_data = implode( '', file($path.'/themeconf.inc.php') );
-
-          if ( preg_match("|Theme Name: (.*)|", $theme_data, $val) )
+          $theme_data = implode('', file($path.'/themeconf.inc.php'));
+
+          if (preg_match("|Theme Name:\\s*(.+)|", $theme_data, $val))
           {
             $theme['name'] = trim( $val[1] );
           }
-          if (preg_match("|Version: (.*)|", $theme_data, $val))
+          if (preg_match("|Version:\\s*([\\w.-]+)|", $theme_data, $val))
           {
             $theme['version'] = trim($val[1]);
           }
-          if ( preg_match("|Theme URI: (.*)|", $theme_data, $val) )
+          if (preg_match("|Theme URI:\\s*(https?:\\/\\/.+)|", $theme_data, $val))
           {
             $theme['uri'] = trim($val[1]);
@@ -394 +394 @@
             $theme['description'] = trim($desc);
           }
-          elseif ( preg_match("|Description: (.*)|", $theme_data, $val) )
+          elseif (preg_match("|Description:\\s*(.+)|", $theme_data, $val))
           {
             $theme['description'] = trim($val[1]);
           }
-          if ( preg_match("|Author: (.*)|", $theme_data, $val) )
+          if (preg_match("|Author:\\s*(.+)|", $theme_data, $val))
           {
             $theme['author'] = trim($val[1]);
           }
-          if ( preg_match("|Author URI: (.*)|", $theme_data, $val) )
+          if (preg_match("|Author URI:\\s*(https?:\\/\\/.+)|", $theme_data, $val))
           {
             $theme['author uri'] = trim($val[1]);

trunk/include/functions_plugins.inc.php

@@ -381 +381 @@
       if ($i < 2) continue; // first lines are typically "<?php" and "/*"
 
-      if (preg_match('#Version: ([\\w.-]+)#', $line, $matches))
+      if (preg_match('/Version:\\s*([\\w.-]+)/', $line, $matches))
       {
         $fs_version = $matches[1];