From 3e79faf124bd90f469b20759a2dce0e97e664736 Mon Sep 17 00:00:00 2001 From: e107steved Date: Sat, 20 Dec 2008 20:19:05 +0000 Subject: [PATCH] Make LANs for user.php distinct --- .../shortcode/batch/user_shortcodes.php | 88 +++++----- e107_handlers/xml_class.php | 8 +- e107_languages/English/lan_user.php | 154 ++++++++++++------ user.php | 48 +++--- 4 files changed, 178 insertions(+), 120 deletions(-) diff --git a/e107_files/shortcode/batch/user_shortcodes.php b/e107_files/shortcode/batch/user_shortcodes.php index 3c1ea3c5f..eaf92f4d0 100644 --- a/e107_files/shortcode/batch/user_shortcodes.php +++ b/e107_files/shortcode/batch/user_shortcodes.php @@ -1,20 +1,18 @@ convert_date($user['user_currentvisit'], "long") : "".LAN_401.""; +return $user['user_currentvisit'] ? $gen->convert_date($user['user_currentvisit'], "long") : "".LAN_USER_33.""; SC_END SC_BEGIN USER_LASTVISIT_LAPSE global $user; $gen = new convert; -return $user['user_currentvisit'] ? "( ".$gen -> computeLapse($user['user_currentvisit'])." ".LAN_426." )" : "".LAN_401.""; +return $user['user_currentvisit'] ? "( ".$gen -> computeLapse($user['user_currentvisit'])." ".LAN_USER_34." )" : "".LAN_USER_33.""; SC_END SC_BEGIN USER_VISITS @@ -153,7 +153,7 @@ SC_END SC_BEGIN USER_DAYSREGGED global $user; $gen = new convert; -return $gen -> computeLapse($user['user_join'])." ".LAN_426; +return $gen -> computeLapse($user['user_join'])." ".LAN_USER_34; SC_END SC_BEGIN USER_REALNAME_ICON @@ -171,7 +171,7 @@ SC_END SC_BEGIN USER_REALNAME global $user; -return $user['user_login'] ? $user['user_login'] : "".LAN_401.""; +return $user['user_login'] ? $user['user_login'] : "".LAN_USER_33.""; SC_END SC_BEGIN USER_EMAIL_ICON @@ -189,12 +189,12 @@ SC_END SC_BEGIN USER_EMAIL_LINK global $user, $tp; -return ($user['user_hideemail'] && !ADMIN) ? "".LAN_143."" : $tp->parseTemplate("{email={$user['user_email']}-link}"); +return ($user['user_hideemail'] && !ADMIN) ? "".LAN_USER_35."" : $tp->parseTemplate("{email={$user['user_email']}-link}"); SC_END SC_BEGIN USER_EMAIL global $user,$tp; -return ($user['user_hideemail'] && !ADMIN) ? "".LAN_143."" : $tp->toHTML($user['user_email'],"no_replace"); +return ($user['user_hideemail'] && !ADMIN) ? "".LAN_USER_35."" : $tp->toHTML($user['user_email'],"no_replace"); SC_END SC_BEGIN USER_ICON @@ -270,7 +270,7 @@ if ($user['user_birthday'] != "" && $user['user_birthday'] != "0000-00-00" && pr } else { - return "".LAN_401.""; + return "".LAN_USER_33.""; } SC_END @@ -281,12 +281,12 @@ SC_END SC_BEGIN USER_COMMENTS_LINK global $user; -return $user['user_comments'] ? "".LAN_423."" : ""; +return $user['user_comments'] ? "".LAN_USER_36."" : ""; SC_END SC_BEGIN USER_FORUM_LINK global $user; -return $user['user_forums'] ? "".LAN_424."" : ""; +return $user['user_forums'] ? "".LAN_USER_37."" : ""; SC_END SC_BEGIN USER_SENDPM @@ -324,11 +324,13 @@ SC_END SC_BEGIN USER_UPDATE_LINK global $user; -if (USERID == $user['user_id']) { - return "".LAN_411.""; +if (USERID == $user['user_id']) +{ + return "".LAN_USER_38.""; } -else if(ADMIN && getperms("4") && !$user['user_admin']) { - return "".LAN_412.""; +else if(ADMIN && getperms("4") && !$user['user_admin']) +{ + return "".LAN_USER_39.""; } SC_END @@ -355,11 +357,11 @@ if(!$userjump = getcachedvars('userjump')) } if($parm == 'prev') { - return isset($userjump['prev']['id']) ? "<< ".LAN_414." [ ".$userjump['prev']['name']." ]" : " "; + return isset($userjump['prev']['id']) ? "<< ".LAN_USER_40." [ ".$userjump['prev']['name']." ]" : " "; } else { - return isset($userjump['next']['id']) ? "[ ".$userjump['next']['name']." ] ".LAN_415." >>" : " "; + return isset($userjump['next']['id']) ? "[ ".$userjump['next']['name']." ] ".LAN_USER_41." >>" : " "; } SC_END @@ -371,7 +373,7 @@ if ($user['user_sess'] && file_exists(e_FILE."public/avatars/".$user['user_sess' } else { - return LAN_408; + return LAN_USER_42; } SC_END @@ -383,7 +385,7 @@ if ($user['user_image']) } else { - return LAN_408; + return LAN_USER_42; } SC_END @@ -401,7 +403,7 @@ if (USERID == $user['user_id'] || (ADMIN && getperms("4"))) { return "
- +
"; } @@ -423,7 +425,7 @@ require_once(e_HANDLER."user_extended_class.php"); $ue = new e107_user_extended; $ueCatList = $ue->user_extended_get_categories(); $ueFieldList = $ue->user_extended_get_fields(); -$ueCatList[0][0] = array('user_extended_struct_name' => LAN_410); +$ueCatList[0][0] = array('user_extended_struct_name' => LAN_USER_44); $ret = ""; foreach($ueCatList as $catnum => $cat) { @@ -528,15 +530,15 @@ global $order; if ($order == "ASC") { $ret = ""; } else { $ret = ""; } return $ret; @@ -556,7 +558,7 @@ return ""; SC_END SC_BEGIN USER_FORM_SUBMIT -return ""; +return ""; SC_END SC_BEGIN USER_EMBED_USERPROFILE diff --git a/e107_handlers/xml_class.php b/e107_handlers/xml_class.php index ae2ba61b3..e3a5984a4 100644 --- a/e107_handlers/xml_class.php +++ b/e107_handlers/xml_class.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/xml_class.php,v $ -| $Revision: 1.9 $ -| $Date: 2008-12-02 20:14:47 $ +| $Revision: 1.10 $ +| $Date: 2008-12-20 20:18:59 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -84,7 +84,7 @@ class xmlClass $remote = @fopen($address, "r"); if(!$remote) { - $this -> error = "fopen: Unable to open remote XML file."; + $this -> error = "fopen: Unable to open remote XML file: ".$address; return FALSE; } } @@ -94,7 +94,7 @@ class xmlClass $tmp = parse_url($address); if(!$remote = fsockopen ($tmp['host'], 80 ,$errno, $errstr, $timeout)) { - $this -> error = "Sockets: Unable to open remote XML file."; + $this -> error = "Sockets: Unable to open remote XML file: ".$address; return FALSE; } else diff --git a/e107_languages/English/lan_user.php b/e107_languages/English/lan_user.php index cad87c5d3..2fdd436b4 100644 --- a/e107_languages/English/lan_user.php +++ b/e107_languages/English/lan_user.php @@ -1,67 +1,123 @@ \ No newline at end of file diff --git a/user.php b/user.php index 2229adda6..bc4737f0e 100644 --- a/user.php +++ b/user.php @@ -1,21 +1,21 @@ tablerender(LAN_20, "
".USERLAN_2."
"); + $ns->tablerender(LAN_USER_48, "
".LAN_USER_55."
"); require_once(FOOTERF); exit; } @@ -108,8 +108,8 @@ if (isset($id)) { if ($id == 0) { - $text = "
".LAN_137." ".SITENAME."
"; - $ns->tablerender(LAN_20, $text); + $text = "
".LAN_USER_49." ".SITENAME."
"; + $ns->tablerender(LAN_USER_48, $text); require_once(FOOTERF); exit; } @@ -120,7 +120,7 @@ if (isset($id)) if ($ret!='') { $text = "
".$ret."
"; - $ns->tablerender(LAN_20, $text); + $ns->tablerender(LAN_USER_48, $text); require_once(FOOTERF); exit; } @@ -139,12 +139,12 @@ if (isset($id)) if($text = renderuser($id)) { - $ns->tablerender(LAN_402, $text); + $ns->tablerender(LAN_USER_50, $text); } else { - $text = "
".LAN_400."
"; - $ns->tablerender(LAN_20, $text); + $text = "
".LAN_USER_51."
"; + $ns->tablerender(LAN_USER_48, $text); } unset($text); require_once(FOOTERF); @@ -155,7 +155,7 @@ $users_total = $sql->db_Count("user","(*)", "WHERE user_ban = 0"); if (!$sql->db_Select("user", "*", "user_ban = 0 ORDER BY user_id $order LIMIT $from,$records")) { - echo "
".LAN_141."
"; + echo "
".LAN_USER_53."
"; } else { @@ -170,7 +170,7 @@ else $text .= $tp->parseTemplate($USER_SHORT_TEMPLATE_END, TRUE, $user_shortcodes); } -$ns->tablerender(LAN_140, $text); +$ns->tablerender(LAN_USER_52, $text); $parms = $users_total.",".$records.",".$from.",".e_SELF.'?[FROM].'.$records.".".$order; echo "
 ".$tp->parseTemplate("{NEXTPREV={$parms}}")."
";