diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 89f714398..d4b11dc71 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -128,7 +128,7 @@ $fVars->SEARCH = " - +

\n"; diff --git a/e107_plugins/forum/forum_conf.php b/e107_plugins/forum/forum_conf.php index de2aaa907..c0e829280 100644 --- a/e107_plugins/forum/forum_conf.php +++ b/e107_plugins/forum/forum_conf.php @@ -123,8 +123,8 @@ if ($action == "delete_poll") ".FORCONF_13."

- - + +
"; $ns->tablerender(FORCONF_16, $text); @@ -179,8 +179,8 @@ if ($action == 'move')
- - + + diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php index 38a09671a..e52513786 100644 --- a/e107_plugins/forum/forum_post.php +++ b/e107_plugins/forum/forum_post.php @@ -537,7 +537,7 @@ function forumjump() { $text .= "\n"; } - $text .= "

"; + $text .= "

"; return $text; } diff --git a/e107_plugins/forum/forum_stats.php b/e107_plugins/forum/forum_stats.php index c8d298d14..7b900684d 100644 --- a/e107_plugins/forum/forum_stats.php +++ b/e107_plugins/forum/forum_stats.php @@ -36,8 +36,8 @@ $bar = (file_exists(THEME.'images/bar.png') ? THEME.'images/bar.png' : e_PLUGIN. require_once(HEADERF); -$total_posts = $sql->db_Count('forum_post'); -$total_topics = $sql->db_Count('forum_thread'); +$total_posts = $sql->count('forum_post'); +$total_topics = $sql->count('forum_thread'); $total_replies = $total_posts - $total_topics; $total_views = 0; $query = 'SELECT sum(thread_views) AS total FROM `#forum_thread` '; @@ -58,7 +58,7 @@ $postsperday = ($open_days < 1 ? $total_posts : round($total_posts / $open_days) $query = "SHOW TABLE STATUS FROM `{$mySQLdefaultdb}`"; -$sql -> db_Select_gen($query); +$sql->gen($query); $array = $sql -> db_getList(); foreach($array as $table) { @@ -77,7 +77,7 @@ LEFT JOIN #forum AS f ON f.forum_id = ft.thread_forum_id WHERE ft.thread_active > 0 AND f.forum_class IN (".USERCLASS_LIST.") ORDER BY ft.thread_total_replies DESC LIMIT 0,10"; -$sql -> db_Select_gen($query); +$sql->gen($query); $most_activeArray = $sql -> db_getList(); $query = " @@ -87,7 +87,7 @@ LEFT JOIN #forum AS f ON f.forum_id = ft.thread_forum_id WHERE f.forum_class IN (".USERCLASS_LIST.") ORDER BY ft.thread_views DESC LIMIT 0,10"; -$sql -> db_Select_gen($query); +$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"); @@ -105,7 +105,7 @@ SELECT COUNT(fp.post_id) AS post_count, u.user_name, u.user_id, fp.post_thread F LEFT JOIN #user AS u ON fp.post_user = u.user_id GROUP BY fp.post_user ORDER BY post_count DESC LIMIT 0,10"; -$sql -> db_Select_gen($query); +$sql->gen($query); $top_repliers_data = $sql -> db_getList('ALL', false, false, 'user_id'); // build top posters meanwhile @@ -125,7 +125,7 @@ SELECT COUNT(ft.thread_id) AS thread_count, u.user_id FROM #forum_thread as ft LEFT JOIN #user AS u ON ft.thread_user = u.user_id WHERE u.user_id IN ({$ids}) GROUP BY ft.thread_user"; -$sql -> db_Select_gen($query); +$sql->gen($query); $top_repliers_data_c = $sql -> db_getList('ALL', false, false, 'user_id'); $top_repliers = array(); @@ -153,7 +153,7 @@ SELECT COUNT(ft.thread_id) AS thread_count, u.user_name, u.user_id FROM #forum_t LEFT JOIN #user AS u ON ft.thread_user = u.user_id GROUP BY ft.thread_user ORDER BY thread_count DESC LIMIT 0,10"; -$sql -> db_Select_gen($query); +$sql->gen($query); $top_topic_starters_data = $sql -> db_getList(); $top_topic_starters = array(); foreach($top_topic_starters_data as $poster) @@ -199,16 +199,30 @@ foreach($posters as $poster) */ +function showBar($perc) +{ + + return "
+
+
"; + +//
+//
+//
+ + +} + + $text = "
- +
- + - +
".FSLAN_1."".FSLAN_1."
- + @@ -219,23 +233,22 @@ $text = " -
".FSLAN_2.":  {$open_date}
".FSLAN_3.":  {$open_since}
".FSLAN_4.":  {$total_posts}
".FSLAN_8.":  {$db_size}
".FSLAN_9.":  {$avg_row_len}
-
- +
- - - - - + + + + + "; @@ -267,16 +280,16 @@ $text .= "
".FSLAN_10."
".FSLAN_11."".FSLAN_12."".FSLAN_13."".FSLAN_14."".FSLAN_15."".FSLAN_11."".FSLAN_12."".FSLAN_13."".FSLAN_14."".FSLAN_15."
- +
- - - - - + + + + + "; @@ -308,17 +321,20 @@ $text .= "
".FSLAN_16."
".FSLAN_11."".FSLAN_12."".FSLAN_17."".FSLAN_14."".FSLAN_15."".FSLAN_11."".FSLAN_12."".FSLAN_17."".FSLAN_14."".FSLAN_15."
- +
+ - - - - - + + + + + + + "; $count=1; @@ -330,32 +346,27 @@ foreach($top_posters as $ma) - "; $count++; } -$text .= " +$text .= "
".FSLAN_18."
".FSLAN_11."".FSLAN_19."".FSLAN_20."% ".FSLAN_11."".FSLAN_19."".FSLAN_20."% 
$user_name $user_forums $percentage% - -
-
-
- + 		".showBar($percentage)."
- +
- - - - - + + + + + "; @@ -368,13 +379,7 @@ foreach($top_topic_starters as $ma) - + "; $count++; @@ -384,16 +389,16 @@ $text .= "
".FSLAN_21."
".FSLAN_11."".FSLAN_19."".FSLAN_20."% ".FSLAN_11."".FSLAN_19."".FSLAN_20."% 
$user_name $user_forums $percentage% - -
-
-
- - 		".showBar($percentage)."
- +
- - - - - + + + + + "; @@ -406,13 +411,7 @@ foreach($top_repliers as $ma) - + "; $count++; diff --git a/e107_plugins/forum/forum_update.php b/e107_plugins/forum/forum_update.php index 0eb2f4ee3..d12b42c5a 100644 --- a/e107_plugins/forum/forum_update.php +++ b/e107_plugins/forum/forum_update.php @@ -127,7 +127,7 @@ function step2() This step will create the new forum_thread, forum_post, and forum_attach tables. It will also create a forum_new table that will become the 'real' forum table once the data from the current table is migrated.

