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

Remove some references to deprecated functions/methods.

Browse Source
This commit is contained in:
Cameron
2015-02-14 23:34:15 -08:00
parent db057b3788
commit e576370e57
84 changed files with 319 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_core/bbcodes/bb_block.php
View File

@@ -31,9 +31,9 @@ class bb_block extends e_bb_base
$parms = eHelper::scParams($parm);
$safe = array();
if(varsettrue($parms['class'])) $safe['class'] = eHelper::secureClassAttr($parms['class']);
if(varsettrue($parms['id'])) $safe['id'] = eHelper::secureIdAttr($parms['id']);
if(varsettrue($parms['style'])) $safe['style'] = eHelper::secureStyleAttr($parms['style']);
if(vartrue($parms['class'])) $safe['class'] = eHelper::secureClassAttr($parms['class']);
if(vartrue($parms['id'])) $safe['id'] = eHelper::secureIdAttr($parms['id']);
if(vartrue($parms['style'])) $safe['style'] = eHelper::secureStyleAttr($parms['style']);
if($safe)
{
return '[block='.eHelper::buildAttr($safe).']'.$code_text.'[/block]';
@@ -54,8 +54,8 @@ class bb_block extends e_bb_base
$class = e107::getBB()->getClass('block').(varset($parms['class']) ? ' '.$parms['class'] : '');
$class = ' class="'.$class.'"';
$id = varsettrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
$style = varsettrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
$id = vartrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
$style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
if(empty($code_text)) $code_text = '<!-- -->';
return '<div'.$id.$class.$style.'>'.$code_text.'</div>';

4
e107_core/bbcodes/bb_h.php
View File

@@ -67,8 +67,8 @@ class bb_h extends e_bb_base
$class = " class='".e107::getBB()->getClass($h)."'"; // consistent classes across all themes.
$id = varsettrue($parms['id']) ? ' id='.eHelper::secureIdAttr($parms['id']) : '';
$style = varsettrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
$id = vartrue($parms['id']) ? ' id='.eHelper::secureIdAttr($parms['id']) : '';
$style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
return "<{$h}{$id}{$class}{$style}>".$code_text."</{$h}>";
}

8
e107_core/bbcodes/bb_img.php
View File

@@ -20,9 +20,9 @@ class bb_img extends e_bb_base
$parms = eHelper::scParams($parm);
$safe = array();
if(varsettrue($parms['class'])) $safe['class'] = eHelper::secureClassAttr($parms['class']);
if(varsettrue($parms['id'])) $safe['id'] = eHelper::secureIdAttr($parms['id']);
if(varsettrue($parms['style'])) $safe['style'] = eHelper::secureStyleAttr($parms['style']);
if(vartrue($parms['class'])) $safe['class'] = eHelper::secureClassAttr($parms['class']);
if(vartrue($parms['id'])) $safe['id'] = eHelper::secureIdAttr($parms['id']);
if(vartrue($parms['style'])) $safe['style'] = eHelper::secureStyleAttr($parms['style']);
if($safe)
{
return '[img='.eHelper::buildAttr($safe).']'.$code_text.'[/img]';
@@ -202,7 +202,7 @@ class bb_img extends e_bb_base
// Check for whether we can display image down here - so we can show image name if appropriate
if (!varsettrue($pref['image_post']) || !check_class($pref['image_post_class']))
if (!vartrue($pref['image_post']) || !check_class($pref['image_post_class']))
{
switch ($pref['image_post_disabled_method'])
{

4
e107_core/bbcodes/bb_p.php
View File

@@ -62,8 +62,8 @@ class bb_p extends e_bb_base
$class = " ".e107::getBB()->getClass('p'); // consistent classes across all themes.
$id = varsettrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
$style = varsettrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
$id = vartrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
$style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';
return "<p{$id}{$class}{$style}>".$code_text.'</p>';
}

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

@@ -1483,7 +1483,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
// ---------------- Cameron's Bit ---------------------------------
if(!varsettrue($pref['admin_separate_plugins']))
if(!vartrue($pref['admin_separate_plugins']))
{
// Convert Plugin Categories to Core Categories.
$convert = array(
@@ -1517,7 +1517,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
// ------------------------------------------------------------------
//added option to disable leave/logout (ll) - more flexibility for theme developers
if(!varsettrue($parms['disable_ll']))
if(!vartrue($parms['disable_ll']))
{
// $menu_vars += $this->getOtherNav('home');
}

2
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -153,7 +153,7 @@ class news_shortcodes extends e_shortcode
function sc_trackback($parm)
{
global $pref;
if(!varsettrue($pref['trackbackEnabled'])) { return ''; }
if(!vartrue($pref['trackbackEnabled'])) { return ''; }
$news_item = $this->news_item;
$news_item['#'] = 'track';

2
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -186,7 +186,7 @@ class signup_shortcodes extends e_shortcode
function sc_signup_loginname()
{
global $rs, $pref;
if (varsettrue($pref['predefinedLoginName']))
if (vartrue($pref['predefinedLoginName']))
{
return LAN_SIGNUP_67;
}

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

@@ -27,7 +27,7 @@ function imageselector_shortcode($parm = '', $mod = '')
$path = ""; // remove the default path if a constant is used.
}
$scaction = varsettrue($scaction, 'all');
$scaction = vartrue($scaction, 'all');
$text = '';
$name_id = e107::getForm()->name2id($name);
$imagelist = array();

2
e107_core/shortcodes/single/nextprev.php
View File

@@ -409,7 +409,7 @@ function nextprev_shortcode($parm = '')
if($total_pages > 1)
{
if(varsettrue($pref['old_np']))
if(vartrue($pref['old_np']))
{
$NP_PRE_ACTIVE = '';