mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Notice removals

Browse Source
This commit is contained in:
Tijn Kuyper
2012-12-16 12:28:28 +01:00
parent 9217a078fd
commit 57dbc89d18
14 changed files with 102 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/language.php
View File

@@ -263,7 +263,7 @@ if(varset($_POST['searchDeprecated']) && varset($_POST['deprecatedLans']))
else else
{ {
$mes->addDebug("Couldn't Read LanFile... "); $mes->addDebug("Couldn't Read LanFile... ");
$ns -> tablerender($res['caption'],$mes->render(). $res['text']); $ns -> tablerender(vartrue($res['caption']), $mes->render(). vartrue($res['text']));
} }

2
e107_admin/users.php
View File

@@ -283,6 +283,7 @@ class users_admin_ui extends e_admin_ui
// { // {
// addUser(); // addUser();
// } // }
} }
/** /**
@@ -1978,6 +1979,7 @@ class users_admin_form_ui extends e_admin_form_ui
extract($row); extract($row);
$text = "";
$text .= "<div> $text .= "<div>
<input type='hidden' name='userid[{$user_id}]' value='{$user_id}' /> <input type='hidden' name='userid[{$user_id}]' value='{$user_id}' />

4
e107_core/controllers/system/error.php
View File

@@ -23,11 +23,11 @@ class core_system_error_controller extends eController
$this->addTitle(LAN_ERROR_7); $this->addTitle(LAN_ERROR_7);
//var_dump($this->getRequest()->getRouteHistory()); //var_dump($this->getRequest()->getRouteHistory());
$errorText = "<img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_21.'<br />'.LAN_ERROR_9."<br /><br />"; $errorText = "<img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_21.'<br />'.LAN_ERROR_9."<br /><br />";
if (strlen($errFrom)) $errorText .= LAN_ERROR_23." <a href='{$errFrom}' rel='external'>{$errFrom}</a> ".LAN_ERROR_24." -- ".LAN_ERROR_19."<br /><br />"; if (strlen(vartrue($errFrom))) $errorText .= LAN_ERROR_23." <a href='{$errFrom}' rel='external'>{$errFrom}</a> ".LAN_ERROR_24." -- ".LAN_ERROR_19."<br /><br />";
$errorText .= "<h3>".LAN_ERROR_45."</h3>"; $errorText .= "<h3>".LAN_ERROR_45."</h3>";
if($errReturnTo) if(vartrue($errReturnTo))
{ {
foreach ($errReturnTo as $url => $label) foreach ($errReturnTo as $url => $label)
{ {

2
e107_handlers/admin_ui.php
View File

@@ -1759,7 +1759,7 @@ class e_admin_controller
*/ */
public function addHeader($content) public function addHeader($content)
{ {
$this->getResponse()->addHeaderContent($content); $this->getResponse()->addHeaderContent(vartrue($content));
return $this; return $this;
} }

2
e107_handlers/application.php
View File

