mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-13 17:12:07 +02:00
Code Issues Releases Wiki Activity

More deprecated function/method cleanup.

Browse Source
This commit is contained in:
Cameron 2016-02-15 01:07:34 -08:00
parent 2c50a06517
commit b402a12ec7
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/header.php
View File

@ -453,12 +453,12 @@ if (count($js_body_onload)) $body_onload = " onload=\"".implode(" ",$js_body_onl
/*
* Admin LAN
* TODO - remove it from here
*/
*//*
e107::js('inline',"
(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');
(".e_jshelper::toString(LAN_DELETE).").addModLan('core', 'delete');
",'prototype',5);
",'prototype',5);*/
// [JSManager] Load JS Includes - Zone 5 - After theme_head, before e107:loaded trigger

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

@ -1210,7 +1210,7 @@ class admin_shortcodes
}
}
function getBadge($total, $type = 'latest')
static function getBadge($total, $type = 'latest')
{
/*
@ -1269,7 +1269,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
/**
* Attempt to Convert Old $text string into new array format (e_status and e_latest)
*/
function legacyToConfig($text)
static function legacyToConfig($text)
{
$var = array();
preg_match_all('/(<img[^>]*>)[\s]*<a[^>]href=(\'|")([^\'"]*)(\'|")>([^<]*)<\/a>[: ]*([\d]*)/is',$text, $match);

5
install.php
View File

@ -843,6 +843,7 @@ class e_install
$xml_installed = (!function_exists('utf8_encode')) ? false : true;
$exif_installed = (!function_exists('exif_imagetype')) ? false : true;
$gdlib_installed = (extension_loaded('gd') && function_exists('gd_info')) ? true : false;
$curl_installed = (function_exists('curl_version')) ? true : false;
@ -877,9 +878,12 @@ class e_install
$mysqlColor = ($mysql_pass == true) ? "text-success" : "text-error";
$gdLibColor = ($gdlib_installed == true) ? "text-success" : "text-error";
$curlColor = ($curl_installed == true) ? "text-success" : "text-error"; //TODO Below.
$xmlExtensionLink = "<a href='http://php.net/manual/en/ref.xml.php'>php.net</a>";
// TODO Lots of repetition below - clean it up with an array and loop.
$output = "
<table class='table table-striped table-bordered' style='width: 100%; margin-left: auto; margin-right: auto;'>
<tr>
@ -917,6 +921,7 @@ class e_install
<td class='{$exifColor}'>".($exif_installed ? "<i class='glyphicon glyphicon-ok'></i> ".LANINS_017 : str_replace("[x]", $exifExtensionLink, LANINS_054) )."</td>
</tr>
</table>\n";
$this->finish_form();
$this->template->SetTag("stage_content", $output.$e_forms->return_form());
$this->logLine('Stage 4 completed');

2
submitnews.php
View File

@ -190,7 +190,7 @@ else
{
$text .= "
<select name='cat_id' class='tbox form-control'>";
while (list($cat_id, $cat_name, $cat_icon) = $sql->db_Fetch('num'))
while (list($cat_id, $cat_name, $cat_icon) = $sql->fetch('num'))
{
$sel = (varset($_POST['cat_id'],'') == $cat_id) ? "selected='selected'" : "";
$text .= "<option value='{$cat_id}' {$sel}>".$tp->toHTML($cat_name, FALSE, "defs")."</option>";

6
top.php
View File

@ -210,7 +210,7 @@ if ($action == 'top')
if ($subaction == 'comment' || $subaction == 'all')
{
$top_forum_posters = $sql->db_Select("user", "*", "`user_comments` > 0 ORDER BY user_comments DESC LIMIT 0, 10");
$top_forum_posters = $sql->select("user", "*", "`user_comments` > 0 ORDER BY user_comments DESC LIMIT 0, 10");
$text = "
<div style='text-align:center'>
<table style='width:95%' class='fborder'>
@ -258,7 +258,7 @@ if ($action == 'top')
if ($subaction == 'chat' || $subaction == 'all')
{
$top_forum_posters = $sql->db_Select("user", "*", "`user_chats` > 0 ORDER BY user_chats DESC LIMIT 0, 10");
$top_forum_posters = $sql->select("user", "*", "`user_chats` > 0 ORDER BY user_chats DESC LIMIT 0, 10");
$text = "
<div style='text-align:center'>
<table style='width:95%' class='fborder'>
@ -271,7 +271,7 @@ if ($action == 'top')
$counter = 1;
if($top_forum_posters)
{
while ($row = $sql->db_Fetch())
while ($row = $sql->fetch())
{
// TODO - Custom ranking (chat), LANs
$ldata = $rank->getRanks($row);

6
user.php
View File

@ -87,7 +87,7 @@ if (isset($_POST['delp']))
if (USERID == $tmp[1] || (ADMIN && getperms("4")))
{
$sql->select("user", "user_sess", "user_id='". USERID."'");
$row = $sql->db_Fetch();
$row = $sql->fetch();
@unlink(e_AVATAR_UPLOAD.$row['user_sess']);
$sql->update("user", "user_sess='' WHERE user_id=".intval($tmp[1]));
header("location:".e_SELF."?id.".$tmp[1]);
@ -234,9 +234,9 @@ if (isset($id))
exit;
}
$users_total = $sql->db_Count("user","(*)", "WHERE user_ban = 0");
$users_total = $sql->count("user","(*)", "WHERE user_ban = 0");
if (!$sql->db_Select("user", "*", "user_ban = 0 ORDER BY user_id $order LIMIT $from,$records"))
if (!$sql->select("user", "*", "user_ban = 0 ORDER BY user_id $order LIMIT $from,$records"))
{
echo "<div style='text-align:center'><b>".LAN_USER_53."</b></div>";
}