mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 11:36:08 +02:00
Code Issues Releases Wiki Activity

PHP8 Plugin code cleanup

Browse Source
This commit is contained in:
Cameron
2021-01-21 09:38:38 -08:00
parent 9e0d014e39
commit f055b49d91
83 changed files with 753 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/forum/e_url.php
View File

@@ -10,7 +10,7 @@
*
* if (!defined('e107_INIT'))
* {
* require_once("../../class2.php");
* require_once(__DIR__.'/../../class2.php');
* }
*
*/

161
e107_plugins/forum/forum.php
View File

@@ -11,7 +11,7 @@
*/
if(!defined('e107_INIT'))
{
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
}
$e107 = e107::getInstance();
$tp = e107::getParser();
@@ -214,82 +214,6 @@ foreach ($forumList['parents'] as $parent)
}
function parse_forum($f, $restricted_string = '')
{
global $FORUM_MAIN_FORUM, $forumList, $sc;
$tp = e107::getParser();
if(!empty($forumList['subs']) && is_array($forumList['subs'][$f['forum_id']]))
{
$lastPost = explode('.', $f['forum_lastpost_info']);
$lastpost_datestamp = reset($lastPost);
$ret = parse_subs($forumList, $f['forum_id'], $lastpost_datestamp);
$f['forum_threads'] += $ret['threads'];
$f['forum_replies'] += $ret['replies'];
if(isset($ret['lastpost_info']))
{
$f['forum_lastpost_info'] = $ret['lastpost_info'];
$f['forum_lastpost_user'] = $ret['lastpost_user'];
$f['forum_lastpost_user_anon'] = $ret['lastpost_user_anon'];
$f['user_name'] = $ret['user_name'];
}
$f['text'] = $ret['text'];
}
$sc->setVars($f);
$sc->wrapper('forum/main/forum');
return $tp->parseTemplate($FORUM_MAIN_FORUM, true, $sc);
}
function parse_subs($forumList, $id, $lastpost_datestamp)
{
$tp = e107::getParser();
$ret = array();
$subList = $forumList['subs'][$id];
$ret['text'] = '';
$ret['threads'] = 0;
$ret['replies'] = 0;
foreach($subList as $sub)
{
// print_a($sub);
$ret['text'] .= ($ret['text'] ? ', ' : '');
$urlData = $sub;
$urlData['parent_sef'] = $forumList['all'][$sub['forum_sub']]['forum_sef']; // = array('parent_sef'=>
$suburl = e107::url('forum','forum', $urlData);
$ret['text'] .= "<a href='{$suburl}'>".$tp->toHTML($sub['forum_name']).'</a>';
$ret['threads'] += $sub['forum_threads'];
$ret['replies'] += $sub['forum_replies'];
$tmp = explode('.', $sub['forum_lastpost_info']);
if($tmp[0] > $lastpost_datestamp)
{
$ret['lastpost_info'] = $sub['forum_lastpost_info'];
$ret['lastpost_user'] = $sub['forum_lastpost_user'];
$ret['lastpost_user_anon'] = $sub['forum_lastpost_user_anon'];
$ret['user_name'] = $sub['user_name'];
$lastpost_datestamp = $tmp[0];
}
}
return $ret;
}
//if (e_QUERY == 'track')
//{
@@ -468,7 +392,7 @@ function forum_track()
$row['thread_sef'] = eHelper::title2sef($row['thread_name'],'dashl');
$data['NEWIMAGE'] = $IMAGE_nonew_small;
if ($row['thread_datestamp'] > USERLV && !in_array($row['thread_id'], $viewed))
{
$data['NEWIMAGE'] = $IMAGE_new_small;
@@ -476,7 +400,7 @@ function forum_track()
$data['LASTPOSTUSER'] = !empty($row['user_name']) ? "<a href='".e107::url('user/profile/view', array('name' => $row['user_name'], 'id' => $row['thread_lastuser']))."'>".$row['user_name']."</a>" : LAN_ANONYMOUS;
$data['LASTPOSTDATE'] = $tp->toDate($row['thread_lastpost'],'relative');
$buttonId = "forum-track-button-".intval($row['thread_id']);
$forumUrl = e107::url('forum','forum',$row);
@@ -538,3 +462,82 @@ function forum_track()
}
function parse_forum($f, $restricted_string = '')
{
global $FORUM_MAIN_FORUM, $forumList, $sc;
$tp = e107::getParser();
if(!empty($forumList['subs']) && is_array($forumList['subs'][$f['forum_id']]))
{
$lastPost = explode('.', $f['forum_lastpost_info']);
$lastpost_datestamp = reset($lastPost);
$ret = parse_subs($forumList, $f['forum_id'], $lastpost_datestamp);
$f['forum_threads'] += $ret['threads'];
$f['forum_replies'] += $ret['replies'];
if(isset($ret['lastpost_info']))
{
$f['forum_lastpost_info'] = $ret['lastpost_info'];
$f['forum_lastpost_user'] = $ret['lastpost_user'];
$f['forum_lastpost_user_anon'] = $ret['lastpost_user_anon'];
$f['user_name'] = $ret['user_name'];
}
$f['text'] = $ret['text'];
}
$sc->setVars($f);
$sc->wrapper('forum/main/forum');
return $tp->parseTemplate($FORUM_MAIN_FORUM, true, $sc);
}
function parse_subs($forumList, $id, $lastpost_datestamp)
{
$tp = e107::getParser();
$ret = array();
$subList = $forumList['subs'][$id];
$ret['text'] = '';
$ret['threads'] = 0;
$ret['replies'] = 0;
foreach($subList as $sub)
{
// print_a($sub);
$ret['text'] .= ($ret['text'] ? ', ' : '');
$urlData = $sub;
$urlData['parent_sef'] = $forumList['all'][$sub['forum_sub']]['forum_sef']; // = array('parent_sef'=>
$suburl = e107::url('forum','forum', $urlData);
$ret['text'] .= "<a href='{$suburl}'>".$tp->toHTML($sub['forum_name']).'</a>';
$ret['threads'] += $sub['forum_threads'];
$ret['replies'] += $sub['forum_replies'];
$tmp = explode('.', $sub['forum_lastpost_info']);
if($tmp[0] > $lastpost_datestamp)
{
$ret['lastpost_info'] = $sub['forum_lastpost_info'];
$ret['lastpost_user'] = $sub['forum_lastpost_user'];
$ret['lastpost_user_anon'] = $sub['forum_lastpost_user_anon'];
$ret['user_name'] = $sub['user_name'];
$lastpost_datestamp = $tmp[0];
}
}
return $ret;
}

