mirror of
https://github.com/e107inc/e107.git
synced 2025-03-17 19:09:45 +01:00
Issue #1174 - Orphaned LANs corrected. User Profile LANs cleaned up.
This commit is contained in:
parent
ed569c4947
commit
5e008b5df4
@ -798,7 +798,7 @@ class user_shortcodes extends e_shortcode
|
||||
|
||||
function sc_user_form_submit($parm)
|
||||
{
|
||||
return "<input class='btn btn-default button' type='submit' name='submit' value='".LAN_USER_47."' />";
|
||||
return "<input class='btn btn-default button' type='submit' name='submit' value='".LAN_GO."' />";
|
||||
}
|
||||
|
||||
|
||||
|
@ -93,7 +93,7 @@ $sc_style['USER_FORUM_LINK']['post'] = "</td></tr>";
|
||||
$sc_style['USER_UPDATE_LINK']['pre'] = "<tr><td colspan='2' class='forumheader3 center'>";
|
||||
$sc_style['USER_UPDATE_LINK']['post'] = "</td></tr>";
|
||||
|
||||
$sc_style['USER_RATING']['pre'] = "<tr><td colspan='2' class='forumheader3'><div class='f-left'>".LAN_USER_61."</div><div class='f-right'>";
|
||||
$sc_style['USER_RATING']['pre'] = "<tr><td colspan='2' class='forumheader3'><div class='f-left'>".LAN_RATING."</div><div class='f-right'>";
|
||||
$sc_style['USER_RATING']['post'] = "</div></td></tr>";
|
||||
|
||||
$sc_style['USER_LOGINNAME']['pre'] = " : ";
|
||||
|
@ -1334,7 +1334,7 @@ class e_form
|
||||
}
|
||||
elseif(!vartrue($options['noresize']))
|
||||
{
|
||||
$options['class'] = (isset($options['class']) && $options['class']) ? $options['class'].' e-autoheight' : 'tbox span7 e-autoheight';
|
||||
$options['class'] = (isset($options['class']) && $options['class']) ? $options['class'].' e-autoheight' : 'tbox col-md-7 span7 e-autoheight';
|
||||
}
|
||||
|
||||
$options = $this->format_options('textarea', $name, $options);
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
$comments_title = ADLAN_24;
|
||||
$comments_title = LAN_PLUGIN_DOWNLOAD_NAME;
|
||||
$comments_type_id = '2';
|
||||
$comments_return['download'] = "d.download_id, d.download_name";
|
||||
$comments_table['download'] = "LEFT JOIN #download AS d ON c.comment_type=2 AND d.download_id = c.comment_item_id";
|
||||
|
@ -74,8 +74,8 @@ define("LAN_USER_43", "delete photo"); // LAN_413
|
||||
define("LAN_USER_44", "Miscellaneous"); // LAN_410
|
||||
define("LAN_USER_45", "DESC"); // LAN_420
|
||||
define("LAN_USER_46", "ASC"); // LAN_421
|
||||
define("LAN_USER_47", "Go"); // LAN_422
|
||||
define("LAN_USER_48", "Error"); // LAN_20
|
||||
// define("LAN_USER_47", "Go"); // LAN_422
|
||||
// define("LAN_USER_48", "Error"); // LAN_20
|
||||
define("LAN_USER_49", "There is no information for that user as they are not registered at"); // LAN_137
|
||||
define("LAN_USER_50", "Member Profile"); // LAN_402
|
||||
define("LAN_USER_51", "That is not a valid user."); // LAN_400
|
||||
@ -117,7 +117,7 @@ define("LAN_USER_86", "Maximum avatar size is --WIDTH-- x --HEIGHT-- pixels");
|
||||
|
||||
|
||||
// Error messages for when user data is missing. Done this way so that other code can override the default messages
|
||||
// FIXME - do we need this?
|
||||
|
||||
// - [Berckoff] Used in validator_class for error handling, maybe moved to a more suitable place?
|
||||
if (!defined("USER_ERR_01")) { define("USER_ERR_01","Missing value"); }
|
||||
if (!defined("USER_ERR_02")) { define("USER_ERR_02","Unexpected value"); }
|
||||
@ -143,21 +143,6 @@ if (!defined("USER_ERR_21")) { define("USER_ERR_21","Image too high"); }
|
||||
if (!defined("USER_ERR_22")) { define("USER_ERR_22","Unspecified error"); }
|
||||
if (!defined("USER_ERR_23")) { define("USER_ERR_23","Disallowed value (exact match)"); }
|
||||
|
||||
// BC for v1.x template
|
||||
define("LAN_112", "Email Address");
|
||||
define("LAN_138", "Registered members: ");
|
||||
define("LAN_139", "Order: ");
|
||||
define("LAN_142", "Member");
|
||||
define("LAN_145", "Joined");
|
||||
define("LAN_146", "Visits to site since registration");
|
||||
define("LAN_147", "Chatbox posts");
|
||||
define("LAN_148", "Comments posted");
|
||||
define("LAN_149", "Forum posts");
|
||||
define("LAN_308", "Real Name");
|
||||
define("LAN_403", "Site Stats");
|
||||
define("LAN_404", "Last visit");
|
||||
//define("LAN_406", "Rating");//LAN_RATING
|
||||
define("LAN_419", "Show");
|
||||
define("LAN_425", "Send Private Message");
|
||||
|
||||
|
||||
?>
|
@ -2031,7 +2031,7 @@ $columnInfo = array(
|
||||
$order_options = array(
|
||||
"download_id" => "Id No.",
|
||||
"download_datestamp" => LAN_DATE,
|
||||
"download_requested" => ADLAN_24,
|
||||
"download_requested" => LAN_PLUGIN_DOWNLOAD_NAME,
|
||||
"download_name" => DOWLAN_59,
|
||||
"download_author" => DOWLAN_15
|
||||
);
|
||||
|
30
user.php
30
user.php
@ -21,6 +21,28 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
|
||||
global $user;
|
||||
$user['user_id'] = USERID;
|
||||
|
||||
// BC for v1.x template
|
||||
$bcList = array(
|
||||
'LAN_112' => 'LAN_USER_60',// Email Address
|
||||
'LAN_138' => 'LAN_USER_52', // Registered members
|
||||
'LAN_139' => 'LAN_USER_57', // Order
|
||||
"LAN_142" => "LAN_USER_58", // Member
|
||||
"LAN_145" => "LAN_USER_59", // Joined
|
||||
"LAN_146" => "LAN_USER_66", // Visits since...
|
||||
"LAN_147" => "LAN_USER_67", // Chatbox posts
|
||||
"LAN_148" => "LAN_USER_68", // Comments posted
|
||||
"LAN_149" => "LAN_USER_69", // Forum posts
|
||||
"LAN_308" => "LAN_USER_63", // Real Name
|
||||
"LAN_403" => "LAN_USER_64", // Site Stats
|
||||
"LAN_404" => "LAN_USER_65", // Last visit
|
||||
"LAN_419" => "LAN_USER_70", // Show
|
||||
"LAN_425" => "LAN_USER_62" // Send Private Message
|
||||
);
|
||||
|
||||
e107::getLanguage()->bcDefs($bcList);
|
||||
|
||||
|
||||
|
||||
if(e_AJAX_REQUEST)
|
||||
{
|
||||
if(vartrue($_POST['q']))
|
||||
@ -120,7 +142,7 @@ if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
|
||||
$full_perms = getperms("0") || check_class(varset($pref['memberlist_access'], 253)); // Controls display of info from other users
|
||||
if (!$full_perms && !$self_page)
|
||||
{
|
||||
$ns->tablerender(LAN_USER_48, "<div style='text-align:center'>".LAN_USER_55."</div>");
|
||||
$ns->tablerender(LAN_ERROR, "<div style='text-align:center'>".LAN_USER_55."</div>");
|
||||
require_once(FOOTERF);
|
||||
exit;
|
||||
}
|
||||
@ -168,7 +190,7 @@ if (isset($id))
|
||||
if ($id == 0)
|
||||
{
|
||||
$text = "<div style='text-align:center'>".LAN_USER_49." ".SITENAME."</div>";
|
||||
$ns->tablerender(LAN_USER_48, $text);
|
||||
$ns->tablerender(LAN_ERROR, $text);
|
||||
require_once(FOOTERF);
|
||||
exit;
|
||||
}
|
||||
@ -181,7 +203,7 @@ if (isset($id))
|
||||
if (!empty($ret) || !empty($ret2))
|
||||
{
|
||||
$text = "<div style='text-align:center'>".$ret."</div>";
|
||||
$ns->tablerender(LAN_USER_48, $text);
|
||||
$ns->tablerender(LAN_ERROR, $text);
|
||||
require_once(FOOTERF);
|
||||
exit;
|
||||
}
|
||||
@ -205,7 +227,7 @@ if (isset($id))
|
||||
else
|
||||
{
|
||||
$text = "<div style='text-align:center'>".LAN_USER_51."</div>";
|
||||
$ns->tablerender(LAN_USER_48, $text);
|
||||
$ns->tablerender(LAN_ERROR, $text);
|
||||
}
|
||||
unset($text);
|
||||
require_once(FOOTERF);
|
||||
|
Loading…
x
Reference in New Issue
Block a user