- + "; $ns->tablerender('Step 2: Forum table creation', $text); @@ -188,7 +188,7 @@ function step3() * user_plugin_forum_viewed (to track threads viewed by each user


- + "; $e107->ns->tablerender($stepCaption, $text); @@ -227,7 +227,7 @@ function step3() $text .= "

- + "; } @@ -252,7 +252,7 @@ function step4() Depending on the size of your user table, this step could take a while.

- + "; $ns->tablerender($stepCaption, $text); @@ -355,7 +355,7 @@ function step4() "); $text = " - + "; $ns->tablerender($stepCaption, $mes->render().$text); @@ -378,7 +378,7 @@ function step5() "); $text = " - + "; $ns->tablerender($stepCaption, $mes->render().$text); @@ -430,7 +430,7 @@ function step5() $text = " - + "; @@ -468,7 +468,7 @@ function step6()

There are {$count} forum threads to convert, we will be doing it in steps of: {$limitDropdown}

- + "; $ns->tablerender($stepCaption, $mes->render(). $text); @@ -541,7 +541,7 @@ function step6() { $mes->addSuccess("Thread migration is complete!!"); $text = " - + "; $ns->tablerender($stepCaption, $mes->render(). $text); @@ -560,7 +560,7 @@ function step7() This step will calculate post count information for all users, as well as recount all for thread and reply counts.

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -585,7 +585,7 @@ function step7() Successfully recalculated forum posts for ".count($counts)." users.

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -601,7 +601,7 @@ function step8() This step will recalculate all thread and forum lastpost information

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -620,7 +620,7 @@ function step8() Successfully recalculated lastpost information for all forums and threads.

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -636,7 +636,7 @@ function step9() This step will recalculate all poll information that has been entered in the forums.

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -685,7 +685,7 @@ function step9() Successfully migrated forum poll information for ".count($threadList)." thread poll(s).

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -708,7 +708,7 @@ function step10() All files will be moved from the e107_files/public directory into the e107_plugins/forum/attachment directory and related posts will be updated accordingly.

