diff --git a/e107_plugins/forum/e_list.php b/e107_plugins/forum/e_list.php index c6184dd40..53c89b34a 100644 --- a/e107_plugins/forum/e_list.php +++ b/e107_plugins/forum/e_list.php @@ -101,7 +101,7 @@ class list_forum $LASTPOST = ""; if($lp_name) { - $LASTPOST = "$lp_name"; + $LASTPOST = "$lp_name"; } else { @@ -130,7 +130,7 @@ class list_forum $lnk = ($parent_id ? $thread_id.".post" : $thread_id); $record['heading'] = "".$rowheading.""; - $record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : "$user_name") : ""); + $record['author'] = ($this->parent->settings['author'] ? ($thread_anon ? $thread_user : "$user_name") : ""); $record['category'] = ($this->parent->settings['category'] ? "$forum_name" : ""); $record['date'] = ($this->parent->settings['date'] ? $this->parent->getListDate($thread_datestamp) : ""); $record['icon'] = $bullet; diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 68467dc3e..0d031818b 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -79,7 +79,7 @@ $rules_text = forum_rules('check'); $fVars->USERINFO = "".LAN_FORUM_0010." | ".LAN_FORUM_0011.""; if(USER) { - $fVars->USERINFO .= " | ".LAN_FORUM_0012." | ".LAN_FORUM_0013." | ".LAN_FORUM_0014.""; + $fVars->USERINFO .= " | ".LAN_FORUM_0012." | ".LAN_FORUM_0013." | ".LAN_FORUM_0014.""; if($forum->prefs->get('attach') && (check_class($pref['upload_class']) || getperms('0'))) { $fVars->USERINFO .= " | ".LAN_FORUM_0015.""; @@ -126,7 +126,7 @@ if(!defined('e_TRACKING_DISABLED')) { list($oid, $oname) = explode(".", $uinfo, 2); $c ++; - $fVars->USERLIST .= "$oname".($c == MEMBERS_ONLINE ? "." :", "); + $fVars->USERLIST .= "$oname".($c == MEMBERS_ONLINE ? "." :", "); } } $fVars->USERLIST .= "
".LAN_FORUM_0037." ".LAN_FORUM_0038; @@ -231,7 +231,7 @@ if (USER && vartrue($forum->prefs->get('track')) && e_QUERY != 'track') $fVars->FORUMINFO = str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_topics ".($total_topics == 1 ? LAN_FORUM_0032 : LAN_FORUM_0033).", $total_replies ".($total_replies == 1 ? LAN_FORUM_0034 : LAN_FORUM_0035).") -".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")
".LAN_FORUM_0066." ".$total_members."
".LAN_FORUM_0065." ".$nuser_name.".\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref? +".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")
".LAN_FORUM_0066." ".$total_members."
".LAN_FORUM_0065." ".$nuser_name.".\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref? if (!isset($FORUM_MAIN_START)) { diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php index 3fd4fa627..16e63a66f 100644 --- a/e107_plugins/forum/forum_admin.php +++ b/e107_plugins/forum/forum_admin.php @@ -2508,7 +2508,7 @@ class forumAdmin ".FORLAN_171.": - #".$row['gen_intdata']." + #".$row['gen_intdata']." ".FORLAN_173.": @@ -2516,7 +2516,7 @@ class forumAdmin ".FORLAN_174.": - ".$user['user_name']." + ".$user['user_name']." diff --git a/e107_plugins/forum/forum_stats.php b/e107_plugins/forum/forum_stats.php index ec34dfb2b..5556b7f53 100644 --- a/e107_plugins/forum/forum_stats.php +++ b/e107_plugins/forum/forum_stats.php @@ -264,7 +264,7 @@ class forumStats { if($ma['user_name']) { - $uinfo = "{$ma['user_name']}"; //TODO SEf Url . + $uinfo = "{$ma['user_name']}"; //TODO SEf Url . } else { @@ -310,7 +310,7 @@ class forumStats { if($ma['user_name']) { - $uinfo = "".$ma['user_name'].""; //TODO SEf Url . + $uinfo = "".$ma['user_name'].""; //TODO SEf Url . } else { @@ -360,7 +360,7 @@ class forumStats //TODO SEf Url . $text_3 .= " $count - ".$ma['user_name']." + ".$ma['user_name']." $user_forums $percentage% ".$this->showBar($percentage)." @@ -398,7 +398,7 @@ class forumStats $text_4 .= " $count - $user_name + $user_name $user_forums $percentage% ".$this->showBar($percentage)." @@ -432,7 +432,7 @@ class forumStats $text_5 .= " $count - $user_name + $user_name $user_forums $percentage% ".$this->showBar($percentage)." diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index b3f5a0847..1ab98a8db 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -454,10 +454,12 @@ class plugin_forum_view_shortcodes extends e_shortcode $ue = $tp->parseTemplate("{USER_EXTENDED=location.text_value}",true); $username = (empty($this->postInfo['user_name'])) ? LAN_ANONYMOUS : $this->postInfo['user_name']; - + + $userUrl = empty($this->postInfo['post_user']) ? '#' : e107::getUrl()->create('user/profile/view', array('user_id'=>$this->postInfo['post_user'], 'user_name'=>$username)); + // e_HTTP.'user.php?id.'.$this->postInfo['post_user'] $text = '
- '.$username.' + '.$username.'