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

Deprecated function cleanup

Browse Source
This commit is contained in:
Cameron 2016-02-15 00:14:45 -08:00
parent a673206da5
commit a469b7ca6e
18 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comment.php
View File

@ -422,7 +422,7 @@ elseif ($action == 'comment')
AND n.news_allow_comments=0";
}
if (!$sql->db_Select_gen($query))
if (!$sql->gen($query))
{
e107::redirect();
exit;

4
e107_admin/admin_log.php
View File

@ -1511,7 +1511,7 @@ if(isset($page_title[$action]))
}
$num_entry = 0;
if($sql->db_Select_gen($qry.$limit_clause))
if($sql->gen($qry.$limit_clause))
{
$num_entry = $sql->total_results;
}
@ -1519,7 +1519,7 @@ if(isset($page_title[$action]))
{
$from = 0; // We may be on a later page
$limit_clause = " LIMIT {$from}, {$amount} ";
$sql->db_Select_gen($qry.$limit_clause); // Re-run query with new value of $from
$sql->gen($qry.$limit_clause); // Re-run query with new value of $from
$num_entry = $sql->total_results;
}

2
e107_admin/banlist.php
View File

@ -1582,7 +1582,7 @@ function process_csv($filename, $override_imports, $override_expiry, $separator
}
$qry = "REPLACE INTO `#banlist` (".implode(',', array_keys($field_list)).") values ('".implode("', '", $field_list)."')";
// echo count($field_list)." elements, query: ".$qry."<br />";
if (!$sql->db_Select_gen($qry))
if (!$sql->gen($qry))
{
$mes->addError(BANLAN_50.$line_num);
return BANLAN_50.$line_num;

2
e107_admin/banlist_export.php
View File

@ -88,7 +88,7 @@ function do_export($filename, $type_list='',$format_array, $sep = ',', $quot = '
$export_text = '';
$qry = "SELECT * FROM `#banlist` ";
if ($type_list != '') $qry .= " WHERE`banlist_bantype` IN ({$type_list})";
if (!$sql->db_Select_gen($qry)) return 'No data: '.$qry;
if (!$sql->gen($qry)) return 'No data: '.$qry;
while ($row = $sql->db_Fetch())
{
$line = '';

6
e107_admin/image.php
View File

@ -333,8 +333,8 @@ class media_form_ui extends e_admin_form_ui
function init()
{
/*$sql = e107::getDb();
// $sql->db_Select_gen("SELECT media_cat_title, media_title_nick FROM #core_media as m LEFT JOIN #core_media_cat as c ON m.media_category = c.media_cat_owner GROUP BY m.media_category");
$sql->db_Select_gen("SELECT media_cat_title, media_cat_owner FROM #core_media_cat");
// $sql->gen("SELECT media_cat_title, media_title_nick FROM #core_media as m LEFT JOIN #core_media_cat as c ON m.media_category = c.media_cat_owner GROUP BY m.media_category");
$sql->gen("SELECT media_cat_title, media_cat_owner FROM #core_media_cat");
while($row = $sql->db_Fetch())
{
$cat = $row['media_cat_owner'];
@ -848,7 +848,7 @@ class media_admin_ui extends e_admin_ui
}
$sql = e107::getDb();
// $sql->db_Select_gen("SELECT media_cat_title, media_title_nick FROM #core_media as m LEFT JOIN #core_media_cat as c ON m.media_category = c.media_cat_owner GROUP BY m.media_category");
// $sql->gen("SELECT media_cat_title, media_title_nick FROM #core_media as m LEFT JOIN #core_media_cat as c ON m.media_category = c.media_cat_owner GROUP BY m.media_category");
$sql->gen("SELECT media_cat_title, media_cat_owner, media_cat_category FROM `#core_media_cat`");
while($row = $sql->fetch())
{

2
e107_admin/includes/infopanel.php
View File

@ -673,7 +673,7 @@ class adminstyle_infopanel
$menu_qry = 'SELECT * FROM #menus WHERE menu_id!= 0 GROUP BY menu_name ORDER BY menu_name';
$settings = varset($pref['core-infopanel-menus'],array());
if (e107::getDb()->db_Select_gen($menu_qry))
if (e107::getDb()->gen($menu_qry))
{
while ($row = e107::getDb()->db_Fetch())
{

8
e107_admin/newspost.php
View File

@ -2431,11 +2431,11 @@ class admin_newspost
$query .= ($check_perms ? "WHERE {$check_perms}" : '')."ORDER BY {$ordfield} ".strtoupper($this->_sort_order);
}
$newsposts = $sql->db_Select_gen($query);
$newsposts = $sql->gen($query);
//echo "sql=".$query;
if ($sql->db_Select_gen($query." LIMIT ".$this->getFrom().", {$amount}"))
if ($sql->gen($query." LIMIT ".$this->getFrom().", {$amount}"))
{
$newsarray = $e107->sql->db_getList();
@ -2865,7 +2865,7 @@ class admin_newspost
}
}
$sql->db_Select_gen($qry);
$sql->gen($qry);
while($row = $sql->fetch())
{
if(vartrue($_POST['news_author']))
@ -3920,7 +3920,7 @@ class admin_newspost
$deleteCount = 0;
$updateCount = 0;
$canDelete = isset($_POST['newsdeletecomments']);
if ($result = e107::getDb()->db_Select_gen($qry))
if ($result = e107::getDb()->gen($qry))
{
while ($row = e107::getDb()->fetch())
{

22
e107_admin/update_routines.php
View File

@ -1708,7 +1708,7 @@ function update_70x_to_706($type='')
if(!$sql->db_Field("plugin",5)) // not plugin_rss so just add the new one.
{
if ($just_check) return update_needed();
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."plugin` ADD `plugin_addons` TEXT NOT NULL ;");
$sql->gen("ALTER TABLE `".MPREFIX."plugin` ADD `plugin_addons` TEXT NOT NULL ;");
catch_error($sql);
}
@ -1716,7 +1716,7 @@ function update_70x_to_706($type='')
if($sql->db_Field("plugin",5) == "plugin_rss")
{
if ($just_check) return update_needed();
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."plugin` CHANGE `plugin_rss` `plugin_addons` TEXT NOT NULL;");
$sql->gen("ALTER TABLE `".MPREFIX."plugin` CHANGE `plugin_rss` `plugin_addons` TEXT NOT NULL;");
catch_error($sql);
}
@ -1724,16 +1724,16 @@ function update_70x_to_706($type='')
if($sql->db_Field("dblog",5) == "dblog_query")
{
if ($just_check) return update_needed();
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."dblog` CHANGE `dblog_query` `dblog_title` VARCHAR( 255 ) NOT NULL DEFAULT '';");
$sql->gen("ALTER TABLE `".MPREFIX."dblog` CHANGE `dblog_query` `dblog_title` VARCHAR( 255 ) NOT NULL DEFAULT '';");
catch_error($sql);
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."dblog` CHANGE `dblog_remarks` `dblog_remarks` TEXT NOT NULL;");
$sql->gen("ALTER TABLE `".MPREFIX."dblog` CHANGE `dblog_remarks` `dblog_remarks` TEXT NOT NULL;");
catch_error($sql);
}
if(!$sql->db_Field("plugin","plugin_path","UNIQUE"))
{
if ($just_check) return update_needed();
if(!$sql->db_Select_gen("ALTER TABLE `".MPREFIX."plugin` ADD UNIQUE (`plugin_path`);"))
if(!$sql->gen("ALTER TABLE `".MPREFIX."plugin` ADD UNIQUE (`plugin_path`);"))
{
$mesg = LAN_UPDATE_12." : <a href='".e_ADMIN."db.php?plugin'>".ADLAN_145."</a>.";
//$ns -> tablerender(LAN_ERROR,$mes);
@ -1745,7 +1745,7 @@ function update_70x_to_706($type='')
if(!$sql->db_Field("online",6)) // online_active field
{
if ($just_check) return update_needed();
$sql->db_Select_gen("ALTER TABLE ".MPREFIX."online ADD online_active INT(10) UNSIGNED NOT NULL DEFAULT '0'");
$sql->gen("ALTER TABLE ".MPREFIX."online ADD online_active INT(10) UNSIGNED NOT NULL DEFAULT '0'");
catch_error($sql);
}
@ -1755,9 +1755,9 @@ function update_70x_to_706($type='')
if (!in_array('tmp_ip', $row))
{
if ($just_check) return update_needed();
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."tmp` ADD INDEX `tmp_ip` (`tmp_ip`);");
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."upload` ADD INDEX `upload_active` (`upload_active`);");
$sql->db_Select_gen("ALTER TABLE `".MPREFIX."generic` ADD INDEX `gen_type` (`gen_type`);");
$sql->gen("ALTER TABLE `".MPREFIX."tmp` ADD INDEX `tmp_ip` (`tmp_ip`);");
$sql->gen("ALTER TABLE `".MPREFIX."upload` ADD INDEX `upload_active` (`upload_active`);");
$sql->gen("ALTER TABLE `".MPREFIX."generic` ADD INDEX `gen_type` (`gen_type`);");
}
}
@ -1852,7 +1852,7 @@ function addIndexToTable($target, $indexSpec, $just_check, &$updateMessages, $op
$updateMessages[] = str_replace(array('--TABLE--','--INDEX--'),array($target,$indexSpec),LAN_UPDATE_54);
return !$just_check; // No point carrying on - return 'nothing to do'
}
if ($sql->db_Select_gen("SHOW INDEX FROM ".MPREFIX.$target))
if ($sql->gen("SHOW INDEX FROM ".MPREFIX.$target))
{
$found = FALSE;
while ($row = $sql -> db_Fetch())
@ -1867,7 +1867,7 @@ function addIndexToTable($target, $indexSpec, $just_check, &$updateMessages, $op
{
return 'Required to add index to '.$target;
}
$sql->db_Select_gen("ALTER TABLE `".MPREFIX.$target."` ADD INDEX `".$indexSpec."` (`".$indexSpec."`);");
$sql->gen("ALTER TABLE `".MPREFIX.$target."` ADD INDEX `".$indexSpec."` (`".$indexSpec."`);");
$updateMessages[] = str_replace(array('--TABLE--','--INDEX--'),array($target,$indexSpec),LAN_UPDATE_37);
}
return FALSE;

2
e107_admin/userclass2.php
View File

@ -1273,7 +1273,7 @@ unset($title);
if (isset($_POST['remove_db_fields']))
{ // Remove the DB fields
$message = "Remove DB fields: ";
$sql->db_Select_gen("ALTER TABLE #userclass_classes DROP `userclass_parent`, DROP `userclass_accum`, DROP `userclass_visibility`");
$sql->gen("ALTER TABLE #userclass_classes DROP `userclass_parent`, DROP `userclass_accum`, DROP `userclass_visibility`");
$message .= "Completed";
}

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

@ -441,7 +441,7 @@ SC_BEGIN DOWNLOAD_CATEGORY_SELECT
if (ADMIN === FALSE) $qry .= " WHERE dc.download_category_class IN (".USERCLASS_LIST.") ";
$qry .= " ORDER by dc2.download_category_order, dc1.download_category_order, dc.download_category_order"; // This puts main categories first, then sub-cats, then sub-sub cats
if (!$sql->db_Select_gen($qry))
if (!$sql->gen($qry))
{
return "Error reading categories<br />";
exit;

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

@ -28,7 +28,7 @@ function iconpicker_shortcode($parm)
$size_section = array();
$lastsize = "16";
if($sql->db_Select_gen($qry))
if($sql->gen($qry))
{
while($row = $sql->db_Fetch())
{

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

@ -42,7 +42,7 @@ function imageselector_shortcode($parm = '', $mod = '')
$qry .= vartrue($parms['media']) && $parms['media'] !== 'all' ? " AND media_category='".$tp->toDB($parms['media'])."' " : " AND `media_category` NOT REGEXP '_icon_16|_icon_32|_icon_48|_icon_64' ";
$qry .= " AND media_url REGEXP '\.jpg$|\.png$|\.gif$|\.jpeg$|\.svn$|\.JPG$|\.PNG$|\.GIF$|\.jpeg$|\.SVN$' ORDER BY media_name";
// FIXME - media_type=image?
if($sql->db_Select_gen($qry))
if($sql->gen($qry))
{
while($row = $sql->db_Fetch())
{

4
e107_core/shortcodes/single/news_categories.sc
View File

@ -118,7 +118,7 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
AND (n.news_end=0 || news_end > {$_time})
GROUP BY nc.category_id
ORDER BY nc.category_order ASC";
if(!$sql2->db_Select_gen($qry))
if(!$sql2->gen($qry))
{
return '';
}
@ -161,7 +161,7 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
AND (news_end=0 || news_end > {$_time})
ORDER BY news_datestamp DESC LIMIT 0,".NEWSCAT_AMOUNT;
$count = $sql->db_Select_gen($cqry);
$count = $sql->gen($cqry);
//$count = $sql->db_Select("news", "*", "news_category='".intval($category_id)."' AND news_class IN (".USERCLASS_LIST.") AND (news_start=0 || news_start < ".time().") AND (news_end=0 || news_end>".time().") ORDER BY news_datestamp DESC LIMIT 0,".NEWSCAT_AMOUNT);
if($count)
{

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

@ -43,7 +43,7 @@ function usersearch_shortcode($parm)
WHERE {$search_field} LIKE '".$tp->toDb($posted)."%'{$emailSrch}
";
if($sql->db_Select_gen($qry))
if($sql->gen($qry))
{
if($emailSrch) $info_field = 'user_email';
while($row = $sql->db_Fetch())

2
e107_handlers/admin_log_class.php
View File

@ -444,7 +444,7 @@ class e_admin_log
global $sql;
if ($days == false)
{ // $days is false, so truncate the log table
$sql->db_Select_gen("TRUNCATE TABLE #dblog ");
$sql->gen("TRUNCATE TABLE #dblog ");
}
else
{ // $days is set, so remove all entries older than that.

2
e107_handlers/admin_ui.php
View File

@ -3435,7 +3435,7 @@ class e_admin_controller_ui extends e_admin_controller
// Make query
$sql = e107::getDb();
if($qry && $sql->db_Select_gen($qry, $debug))
if($qry && $sql->gen($qry, $debug))
{
while ($res = $sql->db_Fetch())
{

12
e107_handlers/comment_class.php
View File

@ -1165,7 +1165,7 @@ class comment
ORDER BY c.comment_datestamp ".$sort;
}
$this->totalComments = $sql->db_Select_gen($query);
$this->totalComments = $sql->gen($query);
$query .= " LIMIT ".$from.",".$this->commentsPerPage;
@ -1247,7 +1247,7 @@ class comment
FROM #comments
WHERE comment_author_id = '{$id}'
";
if ($sql->db_Select_gen($qry))
if ($sql->gen($qry))
{
$row = $sql->db_Fetch();
$sql->db_Update("user", "user_comments = '{$row['count']}' WHERE user_id = '{$id}'");
@ -1265,7 +1265,7 @@ class comment
WHERE comment_item_id='{$id}' AND comment_type='{$comment_type}'
GROUP BY author
";
if ($sql->db_Select_gen($qry))
if ($sql->gen($qry))
{
while ($row = $sql->db_Fetch())
{
@ -1396,7 +1396,7 @@ class comment
LEFT JOIN #user AS u ON c.comment_author_id = u.user_id
LEFT JOIN #user_extended AS ue ON c.comment_author_id = ue.user_extended_id
WHERE c.comment_id!='' AND c.comment_blocked = 0 ".$qry1." ORDER BY c.comment_datestamp DESC LIMIT ".intval($from1).",".intval($amount1)." ";
if ($comment_total = $sql->db_Select_gen($query))
if ($comment_total = $sql->gen($query))
{
$width = 0;
while ($row = $sql->db_Fetch())
@ -1432,7 +1432,7 @@ class comment
break;
case '2': // downloads
$qryd = "SELECT d.download_name, dc.download_category_class, dc.download_category_id, dc.download_category_name FROM #download AS d LEFT JOIN #download_category AS dc ON d.download_category=dc.download_category_id WHERE d.download_id={$row['comment_item_id']} AND dc.download_category_class REGEXP '".e_CLASS_REGEXP."' ";
if ($sql2->db_Select_gen($qryd))
if ($sql2->gen($qryd))
{
$row2 = $sql2->db_Fetch();
$ret['comment_type'] = COMLAN_TYPE_2;
@ -1481,7 +1481,7 @@ class comment
if ($installed = isset($pref['plug_installed'][$var['plugin_path']]))
{
$qryp = str_replace("{NID}", $row['comment_item_id'], $var['qry']);
if ($sql2->db_Select_gen($qryp))
if ($sql2->gen($qryp))
{
$row2 = $sql2->db_Fetch();
$ret['comment_type'] = $var['plugin_name'];

7
e107_plugins/newsletter/admin_config.php
View File

@ -231,7 +231,7 @@ class newsletter
$newsletter_header = $tp->toFORM($edit['newsletter_header']);
}
$text .= "
$text = "
<form action='".e_SELF."' id='newsletterform' method='post'>
<table class='table adminform'>
<colgroup span='2'>
@ -326,7 +326,7 @@ class newsletter
{
$nlArray = $sql -> db_getList();
$text .= "
$text = "
<form action='".e_SELF."' id='newsletterform' method='post'>
<table class='table adminform'>
<colgroup span='2'>
@ -398,7 +398,8 @@ class newsletter
$mes->addSuccess(NLLAN_39);
}
$ns->tablerender($caption, $mes->render() . $text);
echo $mes->render();
// $ns->tablerender($caption, $mes->render() . $text);
}