- + "; $ns->tablerender($stepCaption, $text); @@ -915,7 +915,7 @@ function step10() Successfully migrated forum attachment information for ".count($postList)." post(s).

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -934,7 +934,7 @@ function step11() we will try to identify these files and delete them.

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -976,7 +976,7 @@ function step11() {$failText}

- + "; $e107->ns->tablerender($stepCaption, $text); @@ -994,13 +994,13 @@ function step11() } else { - $extra = "       "; + $extra = "       "; } $text .= "

{$extra} - + "; $e107->ns->tablerender($stepCaption, $text); @@ -1012,7 +1012,7 @@ function step11() There were no orphaned files found


- + "; $e107->ns->tablerender($stepCaption, $text); @@ -1039,7 +1039,7 @@ function step12()



- + "; $ns->tablerender($stepCaption, $text); diff --git a/e107_plugins/forum/forum_uploads.php b/e107_plugins/forum/forum_uploads.php index 274ae9d7f..aa11fe617 100644 --- a/e107_plugins/forum/forum_uploads.php +++ b/e107_plugins/forum/forum_uploads.php @@ -104,7 +104,7 @@ if(is_array($fileList)) } else { - $txt .= ""; + $txt .= ""; } $txt .= ""; } diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index accf1b72d..72ea4317e 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -214,7 +214,7 @@ $fVars->SEARCH = " - +

"; @@ -575,7 +575,7 @@ function forumjump() { $text .= "\n"; } - $text .= ""; + $text .= ""; return $text; } diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php index 054caf76f..fb8b01271 100644 --- a/e107_plugins/forum/forum_viewtopic.php +++ b/e107_plugins/forum/forum_viewtopic.php @@ -376,7 +376,7 @@ function forumjump() { $text .= "\n"; } - $text .= "

"; + $text .= "

"; return $text; } @@ -642,7 +642,7 @@ class e107ForumThread
".FSLAN_22."
".FSLAN_11."".FSLAN_19."".FSLAN_20."% ".FSLAN_11."".FSLAN_19."".FSLAN_20."% 
$user_name $user_forums $percentage% - -
-
-
- - 		".showBar($percentage)."
".FRMUP_8." ".FRMUP_8."

