mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-15 03:56:20 +02:00
Code Issues Releases Wiki Activity

Fix for user profile data. Fix for default settings of newforumposts_menu.php.

Browse Source
This commit is contained in:
Cameron
2016-03-23 19:34:17 -07:00
parent 825ab74984
commit 12beda569d
8 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/users.php
View File

@ -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_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_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_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_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 'user_sess' => array('title' => 'Session', 'tab'=>0, 'noedit'=>true, 'type' => 'text', 'width' => 'auto'), // Photo

2
e107_handlers/user_extended_class.php
View File

@ -1123,7 +1123,7 @@ class e107_user_extended
* @param $type * @param $type
* @return array|string * @return array|string
*/ */
function renderValue($value, $type) function renderValue($value, $type='')
{ {
//TODO FIXME Add more types. //TODO FIXME Add more types.

5
e107_plugins/forum/forum.css
View File

@ -13,6 +13,11 @@
.forum-attachment-file { margin-top:15px; } .forum-attachment-file { margin-top:15px; }
.forum-user-combo { padding-bottom:5px } .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) { @media all and (min-height: 800px) {
#forum, #forum-stats, #forum-rules { min-height: 500px; } #forum, #forum-stats, #forum-rules { min-height: 500px; }
} }

2
e107_plugins/forum/forum_admin.php
View File

@ -80,7 +80,7 @@ if(!deftrue('OLD_FORUMADMIN'))
'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'), 'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'),
'opt2' => array('divider'=>true), 'opt2' => array('divider'=>true),
'report/list' => array('caption'=> FORLAN_116, 'perm'=>'P'), '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/prune' => array('caption'=> LAN_PRUNE, 'perm' => 'P'),
'main/tools' => array('caption'=>FORLAN_153, 'perm'=>'p') 'main/tools' => array('caption'=>FORLAN_153, 'perm'=>'p')

2
e107_plugins/forum/languages/English/English_admin.php
View File

@ -211,6 +211,6 @@ define("FORLAN_185", "Indicates who can create new threads");
define("FORLAN_186", "Threads per page"); define("FORLAN_186", "Threads per page");
define("FORLAN_187", "Number of threads displayed 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"); define("FORLAN_189", "Click the 'delete' button to delete the report.<br /><br />Click the 'view' button to view the topic/thread");
?> ?>

1
e107_plugins/forum/languages/English/English_global.php
View File

@ -4,6 +4,7 @@ define("LAN_PLUGIN_FORUM_NAME", "Forum");
define("LAN_PLUGIN_FORUM_DESC", "This plugin is a fully featured forum system."); define("LAN_PLUGIN_FORUM_DESC", "This plugin is a fully featured forum system.");
define("LAN_PLUGIN_FORUM_POSTS", "Forum posts"); 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 // Notify
// TODO - LAN cleanup (see e_notify) // TODO - LAN cleanup (see e_notify)

15
e107_plugins/forum/newforumposts_menu.php
View File

@ -71,7 +71,7 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
if($results = $sql->gen($qry)) if($results = $sql->gen($qry))
{ {
$text = "<ul>"; $text = "<ul class='newforumposts-menu'>";
while($row = $sql->fetch()) 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 = 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. // 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"); // $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; $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'); e107::getRender()->tablerender($caption, $text, 'nfp_menu');
} }

1
user.php
View File

@ -303,6 +303,7 @@ function renderuser($uid, $mode = "verbose")
} }
} }
$user_shortcodes->setVars($user);
if($mode == 'verbose') if($mode == 'verbose')