mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

Issue #3 Should address some of the Notices/Warnings.

Browse Source
This commit is contained in:
Cameron 2012-11-29 23:12:20 -08:00
parent db07d72afc
commit 2234f8f62c
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/image.php
View File

@ -632,7 +632,7 @@ class media_admin_ui extends e_admin_ui
'text' => e_MEDIA_FILE,
'multipart' => e_MEDIA_FILE,
'application' => e_MEDIA_FILE,
'audio' => e_MEDIA_AUDIO,
// 'audio' => e_MEDIA_AUDIO,
'image' => e_MEDIA_IMAGE,
'video' => e_MEDIA_VIDEO,
'other' => e_MEDIA_FILE

9
e107_handlers/language_class.php
View File

@ -335,16 +335,19 @@ class language{
{
if(null == $this->lanlist)
{
$handle = opendir(e_LANGUAGEDIR);
$fl = e107::getFile();
$dirArray = $fl->get_dirs(e_LANGUAGEDIR);
// $handle = opendir(e_LANGUAGEDIR);
$lanlist = array();
while ($file = readdir($handle))
// while ($file = readdir($handle))
foreach($dirArray as $file)
{
if ($file != '.' && $file != '..' && is_readable(e_LANGUAGEDIR.$file.'/'.$file.'.php'))
{
$lanlist[] = $file;
}
}
closedir($handle);
// closedir($handle);
$this->lanlist = array_intersect($lanlist,$this->list);
}

4
e107_handlers/plugin_class.php
View File

@ -187,7 +187,7 @@ class e107plugin
continue;
}
if(in_array($path,$this->disAllowed))
if(in_array($plugin_path, $this->disAllowed))
{
$mes->addWarning("Folder error: <i>{$p['path']}</i> is not permitted as an acceptable folder name.");
continue;
@ -2467,7 +2467,7 @@ class e107plugin
$this->plug_vars['category'] = (isset($this->plug_vars['category'])) ? $this->manage_category($this->plug_vars['category']) : "misc";
$this->plug_vars['folder'] = $plugName; // remove the need for <folder> tag in plugin.xml.
if(!is_array($this->plug_vars['description']))
if(varset($this->plug_vars['description']) && !is_array($this->plug_vars['description']))
{
$diz = $this->plug_vars['description'];
unset($this->plug_vars['description']);

18
e107_handlers/theme_handler.php
View File

@ -173,10 +173,12 @@ class themeHandler
$themeArray = array();
$tloop = 1;
$handle = opendir(e_THEME);
$fl = e107::getFile();
$array = $fl->get_dirs(e_THEME);
while(false !== ($file = readdir($handle)))
foreach($array as $file)
{
if(($mode == 'xml') && !is_readable(e_THEME.$file."/theme.xml"))
{
continue;
@ -196,12 +198,10 @@ class themeHandler
$tloop++;
}
}
closedir($handle);
/*
echo "<pre>";
print_r($themeArray);
echo "</pre>";*/
// echo "<pre>";
// print_r($themeArray);
// echo "</pre>";
return $themeArray;
@ -1101,7 +1101,7 @@ class themeHandler
$themeArray = $this->getThemes("id");
$name = ($name) ? $name : $themeArray[$this->id];
$name = ($name) ? $name : vartrue($themeArray[$this->id]);
$layout = $pref['sitetheme_layouts'] = is_array($this->themeArray[$name]['layouts']) ? $this->themeArray[$name]['layouts'] : array();
$deflayout = $this->findDefault($name);
$customPages = $this->themeArray[$name]['custompages'];