- +
"; diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index 69d782727..0f44248ee 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -88,14 +88,14 @@ class plugin_forum_post_shortcodes extends e_shortcode function sc_buttons() { global $action, $eaction; - $ret = " "; + $ret = " "; if ($action != 'nt') { - $ret .= ($eaction ? "" : ""); + $ret .= ($eaction ? "" : ""); } else { - $ret .= ($eaction ? "" : ""); + $ret .= ($eaction ? "" : ""); } return $ret; } diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php index a8a1c971b..1db03f98a 100644 --- a/e107_plugins/forum/templates/forum_post_template.php +++ b/e107_plugins/forum/templates/forum_post_template.php @@ -62,7 +62,7 @@ $fileattach = "
- + "; @@ -88,7 +88,7 @@ $FORUMPOST = "
{FORMSTART} - +
@@ -132,7 +132,7 @@ $FORUMPOST_REPLY = "
{FORMSTART} -
{BACKLINK}
+
@@ -179,7 +179,7 @@ $FORUMPOST_REPLY = " if(!vartrue($LATESTPOSTS_START)) { $LATESTPOSTS_START = " -
{BACKLINK}
+
". LAN_101."{LATESTPOSTSCOUNT}".LAN_102." @@ -210,7 +210,7 @@ $LATESTPOSTS_END = " if(!vartrue($THREADTOPIC_REPLY)) { $THREADTOPIC_REPLY = " - +
diff --git a/e107_plugins/forum/templates/forum_posted_template.php b/e107_plugins/forum/templates/forum_posted_template.php index 8a39c0b15..e12a3cc25 100644 --- a/e107_plugins/forum/templates/forum_posted_template.php +++ b/e107_plugins/forum/templates/forum_posted_template.php @@ -15,7 +15,7 @@ if (!defined('e107_INIT')) { exit; } if(!defined('USER_WIDTH')) { define('USER_WIDTH','width:95%'); } $FORUMPOLLPOSTED = -"
".LAN_100."
+"
@@ -27,7 +27,7 @@ $FORUMPOLLPOSTED =
".LAN_133."
"; $FORUMTHREADPOSTED = " - +
@@ -41,7 +41,7 @@ $FORUMTHREADPOSTED = " $FORUMREPLYPOSTED = " -
".LAN_133."
+
diff --git a/e107_plugins/forum/templates/forum_preview_template.php b/e107_plugins/forum/templates/forum_preview_template.php index 0c292bfa3..0bee4d1d3 100644 --- a/e107_plugins/forum/templates/forum_preview_template.php +++ b/e107_plugins/forum/templates/forum_preview_template.php @@ -15,7 +15,7 @@ if (!defined('e107_INIT')) { exit; } if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%;margin-left:auto;margin-right:auto"); } $FORUM_PREVIEW = "
-
".LAN_133."
+
" : " ( ".LAN_62.$tsubject." )")." diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php index 5431cac59..f0a24c206 100644 --- a/e107_plugins/forum/templates/forum_template.php +++ b/e107_plugins/forum/templates/forum_template.php @@ -16,7 +16,7 @@ if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); } if (!isset($FORUM_MAIN_START)) { - $FORUM_MAIN_START = "
\n
\n
".LAN_323. ($action != "nt" ? "
\n\n\n\n\n\n"; + $FORUM_MAIN_START = "
\n
\n
{FORUMTITLE}{THREADTITLE}{REPLYTITLE}{LASTPOSTITLE}
\n\n\n\n\n\n"; } if (!isset($FORUM_MAIN_PARENT)) { @@ -28,12 +28,12 @@ if (!isset($FORUM_MAIN_FORUM)) } if (!isset($FORUM_MAIN_END)) { - $FORUM_MAIN_END = "
{FORUMTITLE}{THREADTITLE}{REPLYTITLE}{LASTPOSTITLE}
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
{INFOTITLE}
{LOGO}{USERINFO}
{INFO}
{FORUMINFO}
{USERLIST}
{STATLINK}
\n
\n
\n\n\n\n\n\n\n
{ICONKEY}{SEARCH}{PERMS}\n
\n
\n"; + $FORUM_MAIN_END = "
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
{INFOTITLE}
{LOGO}{USERINFO}
{INFO}
{FORUMINFO}
{USERLIST}
{STATLINK}
\n
\n
\n\n\n\n\n\n\n
{ICONKEY}{SEARCH}{PERMS}\n
\n
\n
"; } if (!isset($FORUM_NEWPOSTS_START)) { - $FORUM_NEWPOSTS_START = "
\n
\n\n\n\n\n\n"; + $FORUM_NEWPOSTS_START = "
\n
\n
 {NEWTHREADTITLE}{POSTEDTITLE}
\n\n\n\n\n"; } if (!isset($FORUM_NEWPOSTS_MAIN)) @@ -48,7 +48,7 @@ if (!isset($FORUM_NEWPOSTS_END)) if (!isset($FORUM_TRACK_START)) { - $FORUM_TRACK_START = "
\n
\n
 {NEWTHREADTITLE}{POSTEDTITLE}
\n\n\n\n"; + $FORUM_TRACK_START = "
\n
\n
{TRACKTITLE}
\n\n\n\n"; if (!isset($FORUM_TRACK_MAIN)) { diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index 9de03cba8..f9ac55054 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -20,7 +20,7 @@ $FORUM_VIEW_START = "
-
{TRACKTITLE}
+
@@ -45,7 +45,7 @@ $FORUM_VIEW_START = "
{MESSAGE}
-
{BREADCRUMB}
+
@@ -61,7 +61,7 @@ if(!$FORUM_VIEW_START_CONTAINER) $FORUM_VIEW_START_CONTAINER = "
-
  {THREADTITLE}
+
@@ -159,7 +159,7 @@ if (!$FORUM_VIEW_END) {
{BREADCRUMB}
- +
@@ -168,7 +168,7 @@ if (!$FORUM_VIEW_END) {
-
{MODERATORS} {BROWSERS}
+
{ICONKEY} {PERMS}

{SEARCH} diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php index b9a4f10ac..79b6a3022 100644 --- a/e107_plugins/forum/templates/forum_viewtopic_template.php +++ b/e107_plugins/forum/templates/forum_viewtopic_template.php @@ -33,7 +33,7 @@ $sc_style['USER_EXTENDED']['location.text_value']['post'] = "
"; $FORUMSTART = "
- +
{BACKLINK} @@ -81,7 +81,7 @@ $FORUMSTART = "
- +
".LAN_402."