From 5e008b5df4381428646edc1e0343569b7a5a1785 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 29 Aug 2015 15:56:18 -0700 Subject: [PATCH] Issue #1174 - Orphaned LANs corrected. User Profile LANs cleaned up. --- .../shortcodes/batch/user_shortcodes.php | 2 +- e107_core/templates/user_template.php | 2 +- e107_handlers/form_handler.php | 2 +- e107_handlers/search/comments_download.php | 2 +- e107_languages/English/lan_user.php | 23 +++----------- e107_plugins/download/includes/admin.php | 2 +- user.php | 30 ++++++++++++++++--- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index 77063145b..d94a68dfd 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -798,7 +798,7 @@ class user_shortcodes extends e_shortcode function sc_user_form_submit($parm) { - return ""; + return ""; } diff --git a/e107_core/templates/user_template.php b/e107_core/templates/user_template.php index e1ab045dd..5ac0b86e7 100644 --- a/e107_core/templates/user_template.php +++ b/e107_core/templates/user_template.php @@ -93,7 +93,7 @@ $sc_style['USER_FORUM_LINK']['post'] = ""; $sc_style['USER_UPDATE_LINK']['pre'] = ""; $sc_style['USER_UPDATE_LINK']['post'] = ""; -$sc_style['USER_RATING']['pre'] = "
".LAN_USER_61."
"; +$sc_style['USER_RATING']['pre'] = "
".LAN_RATING."
"; $sc_style['USER_RATING']['post'] = "
"; $sc_style['USER_LOGINNAME']['pre'] = " : "; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 8e491b9c8..0544886f1 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -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); diff --git a/e107_handlers/search/comments_download.php b/e107_handlers/search/comments_download.php index 7998e27de..958e41bf0 100644 --- a/e107_handlers/search/comments_download.php +++ b/e107_handlers/search/comments_download.php @@ -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"; diff --git a/e107_languages/English/lan_user.php b/e107_languages/English/lan_user.php index d82f06e9c..7a25b847e 100644 --- a/e107_languages/English/lan_user.php +++ b/e107_languages/English/lan_user.php @@ -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"); + ?> \ No newline at end of file diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php index 06358c223..a5d02cd4e 100644 --- a/e107_plugins/download/includes/admin.php +++ b/e107_plugins/download/includes/admin.php @@ -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 ); diff --git a/user.php b/user.php index 001a8171a..62a6368da 100644 --- a/user.php +++ b/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, "
".LAN_USER_55."
"); + $ns->tablerender(LAN_ERROR, "
".LAN_USER_55."
"); require_once(FOOTERF); exit; } @@ -168,7 +190,7 @@ if (isset($id)) if ($id == 0) { $text = "
".LAN_USER_49." ".SITENAME."
"; - $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 = "
".$ret."
"; - $ns->tablerender(LAN_USER_48, $text); + $ns->tablerender(LAN_ERROR, $text); require_once(FOOTERF); exit; } @@ -205,7 +227,7 @@ if (isset($id)) else { $text = "
".LAN_USER_51."
"; - $ns->tablerender(LAN_USER_48, $text); + $ns->tablerender(LAN_ERROR, $text); } unset($text); require_once(FOOTERF);