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

More notice removal

Browse Source
This commit is contained in:
Tijn Kuyper
2012-12-08 13:52:05 +01:00
parent bb13386eb3
commit 5290bb8ea4
36 changed files with 134 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/cron.php
View File

@@ -157,7 +157,7 @@ class cron_admin_ui extends e_admin_ui
),
);
if(!$_GET['action'] || $_GET['action'] == 'refresh')
if(!vartrue($_GET['action']) || $_GET['action'] == 'refresh')
{
$this->cronImport($cronDefaults); // import Core Crons (if missing)

4
e107_admin/db.php
View File

@@ -605,7 +605,7 @@ class system_tools
foreach($pref_types as $key=>$description)
{
$checked = ($_POST['xml_prefs'][$key] == $key) ? 1: 0;
$checked = (vartrue($_POST['xml_prefs'][$key]) == $key) ? 1: 0;
$text .= "<tr>
<td>
@@ -636,7 +636,7 @@ class system_tools
foreach($tables as $name=>$count)
{
$checked = ($_POST['xml_tables'][$name] == $name) ? 1: 0;
$checked = (vartrue($_POST['xml_tables'][$name]) == $name) ? 1: 0;
$text .= "<tr>
<td>
".$frm->checkbox("xml_tables[".$name."]", $name, $checked)." Table Data: ".$name."

10
e107_admin/fileinspector.php
View File

@@ -82,7 +82,7 @@ if(isset($_GET['scan']))
$_POST = $_GET;
if($_GET['exploit'])
if(vartrue($_GET['exploit']))
{
$fi->exploit();
}
@@ -141,7 +141,7 @@ class file_inspector {
if ($_POST['core'] == 'fail') {
$_POST['integrity'] = TRUE;
}
if (MAGIC_QUOTES_GPC && $_POST['regex']) {
if (MAGIC_QUOTES_GPC && vartrue($_POST['regex'])) {
$_POST['regex'] = stripslashes($_POST['regex']);
}
if ($_POST['regex']) {
@@ -410,7 +410,7 @@ class file_inspector {
$this->sendProgress($this->count['core']['num'],$this->totalFiles,FR_LAN_1);
$this->sendProgress(vartrue($this->count['core']['num']),$this->totalFiles,FR_LAN_1);
foreach ($list as $key => $value)
{
@@ -431,7 +431,7 @@ class file_inspector {
}
else
{
$this->sendProgress($this->count['core']['num'],$this->totalFiles,FR_LAN_1);
$this->sendProgress(vartrue($this->count['core']['num']),$this->totalFiles,FR_LAN_1);
$path = $dir.'/'.$key;
$fid = strtolower($key);
@@ -1208,7 +1208,7 @@ function sh(showid) {
</script>
<style type='text/css'>
<!--\n";
if ($_POST['regex']) {
if (vartrue($_POST['regex'])) {
$text .= ".f { padding: 1px 0px 1px 8px; vertical-align: bottom; width: 90% }\n";
} else {
$text .= ".f { padding: 1px 0px 1px 8px; vertical-align: bottom; width: 90%; white-space: nowrap }\n";

2
e107_admin/mailout.php
View File

@@ -83,7 +83,7 @@ if (!getperms('W'))
$e_sub_cat = 'mail';
if($_GET['mode']=="progress")
if(vartrue($_GET['mode']) == "progress")
{
session_write_close();
sendProgress();

38
e107_admin/newspost.php
View File

@@ -24,7 +24,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
// ------------------------------
// done in class2: require_once(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_admin.php"); // maybe this should be put in class2.php when 'admin' is detected.
$newspost = new admin_newspost(e_QUERY, $pst);
$newspost = new admin_newspost(e_QUERY, vartrue($pst));
e107::setRegistry('_newspost_admin', $newspost);
$gen = new convert();
@@ -1931,7 +1931,7 @@ class admin_newspost
<tr>
<td>".NWSLAN_12.":</td>
<td>
<input type='text' name='news_title' value=\"". $tp->post_toForm($_POST['news_title'])."\" class='tbox' style='width:90%' required='required' />
<input type='text' name='news_title' value=\"". $tp->post_toForm(vartrue($_POST['news_title']))."\" class='tbox' style='width:90%' required='required' />
".
// TOO short -> $frm->text('news_title', $tp->post_toForm($_POST['news_title']),200,array('size'=>300)).
"
@@ -1941,7 +1941,7 @@ class admin_newspost
<tr>
<td>".LAN_NEWS_27.":</td>
<td>
<input type='text' name='news_summary' value=\"". $tp->post_toForm($_POST['news_summary'])."\" class='tbox' style='width:90%' />
<input type='text' name='news_summary' value=\"". $tp->post_toForm(vartrue($_POST['news_summary']))."\" class='tbox' style='width:90%' />
".
// $frm->text('news_summary', $tp->post_toForm($_POST['news_summary']), 250).
"
@@ -1955,7 +1955,7 @@ class admin_newspost
";
//XXX multiple-selections at once. (comma separated) - working
$text .= $frm->selectbox('news_render_type', $this->news_renderTypes, $_POST['news_render_type'], "multiple=1",array(NWSLAN_74))."
$text .= $frm->selectbox('news_render_type', $this->news_renderTypes, vartrue($_POST['news_render_type']), "multiple=1",array(NWSLAN_74))."
<div class='field-help'>
".NWSLAN_74."
</div>
@@ -2003,7 +2003,7 @@ class admin_newspost
$sql->db_Select_gen($qry);
while($row = $sql->db_Fetch())
{
if($_POST['news_author'])
if(vartrue($_POST['news_author']))
{
$sel = ($_POST['news_author'] == $row['user_id']);
}
@@ -2033,13 +2033,13 @@ class admin_newspost
<li><a href='#news-extended-container'>".NWSLAN_14."</a></li>
</ul>";
$val = (strstr($tp->post_toForm($_POST['news_body']), "[img]http") ? $tp->post_toForm($_POST['news_body']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body'])));
$val = (strstr($tp->post_toForm(vartrue($_POST['news_body'])), "[img]http") ? $tp->post_toForm(vartrue($_POST['news_body'])) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body'])));
$text .= "<div id='news-body-container' class='e-tab'>";
$text .= $frm->bbarea('news_body', $val, 'news', 'news');
$text .= "</div><div id='news-extended-container' class='t-container'>";
$val = (strstr($tp->post_toForm($_POST['news_extended']), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])));
$val = (strstr($tp->post_toForm(vartrue($_POST['news_extended'])), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])));
$text .= $frm->bbarea('news_extended', $val, 'extended', 'news','large');
$text .= "</div>
@@ -2124,14 +2124,14 @@ class admin_newspost
<tr>
<td>Friendly URL string: </td>
<td>
".$frm->text('news_sef', $tp->post_toForm($_POST['news_sef']), 255)."
".$frm->text('news_sef', $tp->post_toForm(vartrue($_POST['news_sef'])), 255)."
<div class='field-help'>If left empty will be automatically created from current News Title based on your current <a href='".e_ADMIN_ABS."eurl.php?mode=main&amp;action=settings' title='To URL settings area' rel='external'>URL settings</a></div>
</td>
</tr>
<tr>
<td>".LAN_KEYWORDS.": </td>
<td>".$frm->tags('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."
<td>".$frm->tags('news_meta_keywords', $tp->post_toForm(vartrue($_POST['news_meta_keywords'])), 255)."
<div class='field-help'>Keywords/tags associated to associate with this news item</div>
</td>
@@ -2140,7 +2140,7 @@ class admin_newspost
<tr>
<td>Meta description: </td>
<td>".$frm->textarea('news_meta_description', $tp->post_toForm($_POST['news_meta_description']), 7)."</td>
<td>".$frm->textarea('news_meta_description', $tp->post_toForm(vartrue($_POST['news_meta_description'])), 7)."</td>
</tr>
</tbody>
</table>
@@ -2160,8 +2160,8 @@ class admin_newspost
<tr>
<td>".NWSLAN_15.":</td>
<td>
".$frm->radio('news_allow_comments', 0, !$_POST['news_allow_comments'])."".$frm->label(LAN_ENABLED, 'news_allow_comments', 0)."&nbsp;&nbsp;
".$frm->radio('news_allow_comments', 1, $_POST['news_allow_comments'])."".$frm->label(LAN_DISABLED, 'news_allow_comments', 1)."
".$frm->radio('news_allow_comments', 0, !vartrue($_POST['news_allow_comments']))."".$frm->label(LAN_ENABLED, 'news_allow_comments', 0)."&nbsp;&nbsp;
".$frm->radio('news_allow_comments', 1, vartrue($_POST['news_allow_comments']))."".$frm->label(LAN_DISABLED, 'news_allow_comments', 1)."
<div class='field-help'>
".NWSLAN_18."
</div>
@@ -2176,9 +2176,9 @@ class admin_newspost
";
$text .= $frm->datepicker("news_start",$_POST['news_start'],"type=datetime");
$text .= $frm->datepicker("news_start",vartrue($_POST['news_start']),"type=datetime");
$text .= " - ";
$text .= $frm->datepicker("news_end",$_POST['news_end'],"type=datetime");
$text .= $frm->datepicker("news_end",vartrue($_POST['news_end']),"type=datetime");
$text .= "</div>
<div class='field-help'>
@@ -2192,7 +2192,7 @@ class admin_newspost
<div class='field-spacer'>
";
$text .= $frm->datepicker("news_datestamp",$_POST['news_datestamp'],"type=datetime");
$text .= $frm->datepicker("news_datestamp",vartrue($_POST['news_datestamp']),"type=datetime");
$text .= "</div>";
/*
@@ -2228,7 +2228,7 @@ class admin_newspost
<tr>
<td>".LAN_NEWS_28.":</td>
<td>
".$frm->checkbox('news_sticky', '1', $_POST['news_sticky']).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
".$frm->checkbox('news_sticky', '1', vartrue($_POST['news_sticky'])).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
<div class='field-help'>
".LAN_NEWS_30."
</div>
@@ -2750,7 +2750,7 @@ class admin_newspost
<tr>
<td>".LAN_NEWS_51."</td>
<td>
".$frm->uc_select('news_editauthor', $pref['news_editauthor'], 'nobody,main,admin,classes')."
".$frm->uc_select('news_editauthor', vartrue($pref['news_editauthor']), 'nobody,main,admin,classes')."
</td>
</tr>
<tr>
@@ -2791,7 +2791,7 @@ class admin_newspost
<td>".NWSLAN_113."</td>
<td>
<div class='auto-toggle-area autocheck'>
".$frm->checkbox_switch('news_unstemplate', '1', $pref['news_unstemplate'])."
".$frm->checkbox_switch('news_unstemplate', '1', vartrue($pref['news_unstemplate']))."
<div class='field-help'>".NWSLAN_114."</div>
</div>
</td>
@@ -2799,7 +2799,7 @@ class admin_newspost
<tr>
<td>".NWSLAN_120."</td>
<td>
".$frm->bbarea('news_subheader', stripcslashes($pref['news_subheader']), 2, 'helpb')."
".$frm->bbarea('news_subheader', stripcslashes(vartrue($pref['news_subheader'])), 2, 'helpb')."
</td>
</tr>
</tbody>

6
e107_admin/prefs.php
View File

@@ -813,17 +813,17 @@ $text .= "
switch ($k) {
case 'enabled':
$eopt = array('class'=>'e-expandit');
$text .= $frm->radio_switch('social_login['.$prov.'][enabled]', $pref['social_login'][$prov]['enabled'],'','',$eopt);
$text .= $frm->radio_switch('social_login['.$prov.'][enabled]', vartrue($pref['social_login'][$prov]['enabled']),'','',$eopt);
break;
case 'keys':
// $cls = vartrue($pref['single_login'][$prov]['keys'][$tk]) ? "class='e-hideme'" : '';
$sty = vartrue($pref['social_login'][$prov]['keys'][$tk]) ? "" : "display:none";
$sty = vartrue($pref['social_login'][$prov]['keys'][vartrue($tk)]) ? "" : "display:none";
$text .= "<div id='option-{$prov}' style='padding:10px;{$sty}'>";
foreach($v as $tk=>$idk)
{
$opt['placeholder'] = $tk;
$text .= "<br />".$frm->text('social_login['.$prov.'][keys]['.$tk.']', $pref['social_login'][$prov]['keys'][$tk],100,$opt);
$text .= "<br />".$frm->text('social_login['.$prov.'][keys]['.$tk.']', vartrue($pref['social_login'][$prov]['keys'][$tk]),100,$opt);
}
$text .= "</div>";

4
e107_admin/search.php
View File

@@ -67,7 +67,7 @@ if (!isset($search_prefs['boundary']))
$save_search = TRUE;
}
if ($save_search)
if (vartrue($save_search))
{
$serialpref = addslashes(serialize($search_prefs));
$sql -> db_Update("core", "e107_value='".$serialpref."' WHERE e107_name='search_prefs'");
@@ -407,7 +407,7 @@ else
<select name='plug_handlers[".$plug_dir."][order]' class='tbox select order'>
";
for($a = 1; $a <= $handlers_total; $a++) {
$text .= ($search_prefs['plug_handlers'][$plug_dir]['order'] == $a) ? "<option value='".$a."' selected='selected'>".$a."</option>" : "<option value='".$a."'>".$a."</option>";
$text .= (vartrue($search_prefs['plug_handlers'][$plug_dir]['order']) == $a) ? "<option value='".$a."' selected='selected'>".$a."</option>" : "<option value='".$a."'>".$a."</option>";
}
$text .= "
</select>

2
e107_admin/ugflag.php
View File

@@ -103,7 +103,7 @@ $text .= "
</td>
<td>
".$frm->bbarea('maintainance_text', $pref['maintainance_text'], 'maintenance', 'maintenance_bbhelp')."
".$frm->bbarea('maintainance_text', vartrue($pref['maintainance_text']), 'maintenance', 'maintenance_bbhelp')."
<div class='field-help'>".UGFLAN_6."</div>
</td>
</tr>

2
e107_admin/userclass2.php
View File

@@ -936,7 +936,7 @@ class uclass_manager
}
else
{
$text .= "<form method='post' action='".e_SELF."?".e_QUERY."'>
$text = "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-userclass-list'>
<legend class='e-hideme'>".UCSLAN_5."</legend>
<table class='table adminlist'>".

11
e107_admin/users.php
View File

@@ -153,6 +153,7 @@ if (isset ($_POST['resend_to_all']))
// ------- Test Email. --------------
if (isset ($_POST['test_mail']))
{
@@ -451,12 +452,14 @@ if (isset ($_POST['useraction']) && $_POST['useraction'] == "unban")
// $user->user_info($ip);
// }
// ------- Delete User --------------
// if (isset ($_POST['useraction']) && $_POST['useraction'] == 'deluser')
// {
// $user->user_delete($_POST['userid'],true);
// }
// ---- Update User's class --------------------
if (isset ($_POST['updateclass']))
{
@@ -1111,13 +1114,13 @@ class users_admin_form_ui extends e_admin_form_ui
return $list;
}
return $list;
$tmp = explode(",", $curval);
$text = array();
foreach($tmp as $v)
{
$text[] = $list[$v];
}
{
return implode("<br />", $text); // $list[$curval];
}
@@ -1176,7 +1179,7 @@ class users_admin_form_ui extends e_admin_form_ui
extract($row);
$text = "<div>
<input type='hidden' name='userid[{$user_id}]' value='{$user_id}' />
<input type='hidden' name='userip[{$user_id}]' value='{$user_ip}' />
@@ -1371,7 +1374,7 @@ class users
save_prefs();
}
// $this->usersSaveColumnPref();
save_prefs();
$this->fieldpref = (!vartrue($user_pref['admin_users_columns'])) ? array('user_name','user_class') : $user_pref['admin_users_columns'];
/* if (e_QUERY)
{

8
e107_admin/wmessage.php
View File

@@ -34,7 +34,7 @@ require_once(e_HANDLER."ren_help.php");
$rs = new form;
$frm = new e_form;
$action == '';
vartrue($action) == '';
if (e_QUERY)
{
$tmp = explode('.', e_QUERY);
@@ -170,14 +170,14 @@ if ($action == "create" || $action == "edit")
<tr>
<td>".WMLAN_10."</td>
<td>
<input type='text' class='tbox' id='wm_caption' name='wm_caption' maxlength='80' style='width:95%' value=\"".$tp->toForm($row['gen_ip'])."\" />
<input type='text' class='tbox' id='wm_caption' name='wm_caption' maxlength='80' style='width:95%' value=\"".$tp->toForm(vartrue($row['gen_ip']))."\" />
</td>
</tr>";
$text .= "<tr>
<td>".WMLAN_04."</td>
<td>
<textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm($row['gen_chardata'])."</textarea>
<textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm(vartrue($row['gen_chardata']))."</textarea>
<br />";
$text .= display_help("helpb", "admin");
@@ -187,7 +187,7 @@ if ($action == "create" || $action == "edit")
</td>
</tr>
<tr><td>".WMLAN_03."</td>
<td>".r_userclass("wm_active", $row['gen_intdata'], "off", "public,guest,nobody,member,admin,classes")."</td></tr>
<td>".r_userclass("wm_active", vartrue($row['gen_intdata']), "off", "public,guest,nobody,member,admin,classes")."</td></tr>
</table>";
$text .= "

4
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@@ -252,11 +252,11 @@ class bbcode_shortcodes extends e_shortcode
$emote = ",".$emote;
}
$text = "onclick=\"{$func}('".$func_var."'{$emote})\" ";
$bbcode_help = $this->var['hint_func'];
$bbcode_help = vartrue($this->var['hint_func']);
$bbcode_tag = $this->var['tagid'];
$_helptxt = $hint_diz;
// onclick="addtext('[justify][/justify]')" onmouseout="help('','admin')" onmouseover="help('Justify align: [justify]This text will be justified[/justify]','admin')">
$text .= ($this->var['hint_active'] ? "onmouseout=\"{$bbcode_help}('','{$bbcode_tag}')\" onmouseover=\"{$bbcode_help}('".$_helptxt."','{$bbcode_tag}')\"" : "" );
$text .= (vartrue($this->var['hint_active']) ? "onmouseout=\"{$bbcode_help}('','{$bbcode_tag}')\" onmouseover=\"{$bbcode_help}('".$_helptxt."','{$bbcode_tag}')\"" : "" );
return $text;
}

4
e107_core/shortcodes/single/imageselector.php
View File

@@ -71,8 +71,8 @@ function imageselector_shortcode($parm = '', $mod = '')
}
$multi = ($multiple == "TRUE" || $multiple == "1") ? " multiple='multiple' style='height:{$height}'" : ""; //style='float:left'
$width = ($width) ? $width : "0";
$height = ($height) ? $height : "0";
$width = (vartrue($width)) ? $width : "0";
$height = (vartrue($height)) ? $height : "0";
$label = ($label) ? $label : " -- -- ";
$tabindex = varset($tabindex) ? " tabindex='{$tabindex}'" : '';
$class = varset($class) ? " class='{$class}'" : " class='tbox imgselector'";

2
e107_core/url/user/url.php
View File

@@ -52,7 +52,7 @@ class core_user_url extends eUrlConfig
if(isset($params['user_id']) && !empty($params['user_id'])) $params['id'] = $params['user_id'];
$url = 'user.php';
$page = $params['page'] ? intval($params['page']) : '0';
$page = vartrue($params['page']) ? intval($params['page']) : '0';
if($route[0] == 'profile')
{

6
e107_handlers/admin_ui.php
View File

@@ -3302,13 +3302,13 @@ class e_admin_controller_ui extends e_admin_controller
{
// disabled or system
if((vartrue($var['nolist']) && !vartrue($var['filter'])) || null === $var['type'])
if((vartrue($var['nolist']) && !vartrue($var['filter'])) || null === vartrue($var['type']))
{
continue;
}
// select FROM... for main table
if($var['alias'] && vartrue($var['__tableField']))
if(vartrue($var['alias']) && vartrue($var['__tableField']))
{
$tableSFieldsArr[] = $var['__tableField'];
}
@@ -4344,7 +4344,7 @@ class e_admin_form_ui extends e_form
foreach($fields as $field => $foptions)
{
// check form custom methods
if($foptions['type'] === 'method' && method_exists('e_form', $field)) // check even if type is not method. - just in case of an upgrade later by 3rd-party.
if(vartrue($foptions['type']) === 'method' && method_exists('e_form', $field)) // check even if type is not method. - just in case of an upgrade later by 3rd-party.
{
e107::getMessage()->addError(sprintf(LAN_UI_FORM_METHOD_ERROR, $field));
$err = true;

4
e107_handlers/bbcode_handler.php
View File

@@ -527,10 +527,10 @@ class e_bbcode
$data = array(
'tagid' => $id,
'template' => $template,
'trigger' => $addtextfunc,
'trigger' => vartrue($addtextfunc),
// 'hint_func' => $helpfunc, // unused
// 'hint_active' => $bbcode_helpactive, // unused
'size' => $helpsize
'size' => vartrue($helpsize)
);
$bbcode_shortcodes->setVars($data);

2
e107_handlers/db_verify_class.php
View File

@@ -89,7 +89,7 @@ class db_verify
function verify()
{
if($_POST['verify_table'])
if(vartrue($_POST['verify_table']))
{
$this->runComparison($_POST['verify_table']);

38
e107_handlers/form_handler.php
View File

@@ -217,7 +217,7 @@ class e_form
if(!vartrue($parms['size'])) $parms['size'] = 15;
if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner input-small';
if(!$value) $value = '0';
return $this->text($key, $value, $maxlength, $parms);
return $this->text(vartrue($key), $value, $maxlength, $parms);
}
function email($name, $value, $maxlength = 200, $options = array())
@@ -280,10 +280,10 @@ class e_form
parse_str($extras);
if($bbcode) $cat .= '&amp;bbcode=1';
if(vartrue($bbcode)) $cat .= '&amp;bbcode=1';
if(!$mode) $mode = 'main';
if(!$action) $action = 'dialog';
if(!vartrue($mode)) $mode = 'main';
if(!vartrue($action)) $action = 'dialog';
// $tabs // TODO - option to choose which tabs to display.
@@ -465,12 +465,12 @@ class e_form
}
//$width = intval(vartrue($sc_parameters['width'], 150));
$cat = $tp->toDB($sc_parameters['media']);
$cat = $tp->toDB(vartrue($sc_parameters['media']));
if($cat == '_icon')
{
$ret = "<div class='imgselector-container' style='display:block;width:64px;min-height:64px'>";
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $default_thumb;
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $default_thumb;
$style = ($blank) ? "border:1px dashed black;width:64px;height:64px" : "border:1px dashed black";
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='{$style}' />";
@@ -479,7 +479,7 @@ class e_form
{
$ret = "<div class='imgselector-container' style='display:block;width:120px;min-height:100px'>";
$att = 'aw=120&ah=100';
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true);
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
}
@@ -888,7 +888,7 @@ class e_form
$options_on = varset($options['enabled'],array());
$options_off = varset($options['disabled'],array());
if($options['class'] == 'e-expandit') // See admin->prefs 'Single Login' for an example.
if(vartrue($options['class']) == 'e-expandit') // See admin->prefs 'Single Login' for an example.
{
$options_on = array('class' => 'e-expandit-on');
$options_off = array('class' => 'e-expandit-off');
@@ -971,7 +971,7 @@ class e_form
$option_array = array(1 => LAN_YES, 0 => LAN_NO);
}
if($options['multiple'])
if(vartrue($options['multiple']))
{
$name = (strpos($name, '[') === false) ? $name.'[]' : $name;
$selected = explode(",",$selected);
@@ -1641,7 +1641,7 @@ class e_form
foreach ($fieldarray as $field => $data)
{
// shouldn't happen...
if(!isset($fieldvalues[$field]) && $data['alias'])
if(!isset($fieldvalues[$field]) && vartrue($data['alias']))
{
$fieldvalues[$data['alias']] = $fieldvalues[$data['field']];
$field = $data['alias'];
@@ -1652,7 +1652,7 @@ class e_form
{
continue;
}
elseif($data['type'] != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
elseif(vartrue($data['type']) != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
{
$ret .= "
<td>
@@ -1666,7 +1666,7 @@ class e_form
$tdclass = vartrue($data['class']);
if($field == 'checkboxes') $tdclass = $tdclass ? $tdclass.' autocheck e-pointer' : 'autocheck e-pointer';
// there is no other way for now - prepare user data
if('user' == $data['type']/* && isset($data['readParms']['idField'])*/)
if('user' == vartrue($data['type']) /* && isset($data['readParms']['idField'])*/)
{
if(is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']);
if(isset($data['readParms']['idField']))
@@ -1865,7 +1865,7 @@ class e_form
$opts = $wparms['__options'];
unset($wparms['__options']);
if($opts['multiple'] || $attributes['data']=='comma')
if(vartrue($opts['multiple']) || $attributes['data']=='comma')
{
$ret = array();
$value = is_array($value) ? $value : explode(',', $value);
@@ -2222,7 +2222,7 @@ class e_form
case 'textarea':
$text = "";
if($parms['append']) // similar to comments - TODO TBD. a 'comment' field type may be better.
if(vartrue($parms['append'])) // similar to comments - TODO TBD. a 'comment' field type may be better.
{
$attributes['readParms'] = 'bb=1';
$text = $this->renderValue($key, $value, $attributes).$this->hidden($key, $value).'<br />';
@@ -2351,7 +2351,7 @@ class e_form
$uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler)
unset($parms['classlist']);
$method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select';
if($atrributes['type'] == 'userclasses'){ $parms['multiple'] = true; }
if(vartrue($atrributes['type']) == 'userclasses'){ $parms['multiple'] = true; }
$ret = $this->$method($key, $value, $uc_options, vartrue($parms, array()));
break;
@@ -2500,7 +2500,7 @@ class e_form
$asc = strtoupper(vartrue($options['asc'], 'asc'));
$elid = $fid;//$options['id'];
$query = isset($options['query']) ? $options['query'] : e_QUERY ;
if($_GET['action'] == 'list')
if(vartrue($_GET['action']) == 'list')
{
$query = e_QUERY; //XXX Quick fix for loss of pagination after 'delete'.
}
@@ -2692,7 +2692,7 @@ class e_form
foreach($fdata['fields'] as $key => $att)
{
// convert aliases - not supported in edit mod
if($att['alias'] && !$model->hasData($key))
if(vartrue($att['alias']) && !$model->hasData($key))
{
$key = $att['field'];
}
@@ -2715,7 +2715,7 @@ class e_form
}
// type null - system (special) fields
if($att['type'] !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
{
$required = '';
$required_class = '';
@@ -2749,7 +2749,7 @@ class e_form
$text .= "
<tr>
<td>
".$required."<span{$required_class}>".defset($att['title'], $att['title'])."</span>".$label."
".$required."<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title']))."</span>".$label."
</td>
<td>
".$this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()))."

4
e107_handlers/userclass_class.php
View File

@@ -855,7 +855,7 @@ class user_class
public function isEditableClass($classID)
{
if (($classID >= e_UC_SPECIAL_BASE) && ($classID <= e_UC_SPECIAL_END)) return FALSE; // Don't allow deletion of fixed classes
if (isset($this->fixed_classes[$class_id])) return FALSE; // This picks up classes such as e_UC_PUBLIC outside the main range which can't be deleted
if (isset($this->fixed_classes[vartrue($class_id)])) return FALSE; // This picks up classes such as e_UC_PUBLIC outside the main range which can't be deleted
return TRUE;
}
@@ -1187,7 +1187,7 @@ class user_class_admin extends user_class
*/
protected function show_graphical_subtree($listnum, $indent_images, $is_last = FALSE)
{
$num_children = count($this->class_tree[$listnum]['class_children']);
$num_children = count(vartrue($this->class_tree[$listnum]['class_children']));
$is_open = TRUE;
$tag_name = 'uclass_tree_'.$listnum;

2
e107_languages/English/admin/help/userclass2.php
View File

@@ -18,7 +18,7 @@ if (!defined('e107_INIT')) { exit; }
$caption = "User Class Help";
if (!($action = $_GET['action']))
if (!($action = vartrue($_GET['action'])))
{
if (e_QUERY)
{

2
e107_plugins/alt_auth/alt_auth_adminmenu.php
View File

@@ -31,7 +31,7 @@ TODO:
if (!defined('e107_INIT')) { exit; }
if (!is_object($euf))
if (!is_object(vartrue($euf)))
{
require_once(e_HANDLER.'user_extended_class.php');
$euf = new e107_user_extended;

4
e107_plugins/banner/admin_banner.php
View File

@@ -98,7 +98,7 @@ if (isset($_POST['update_menu']))
if ($_POST['createbanner'] || $_POST['updatebanner'])
if (vartrue($_POST['createbanner']) || vartrue($_POST['updatebanner']))
{
$start_date = (!$_POST['startmonth'] || !$_POST['startday'] || !$_POST['startyear'] ? 0 : mktime (0, 0, 0, $_POST['startmonth'], $_POST['startday'], $_POST['startyear']));
$end_date = (!$_POST['endmonth'] || !$_POST['endday'] || !$_POST['endyear'] ? 0 : mktime (0, 0, 0, $_POST['endmonth'], $_POST['endday'], $_POST['endyear']));
@@ -154,7 +154,7 @@ if (isset($_POST['delete_cancel']))
header('Location:'.e_SELF);
exit;
}
if ($action == "delete" && $sub_action && varsettrue($_POST['delete_confirm']))
if (vartrue($action) == "delete" && $sub_action && varsettrue($_POST['delete_confirm']))
{
if($sql->db_Delete("banner", "banner_id=".intval($sub_action)))
{

26
e107_plugins/download/admin_download.php
View File

@@ -339,11 +339,11 @@ function showLimits()
}
$txt = "
<form method='post' action='".e_SELF."?".e_QUERY."'>
<table class='adminlist'>
<table class='table adminform'>
<tr>
<td colspan='4' style='text-align:left'>
";
if ($pref['download_limits'] == 1)
if(vartrue($pref['download_limits']) == 1)
{
$chk = "checked = 'checked'";
}
@@ -364,7 +364,7 @@ function showLimits()
</tr>
";
if(is_array($limitList))
if(is_array(vartrue($limitList)))
{
foreach($limitList as $row)
{
@@ -453,7 +453,7 @@ function showMaint() // Deprecated.
if (!$foundSome) {
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminform">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_13.'</th>';
$text .= '<th>'.DOWLAN_67.'</th>';
@@ -509,7 +509,7 @@ function showMaint() // Deprecated.
if (!$foundSome) {
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminform">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_13.'</th>';
$text .= '<th>'.DOWLAN_182.'</th>';
@@ -602,7 +602,7 @@ function showMaint() // Deprecated.
{
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminform">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>';
@@ -657,7 +657,7 @@ function showMaint() // Deprecated.
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '
<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminlist">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>';
@@ -711,7 +711,7 @@ function showMaint() // Deprecated.
if (!$foundSome) {
// $text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform");
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">';
<table class="table adminlist">';
$text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>';
@@ -766,7 +766,7 @@ function showMaint() // Deprecated.
<form method='post' action='".e_SELF."?".e_QUERY."' id='core-db-main-form'>
<fieldset id='core-db-plugin-scan'>
<legend class='e-hideme'>".DOWLAN_10."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<table class='table adminform'>
<colgroup span='2'>
<col style='width: 40%'></col>
<col style='width: 60%'></col>
@@ -927,7 +927,7 @@ function showMaint() // Deprecated.
<div id='download_search'>
<fieldset>
<legend class='e-hideme'>".DOWLAN_194."</legend>
<table class='adminlist'>
<table class='table adminform'>
<tr>
<td>".DOWLAN_198." ".$frm->text('download-search-text', $this->searchField, 50, array('size'=>50, 'class' => 'someclass'))."&nbsp;<a href='#download_search#download_advanced_search' class='e-swapit'>Switch to Advanced-Search</a></td>
</tr>
@@ -955,7 +955,7 @@ function showMaint() // Deprecated.
<div id='download_advanced_search' class='e-hideme'>
<fieldset>
<legend class='e-hideme'>".DOWLAN_183."</legend>
<table class='adminform'>
<table class='table adminform'>
<colgroup>
<col style='width:15%;'/>
<col style='width:35%;'/>
@@ -1143,7 +1143,7 @@ function showMaint() // Deprecated.
."</p><p>".
DOWLAN_72.$source_file."
</p></div>
<table style='".ADMIN_WIDTH."' class='adminlist'>"
<table class='table adminform'>"
.$frm->colGroup($columnInfo)
.$frm->thead($columnInfo,$filterColumns)."
<tbody>
@@ -1197,7 +1197,7 @@ function showMaint() // Deprecated.
<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-download-upload1'>
<div>
<table style='".ADMIN_WIDTH."' class='adminlist'>
<table class='table adminform'>
<colgroup>
<col style='width:30%'/>
<col style='width:70%'/>

3
e107_plugins/download/e_help.php
View File

@@ -22,7 +22,7 @@ if (e_QUERY)
$action = $tmp[0];
}
switch($action) {
switch(vartrue($action)) {
case 'create' :{
$text = DOWLAN_HELP_2;
break;
@@ -71,6 +71,7 @@ switch($action) {
$text .= "</div>";
*/
$text = "";
}
}
$ns -> tablerender(DOWLAN_HELP_1, $text);

10
e107_plugins/download/includes/admin.php
View File

@@ -327,9 +327,9 @@ $columnInfo = array(
public function init()
{
$this->action = $_GET['mode'];
$this->subAction = $_GET['action'];
$this->id = $_GET['id'];
$this->action = vartrue($_GET['mode']);
$this->subAction = vartrue($_GET['action']);
$this->id = vartrue($_GET['id']);
$this->observe();
@@ -353,7 +353,7 @@ $columnInfo = array(
$this->fields['download_category']['readParms'] = $categories;
// Custom filter queries
if($_GET['filter_options'])
if(vartrue($_GET['filter_options']))
{
list($filter,$mode) = explode("__",$_GET['filter_options']);
@@ -1297,7 +1297,7 @@ $columnInfo = array(
$text = "<div>
<form method='post' action='".e_SELF."?".e_QUERY."' id='dataform'>\n
<table style='".ADMIN_WIDTH."' class='adminlist'>
<table class='table adminform'>
<tr>
<td style='width: 30%;'>".DOWLAN_12."</td>

6
e107_plugins/forum/forum_admin.php
View File

@@ -307,13 +307,13 @@ if (isset($_POST['frsubmit']))
}
if ($delete == 'main') {
if (vartrue($delete) == 'main') {
if ($e107->sql->db_Delete('forum', "forum_id='$del_id' ")) {
$forum->show_message(FORLAN_96);
}
}
if ($action == 'create')
if (vartrue($action) == 'create')
{
if ($e107->sql->db_Select('forum', '*', "forum_parent='0' "))
{
@@ -390,7 +390,7 @@ if ($delete == 'reported')
if (!e_QUERY || $action == 'main')
{
$forum->show_existing_forums($sub_action, $id);
$forum->show_existing_forums(vartrue($sub_action), vartrue($id));
}
//$forum->show_options($action);

20
e107_plugins/forum/forum_admin_class.php
View File

@@ -517,7 +517,7 @@ class forumAdmin
$text .= "<select name='forum_parent' class='tbox'>\n";
while (list($fid, $fname) = $sql->db_Fetch(MYSQL_NUM))
{
$sel = ($fid == $fInfor['forum_parent'] ? "selected='selected'" : '');
$sel = ($fid == vartrue($fInfor['forum_parent']) ? "selected='selected'" : '');
$text .= "<option value='{$fid}' {$sel}>{$fname}</option>\n";
}
$text .= "</select>
@@ -527,14 +527,14 @@ class forumAdmin
<tr>
<td>".FORLAN_31.":</td>
<td>
<input class='tbox' type='text' name='forum_name' size='60' value='".$tp->toForm($fInfo['forum_name'])."' maxlength='250' /><span class='field-help'>".FORLAN_179."</span>
<input class='tbox' type='text' name='forum_name' size='60' value='".$tp->toForm(vartrue($fInfo['forum_name']))."' maxlength='250' /><span class='field-help'>".FORLAN_179."</span>
</td>
</tr>
<tr>
<td>".FORLAN_32.":</td>
<td>
<textarea class='tbox' name='forum_description' cols='50' rows='5'>".$tp->toForm($fInfo['forum_description'])."</textarea>
<textarea class='tbox' name='forum_description' cols='50' rows='5'>".$tp->toForm(vartrue($fInfo['forum_description']))."</textarea>
</td>
</tr>
@@ -883,7 +883,7 @@ class forumAdmin
}
else
{
$text .= "<div style='text-align:center'>".FORLAN_121."</div>";
$text = "<div style='text-align:center'>".FORLAN_121."</div>";
}
$ns->tablerender(FORLAN_116, $text);
}
@@ -1031,9 +1031,9 @@ class forumAdmin
$admin_rules = $sql->db_Fetch();
}
$guesttext = $tp->toFORM($guest_rules['gen_chardata']);
$membertext = $tp->toFORM($member_rules['gen_chardata']);
$admintext = $tp->toFORM($admin_rules['gen_chardata']);
$guesttext = $tp->toFORM(vartrue($guest_rules['gen_chardata']));
$membertext = $tp->toFORM(vartrue($member_rules['gen_chardata']));
$admintext = $tp->toFORM(vartrue($admin_rules['gen_chardata']));
$text = "
<form method='post' action='".e_SELF."?rules' id='wmform'>
@@ -1044,7 +1044,7 @@ class forumAdmin
<td style='width:20%'>".WMGLAN_1.": <br />
".WMGLAN_6.":";
if ($guest_rules['gen_intdata'])
if (vartrue($guest_rules['gen_intdata']))
{
$text .= "<input type='checkbox' name='guest_active' value='1' checked='checked' />";
}
@@ -1065,7 +1065,7 @@ class forumAdmin
<tr>
<td style='width:20%'>".WMGLAN_2.": <br />
".WMGLAN_6.":";
if ($member_rules['gen_intdata'])
if (vartrue($member_rules['gen_intdata']))
{
$text .= "<input type='checkbox' name='member_active' value='1' checked='checked' />";
}
@@ -1087,7 +1087,7 @@ class forumAdmin
<td style='width:20%'>".WMGLAN_3.": <br />
".WMGLAN_6.": ";
if ($admin_rules['gen_intdata'])
if (vartrue($admin_rules['gen_intdata']))
{
$text .= "<input type='checkbox' name='admin_active' value='1' checked='checked' />";
}

2
e107_plugins/links_page/admin_linkspage_config.php
View File

@@ -311,7 +311,7 @@ function admin_linkspage_config_adminmenu()
$var[$row['link_category_id']]['text'] = $row['link_category_name'];
$var[$row['link_category_id']]['link'] = e_SELF."?link.view.".$row['link_category_id'];
}
$active = ($qs[0] == 'link') ? $id : FALSE;
$active = ($qs[0] == 'link') ? vartrue($id) : FALSE;
show_admin_menu(LCLAN_ADMINMENU_8, $active, $var);
}
}

2
e107_plugins/links_page/e_help.php
View File

@@ -1,7 +1,7 @@
<?php
if (!defined('e107_INIT')) { exit; }
include_lan($plugindir."languages/".e_LANGUAGE."_admin_links_page.php");
include_lan(e_PLUGIN."/links_page/languages/".e_LANGUAGE."_admin_links_page.php");
if(!e_QUERY)
{

4
e107_plugins/links_page/link_class.php
View File

@@ -806,7 +806,7 @@ class linkclass
</tr>";
//triggerHook
$data = array('method'=>'form', 'table'=>'links_page', 'id'=>$row['link_id'], 'plugin'=>'links_page', 'function'=>'show_link_create');
$data = array('method'=>'form', 'table'=>'links_page', 'id'=>vartrue($row['link_id']), 'plugin'=>'links_page', 'function'=>'show_link_create');
$text .= $frm->renderHooks($data);
$text .= "
@@ -1036,7 +1036,7 @@ class linkclass
<tr>
<td>".LCLAN_CAT_24."</td>
<td>
".r_userclass("link_category_class", $row['link_category_class'], "off", "public,guest,nobody,member,admin,classes")."
".r_userclass("link_category_class", vartrue($row['link_category_class']), "off", "public,guest,nobody,member,admin,classes")."
</td>
</tr>
<tr><td colspan='2' style='text-align:center'>";

2
e107_plugins/linkwords/e_tohtml.php
View File

@@ -89,7 +89,7 @@ class e_tohtml_linkwords
$this->lw_enabled = TRUE;
}
}
if (!$temp)
if (!vartrue($temp))
{ // Either cache disabled, or no info in cache (or error reading/processing cache)
$link_sql = new db;
if($link_sql -> db_Select("linkwords", "*", "linkword_active!=1"))

2
e107_plugins/metaweblog/admin_config.php
View File

@@ -15,7 +15,7 @@ if(!getperms("P")){ header("location:".e_BASE."index.php"); exit; }
include_lan(e_PLUGIN."metaweblog/languages/".e_LANGUAGE.".php");
require_once(e_ADMIN."auth.php");
$text .= XMLRPC_HELP_011;
$text = XMLRPC_HELP_011;
$ns -> tablerender(XMLRPC_CONFIG_001, $text);
require_once(e_ADMIN."footer.php");
?>

4
e107_plugins/newsfeed/admin_config.php
View File

@@ -102,7 +102,7 @@ if($headline_total = $sql->db_Select("newsfeed"))
{
$nfArray = $sql -> db_getList();
$text = "<div style='text-align:center'>
$text = "
<table class='table adminform'>
<colgroup>
<col style='width: 5%; text-align: center;' />
@@ -134,7 +134,7 @@ if($headline_total = $sql->db_Select("newsfeed"))
</tr>\n";
}
$text .= "</table>\n</div>";
$text .= "</table>";
}
else
{

2
e107_plugins/newsfeed/e_frontpage.php
View File

@@ -23,7 +23,7 @@ if (!plugInstalled('newsfeed'))
include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_frontpage.php');
$front_page['newsfeed']['title'] = NWSF_FP_1.': '.$row['content_heading'];
$front_page['newsfeed']['title'] = NWSF_FP_1.': '.vartrue($row['content_heading']);
$front_page['newsfeed']['page'][] = array('page' => $PLUGINS_DIRECTORY.'newsfeed/newsfeed.php', 'title' => NWSF_FP_2);
if ($sql -> db_Select("newsfeed", "newsfeed_id, newsfeed_name")) {

2
e107_plugins/poll/poll_class.php
View File

@@ -602,7 +602,7 @@ class poll
$text .= "
<td>".r_userclass("pollUserclass", $_POST['pollUserclass'], 'off', $uclass)."</td>
<td>".r_userclass("pollUserclass", vartrue($_POST['pollUserclass']), 'off', $uclass)."</td>
</tr>
<tr>

2
e107_plugins/siteinfo/e_shortcode.php
View File

@@ -41,7 +41,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
function sc_logo($parm)
{
parse_str($parm); // Optional {LOGO=file=file_name} or {LOGO=link=url} or {LOGO=file=file_name&link=url}
parse_str(vartrue($parm)); // Optional {LOGO=file=file_name} or {LOGO=link=url} or {LOGO=file=file_name&link=url}
// Paths to image file, link are relative to site base
$tp = e107::getParser();