@@ -1701,7 +1701,7 @@ class eRouter
} }
// final fallback // final fallback
if(!$route) if(!vartrue($route))
{ {
if($request->routed) if($request->routed)
{ {

2
e107_handlers/menumanager_class.php
View File

@@ -1354,7 +1354,7 @@ class e_menuManager {
if($link) if($link)
{ {
$tmp[$id]['name'] = ucwords(str_replace("_menu","",$menu_name)); $tmp[$id]['name'] = ucwords(str_replace("_menu","",$menu_name));
if($prev == $id && ($tmp[$id]['name']!=$prev_name)) if(vartrue($prev) == $id && ($tmp[$id]['name']!=$prev_name))
{ {
$tmp[$id]['name'] .= ":".$prev_name; $tmp[$id]['name'] .= ":".$prev_name;
} }

1
e107_plugins/alt_auth/alt_auth_adminmenu.php
View File

@@ -333,6 +333,7 @@ function alt_auth_post_options($prefix)
function altAuthGetPasswordSelector($name, $frm, $currentSelection = '', $getExtended = FALSE) function altAuthGetPasswordSelector($name, $frm, $currentSelection = '', $getExtended = FALSE)
{ {
$password_methods = ExtendedPasswordHandler::GetPasswordTypes($getExtended); $password_methods = ExtendedPasswordHandler::GetPasswordTypes($getExtended);
$text = "";
$text .= $frm->form_select_open($name); $text .= $frm->form_select_open($name);
foreach($password_methods as $k => $v) foreach($password_methods as $k => $v)
{ {

4
e107_plugins/alt_auth/e107db_conf.php
View File

@@ -30,13 +30,13 @@ require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php');
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php');
if($_POST['update']) if(vartrue($_POST['update']))
{ {
$message = alt_auth_post_options('e107db'); $message = alt_auth_post_options('e107db');
} }
if($message) if(vartrue($message))
{ {
e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>'); e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>');
} }

4
e107_plugins/alt_auth/importdb_conf.php
View File

@@ -32,13 +32,13 @@ require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php');
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php');
if($_POST['update']) if(vartrue($_POST['update']))
{ {
// $message = update_importdb_prefs(); // $message = update_importdb_prefs();
$message = alt_auth_post_options('importdb'); $message = alt_auth_post_options('importdb');
} }
if($message) if(vartrue($message))
{ {
e107::getRender()->tablerender("","<div style='text-align:center;'>".$message."</div>"); e107::getRender()->tablerender("","<div style='text-align:center;'>".$message."</div>");
} }

14
e107_plugins/alt_auth/ldap_conf.php
View File

@@ -39,7 +39,7 @@ $ldap_ver[1]='2';
$ldap_ver[2]='3'; $ldap_ver[2]='3';
$message = ''; $message = '';
if($_POST['update']) if(vartrue($_POST['update']))
{ {
$message .= alt_auth_post_options('ldap'); $message .= alt_auth_post_options('ldap');
} }
@@ -71,28 +71,28 @@ $text .= "<tr><td>".LDAPLAN_12."</td><td>";
$text .= $frm -> form_select_open("ldap_servertype"); $text .= $frm -> form_select_open("ldap_servertype");
foreach($server_types as $v) foreach($server_types as $v)
{ {
$sel = ($ldap['ldap_servertype'] == $v) ? " Selected='selected'" : ''; $sel = (vartrue($ldap['ldap_servertype']) == $v) ? " Selected='selected'" : '';
$text .= $frm -> form_option($v, $sel, $v); $text .= $frm -> form_option($v, $sel, $v);
} }
$text .= $frm -> form_select_close(); $text .= $frm -> form_select_close();
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_1."</td><td>"; $text .= "<tr><td>".LDAPLAN_1."</td><td>";
$text .= $frm -> form_text("ldap_server", 35, $ldap['ldap_server'], 120); $text .= $frm -> form_text("ldap_server", 35, vartrue($ldap['ldap_server']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_2."</td><td>"; $text .= "<tr><td>".LDAPLAN_2."</td><td>";
$text .= $frm -> form_text("ldap_basedn", 35, $ldap['ldap_basedn'], 120); $text .= $frm -> form_text("ldap_basedn", 35, vartrue($ldap['ldap_basedn']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_14."</td><td>"; $text .= "<tr><td>".LDAPLAN_14."</td><td>";
$text .= $frm -> form_text("ldap_ou", 35, $ldap['ldap_ou'], 60); $text .= $frm -> form_text("ldap_ou", 35, vartrue($ldap['ldap_ou']), 60);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_3."</td><td>"; $text .= "<tr><td>".LDAPLAN_3."</td><td>";
$text .= $frm -> form_text("ldap_user", 35, $ldap['ldap_user'], 120); $text .= $frm -> form_text("ldap_user", 35, vartrue($ldap['ldap_user']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_4."</td><td>"; $text .= "<tr><td>".LDAPLAN_4."</td><td>";
$text .= $frm -> form_text("ldap_passwd", 35, $ldap['ldap_passwd'], 120); $text .= $frm -> form_text("ldap_passwd", 35, vartrue($ldap['ldap_passwd']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LDAPLAN_5."</td><td>"; $text .= "<tr><td>".LDAPLAN_5."</td><td>";

4
e107_plugins/alt_auth/otherdb_conf.php
View File

@@ -31,13 +31,13 @@ require_once(e_PLUGIN.'alt_auth/alt_auth_adminmenu.php');
require_once(e_PLUGIN.'alt_auth/extended_password_handler.php'); require_once(e_PLUGIN.'alt_auth/extended_password_handler.php');
if($_POST['update']) if(vartrue($_POST['update']))
{ {
$message = alt_auth_post_options('otherdb'); $message = alt_auth_post_options('otherdb');
} }
if($message) if(vartrue($message))
{ {
e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>'); e107::getRender()->tablerender('',"<div style='text-align:center;'>".$message.'</div>');
} }

8
e107_plugins/alt_auth/radius_conf.php
View File

@@ -27,7 +27,7 @@ require_once(e_PLUGIN."alt_auth/alt_auth_adminmenu.php");
$mes = e107::getMessage(); $mes = e107::getMessage();
$message = ''; $message = '';
if($_POST['update']) if(vartrue($_POST['update']))
{ {
// $message .= alt_auth_post_options('radius'); // $message .= alt_auth_post_options('radius');
$mes->addSuccess(alt_auth_post_options('radius')); $mes->addSuccess(alt_auth_post_options('radius'));
@@ -58,14 +58,14 @@ $frm = new form;
$text = $frm -> form_open("post",e_SELF); $text = $frm -> form_open("post",e_SELF);
$text .= "<table class='table adminform'>"; $text .= "<table class='table adminform'>";
$text .= "<tr><td>".LAN_RADIUS_01."</td><td>"; $text .= "<tr><td>".LAN_RADIUS_01."</td><td>";
$text .= $frm -> form_text("radius_server", 35, $radius['radius_server'], 120); $text .= $frm -> form_text("radius_server", 35, vartrue($radius['radius_server']), 120);
$text .= "</td></tr>"; $text .= "</td></tr>";
$text .= "<tr><td>".LAN_RADIUS_02."</td><td>"; $text .= "<tr><td>".LAN_RADIUS_02."</td><td>";
$text .= $frm -> form_text('radius_secret', 35, $radius['radius_secret'], 200); $text .= $frm -> form_text('radius_secret', 35, vartrue($radius['radius_secret']), 200);
$text .= "</td></tr>"; $text .= "</td></tr>";
$tmp = alt_auth_get_field_list('radius',$frm, $ldap, FALSE); $tmp = alt_auth_get_field_list('radius',$frm, vartrue($ldap), FALSE);
if ($tmp) if ($tmp)
{ {
$text .= "<tr><td class='forumheader2' colspan='2'>".LAN_ALT_27."</td></tr>".$tmp; $text .= "<tr><td class='forumheader2' colspan='2'>".LAN_ALT_27."</td></tr>".$tmp;

4
e107_plugins/login_menu/login_menu_class.php
View File

@@ -213,7 +213,7 @@ class login_menu_class
$lbox_stats[0]['stat_items'] = LOGIN_MENU_L17; $lbox_stats[0]['stat_items'] = LOGIN_MENU_L17;
$lbox_stats[0]['stat_new'] = 0; $lbox_stats[0]['stat_new'] = 0;
$lbox_stats[0]['stat_nonew'] = LOGIN_MENU_L26.' '.LOGIN_MENU_L17; $lbox_stats[0]['stat_nonew'] = LOGIN_MENU_L26.' '.LOGIN_MENU_L17;
if($get_stats) { if(vartrue($get_stats)) {
$lbox_stats['chatbox_menu'][0]['stat_new'] = $sql->db_Count('chatbox', '(*)', 'WHERE `cb_datestamp` > '.USERLV); $lbox_stats['chatbox_menu'][0]['stat_new'] = $sql->db_Count('chatbox', '(*)', 'WHERE `cb_datestamp` > '.USERLV);
} }
@@ -346,7 +346,7 @@ class login_menu_class
if(($tmp = getcachedvars('loginbox_eplug_data_'.$plugid)) !== FALSE) return $tmp; if(($tmp = getcachedvars('loginbox_eplug_data_'.$plugid)) !== FALSE) return $tmp;
$ret = array(); $ret = array();
if (is_readable(e_PLUGIN.$plugin_path.'/plugin.xml')) if (is_readable(e_PLUGIN.vartrue($plugin_path).'/plugin.xml'))
{ {
require_once(e_HANDLER.'xml_class.php'); require_once(e_HANDLER.'xml_class.php');
$xml = new xmlClass; $xml = new xmlClass;

2
user.php
View File

@@ -136,7 +136,7 @@ if (isset($id))
exit; exit;
} }
if($pref['profile_comments']) if(vartrue($pref['profile_comments']))
{ {
require_once(e_HANDLER."comment_class.php"); require_once(e_HANDLER."comment_class.php");
$comment_edit_query = 'comment.user.'.$id; $comment_edit_query = 'comment.user.'.$id;