mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

More Iconpicker and icon folder cleanup.

Browse Source
This commit is contained in:
CaMer0n
2009-07-16 08:15:35 +00:00
parent 5f1933c3fa
commit afcf85cd8e
8 changed files with 379 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
e107_handlers/plugin_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
| $Revision: 1.68 $
| $Date: 2009-07-16 02:55:19 $
| $Revision: 1.69 $
| $Date: 2009-07-16 08:15:35 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -268,7 +268,7 @@ class e107plugin
function manage_icons($plugin='')
{
global $sql,$tp, $iconpool;
global $sql,$tp, $iconpool,$pref;
$query = "SELECT * FROM #plugin WHERE plugin_installflag =0 ORDER BY plugin_path ASC";
$sql->db_Select_gen($query);
@@ -285,7 +285,7 @@ class e107plugin
require_once(e_HANDLER."file_class.php");
$fl = new e_file;
$filesrch = implode("|",array("_16.png","_16.PNG","_32.png","_32.PNG","_48.png","_48.PNG","_64.png","_64.PNG","_128.png","_128.png"));
$filesrch = implode("|",array("/images(*.)_16.png","_16.PNG","_32.png","_32.PNG","_48.png","_48.PNG","_64.png","_64.PNG","_128.png","_128.png"));
if($plugin_icons = $fl->get_files(e_PLUGIN,$filesrch,$reject_plugin,2))
{
@@ -297,6 +297,11 @@ class e107plugin
sort($core_icons);
}
if($theme_icons = $fl->get_files(e_THEME.$pref['sitetheme']."/images/",$filesrch,$reject_core,2))
{
sort($theme_icons);
}
$srch = array(e_IMAGE,"/");
$repl = array("","-");
@@ -309,8 +314,8 @@ class e107plugin
$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
}
$srch = array(e_PLUGIN,"/images/");
$repl = array("","");
$srch = array(e_PLUGIN,"/images/","/icons/");
$repl = array("","","");
foreach($plugin_icons as $file)
{
@@ -319,6 +324,14 @@ class e107plugin
$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
}
foreach($theme_icons as $file)
{
$path = str_replace($srch,$repl,$file['path']);
$key = "theme-".$path;
$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
}
return (save_prefs("iconpool")) ? TRUE : FALSE;