2
e107_plugins/forum/forum_admin.php
View File

@@ -9,7 +9,7 @@
*/
$eplug_admin = true;
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
if (!getperms('P'))
{
e107::redirect('admin');

8
e107_plugins/forum/forum_class.php
View File

@@ -1756,15 +1756,17 @@ class e107forum
$sql = e107::getDb();
$viewed = '';
if($e107->currentUser['user_plugin_forum_viewed'])
$forumViewed = e107::getUserExt()->get(USERID, 'user_plugin_forum_viewed' );
if($forumViewed)
{
$viewed = " AND thread_id NOT IN (".$e107->currentUser['user_plugin_forum_viewed'].")";
$viewed = " AND thread_id NOT IN (".$forumViewed.")";
}
$_newqry = '
SELECT DISTINCT f.forum_sub, ft.thread_forum_id FROM `#forum_thread` AS ft
LEFT JOIN `#forum` AS f ON f.forum_id = ft.thread_forum_id
WHERE ft.thread_lastpost > '.USERLV.' '.$viewed;
WHERE ft.thread_lastpost > '.defset('USERLV', strtotime('1 month ago') ).' '.$viewed;
$ret = array();

2
e107_plugins/forum/forum_conf.php
View File

@@ -8,7 +8,7 @@
*
*/
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
$e107 = e107::getInstance();
if (!$e107->isInstalled('forum'))
{

2
e107_plugins/forum/forum_post.php
View File

@@ -13,7 +13,7 @@
if(!defined('e107_INIT'))
{
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
}
// Now defined in shortcodes that handle the editors

2
e107_plugins/forum/forum_stats.php
View File

@@ -10,7 +10,7 @@
if(!defined('e107_INIT'))
{
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
}
if (!e107::isInstalled('forum'))

2
e107_plugins/forum/forum_test.php
View File

@@ -1,5 +1,5 @@
<?php
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
require_once(e_PLUGIN.'forum/forum_class.php');
$timestart = microtime();

2
e107_plugins/forum/forum_uploads.php
View File

@@ -8,7 +8,7 @@
*
*/
require_once("../../class2.php");
require_once(__DIR__.'/../../class2.php');
$e107 = e107::getInstance();
if (!$e107->isInstalled('forum'))
{

2
e107_plugins/forum/forum_viewforum.php
View File

@@ -12,7 +12,7 @@
if(!defined('e107_INIT'))
{
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
}
$e107 = e107::getInstance();
if(!e107::isInstalled('forum'))

2
e107_plugins/forum/forum_viewtopic.php
View File

@@ -12,7 +12,7 @@
if(!defined('e107_INIT'))
{
require_once('../../class2.php');
require_once(__DIR__.'/../../class2.php');
}
e107::lan('forum', "front", true);