From 12beda569dd9adb47e0bec5e9c877fa70086d41d Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 23 Mar 2016 19:34:17 -0700
Subject: [PATCH] Fix for user profile data. Fix for default settings of
 newforumposts_menu.php.

---
 e107_admin/users.php                              |  2 +-
 e107_handlers/user_extended_class.php             |  2 +-
 e107_plugins/forum/forum.css                      |  5 +++++
 e107_plugins/forum/forum_admin.php                |  2 +-
 .../forum/languages/English/English_admin.php     |  2 +-
 .../forum/languages/English/English_global.php    |  3 ++-
 e107_plugins/forum/newforumposts_menu.php         | 15 ++++++++++++---
 user.php                                          |  1 +
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/e107_admin/users.php b/e107_admin/users.php
index fcbd4d74d..a312ee465 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -271,7 +271,7 @@ class users_admin_ui extends e_admin_ui
 	
 		'user_name' 		=> array('title' => LAN_USER_01,	'tab'=>0, 'type' => 'text',	'inline'=>true, 'data'=>'str', 'width' => 'auto','thclass' => 'left first'), // Display name
  		'user_loginname' 	=> array('title' => LAN_USER_02,	'tab'=>0, 'type' => 'text',	'data'=>'str', 'width' => 'auto'), // User name
- 		'user_login' 		=> array('title' => LAN_USER_03,	'tab'=>0, 'type' => 'text',	'data'=>'str', 'width' => 'auto'), // Real name (no real vetting)
+ 		'user_login' 		=> array('title' => LAN_USER_03,	'tab'=>0, 'type' => 'text',	'inline'=>true, 'data'=>'str', 'width' => 'auto'), // Real name (no real vetting)
  		'user_customtitle' 	=> array('title' => LAN_USER_04,	'tab'=>0, 'type' => 'text',	'data'=>'str', 'width' => 'auto'), // No real vetting
  		'user_password' 	=> array('title' => LAN_PASSWORD,	'tab'=>0, 'type' => 'method',	'data'=>'str', 'width' => 'auto'), //TODO add md5 option to form handler?
 		'user_sess' 		=> array('title' => 'Session',		'tab'=>0, 'noedit'=>true, 'type' => 'text',	'width' => 'auto'), // Photo
diff --git a/e107_handlers/user_extended_class.php b/e107_handlers/user_extended_class.php
index 79f2eb80f..765465c89 100644
--- a/e107_handlers/user_extended_class.php
+++ b/e107_handlers/user_extended_class.php
@@ -1123,7 +1123,7 @@ class e107_user_extended
 	 * @param $type
 	 * @return array|string
 	 */
