Skip to content

Commit

Permalink
Notice removal
Browse files Browse the repository at this point in the history
  • Loading branch information
CaMer0n committed Sep 4, 2009
1 parent 3e5d466 commit 3220a8e
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 52 deletions.
8 changes: 4 additions & 4 deletions class2.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* General purpose file
*
* $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.136 $
* $Date: 2009-08-28 16:15:57 $
* $Author: marj_nl_fr $
* $Revision: 1.137 $
* $Date: 2009-09-04 14:35:00 $
* $Author: e107coders $
*
*/
//
Expand Down Expand Up @@ -917,7 +917,7 @@ function tablerender($caption, $text, $mode = 'default', $return = false)
$this->eMenuCount++;
}
ob_start();
tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>$this->eMenuTotal[$this->eMenuArea],'setStyle'=>$this->eSetStyle));
tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle));
$ret=ob_get_contents();
ob_end_clean();

Expand Down
27 changes: 5 additions & 22 deletions e107_admin/db.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* Administration - Database Utilities
*
* $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $
* $Revision: 1.27 $
* $Date: 2009-09-02 17:27:29 $
* $Revision: 1.28 $
* $Date: 2009-09-04 14:35:00 $
* $Author: e107coders $
*
*/
Expand Down Expand Up @@ -732,23 +732,6 @@ function table_list()
$exclude[] = "user_extended_country";
$exclude[] = "plugin";


/*
$exclude[] = "banlist"; $exclude[] = "banner";
$exclude[] = "cache"; $exclude[] = "core";
$exclude[] = "plugin"; $exclude[] = "user";
$exclude[] = "userclass_classes";
$exclude[] = "session";
$exclude[] = "flood";
$exclude[] = "stat_info"; $exclude[] = "stat_last";
$exclude[] = "submit_news"; $exclude[] = "rate";
$exclude[] = "stat_counter";$exclude[] = "user_extended";
$exclude[] = "user_extended_struc";
*/

