mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

PHP Warning Removal

Browse Source
This commit is contained in:
Cameron
2012-12-06 14:53:58 -08:00
parent 367ec69c62
commit ebe66a5801
5 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin.php
View File

@@ -19,7 +19,7 @@ require_once('../class2.php');
//TODO - marj prepare language reorganisation
//include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
if($_GET['iframe'] == 1)
if(vartrue($_GET['iframe']) == 1)
{
define('e_IFRAME', true);

16
e107_admin/includes/infopanel.php
View File

@@ -77,7 +77,7 @@ EOF;
$frm = e107::getForm();
/*
XXX Check Bootstrap bug is fixed.
echo '
<ul class="thumbnails">
<li class="span4">
@@ -110,17 +110,11 @@ EOF;
<img src="http://placehold.it/360x270" alt="">
</a>
</li>
</ul>
';
*/
//TODO LANs throughout.
global $style;
@@ -136,16 +130,12 @@ EOF;
$array_functions_assoc = e107::getNav()->adminLinks('assoc');
$iconlist = array_merge($array_functions_assoc, e107::getNav()->pluginLinks(E_16_PLUGMANAGER, "array"));
// "<form method='post' action='".e_SELF."?".e_QUERY."'>";
$tp->parseTemplate("{SETSTYLE=core-infopanel}");
// Personalized Panel
// Rendering the saved configuration.
$mainPanel = "
@@ -166,7 +156,7 @@ EOF;
</div>";
$text .= $ns->tablerender(ucwords(USERNAME)."'s Control Panel", $mainPanel, "core-infopanel_mye107",true);
$text = $ns->tablerender(ucwords(USERNAME)."'s Control Panel", $mainPanel, "core-infopanel_mye107",true);
// ------------------------------- e107 News --------------------------------

14
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1355,10 +1355,10 @@ class admin_shortcodes
{
$plug_vars = $plug->plug_vars;
//if($row['plugin_path']=='tinymce')
//{
// print_a($plug_vars);
//}
if($row['plugin_path']=='calendar_menu')
{
// print_a($plug_vars);
}
// moved to boot.php
// e107::loadLanFiles($row['plugin_path'], 'admin');
@@ -1377,7 +1377,7 @@ class admin_shortcodes
$id = 'plugnav-'.$row['plugin_path'];
$tmp[$id]['text'] = e107::getParser()->toHTML($plug_vars['@attributes']['name'], FALSE, "LINKTEXT");
$tmp[$id]['description'] = $plug_vars['description'];
$tmp[$id]['description'] = vartrue($plug_vars['description']['@value']);
$tmp[$id]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plug_vars['administration']['configFile'];
$tmp[$id]['image'] = $icon_src ? "<img src='{$icon_src}' alt=\"".varset($tmp[$id]['text'])."\" class='icon S16' />" : E_16_PLUGIN;
$tmp[$id]['image_large'] = $icon_src_lrg ? "<img src='{$icon_src_lrg}' alt=\"".varset($tmp[$id]['text'])."\" class='icon S32' />" : $icon_src_lrg;
@@ -1396,7 +1396,7 @@ class admin_shortcodes
{
$subid = $id.'-'.$subkey;
$predef_icons = array('add', 'manage', 'settings');
$title = $plugsub['@value'];
$title = vartrue($plugsub['@value']);
$plugsub = $plugsub['@attributes'];
if(varset($plugsub['primary'])=='true') // remove primary links.
@@ -1408,7 +1408,7 @@ class admin_shortcodes
$tmp[$id]['sub'][$subid]['text'] = e107::getParser()->toHTML($title, FALSE, 'LINKTEXT');
$tmp[$id]['sub'][$subid]['description'] = e107::getParser()->toHTML($plug_vars['description']);
$tmp[$id]['sub'][$subid]['description'] = (vartrue($plug_vars['description']['@value'])) ? e107::getParser()->toHTML($plug_vars['description']['@value']) : "";
$tmp[$id]['sub'][$subid]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plugsub['url'];
$tmp[$id]['sub'][$subid]['image'] = $icon_src ? "<img src='{$icon_src}' alt=\"".varset($tmp[$id]['sub'][$subid]['text'])."\" class='icon S16' />" : "";
$tmp[$id]['sub'][$subid]['image_large'] = '';

4
e107_handlers/cache_handler.php
View File

@@ -297,13 +297,13 @@ class ecache {
if($type == 'db')
{
$path = e_CACHE_DB;
$mask = ($mask == null) ? '*.php' : $mask;
$mask = ($mask == null) ? '.*\.php' : $mask;
}
if($type == 'image')
{
$path = e_CACHE_IMAGE;
$mask = ($mask == null) ? '*.cache\.bin' : $mask;
$mask = ($mask == null) ? '.*\.cache\.bin' : $mask;
}
if((null == $path) || (null == $mask))

2
e107_plugins/calendar_menu/plugin.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<e107Plugin name="Event Calendar" lan="EC_ADLAN_1" version="3.70" date="2012-08-01" compatibility="2.0" installRequired="true" >
<author name="e107 Inc. + Barry" url="http://e107.org" />
<description lan="EC_ADLAN_A206">This plugin is a fully featured event calendar with calendar menu.</description>
<description >This plugin is a fully featured event calendar with calendar menu.</description>
<readMe>readme.pdf</readMe>
<category>content</category>
<languageFiles>