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

Notice removal

Browse Source
This commit is contained in:
CaMer0n
2009-09-04 14:35:01 +00:00
parent 3e5d46663e
commit 3220a8efb3
8 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
class2.php
View File

@@ -9,9 +9,9 @@
* General purpose file * General purpose file
* *
* $Source: /cvs_backup/e107_0.8/class2.php,v $ * $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.136 $ * $Revision: 1.137 $
* $Date: 2009-08-28 16:15:57 $ * $Date: 2009-09-04 14:35:00 $
* $Author: marj_nl_fr $ * $Author: e107coders $
* *
*/ */
// //
@@ -917,7 +917,7 @@ if (!class_exists('e107table'))
$this->eMenuCount++; $this->eMenuCount++;
} }
ob_start(); 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(); $ret=ob_get_contents();
ob_end_clean(); ob_end_clean();

27
e107_admin/db.php
View File

@@ -9,8 +9,8 @@
* Administration - Database Utilities * Administration - Database Utilities
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $
* $Revision: 1.27 $ * $Revision: 1.28 $
* $Date: 2009-09-02 17:27:29 $ * $Date: 2009-09-04 14:35:00 $
* $Author: e107coders $ * $Author: e107coders $
* *
*/ */
@@ -732,23 +732,6 @@ function table_list()
$exclude[] = "user_extended_country"; $exclude[] = "user_extended_country";
$exclude[] = "plugin"; $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); $tables = mysql_list_tables($mySQLdefaultdb);
while (list($temp) = mysql_fetch_array($tables)) while (list($temp) = mysql_fetch_array($tables))
{ {
@@ -766,9 +749,9 @@ function table_list()
$match = array(); $match = array();
// if(preg_match('/^'.$prefix.'(.*)/', $temp, $match)) // if(preg_match('/^'.$prefix.'(.*)/', $temp, $match))
{ {
$e107tab = str_replace(MPREFIX, "", $temp); // $e107tab = str_replace(MPREFIX, "", $temp);
$pos = strrpos($match[1],"_")+1; // $pos = strrpos($match[1],"_")+1;
$core = substr(str_replace("lan_","",$e107tab),$pos); // $core = substr(str_replace("lan_","",$e107tab),$pos);
// if (str_replace($exclude, "", $e107tab)) // if (str_replace($exclude, "", $e107tab))
// { // {
// $tabs[$core] = $e107tab; // $tabs[$core] = $e107tab;

5
e107_admin/includes/infopanel.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $
| $Revision: 1.8 $ | $Revision: 1.9 $
| $Date: 2009-09-03 01:27:26 $ | $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -218,6 +218,7 @@ function render_infopanel_icons()
{ {
$frm = e107::getSingleton('e_form'); $frm = e107::getSingleton('e_form');
global $iconlist,$pluglist; global $iconlist,$pluglist;
$text = "";
foreach ($iconlist as $key=>$icon) foreach ($iconlist as $key=>$icon)
{ {
if (getperms($icon['perms'])) if (getperms($icon['perms']))

13
e107_files/shortcode/batch/admin_shortcodes_class.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) * 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 * Admin shortcode batch - class
*/ */
@@ -612,7 +612,11 @@ class admin_shortcodes
while($rowplug = $sql -> db_Fetch()) while($rowplug = $sql -> db_Fetch())
{ {
extract($rowplug); extract($rowplug);
$e107_plug[$rowplug[1]] = $rowplug[3]; if(varset($rowplug[1]))
{
$e107_plug[$rowplug[1]] = varset($rowplug[3]);
}
} }
} }
} }
@@ -940,6 +944,7 @@ class admin_shortcodes
function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='')
{ {
$exit = "";
$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' "; $text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
if ($cat_id) if ($cat_id)
{ {
@@ -1038,7 +1043,7 @@ class admin_shortcodes
{ {
$text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu'); $text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
$text .= "<div id='plugMenu' class='menu' onmouseover=\"menuMouseover(event)\">"; $text .= "<div id='plugMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
$text .= $plugin_text.$plugs_text; $text .= varset($plugin_text).varset($plugs_text);
$text .= "</div>"; $text .= "</div>";
} }
@@ -1064,7 +1069,7 @@ class admin_shortcodes
$text .= '</div> $text .= '</div>
</td>'; </td>';
if ($exit != 'off') if (varset($exit) != 'off')
{ {
$text .= "<td style='width: 160px; white-space: nowrap'> $text .= "<td style='width: 160px; white-space: nowrap'>
<div class='menuBar' style='width: 100%'>"; <div class='menuBar' style='width: 100%'>";

8
e107_handlers/db_debug_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/db_debug_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/db_debug_class.php,v $
| $Revision: 1.12 $ | $Revision: 1.13 $
| $Date: 2009-08-17 15:45:20 $ | $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -140,8 +140,8 @@ class e107_db_debug {
} }
// Record Basic query info // Record Basic query info
$sCallingFile = $aTrace[1]['file']; $sCallingFile = varset($aTrace[1]['file']);
$sCallingLine = $aTrace[1]['line']; $sCallingLine = varset($aTrace[1]['line']);
$t = &$this->aSQLdetails[$sql->db_QueryCount()]; $t = &$this->aSQLdetails[$sql->db_QueryCount()];
$t['marker'] = $this->curTimeMark; $t['marker'] = $this->curTimeMark;

14
e107_handlers/menu_class.php
View File

@@ -9,9 +9,9 @@
* e107 Menu Class * e107 Menu Class
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/menu_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/menu_class.php,v $
* $Revision: 1.11 $ * $Revision: 1.12 $
* $Date: 2009-08-25 08:34:24 $ * $Date: 2009-09-04 14:35:01 $
* $Author: secretr $ * $Author: e107coders $
*/ */
if(!defined('e107_INIT')) if(!defined('e107_INIT'))
@@ -112,9 +112,11 @@ class e_menu
*/ */
protected function isVisible($row, $url = '') 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; $show_menu = TRUE;
@@ -165,7 +167,7 @@ class e_menu
} //end switch } //end switch
} //endif menu_pages } //endif menu_pages
$this->_visibility_cache[$row['id']] = $show_menu; $this->_visibility_cache[$iD] = $show_menu;
return $show_menu; return $show_menu;
} }

10
e107_handlers/sitelinks_class.php
View File

@@ -4,7 +4,7 @@
| e107 website system | e107 website system
| /sitelinks_class.php | /sitelinks_class.php
| |
| <20>Steve Dunstan 2001-2002 | <20>Steve Dunstan 2001-2002
| http://e107.org | http://e107.org
| jalist@e107.org | jalist@e107.org
| |
@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $
| $Revision: 1.18 $ | $Revision: 1.19 $
| $Date: 2009-08-15 11:55:30 $ | $Date: 2009-09-04 14:35:01 $
| $Author: marj_nl_fr $ | $Author: e107coders $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -100,7 +100,7 @@ class sitelinks
// Sublink styles.- replacing the tree-menu. // 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'])){ if(isset($style['sublinkdisplay']) || isset($style['subindent']) || isset($style['sublinkclass']) || isset($style['sublinkstart']) || isset($style['sublinkend']) || isset($style['subpostlink'])){
foreach($style as $key=>$val){ 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{ }else{
$style['subindent'] = "&nbsp;&nbsp;"; $style['subindent'] = "&nbsp;&nbsp;";

13
e107_handlers/traffic_class.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+ + ----------------------------------------------------------------------------+
| e107 website system | e107 website system
| |
| <20>Steve Dunstan 2001-2002 | <20>Steve Dunstan 2001-2002
| http://e107.org | http://e107.org
| jalist@e107.org | jalist@e107.org
| |
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/traffic_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/traffic_class.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2009-08-17 15:45:20 $ | $Date: 2009-09-04 14:35:01 $
| $Author: e107coders $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -197,9 +197,12 @@ if (!isset($qTimeOn)) {
} }
function eQTimeElapsed() { function eQTimeElapsed() {
// return elapsed time so far, as text in microseconds, or blank if zero // 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); return number_format($GLOBALS['qTimeTotal']*1000000.0,1);
} else { }
else
{
return ''; return '';
} }
} }