-	function renderValue($value, $type)
+	function renderValue($value, $type='')
 	{
 
 		//TODO FIXME Add more types.
diff --git a/e107_plugins/forum/forum.css b/e107_plugins/forum/forum.css
index 7ee46db16..9734209d7 100644
--- a/e107_plugins/forum/forum.css
+++ b/e107_plugins/forum/forum.css
@@ -13,6 +13,11 @@
 .forum-attachment-file                                  { margin-top:15px; }
 .forum-user-combo                                       { padding-bottom:5px }
 
+
+ul.newforumposts-menu                                    { padding-left: 10px; }
+ul.newforumposts-menu li                                 { margin-bottom: 15px;  }
+
+
 @media all and (min-height: 800px) {
     #forum, #forum-stats, #forum-rules                  { min-height: 500px;  }
 }
diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php
index 9aa2b7f22..e9663feef 100644
--- a/e107_plugins/forum/forum_admin.php
+++ b/e107_plugins/forum/forum_admin.php
@@ -80,7 +80,7 @@ if(!deftrue('OLD_FORUMADMIN'))
 			'main/prefs' 		=> array('caption'=> LAN_PREFS, 'perm' => 'P'),
 			'opt2'              => array('divider'=>true),
 			'report/list'         => array('caption'=> FORLAN_116, 'perm'=>'P'),
-			'post/list'         => array('caption'=>FORLAN_188, 'perm'=>'P'),
+			'post/list'         => array('caption'=>LAN_PLUGIN_FORUM_LATESTPOSTS, 'perm'=>'P'),
 			'main/prune'		=> array('caption'=> LAN_PRUNE, 'perm' => 'P'),
 			'main/tools'        => array('caption'=>FORLAN_153, 'perm'=>'p')
 
diff --git a/e107_plugins/forum/languages/English/English_admin.php b/e107_plugins/forum/languages/English/English_admin.php
index ea430d6ef..51b48942c 100644
--- a/e107_plugins/forum/languages/English/English_admin.php
+++ b/e107_plugins/forum/languages/English/English_admin.php
@@ -211,6 +211,6 @@ define("FORLAN_185", "Indicates who can create new threads");
 
 define("FORLAN_186", "Threads per page");
 define("FORLAN_187", "Number of threads displayed per page");
-define("FORLAN_188", "Latest Posts");
+// define("FORLAN_188", "Latest Posts");
 define("FORLAN_189", "Click the 'delete' button to delete the report.<br /><br />Click the 'view' button to view the topic/thread");
 ?>
\ No newline at end of file
diff --git a/e107_plugins/forum/languages/English/English_global.php b/e107_plugins/forum/languages/English/English_global.php
index f98b22ac4..c56c76e78 100644
--- a/e107_plugins/forum/languages/English/English_global.php
+++ b/e107_plugins/forum/languages/English/English_global.php
@@ -3,7 +3,8 @@
 define("LAN_PLUGIN_FORUM_NAME", "Forum");
 define("LAN_PLUGIN_FORUM_DESC", "This plugin is a fully featured forum system.");
 define("LAN_PLUGIN_FORUM_POSTS", "Forum posts");
-define("LAN_PLUGIN_FORUM_ALLFORUMS", "All Forums"); 
+define("LAN_PLUGIN_FORUM_ALLFORUMS", "All Forums");
+define("LAN_PLUGIN_FORUM_LATESTPOSTS", "Latest Posts");
 // Notify
 // TODO - LAN cleanup (see e_notify)
 
diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php
index 43b244d5b..0b3227432 100755
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
@@ -71,7 +71,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
 
 		if($results = $sql->gen($qry))
 		{
-			$text = "<ul>";
+			$text = "<ul class='newforumposts-menu'>";
 
 			while($row = $sql->fetch())
 			{
@@ -99,7 +99,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
 				}
 
 				$post = strip_tags($tp->toHTML($row['post_entry'], true, 'emotes_off, no_make_clickable', '', $pref['menu_wordwrap']));
-				$post = $tp->text_truncate($post, $this->menuPref['characters'], $this->menuPref['postfix']);
+				$post = $tp->text_truncate($post, varset($this->menuPref['characters'],120), varset($this->menuPref['postfix'],'...'));
 
 				// Count previous posts for calculating proper (topic) page number for the current post.
 				//	$postNum = $sql2->count('forum_post', '(*)', "WHERE post_id <= " . $row['post_id'] . " AND post_thread = " . $row['thread_id'] . " ORDER BY post_id ASC");
@@ -138,7 +138,16 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
 			$text = LAN_FORUM_MENU_002;
 		}
 
-		$caption = varset($this->menuPref['caption'][e_LANGUAGE], $this->menuPref['caption']);
+
+		if(isset($this->menuPref['caption']))
+		{
+			$caption = varset($this->menuPref['caption'][e_LANGUAGE], $this->menuPref['caption']);
+		}
+		else
+		{
+			$caption = LAN_PLUGIN_FORUM_LATESTPOSTS;
+		}
+
 		e107::getRender()->tablerender($caption, $text, 'nfp_menu');
 
 	}
diff --git a/user.php b/user.php
index cbc6b3b1b..5bf78ca41 100644
--- a/user.php
+++ b/user.php
@@ -303,6 +303,7 @@ function renderuser($uid, $mode = "verbose")
 		}
 	}
 	
+	$user_shortcodes->setVars($user);
 
 
 	if($mode == 'verbose')