$tables = mysql_list_tables($mySQLdefaultdb);
while (list($temp) = mysql_fetch_array($tables))
{
Expand All @@ -766,9 +749,9 @@ function table_list()
$match = array();
// if(preg_match('/^'.$prefix.'(.*)/', $temp, $match))
{
$e107tab = str_replace(MPREFIX, "", $temp);
$pos = strrpos($match[1],"_")+1;
$core = substr(str_replace("lan_","",$e107tab),$pos);
// $e107tab = str_replace(MPREFIX, "", $temp);
// $pos = strrpos($match[1],"_")+1;
// $core = substr(str_replace("lan_","",$e107tab),$pos);
// if (str_replace($exclude, "", $e107tab))
// {
// $tabs[$core] = $e107tab;
Expand Down
5 changes: 3 additions & 2 deletions e107_admin/includes/infopanel.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $
| $Revision: 1.8 $
| $Date: 2009-09-03 01:27:26 $
| $Revision: 1.9 $
| $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
Expand Down Expand Up @@ -218,6 +218,7 @@ function render_infopanel_icons()
{
$frm = e107::getSingleton('e_form');
global $iconlist,$pluglist;
$text = "";
foreach ($iconlist as $key=>$icon)
{
if (getperms($icon['perms']))
Expand Down
13 changes: 9 additions & 4 deletions e107_files/shortcode/batch/admin_shortcodes_class.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: admin_shortcodes_class.php,v 1.20 2009-08-15 15:44:37 marj_nl_fr Exp $
* $Id: admin_shortcodes_class.php,v 1.21 2009-09-04 14:35:01 e107coders Exp $
*
* Admin shortcode batch - class
*/
Expand Down Expand Up @@ -612,7 +612,11 @@ function sc_admin_plugins($parm)
while($rowplug = $sql -> db_Fetch())
{
extract($rowplug);
$e107_plug[$rowplug[1]] = $rowplug[3];
if(varset($rowplug[1]))
{
$e107_plug[$rowplug[1]] = varset($rowplug[3]);
}

}
}
}
Expand Down Expand Up @@ -940,6 +944,7 @@ function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE)

function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='')
{
$exit = "";
$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
if ($cat_id)
{
Expand Down Expand Up @@ -1038,7 +1043,7 @@ function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlig
{
$text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
$text .= "<div id='plugMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
$text .= $plugin_text.$plugs_text;
$text .= varset($plugin_text).varset($plugs_text);
$text .= "</div>";
}

Expand All @@ -1064,7 +1069,7 @@ function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlig
$text .= '</div>
</td>';

if ($exit != 'off')
if (varset($exit) != 'off')
{
$text .= "<td style='width: 160px; white-space: nowrap'>
<div class='menuBar' style='width: 100%'>";
Expand Down
8 changes: 4 additions & 4 deletions e107_handlers/db_debug_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/db_debug_class.php,v $
| $Revision: 1.12 $
| $Date: 2009-08-17 15:45:20 $
| $Revision: 1.13 $
| $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
Expand Down Expand Up @@ -140,8 +140,8 @@ function Mark_Query($query, $rli, $origQryRes, $aTrace, $mytime, $curtable)
}

// Record Basic query info
$sCallingFile = $aTrace[1]['file'];
$sCallingLine = $aTrace[1]['line'];
$sCallingFile = varset($aTrace[1]['file']);
$sCallingLine = varset($aTrace[1]['line']);

$t = &$this->aSQLdetails[$sql->db_QueryCount()];
$t['marker'] = $this->curTimeMark;
Expand Down
14 changes: 8 additions & 6 deletions e107_handlers/menu_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* e107 Menu Class
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/menu_class.php,v $
* $Revision: 1.11 $
* $Date: 2009-08-25 08:34:24 $
* $Author: secretr $
* $Revision: 1.12 $
* $Date: 2009-09-04 14:35:01 $
* $Author: e107coders $
*/

if(!defined('e107_INIT'))
Expand Down Expand Up @@ -112,9 +112,11 @@ public function init()
*/
protected function isVisible($row, $url = '')
{
if(isset($this->_visibility_cache[$row['id']]))
$iD = varset($row['id']);

if(isset($this->_visibility_cache[$iD]))
{
return $this->_visibility_cache[$row['id']];
return $this->_visibility_cache[$iD];
}

$show_menu = TRUE;
Expand Down Expand Up @@ -165,7 +167,7 @@ protected function isVisible($row, $url = '')
} //end switch
} //endif menu_pages

$this->_visibility_cache[$row['id']] = $show_menu;
$this->_visibility_cache[$iD] = $show_menu;
return $show_menu;
}

Expand Down
10 changes: 5 additions & 5 deletions e107_handlers/sitelinks_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
| e107 website system
| /sitelinks_class.php
|
| ©Steve Dunstan 2001-2002
| Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $
| $Revision: 1.18 $
| $Date: 2009-08-15 11:55:30 $
| $Author: marj_nl_fr $
| $Revision: 1.19 $
| $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $
+---------------------------------------------------------------+
*/

Expand Down Expand Up @@ -100,7 +100,7 @@ function get($cat=1, $style='', $css_class = false)
// Sublink styles.- replacing the tree-menu.
if(isset($style['sublinkdisplay']) || isset($style['subindent']) || isset($style['sublinkclass']) || isset($style['sublinkstart']) || isset($style['sublinkend']) || isset($style['subpostlink'])){
foreach($style as $key=>$val){
$aSubStyle[$key] = ($style["sub".$key]) ? $style["sub".$key] : $style[$key];
$aSubStyle[$key] = vartrue($style["sub".$key]) ? $style["sub".$key] : $style[$key];
}
}else{
$style['subindent'] = "&nbsp;&nbsp;";
Expand Down
13 changes: 8 additions & 5 deletions e107_handlers/traffic_class.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| ©Steve Dunstan 2001-2002
| Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/traffic_class.php,v $
| $Revision: 1.2 $
| $Date: 2009-08-17 15:45:20 $
| $Revision: 1.3 $
| $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
Expand Down Expand Up @@ -197,9 +197,12 @@ function eQTimeOff() {
}
function eQTimeElapsed() {
// return elapsed time so far, as text in microseconds, or blank if zero
if ($GLOBALS['qTimeTotal']) {
if (isset($GLOBALS['qTimeTotal']))
{
return number_format($GLOBALS['qTimeTotal']*1000000.0,1);
} else {
}
else
{
return '';
}
}
Expand Down

0 comments on commit 3220a8e

Please sign in to comment.