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

Issue #4283 - Update deprecated sql method usage. Removed old code.

Browse Source
This commit is contained in:
Cameron
2020-12-17 05:52:54 -08:00
parent 8c0e2c0392
commit 42f0e902d4
42 changed files with 76 additions and 3627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/alt_auth/alt_auth_login_class.php
View File

@@ -58,7 +58,7 @@ class alt_auth_base
{
$sql = e107::getDb();
$sql->db_Select('alt_auth', '*', "auth_type = '".$prefix."' ");
$sql->select('alt_auth', '*', "auth_type = '".$prefix."' ");
$parm = array();
while($row = $sql->fetch())
{

2
e107_plugins/alt_auth/importdb_auth.php
View File

@@ -75,7 +75,7 @@ class auth_login extends alt_auth_base
// See if the user's in the E107 database - otherwise they can go away
global $sql, $tp;
if (!$sql->db_Select('user', 'user_loginname, user_password', "user_loginname = '".$tp -> toDB($uname)."'"))
if (!$sql->select('user', 'user_loginname, user_password', "user_loginname = '".$tp -> toDB($uname)."'"))
{ // Invalid user
$this->makeErrorText('User not found');
return AUTH_NOUSER;

2
e107_plugins/blogcalendar_menu/archive.php
View File

@@ -83,7 +83,7 @@ for($i = $start_year; $i <= $end_year; $i++)
if ($i == $req_year)
{
$year_selector .= " selected='selected'";
if ($bcSql->db_Select("news", "news_id, news_datestamp, news_class", "news_datestamp > {$start} AND news_datestamp < {$end}"))
if ($bcSql->select("news", "news_id, news_datestamp, news_class", "news_datestamp > {$start} AND news_datestamp < {$end}"))
{
while ($news = $bcSql->fetch())
{

4
e107_plugins/chatbox_menu/e_rss.php
View File

@@ -95,9 +95,9 @@ $feed['limit'] = '9';
//##### create rss data, return as array $eplug_rss_data -----------------------------------
$rss = array();
if($items = $sql -> db_Select('chatbox', "*", "cb_blocked=0 ORDER BY cb_datestamp DESC LIMIT 0,".$this -> limit)){
if($items = $sql->select('chatbox', "*", "cb_blocked=0 ORDER BY cb_datestamp DESC LIMIT 0,".$this -> limit)){
$i=0;
while($rowrss = $sql -> db_Fetch()){
while($rowrss = $sql ->fetch()){
$tmp = explode(".", $rowrss['cb_nick']);
$rss[$i]['author'] = $tmp[1];
$rss[$i]['author_email'] = '';

77
e107_plugins/download/e_rss.php
View File

@@ -106,80 +106,3 @@ class download_rss // plugin-folder + '_rss'
return $rss;
}
}
/* OLD V1 CODE LEFT FOR REFERENCE - TO BE DELETED
//##### create feed for admin, return array $eplug_rss_feed --------------------------------
// Download
$feed['name'] = LAN_PLUGIN_DOWNLOAD_NAME;
$feed['url'] = 'download';
$feed['topic_id'] = '';
$feed['path'] = 'download';
$feed['text'] = RSS_PLUGIN_LAN_8;
$feed['class'] = '0';
$feed['limit'] = '9';
$eplug_rss_feed[] = $feed;
// ------------------------------------------------------------------------------------
// Download categories for admin import.
$sqli = e107::getDb('download');
if($sqli -> db_Select("download_category", "*","download_category_id!='' ORDER BY download_category_order "))
{
while($rowi = $sqli ->fetch())
{
$feed['name'] = LAN_PLUGIN_DOWNLOAD_NAME.' > '.$rowi['download_category_name'];
$feed['url'] = 'download';
$feed['topic_id'] = $rowi['download_category_id'];
$feed['path'] = 'download';
$feed['text'] = RSS_PLUGIN_LAN_11.' '.$rowi['download_category_name'];
$feed['class'] = '0';
$feed['limit'] = '9';
$eplug_rss_feed[] = $feed;
}
}
//##### create rss data, return as array $eplug_rss_data -----------------------------------
if($topic_id && is_numeric($topic_id))
{
$topic = "d.download_category='" . intval($topic_id) . "' AND ";
}
else
{
$topic = "";
}
$path='';
//$class_list = "0,251,252,253";
$query = "SELECT d.*, dc.* FROM #download AS d LEFT JOIN #download_category AS dc ON d.download_category = dc.download_category_id WHERE {$topic} d.download_active > 0 AND d.download_class IN (".USERCLASS_LIST.") ORDER BY d.download_datestamp DESC LIMIT 0,".$this -> limit;
$sql -> db_Select_gen($query);
// $sql->db_Select("download", "*", "{$topic} download_active > 0 AND download_class IN (".$class_list.") ORDER BY download_datestamp DESC LIMIT 0,".$this -> limit);
$tmp = $sql->db_getList();
$rss = array();
$loop=0;
foreach($tmp as $value)
{
if($value['download_author'])
{
$nick = preg_replace("/[0-9]+\./", "", $value['download_author']);
$rss[$loop]['author'] = $nick;
}
$rss[$loop]['author_email'] = $value['download_author_email'];
$rss[$loop]['title'] = $value['download_name'];
$rss[$loop]['link'] = $e107->base_path."download/download.php?view.".$value['download_id'];
$rss[$loop]['description'] = ($rss_type == 3 ? $value['download_description'] : $value['download_description']);
$rss[$loop]['category_name'] = $value['download_category_name'];
$rss[$loop]['category_link'] = $e107->base_path."download/download.php?list.".$value['download_category_id'];
$rss[$loop]['enc_url'] = $e107->base_path."download/request.php?".$value['download_id'];
$rss[$loop]['enc_leng'] = $value['download_filesize'];
$rss[$loop]['enc_type'] = $this->getmime($value['download_url']);
$rss[$loop]['datestamp'] = $value['download_datestamp'];
$loop++;
}
//##### ------------------------------------------------------------------------------------
$eplug_rss_data[] = $rss;
*/

2112
e107_plugins/download/handlers/adminDownload_class.php
View File

File diff suppressed because it is too large Load Diff

7
e107_plugins/forum/forum_stats.php
View File

@@ -108,7 +108,7 @@ class forumStats
$sql->gen($query);
$most_viewedArray = $sql->db_getList();
/*$sql->db_Select("user", "user_id, user_name, user_forums", "ORDER BY user_forums DESC LIMIT 0, 10", "no_where");
/*$sql->select("user", "user_id, user_name, user_forums", "ORDER BY user_forums DESC LIMIT 0, 10", "no_where");
$posters = $sql -> db_getList();
$top_posters = array();
foreach($posters as $poster)
@@ -199,7 +199,7 @@ class forumStats
GROUP BY t_user
ORDER BY ucount DESC
LIMIT 0,10";
$sql -> db_Select_gen($query);
$sql -> gen($query);
$posters = $sql -> db_getList();
$top_topic_starters = array();
foreach($posters as $poster)
@@ -216,7 +216,7 @@ class forumStats
GROUP BY t_user
ORDER BY ucount DESC
LIMIT 0,10";
$sql -> db_Select_gen($query);
$sql -> gen($query);
$posters = $sql -> db_getList();
$top_repliers = array();
@@ -516,7 +516,6 @@ class forumStats
ORDER BY ue.user_plugin_forum_posts DESC LIMIT {$this->from}, {$this->view}
";
// $top_forum_posters = $sql->db_Select("user", "*", "`user_forums` > 0 ORDER BY user_forums DESC LIMIT ".$from.", ".$view."");
$text = "
<div>
<table style='width:95%' class='table table-striped fborder'>

2
e107_plugins/forum/forum_uploads.php
View File

@@ -56,7 +56,7 @@ if($msg)
$fi = new e_file;
$mask = ".*_".USERID."_FT.*";
$fileList = $fi->get_files(e_UPLOAD, $mask);
if($sql->db_Select('forum_thread','thread_id, thread_thread, thread_parent', "thread_thread REGEXP '.*_".USERID."_FT.*'")) // FIXME new forum db structure
if($sql->select('forum_thread','thread_id, thread_thread, thread_parent', "thread_thread REGEXP '.*_".USERID."_FT.*'")) // FIXME new forum db structure
{
$threadList = $sql->db_getList();
}

2
e107_plugins/import/providers/e107_import_class.php
View File

@@ -71,7 +71,7 @@ class e107_import extends base_import_class
{
case 'users' :
$query = "SELECT * FROM {$this->DBPrefix}user WHERE `user_id` != 1";
$result = $this->ourDB->db_Select_gen($query);
$result = $this->ourDB->gen($query);
if ($result === false) return false;
break;

385
e107_plugins/linkwords/admin_config.php
View File

@@ -195,388 +195,3 @@ exit;
/*
require_once(e_ADMIN.'auth.php');
e107::lan('linkwords', true); // e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin.php'
define('LW_CACHE_TAG', 'nomd5_linkwords');
$pref = e107::getConfig()->getPref();
// print_a($pref['lw_context_visibility']);
$mes = e107::getMessage();
$tp = e107::getParser();
$frm = e107::getForm();
$lw_context_areas = array(
'TITLE' => LWLAN_33,
'SUMMARY' => LWLAN_34,
'BODY' => LWLAN_35,
'DESCRIPTION' => LWLAN_36,
'USER_TITLE' => LWLAN_40,
'USER_BODY' => LWLAN_41
// Don't do the next three - linkwords are meaningless on them
// 'olddefault' => LWLAN_37,
// 'linktext' => LWLAN_38,
// 'rawtext' => LWLAN_39'
);
// Yes, I know its a silly order - but that's history!
$lwaction_vals = array(1=>LAN_INACTIVE, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54);
$frm = e107::getForm();
// Generate dropdown for possible actions on finding a linkword
function lw_act_opts($curval)
{
global $lwaction_vals;
$ret = '';
foreach ($lwaction_vals as $opt => $val)
{
$selected = ($curval == $opt ? "selected='selected'" : '');
$ret .= "<option value='{$opt}' {$selected}>{$val}</option>\n";
}
return $ret;
}
$deltest = array_flip($_POST);
if(isset($deltest[LAN_DELETE]))
{
$delete_id = intval(str_replace('delete_', '', $deltest[LAN_DELETE]));
if ($sql->db_Count('linkwords', '(*)', "WHERE linkword_id = ".$delete_id))
{
$sql->db_Delete('linkwords', 'linkword_id='.$delete_id);
e107::getLog()->add('LINKWD_03','ID: '.$delete_id,'');
$e107->ecache->clear_sys(LW_CACHE_TAG);
//$message = LWLAN_19;
$mes->addSuccess(LAN_DELETED);
}
}
if(e_QUERY)
{
$lw_qs = explode('.', e_QUERY);
if (!isset($lw_qs[0])) $lw_qs[0] = 'words';
if (!isset($lw_qs[1])) $lw_qs[1] = -1;
$action = $lw_qs[0];
$id = intval($lw_qs[1]);
}
if (!isset($action)) $action = 'words';
if (isset($_POST['saveopts_linkword']))
{ // Save options page
// Array of context flags
$pref['lw_context_visibility'] = array(
'OLDDEFAULT' => FALSE,
'TITLE' => FALSE,
'USER_TITLE' => FALSE,
'SUMMARY' => FALSE,
'BODY' => FALSE,
'USER_BODY' => FALSE,
'DESCRIPTION' => FALSE,
'LINKTEXT' => FALSE,
'RAWTEXT' => FALSE
);
foreach ($_POST['lw_visibility_area'] as $can_see)
{
if (key_exists($can_see,$lw_context_areas))
{
$pref['lw_context_visibility'][$can_see] = TRUE;
}
}
// Text area for 'exclude' pages - use same method as for menus
$pagelist = explode("\r\n", $_POST['linkword_omit_pages']);
for ($i = 0 ; $i < count($pagelist) ; $i++)
{
$pagelist[$i] = trim($pagelist[$i]);
}
$pref['lw_page_visibility'] = '2-'.implode("|", $pagelist); // '2' for 'hide on specified pages'
$pref['lw_ajax_enable'] = isset($_POST['lw_ajax_enable']);
$pref['lw_notsamepage'] = isset($_POST['lw_notsamepage']);
save_prefs();
$logString = implode(', ',$pref['lw_context_visibility']).'[!br!]'.$pref['lw_page_visibility'].'[!br!]'.$pref['lw_ajax_enable'].'[!br!]'.$pref['lw_notsamepage'];
e107::getCache()->clear_sys(LW_CACHE_TAG);
e107::getLog()->add('LINKWD_04',$logString,'');
}
if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword']))
{
if(!$_POST['linkwords_word'] && $_POST['linkwords_url'])
{ // Key fields empty
$mes->addError(LAN_REQUIRED_BLANK);
}
else
{
$data['linkword_word'] = $tp->toDB($_POST['linkword_word']);
$data['linkword_link'] = $tp->toDB($_POST['linkword_link']);
$data['linkword_tooltip'] = $tp->toDB($_POST['linkword_tooltip']);
$data['linkword_tip_id'] = intval($_POST['linkword_tip_id']);
$data['linkword_active'] = intval($_POST['linkword_active']);
$data['linkword_newwindow'] = isset($_POST['linkword_newwindow']) ? 1 : 0;
$logString = implode('[!br!]',$data);
if (isset($_POST['submit_linkword']))
{
if ($sql->db_Insert('linkwords', $data))
{
e107::getLog()->add('LINKWD_01',$logString,'');
$mes->addSuccess(LAN_CREATED);
}
else
{
//$message = LWLAN_57;
$mes->addError(LAN_CREATED_FAILED);
}
}
elseif (isset($_POST['update_linkword']))
{
$id = intval(varset($_POST['lw_edit_id'],0));
if (($id > 0) && $sql->db_UpdateArray('linkwords', $data, ' WHERE `linkword_id`='.$id))
{
$mes->addSuccess(LAN_UPDATED);
$logString = 'ID: '.$id.'[!br!]'.$logString;
e107::getLog()->add('LINKWD_02',$logString,'');
}
else
{
$mes->addError(LAN_UPDATED_FAILED);
}
}
e107::getCache()->clear_sys(LW_CACHE_TAG);
}
}
$ns->tablerender($caption, $mes->render() . $text);
$chkNewWindow = " checked='checked'"; // Open links in new window by default
if($action == "edit")
{
if($sql -> db_Select("linkwords", "*", "linkword_id=".$id))
{
$row = $sql -> db_Fetch();
extract($row);
$chkNewWindow = $row['linkword_newwindow'] ? " checked='checked'" : ''; // Open links in new window by default
define("LW_EDIT", TRUE);
}
}
else
{
$linkword_word = '';
$linkword_link = '';
$linkword_active = '';
$linkword_tooltip = '';
$linkword_tip_id = '';
}
if (($action == 'words') || ($action == 'edit'))
{
$text = "
<form method='post' action='".e_SELF."?words'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tr>
<td>".LWLAN_21."</td>
<td>
<input class='tbox' type='text' name='linkword_word' size='40' value='".$linkword_word."' maxlength='100' />
</td>
</tr>
<tr>
<td>".LWLAN_6."</td>
<td>
<input class='tbox' type='text' name='linkword_link' size='60' value='".$linkword_link."' maxlength='250' /><br />
<input type='checkbox' name='linkword_newwindow' value='1'{$chkNewWindow} /> ".LWLAN_55."
</td>
</tr>
<tr>
<td>".LWLAN_50."</td>
<td>
<textarea rows='3' cols='80' class='tbox' name='linkword_tooltip'>".$linkword_tooltip."</textarea>
</td>
</tr>
<tr>
<td>".LWLAN_62."</td>
<td>
<input class='tbox' type='text' name='linkword_tip_id' size='10' value='".$linkword_tip_id."' maxlength='10' /><span class='field-help'>".LWLAN_63."</span>
</td>
</tr>
<tr>
<td>".LWLAN_22."</td>
<td>
<select class='tbox' name='linkword_active'>".lw_act_opts($linkword_active)."</select>
</td>
</tr>
</table>
<div class='buttons-bar center'>
".
(defined("LW_EDIT") ? $frm->admin_button('update_linkword','no-value','update',LAN_UPDATE) . "<input type='hidden' name='lw_edit_id' value='{$id}' />" : $frm->admin_button('submit_linkword','no-value','submit',LAN_CREATE))."
</div>
</form>\n";
$ns -> tablerender(LWLAN_31, $text);
}
if (($action == 'words') || ($action == 'edit'))
{
$text = "<div class='center'>\n";
if(!$sql -> db_Select("linkwords"))
{
//$text .= LWLAN_4;
$mes->addInfo(LWLAN_4);
}
else
{
$text = "
<table class='table adminlist'>
<colgroup>
<col style='width: 5%; vertical-align:top;' />
<col style='width: 15%; vertical-align:top;' />
<col style='width: 20%; vertical-align:top;' />
<col style='width: 10%; vertical-align:top;' />
<col style='width: 25%; vertical-align:top;' />
<col style='width: 5%; vertical-align:top;' />
<col style='width: 10%; vertical-align:top; text-align: center;' />
<col style='width: 15%; vertical-align:top; text-align: center;' />
</colgroup>
<tr>
<td>".LAN_ID."</td>
<td>".LWLAN_5."</td>
<td>".LWLAN_6."</td>
<td>".LWLAN_56."</td>
<td>".LWLAN_50."</td>
<td>".LWLAN_60."</td>
<td>".LWLAN_7."</td>
<td>".LAN_OPTIONS."</td>
</tr>\n";
while($row = $sql->db_Fetch())
{
$text .= "
<tr>
<td>{$row['linkword_id']}</td>
<td>{$row['linkword_word']}</td>
<td>{$row['linkword_link']}</td>
<td>".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)."</td>
<td>{$row['linkword_tooltip']}</td>
<td>".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')."</td>
<td>".$lwaction_vals[$row['linkword_active']]."</td>
<td>
<form action='".e_SELF."' method='post' id='myform_{$row['linkword_id']}' onsubmit=\"return jsconfirm('".LWLAN_18." [ID: {$row['linkword_id']} ]')\">
<div>
<input class='btn btn-default button' type='button' onclick=\"document.location='".e_SELF."?edit.{$row['linkword_id']}'\" value='".LAN_EDIT."' id='edit_{$row['linkword_id']}' name='edit_linkword_id' />
<input class='btn btn-default button' type='submit' value='".LAN_DELETE."' id='delete_{$row['linkword_id']}' name='delete_{$row['linkword_id']}' />
</div>
</form>\n
</td>
</tr>
";
}
$text .= "</table>";
}
$ns->tablerender(LWLAN_11, $mes->render() . $text);
}
if ($action=='options')
{
$menu_pages = substr($pref['lw_page_visibility'],2); // Knock off the 'show/hide' flag
$menu_pages = str_replace("|", "\n", $menu_pages);
$AjaxEnable = varset($pref['lw_ajax_enable'],0);
$text = "
<div>
<form method='post' action='".e_SELF."?options'>
<table class='table adminform'>
<colgroup>
<col style='width: 30%; />
<col style='width: 70%; />
</colgroup>
<tr>
<td>".LWLAN_26."</td>
<td>";
foreach ($lw_context_areas as $lw_key=>$lw_desc)
{
$checked = $pref['lw_context_visibility'][$lw_key] ? "checked='checked'" : '';
$text .= "<input type='checkbox' name='lw_visibility_area[]' value='{$lw_key}' {$checked} /> {$lw_desc}<br />";
}
$text .= "<span class='field-help'>".LWLAN_27."</span></td>
</tr>
<tr>
<td>".LWLAN_28."</td>
<td><textarea rows='5' cols='60' class='tbox' name='linkword_omit_pages' >".$menu_pages."</textarea><span class='field-help'>".LWLAN_29."</span>
</td>
</tr>";
$checked = varset($pref['lw_ajax_enable'],0) ? 'checked=checked' : '';
$text .= "
<tr>
<td>".LWLAN_59."</td>
<td><input type='checkbox' name='lw_ajax_enable' {$checked} /></td>
</tr>";
$checked = varset($pref['lw_notsamepage'],0) ? 'checked=checked' : '';
$text .= "
<tr>
<td>".LWLAN_64."</td>
<td><input type='checkbox' name='lw_notsamepage' {$checked} /><span class='field-help'>".LWLAN_65."</span></td>
</tr>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('saveopts_linkword','no-value','submit', LAN_UPDATE)."
</div>
</form>
</div>\n";
$ns -> tablerender(LAN_OPTIONS, $text);
}
function admin_config_adminmenu()
{
if (e_QUERY)
{
$tmp = explode(".", e_QUERY);
$action = $tmp[0];
}
if (!isset($action) || ($action == ""))
{
$action = "words";
}
$var['words']['text'] = LWLAN_24;
$var['words']['link'] = "admin_config.php";
$var['options']['text'] = LAN_OPTIONS;
$var['options']['link'] ="admin_config.php?options";
show_admin_menu(LWLAN_23, $action, $var);
}
require_once(e_ADMIN."footer.php");
*/

2
e107_plugins/log/stats.php
View File

@@ -1397,7 +1397,7 @@ class siteStats
$pars = make_bits('statScreen',$act); // Get the query, plus maybe date for heading
if (!is_array($pars)) return $pars; // Return error if necessary
if ($entries = $sql->db_Select('logstats', 'log_data', $pars['query']))
if ($entries = $sql->select('logstats', 'log_data', $pars['query']))
{
$row = $sql -> fetch();
$statScreen = unserialize($row['log_data']);

2
e107_plugins/log/stats_csv.php
View File

@@ -154,7 +154,7 @@ function export_stats($export_type, $export_date, $export_filter, $first_date,
{
$stat_types = array( 1 => 'day', 2 => 'month', 3 => 'year', 4 => 'alltime', 5 => 'all_detail');
global $sql, $e107;
$sql -> db_Select("logstats", "*", "{$export_filter} ");
$sql ->select("logstats", "*", "{$export_filter} ");
$export_text = ''; // Accumulate output string
$export_array = array();

5
e107_plugins/news/news.php
View File

@@ -1545,12 +1545,7 @@ class news_front
$newsAr = $sql -> db_getList();
$news_total=$sql->total_results;
// Get number of entries
//$sql -> db_Select_gen("SELECT FOUND_ROWS()");
// $frows = $sql -> db_Fetch();
//$news_total = $frows[0];
//echo "<br />Total ".$news_total." items found, ".count($newsAr)." displayed, Interval = {$interval}<br /><br />";
$p_title = ($this->action == "item") ? $newsAr[1]['news_title'] : $tp->toHTML($newsAr[1]['category_name'],FALSE,'TITLE');

2
e107_plugins/newsletter/admin_config.php
View File

@@ -610,7 +610,7 @@ class newsletter
$vs_text = '';
if(!$nl_sql->db_Select('newsletter', '*', 'newsletter_id='.$p_id))// Check if newsletter id is available
if(!$nl_sql->select('newsletter', '*', 'newsletter_id='.$p_id))// Check if newsletter id is available
{
$mes->addError(NLLAN_56);
$vs_text .= "<div class='buttons-bar center'>

11
e107_plugins/page/e_frontpage.php
View File

@@ -8,16 +8,7 @@
*
*/
/*
if($sql->db_Select('page', 'page_id, page_title', "menu_name=''"))
{
$front_page['custom']['title'] = FRTLAN_30;
while($row = $sql->db_Fetch())
{
$front_page['custom']['page'][] = array('page' => 'page.php?'.$row['page_id'], 'title' => $row['page_title']);
}
}
*/
if (!defined('e107_INIT')) { exit; }

2
e107_plugins/pm/pm_conf.php
View File

@@ -175,7 +175,7 @@ if (isset($_POST['pm_maint_execute']))
if(isset($_POST['addlimit']))
{
$id = intval($_POST['newlimit_class']);
if($sql->db_Select('generic','gen_id',"gen_type = 'pm_limit' AND gen_datestamp = ".$id))
if($sql->select('generic','gen_id',"gen_type = 'pm_limit' AND gen_datestamp = ".$id))
{
$mes->addInfo(ADLAN_PM_5); // 'Limit for selected user class already exists'
}

1
e107_plugins/poll/poll_class.php
View File

@@ -274,7 +274,6 @@ class poll
{
if ($_POST['votea'])
{
// $sql -> db_Select("polls", "*", "poll_vote_userclass!=255 AND poll_type=1 ORDER BY poll_datestamp DESC LIMIT 0,1");
$row = $pollArray;
extract($row);
$poll_votes = varset($poll_votes);

659
e107_plugins/rss_menu/admin_prefs.php
View File

@@ -138,7 +138,8 @@ class rss_ui extends e_admin_ui
$rssVals['rss_limit'] = intval(varset($_POST['limit'][$key], '0'));
$sql->insert("rss", $rssVals);
e107::getLog()->logArrayAll('RSS_04',$rssVals);
e107::getLog()->addArray($rssVals)->save('RSS_04');
// e107::getLog()->logArrayAll('RSS_04',$rssVals);
}
$message = count($_POST['importid'])." ".RSS_LAN_ADMIN_18;
return $message;
@@ -220,9 +221,9 @@ class rss_ui extends e_admin_ui
$feedlist[] = $feed;
// News categories
if($sqli -> db_Select("news_category", "*","category_id!='' ORDER BY category_name "))
if($sqli ->select("news_category", "*","category_id!='' ORDER BY category_name "))
{
while($rowi = $sqli -> db_Fetch())
while($rowi = $sqli ->fetch())
{
$feed['name'] = ADLAN_0.' > '.$rowi['category_name'];
$feed['url'] = 'news';
@@ -247,9 +248,9 @@ class rss_ui extends e_admin_ui
$feedlist[] = $feed;
// Download categories
if($sqli -> db_Select("download_category", "*","download_category_id!='' ORDER BY download_category_order "))
if($sqli ->select("download_category", "*","download_category_id!='' ORDER BY download_category_order "))
{
while($rowi = $sqli -> db_Fetch())
while($rowi = $sqli ->fetch())
{
$feed['name'] = ADLAN_24.' > '.$rowi['download_category_name'];
$feed['url'] = 'download';
@@ -390,651 +391,3 @@ class rss_form_ui extends e_admin_form_ui
/// ------------------------------- Legacy Code -------------------------------
/*
require_once(e_ADMIN."auth.php");
$imagedir = e_IMAGE."admin_images/";
require_once(e_PLUGIN.'rss_menu/rss_shortcodes.php');
$rss = new rss;
global $tp;
$mes = e107::getMessage();
// Delete entry
if(isset($_POST['delete']))
{
$d_idt = array_keys($_POST['delete']);
$message = ($sql -> db_Delete("rss", "rss_id=".intval($d_idt[0]))) ? LAN_DELETED : LAN_DELETED_FAILED;
e107::getLog()->add('RSS_01','ID: '.intval($d_idt[0]).' - '.$message,E_LOG_INFORMATIVE,'');
e107::getCache()->clear("rss");
}
// Create rss feed
if(isset($_POST['create_rss']))
{
$message = $rss -> dbrss("create");
}
// Update rss feed
if(isset($_POST['update_rss']))
{
$message = $rss -> dbrss("update");
}
// Import rss feed
if(isset($_POST['import_rss']))
{
$message = $rss -> dbrssimport();
}
// Update_limit
if(isset($_POST['update_limit']))
{
$message = $rss -> dbrsslimit();
}
// Update options
if(isset($_POST['updatesettings']))
{
$message = $rss->dboptions();
}
// Config check
if($rss->file_check())
{
$message = RSS_LAN_ERROR_2; // Space found in file.
}
// Render message
if(isset($message))
{
$mes->add($message);
// $rss->show_message('', $message);
}
// Get template
/*
if (is_readable(THEME."rss_template.php"))
{
require_once(THEME."rss_template.php");
}
else
{
require_once(e_PLUGIN."rss_menu/rss_template.php");
}*/
/*
$frm = e107::getForm();
// Admin : rss listing
if(!isset($RSS_ADMIN_LIST_HEADER))
{
$RSS_ADMIN_LIST_HEADER = "
<div style='text-align:center;'>
<form action='".e_SELF.(e_QUERY ? "?".e_QUERY : "")."' id='dataform' method='post' >
<table class='table adminlist'>
<thead>
<tr>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=id,LAN_ID}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=name,LAN_NAME}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=path,LAN_PLUGIN_FOLDER}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=url,LAN_URL}</th>
<th style='white-space:nowrap;'>".RSS_LAN_ADMIN_12."</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=limit,LAN_LIMIT}</th>
<th style='white-space:nowrap;'>".LAN_OPTIONS."</th>
</tr>
</thead>
<tbody>";
}
if(!isset($RSS_ADMIN_LIST_TABLE))
{
$RSS_ADMIN_LIST_TABLE = "
<tr>
<td>{RSS_ADMIN_ID}</td>
<td>{RSS_ADMIN_NAME}</td>
<td>{RSS_ADMIN_PATH}</td>
<td>{RSS_ADMIN_URL}</td>
<td>{RSS_ADMIN_TOPICID}</td>
<td>{RSS_ADMIN_LIMIT}</td>
<td class='center'>{RSS_ADMIN_OPTIONS}</td>
</tr>";
}
if(!isset($RSS_ADMIN_LIST_FOOTER))
{
$RSS_ADMIN_LIST_FOOTER = "
<tr>
<td class='buttons-bar center' colspan='7'>
{RSS_ADMIN_LIMITBUTTON}
</td>
</tr>
</tbody>
</table>
</form>
</div>";
}
// Admin : rss create/edit
if(!isset($RSS_ADMIN_CREATE_TABLE))
{
$RSS_ADMIN_CREATE_TABLE = "
<form action='".e_SELF.(e_QUERY ? "?".e_QUERY : "")."' id='dataform' method='post' >
<table class='table adminform'>
<tr>
<td style='width:12%'>".LAN_NAME."</td>
<td>{RSS_ADMIN_FORM_NAME}</td>
</tr>
<tr>
<td>".LAN_URL."</td>
<td>{RSS_ADMIN_FORM_URL}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_12."</td>
<td>{RSS_ADMIN_FORM_TOPICID}</td>
</tr>
<tr>
<td>".LAN_PLUGIN_FOLDER."</td>
<td>{RSS_ADMIN_FORM_PATH}</td>
</tr>
<tr>
<td>".LAN_DESCRIPTION."</td>
<td>{RSS_ADMIN_FORM_TEXT}</td>
</tr>
<tr>
<td>".LAN_LIMIT."</td>
<td>{RSS_ADMIN_FORM_LIMIT}</td>
</tr>
<tr>
<td>".LAN_VISIBILITY."</td>
<td>{RSS_ADMIN_FORM_CLASS}</td>
</tr>
<tr>
<td colspan='2' style='text-align:center;'>{RSS_ADMIN_FORM_CREATEBUTTON}</td>
</tr>
</table>
</form>
</div>";
}
// Admin : rss options
if(!isset($RSS_ADMIN_OPTIONS_TABLE))
{
$RSS_ADMIN_OPTIONS_TABLE = "
<form action='".e_SELF.(e_QUERY ? "?".e_QUERY : "")."' id='dataform' method='post' >
<table class='table adminform'>
<tr>
<td>".RSS_LAN_ADMIN_13."</td>
<td>
<input type='checkbox' name='rss_othernews' value='1' ".(vartrue($pref['rss_othernews']) == 1 ? " checked='checked' " : "")." />
</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_19."</td>
<td>
<input type='checkbox' name='rss_summarydiz' value='1' ".(vartrue($pref['rss_summarydiz']) == 1 ? " checked='checked' " : "")." />
</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_33."</td>
<td>
<input type='checkbox' name='rss_shownewsimage' value='1' ".(vartrue($pref['rss_shownewsimage']) == 1 ? " checked='checked' " : "")." />
</td>
</tr>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
</div>
</form>";
}
// Admin : rss import
if(!isset($RSS_ADMIN_IMPORT_HEADER))
{
$RSS_ADMIN_IMPORT_HEADER = "
<form action='".e_SELF."' id='imlistform' method='post' >
<table class='table adminform'>
<tr>
<th>".RSS_LAN_ADMIN_16."</td>
<th>".LAN_PLUGIN_FOLDER."</td>
<th>".LAN_NAME."</td>
<th>".LAN_URL."</td>
<th>".RSS_LAN_ADMIN_12."</td>
</tr>";
}
if(!isset($RSS_ADMIN_IMPORT_TABLE))
{
$RSS_ADMIN_IMPORT_TABLE = "
<tr>
<td>{RSS_ADMIN_IMPORT_CHECK}</td>
<td>{RSS_ADMIN_IMPORT_PATH}</td>
<td><b>{RSS_ADMIN_IMPORT_NAME}</b><br />{RSS_ADMIN_IMPORT_TEXT}</td>
<td>{RSS_ADMIN_IMPORT_URL}</td>
<td>{RSS_ADMIN_IMPORT_TOPICID}</td>
</tr>";
}
if(!isset($RSS_ADMIN_IMPORT_FOOTER))
{
$RSS_ADMIN_IMPORT_FOOTER = "
</table>
<div class='buttons-bar center'>
".$frm->admin_button('import_rss',RSS_LAN_ADMIN_17,'submit')."
</div>
</form>
";
}
// Listing
if(e_QUERY)
{
$qs = explode(".", e_QUERY);
}
$action = varset($qs[0],'list');
$field = varset($qs[1], '');
$feedID = intval(varset($qs[2], 0));
switch ($action)
{
case 'create' :
if ($_POST)
{ // List
$rss -> rssadminlist();
}
else
{ // Create
$rss -> rssadmincreate($field, $feedID);
}
break;
case 'import' :
$rss -> rssadminimport();
break;
case 'options' :
$rss -> rssadminoptions();
break;
case 'r3' :
$rss->show_message('', RSS_LAN_ADMIN_31); // Intentionally fall straight through after showing message
case 'list' :
default :
$rss -> rssadminlist();
}
require_once(e_ADMIN."footer.php");
// ##### Display options --------------------------------------------------------------------------
function admin_prefs_adminmenu()
{
global $sql;
$qs = explode(".",e_QUERY);
$act = varset($qs[0], 'list');
$var['list']['text'] = RSS_LAN_ADMINMENU_2;
$var['list']['link'] = e_SELF."?list";
$var['create']['text'] = LAN_CREATE;
$var['create']['link'] = e_SELF."?create";
$var['import']['text'] = RSS_LAN_ADMINMENU_4;
$var['import']['link'] = e_SELF."?import";
$var['options']['text'] = LAN_OPTIONS;
$var['options']['link'] = e_SELF."?options";
show_admin_menu(RSS_LAN_ADMINMENU_1, $act, $var);
}
// ##### End --------------------------------------------------------------------------------------
class rss
{
// Check for config
function file_check()
{
$arrays = file_get_contents(e_BASE."e107_config.php");
$arrays2 = file_get_contents(e_PLUGIN."rss_menu/languages/".e_LANGUAGE."_admin_rss_menu.php");
if($arrays[0] != "<" || $arrays2[0] != "<")
{
return TRUE;
}
return FALSE;
}
// Admin : list : existing rss feeds
function rssadminlist()
{
$tp = e107::getParser();
$mes = e107::getMessage();
$ns = e107::getRender();
$sql = e107::getDb();
global $field, $sort, $rss_shortcodes, $row, $RSS_ADMIN_LIST_HEADER, $RSS_ADMIN_LIST_TABLE, $RSS_ADMIN_LIST_FOOTER;
$fieldstag = array('id'=>'rss_id','path'=>'rss_path','name'=>'rss_name','url'=>'rss_url','limit'=>'rss_limit');
$order = (isset($fieldstag[$field])) ? "ORDER BY ".$fieldstag[$field]." ".$sort : "ORDER BY rss_id";
$query = "SELECT * FROM #rss ".$order;
if(!$sql->db_Select_gen($query))
{
$this->show_message(LAN_ERROR, RSS_LAN_ERROR_3);
}
else
{
$text = $tp -> parseTemplate($RSS_ADMIN_LIST_HEADER, FALSE, $rss_shortcodes);
while($row=$sql->db_Fetch())
{
$text .= $tp -> parseTemplate($RSS_ADMIN_LIST_TABLE, FALSE, $rss_shortcodes);
}
$text .= $tp -> parseTemplate($RSS_ADMIN_LIST_FOOTER, FALSE, $rss_shortcodes);
$ns->tablerender(RSS_LAN_ADMIN_1,$mes->render(). $text);
}
}
// Create or edit - put up a form
function rssadmincreate($action, $id=0)
{
$mes = e107::getMessage();
$ns = e107::getRender();
$tp = e107::getParser();
$sql = e107::getDb();
global $rss_shortcodes, $row, $RSS_ADMIN_CREATE_TABLE;
if (($action == "edit") && $id )
{
if(!$sql -> db_Select("rss", "*", "rss_id=".$id))
{
$this->show_message(LAN_ERROR, RSS_LAN_ERROR_5);
}
else
{
$row = $sql -> db_Fetch();
$row['rss_name'] = $tp -> toForm($row['rss_name']);
$row['rss_path'] = $tp -> toForm($row['rss_path']);
$row['rss_url'] = $tp -> toForm($row['rss_url']);
$row['rss_text'] = $tp -> toForm($row['rss_text']);
}
}
$text = $tp->parseTemplate($RSS_ADMIN_CREATE_TABLE, FALSE, $rss_shortcodes);
$ns->tablerender(RSS_LAN_ADMIN_10, $mes->render().$text);
}
// Import - put up the list of possible feeds to import
function rssadminimport()
{
$sql = e107::getDb();
$ns = e107::getRender();
$mes = e107::getMessage();
$tp = e107::getParser();
global $i,$rss_shortcodes, $feed, $pref;
global $RSS_ADMIN_IMPORT_HEADER, $RSS_ADMIN_IMPORT_TABLE, $RSS_ADMIN_IMPORT_FOOTER;
$sqli = new db;
$feedlist = array();
// News
$feed['name'] = ADLAN_0;
$feed['url'] = 'news'; // The identifier for the rss feed url
$feed['topic_id'] = ''; // The topic_id, empty on default (to select a certain category)
$feed['path'] = 'news'; // This is the plugin path location
$feed['text'] = RSS_PLUGIN_LAN_7;
$feed['class'] = '0';
$feed['limit'] = '9';
$feedlist[] = $feed;
// News categories
if($sqli -> db_Select("news_category", "*","category_id!='' ORDER BY category_name "))
{
while($rowi = $sqli -> db_Fetch())
{
$feed['name'] = ADLAN_0.' > '.$rowi['category_name'];
$feed['url'] = 'news';
$feed['topic_id'] = $rowi['category_id'];
$feed['path'] = 'news';
$feed['text'] = RSS_PLUGIN_LAN_10.' '.$rowi['category_name'];
$feed['class'] = '0';
$feed['limit'] = '9';
// $feed['exclude_class'] = '';
$feedlist[] = $feed;
}
}
/* // Download
$feed['name'] = ADLAN_24;
$feed['url'] = 'download';
$feed['topic_id'] = '';
$feed['path'] = 'download';
$feed['text'] = RSS_PLUGIN_LAN_8;
$feed['class'] = '0';
$feed['limit'] = '9';
$feedlist[] = $feed;
// Download categories
if($sqli -> db_Select("download_category", "*","download_category_id!='' ORDER BY download_category_order "))
{
while($rowi = $sqli -> db_Fetch())
{
$feed['name'] = ADLAN_24.' > '.$rowi['download_category_name'];
$feed['url'] = 'download';
$feed['topic_id'] = $rowi['download_category_id'];
$feed['path'] = 'download';
$feed['text'] = RSS_PLUGIN_LAN_11.' '.$rowi['download_category_name'];
$feed['class'] = '0';
$feed['limit'] = '9';
$feedlist[] = $feed;
}
}
*/
/* // Comments
$feed['name'] = LAN_COMMENTS;
$feed['url'] = 'comments';
$feed['topic_id'] = '';
$feed['path'] = 'comments';
$feed['text'] = RSS_PLUGIN_LAN_9;
$feed['class'] = '0';
$feed['limit'] = '9';
$feedlist[] = $feed;
// Plugin rss feed, using e_rss.php in plugin folder
$plugin_feedlist = array();
foreach($pref['e_rss_list'] as $val)
{
$eplug_rss_feed = array();
if (is_readable(e_PLUGIN.$val."/e_rss.php"))
{
require_once(e_PLUGIN.$val."/e_rss.php");
$className = $val."_rss";
$data = false;
if(!$data = e107::callMethod($className,'config'))
{
$data = $eplug_rss_feed;
}
foreach($data as $v)
{
$v['path'] = $val;
array_push($plugin_feedlist,$v);
}
}
}
$feedlist = array_merge($feedlist, $plugin_feedlist);
// print_a($feedlist);
$render=FALSE;
$i=0;
$text = $RSS_ADMIN_IMPORT_HEADER;
foreach($feedlist as $k=>$feed)
{
$feed['topic_id'] = $tp -> toDB($feed['topic_id']);
$feed['url'] = $tp -> toDB($feed['url']);
// Check if feed is not yet present
if(!$sql->select("rss", "*", "rss_path='".$feed['path']."' AND rss_url='".$feed['url']."' AND rss_topicid='".$feed['topic_id']."' "))
{
$render=TRUE;
$text .= $tp -> parseTemplate($RSS_ADMIN_IMPORT_TABLE, FALSE, $rss_shortcodes);
$i++;
}
}
$text .= $tp -> parseTemplate($RSS_ADMIN_IMPORT_FOOTER, FALSE, $rss_shortcodes);
if(!$render)
{
$this->show_message(RSS_LAN_ADMIN_11, LAN_DESCRIPTION);
}
else
{
$ns->tablerender(RSS_LAN_ADMIN_11, $mes->render(). $text);
}
}
// Options - display form
function rssadminoptions()
{
$mes = e107::getMessage();
$ns = e107::getRender();
$tp = e107::getParser();
global $rss_shortcodes, $row, $RSS_ADMIN_OPTIONS_TABLE;
$text = $tp -> parseTemplate($RSS_ADMIN_OPTIONS_TABLE, FALSE, $rss_shortcodes);
$ns->tablerender(LAN_OPTIONS, $mes->render(). $text);
return;
}
// Render message
function show_message($caption='', $text='')
{
global $ns;
$ns -> tablerender($caption, "<div style='text-align:center'><b>$text</b></div>");
}
// Db:create/update
function dbrss($mode='create')
{
$sql = e107::getDb();
$tp = e107::getParser();
$cache = e107::getCache();
$log = e107::getLog();
if($_POST['rss_name'] && $_POST['rss_url'] && $_POST['rss_path'])
{
$rssVals = array();
$rssVals['rss_name'] = $tp -> toDB(trim($_POST['rss_name']));
$rssVals['rss_url'] = $tp -> toDB($_POST['rss_url']);
$rssVals['rss_topicid'] = $tp -> toDB($_POST['rss_topicid']);
$rssVals['rss_path'] = $tp -> toDB($_POST['rss_path']);
$rssVals['rss_text'] = $tp -> toDB($_POST['rss_text']);
$rssVals['rss_class'] = (intval($_POST['rss_class']) ? intval($_POST['rss_class']) : '0');
$rssVals['rss_limit'] = intval($_POST['rss_limit']);
// $rssVals['rss_exclude_class'] = intval($_POST['rss_exclude_class']);
$rssVals['rss_datestamp'] = !empty($_POST['rss_datestamp']) ? (int) $_POST['rss_datestamp'] : time();
$rssVals['WHERE'] = " rss_id = ".intval($_POST['rss_id']);
switch ($mode)
{
case 'create' :
$message = ($sql ->insert('rss',$rssVals)) ? LAN_CREATED : LAN_CREATED_FAILED;
$log->logArrayAll('RSS_02',$rssVals, $message);
$cache->clear('rss');
break;
case 'update' :
$message = ($sql ->update('rss', $rssVals)) ? LAN_UPDATED : LAN_UPDATED_FAILED;
$log->logArrayAll('RSS_03',$rssVals, $message);
$cache->clear('rss');
break;
}
}
else
{
$message = RSS_LAN_ERROR_7;
}
return $message;
}
// Import rss feeds
function dbrssimport()
{
global $sql, $tp, $admin_log;
foreach($_POST['importid'] as $key=>$value)
{
$rssVals = array();
$rssVals['rss_topicid'] = $tp -> toDB(varset($_POST['topic_id'][$key], ''));
$rssVals['rss_url'] = $tp -> toDB(varset($_POST['url'][$key], ''));
$rssVals['rss_path'] = $tp -> toDB(varset($_POST['path'][$key], ''));
$rssVals['rss_name'] = $tp -> toDB(varset($_POST['name'][$key], ''));
$rssVals['rss_text'] = $tp -> toDB(varset($_POST['text'][$key], ''));
$rssVals['rss_datestamp'] = time();
$rssVals['rss_class'] = intval(varset($_POST['class'][$key], '0'));
$rssVals['rss_limit'] = intval(varset($_POST['limit'][$key], '0'));
$sql -> db_Insert("rss", $rssVals);
$admin_log->logArrayAll('RSS_04',$rssVals);
}
$message = count($_POST['importid'])." ".RSS_LAN_ADMIN_18;
return $message;
}
function dbrsslimit()
{
global $sql, $tp, $admin_log;
$limitVals = array();
foreach($_POST['limit'] as $key=>$value)
{
$key = intval($key);
$value = intval($value);
$limitVals[$key] = $value;
$sql -> db_Update("rss", "rss_limit = ".$value." WHERE rss_id = ".$key);
}
$admin_log->logArrayAll('RSS_05',$limitVals);
header("location:".e_SELF."?r3");
}
// Update options
function dboptions()
{
global $tp, $pref;
$admin_log = e107::getLog();
$temp = array();
$temp['rss_othernews'] = $_POST['rss_othernews'];
$temp['rss_summarydiz'] = $_POST['rss_summarydiz'];
$temp['rss_shownewsimage'] = $_POST['rss_shownewsimage'];
if ($admin_log->logArrayDiffs($temp, $pref, 'RSS_06'))
{
save_prefs(); // Only save if changes
return LAN_SAVED;
}
else
{
return LAN_NOCHANGE_NOTSAVED;
}
}
} // End class rss
?>*/