iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-02 03:22:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

improves regexes parsing plugins metadata

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@28969 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-07-06 14:05:05 +00:00
parent dbedfd173f
commit 1633d8ffaa
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
admin/include/themes.class.php
View File

@@ -375,17 +375,17 @@ SELECT
'author' => '',
'mobile' => false,
);
$theme_data = implode( '', file($path.'/themeconf.inc.php') );
$theme_data = implode('', file($path.'/themeconf.inc.php'));
if ( preg_match("|Theme Name: (.*)|", $theme_data, $val) )
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]);
}
@@ -393,15 +393,15 @@ SELECT
{
$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]);
}