mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Make LANs for user.php distinct

Browse Source
This commit is contained in:
e107steved 2008-12-20 20:19:05 +00:00
parent 56b4721328
commit 3e79faf124
4 changed files with 178 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
e107_files/shortcode/batch/user_shortcodes.php
View File

@ -1,20 +1,18 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system
|
| ©Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $
| $Revision: 1.12 $
| $Date: 2008-04-01 19:58:41 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
* e107 website system
*
* Copyright (C) 2001-2008 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* User information - shortcodes
*
* $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $
* $Revision: 1.13 $
* $Date: 2008-12-20 20:18:54 $
* $Author: e107steved $
*
*/
if (!defined('e107_INIT')) { exit; }
include_once(e_HANDLER.'shortcode_handler.php');
@ -115,11 +113,13 @@ global $user, $pref;
require_once(e_HANDLER."level_handler.php");
$ldata = get_level($user['user_id'], $user['user_forums'], $user['user_comments'], $user['user_chats'], $user['user_visits'], $user['user_join'], $user['user_admin'], $user['user_perms'], $pref);
if (strstr($ldata[0], "IMAGE_rank_main_admin_image")) {
return LAN_417;
if (strstr($ldata[0], "IMAGE_rank_main_admin_image"))
{
return LAN_USER_31;
}
else if(strstr($ldata[0], "IMAGE")) {
return LAN_418;
elseif(strstr($ldata[0], "IMAGE"))
{
return LAN_USER_32;
}
else
{
@ -130,13 +130,13 @@ SC_END
SC_BEGIN USER_LASTVISIT
global $user;
$gen = new convert;
return $user['user_currentvisit'] ? $gen->convert_date($user['user_currentvisit'], "long") : "<i>".LAN_401."</i>";
return $user['user_currentvisit'] ? $gen->convert_date($user['user_currentvisit'], "long") : "<i>".LAN_USER_33."</i>";
SC_END
SC_BEGIN USER_LASTVISIT_LAPSE
global $user;
$gen = new convert;
return $user['user_currentvisit'] ? "( ".$gen -> computeLapse($user['user_currentvisit'])." ".LAN_426." )" : "<i>".LAN_401."</i>";
return $user['user_currentvisit'] ? "( ".$gen -> computeLapse($user['user_currentvisit'])." ".LAN_USER_34." )" : "<i>".LAN_USER_33."</i>";
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'] : "<i>".LAN_401."</i>";
return $user['user_login'] ? $user['user_login'] : "<i>".LAN_USER_33."</i>";
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) ? "<i>".LAN_143."</i>" : $tp->parseTemplate("{email={$user['user_email']}-link}");
return ($user['user_hideemail'] && !ADMIN) ? "<i>".LAN_USER_35."</i>" : $tp->parseTemplate("{email={$user['user_email']}-link}");
SC_END
SC_BEGIN USER_EMAIL
global $user,$tp;
return ($user['user_hideemail'] && !ADMIN) ? "<i>".LAN_143."</i>" : $tp->toHTML($user['user_email'],"no_replace");
return ($user['user_hideemail'] && !ADMIN) ? "<i>".LAN_USER_35."</i>" : $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 "<i>".LAN_401."</i>";
return "<i>".LAN_USER_33."</i>";
}
SC_END
@ -281,12 +281,12 @@ SC_END
SC_BEGIN USER_COMMENTS_LINK
global $user;
return $user['user_comments'] ? "<a href='".e_HTTP."userposts.php?0.comments.".$user['user_id']."'>".LAN_423."</a>" : "";
return $user['user_comments'] ? "<a href='".e_HTTP."userposts.php?0.comments.".$user['user_id']."'>".LAN_USER_36."</a>" : "";
SC_END
SC_BEGIN USER_FORUM_LINK
global $user;
return $user['user_forums'] ? "<a href='".e_HTTP."userposts.php?0.forums.".$user['user_id']."'>".LAN_424."</a>" : "";
return $user['user_forums'] ? "<a href='".e_HTTP."userposts.php?0.forums.".$user['user_id']."'>".LAN_USER_37."</a>" : "";
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 "<a href='".e_HTTP."usersettings.php'>".LAN_411."</a>";
if (USERID == $user['user_id'])
{
return "<a href='".e_HTTP."usersettings.php'>".LAN_USER_38."</a>";
}
else if(ADMIN && getperms("4") && !$user['user_admin']) {
return "<a href='".e_HTTP."usersettings.php?".$user['user_id']."'>".LAN_412."</a>";
else if(ADMIN && getperms("4") && !$user['user_admin'])
{
return "<a href='".e_HTTP."usersettings.php?".$user['user_id']."'>".LAN_USER_39."</a>";
}
SC_END
@ -355,11 +357,11 @@ if(!$userjump = getcachedvars('userjump'))
}
if($parm == 'prev')
{
return isset($userjump['prev']['id']) ? "&lt;&lt; ".LAN_414." [ <a href='".e_SELF."?id.".$userjump['prev']['id']."'>".$userjump['prev']['name']."</a> ]" : "&nbsp;";
return isset($userjump['prev']['id']) ? "&lt;&lt; ".LAN_USER_40." [ <a href='".e_SELF."?id.".$userjump['prev']['id']."'>".$userjump['prev']['name']."</a> ]" : "&nbsp;";
}
else
{
return isset($userjump['next']['id']) ? "[ <a href='".e_SELF."?id.".$userjump['next']['id']."'>".$userjump['next']['name']."</a> ] ".LAN_415." &gt;&gt;" : "&nbsp;";
return isset($userjump['next']['id']) ? "[ <a href='".e_SELF."?id.".$userjump['next']['id']."'>".$userjump['next']['name']."</a> ] ".LAN_USER_41." &gt;&gt;" : "&nbsp;";
}
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 "
<form method='post' action='".e_SELF."?".e_QUERY."'>
<input class='button' type='submit' name='delp' value='".LAN_413."' />
<input class='button' type='submit' name='delp' value='".LAN_USER_43."' />
</form>
";
}
@ -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 = "<select name='order' class='tbox'>
<option value='DESC'>".LAN_420."</option>
<option value='ASC' selected='selected'>".LAN_421."</option>
<option value='DESC'>".LAN_USER_45."</option>
<option value='ASC' selected='selected'>".LAN_USER_46."</option>
</select>";
}
else
{
$ret = "<select name='order' class='tbox'>
<option value='DESC' selected='selected'>".LAN_420."</option>
<option value='ASC'>".LAN_421."</option>
<option value='DESC' selected='selected'>".LAN_USER_45."</option>
<option value='ASC'>".LAN_USER_46."</option>
</select>";
}
return $ret;
@ -556,7 +558,7 @@ return "</form>";
SC_END
SC_BEGIN USER_FORM_SUBMIT
return "<input class='button' type='submit' name='submit' value='".LAN_422."' />";
return "<input class='button' type='submit' name='submit' value='".LAN_USER_47."' />";
SC_END
SC_BEGIN USER_EMBED_USERPROFILE

8
e107_handlers/xml_class.php
View File

@ -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

154
e107_languages/English/lan_user.php
View File

@ -1,67 +1,123 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_user.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:34:40 $
| $Author: mcfly_e107 $
+----------------------------------------------------------------------------+
* e107 website system
*
* Copyright (C) 2001-2008 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* Language file - user-related (many generic definitions)
*
* $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_user.php,v $
* $Revision: 1.2 $
* $Date: 2008-12-20 20:19:05 $
* $Author: e107steved $
*
*/
define("PAGE_NAME", "Members");
define("LAN_20", "Error");
define("LAN_112", "Email Address");
/*
The language defines in this file have been renumbered - old number as a comment, and those apparently not used commented out below.
define("LAN_115", "ICQ Number");
define("LAN_116", "AIM Address");
define("LAN_117", "MSN Messenger");
define("LAN_118", "Birthday");
define("LAN_119", "Location");
define("LAN_120", "Signature");
define("LAN_137", "There is no information for that user as they are not registered at");
define("LAN_138", "Registered members: ");
define("LAN_139", "Order: ");
define("LAN_140", "Registered members");
define("LAN_141", "No registered members yet.");
define("LAN_142", "Member");
define("LAN_143", "[hidden by request]");
define("LAN_144", "Website URL");
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_400", "That is not a valid user.");
define("LAN_401", "no information");
define("LAN_402", "Member Profile");
define("LAN_403", "Site Stats");
define("LAN_404", "Last visit");
define("LAN_405", "days ago");
define("LAN_406", "Rating");
define("LAN_407", "none");
define("LAN_408", "no photo");
define("LAN_409", "points");
define("LAN_410", "Miscellaneous");
define("LAN_411", "Click here to update your information");
define("LAN_412", "Click here to edit this user's information");
define("LAN_413", "delete photo");
define("LAN_414", "previous member");
define("LAN_415", "next member");
define("LAN_416", "You must be logged in to access this page");
define("LAN_417", "Main site administrator");
define("LAN_418", "Site administrator");
define("LAN_419", "Show");
define("LAN_420", "DESC");
define("LAN_421", "ASC");
define("LAN_422", "Go");
define("LAN_423", "Click here to View User Comments");
define("LAN_424", "Click here to View Forum Posts");
define("LAN_425", "Send Private Message");
define("LAN_426", "ago");
*/
// LAN_USER_01..LAN_USER_30 - Descriptions specifically for user-related DB field names
define('LAN_USER_01','Display name');
define('LAN_USER_02','Login Name');
define('LAN_USER_03','Real Name');
define('LAN_USER_04','Custom title');
define('LAN_USER_05','Password');
define('LAN_USER_06','Photo');
define('LAN_USER_07','Avatar');
define('LAN_USER_08','Email address');
define('LAN_USER_09','Signature');
define('LAN_USER_10','Hide email');
define('LAN_USER_11','XUP file');
define('LAN_USER_12','User class');
define('LAN_USER_13','ID');
define('LAN_USER_14','Join Date');
define('LAN_USER_15','Last Visit');
define('LAN_USER_16','Current Visit');
define('LAN_USER_17','Comments');
define('LAN_USER_18','IP Address');
define('LAN_USER_19','Ban');
define('LAN_USER_20','Prefs');
define('LAN_USER_21','Visits');
define('LAN_USER_22','Admin');
define('LAN_USER_23','Perms');
define('LAN_USER_24','Password Change');
// Start here when assigning new messages to leave space for more field names
define('LAN_USER_31', 'Main site administrator'); // LAN_417
define('LAN_USER_32', 'Site administrator'); // LAN_418
define('LAN_USER_33', 'no information'); // LAN_401
define('LAN_USER_34', 'ago'); // LAN_426
define('LAN_USER_35', '[hidden by request]'); // LAN_143
define('LAN_USER_36', 'Click here to View User Comments'); // LAN_423
define('LAN_USER_37', 'Click here to View Forum Posts'); // LAN_424
define('LAN_USER_38', 'Click here to update your information'); // LAN_411
define('LAN_USER_39', 'Click here to edit this user\'s information'); // LAN_412
define('LAN_USER_40', 'previous member'); // LAN_414
define('LAN_USER_41', 'next member'); // LAN_415
define('LAN_USER_42', 'no photo'); // LAN_408
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_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
define('LAN_USER_52', 'Registered members'); // LAN_140
define('LAN_USER_53', 'No registered members yet.'); // LAN_141
define('LAN_USER_54', 'Peer Rating'); // USERLAN_1 (apparently not used)
define('LAN_USER_55', 'You do not have access to view this page.'); // USERLAN_2
define('LAN_USER_56', 'Registered members: '); // LAN_138
define('LAN_USER_57', 'Order: '); // LAN_139
define('LAN_USER_58', 'Member'); // LAN_142
define('LAN_USER_59', 'Joined'); // LAN_145
define('LAN_USER_60', 'Email Address'); // LAN_112
define('LAN_USER_61', 'Rating'); // LAN_406
define('LAN_USER_62', 'Send Private Message'); // LAN_425
define('LAN_USER_63', 'Real Name'); // LAN_308
define('LAN_USER_64', 'Site Stats'); // LAN_403
define('LAN_USER_65', 'Last visit'); // LAN_404
define('LAN_USER_66', 'Visits to site since registration'); // LAN_146
define('LAN_USER_67', 'Chatbox posts'); // LAN_147
define('LAN_USER_68', 'Comments posted'); // LAN_148
define('LAN_USER_69', 'Forum posts'); // LAN_149
define('LAN_USER_70', 'Show'); // LAN_419
// Error messages for when user data is missing
define('USER_ERR_01','Missing value');
define('USER_ERR_02','Unexpected value');
define('USER_ERR_03','Value contains invalid characters');
define('USER_ERR_04','Value too short');
define('USER_ERR_05','Value too long');
define('USER_ERR_06','Duplicate value');
define('USER_ERR_07','Value not allowed');
define('USER_ERR_08','Entry disabled');
define('USER_ERR_09','Invalid word');
define('USER_ERR_10','Password fields different');
define('USER_ERR_11','Banned email address');
define('USER_ERR_12','Invalid format for email address');
define('USER_ERR_13','Data error');
define('USER_ERR_14','Banned user');
define('USER_ERR_15','User name and display name cannot be different');
define("USERLAN_1", "Peer Rating");
define("USERLAN_2", "You do not have access to view this page.");
?>

48
user.php
View File

@ -1,21 +1,21 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system
|
| ©Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/user.php,v $
| $Revision: 1.7 $
| $Date: 2008-06-05 19:57:44 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
* e107 website system
*
* Copyright (C) 2001-2008 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
* User information
*
* $Source: /cvs_backup/e107_0.8/user.php,v $
* $Revision: 1.8 $
* $Date: 2008-12-20 20:18:54 $
* $Author: e107steved $
*
*/
define('PAGE_NAME', 'Members');
require_once("class2.php");
// Next bit is to fool PM plugin into doing things
@ -61,7 +61,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_20, "<div style='text-align:center'>".USERLAN_2."</div>");
$ns->tablerender(LAN_USER_48, "<div style='text-align:center'>".LAN_USER_55."</div>");
require_once(FOOTERF);
exit;
}
@ -108,8 +108,8 @@ if (isset($id))
{
if ($id == 0)
{
$text = "<div style='text-align:center'>".LAN_137." ".SITENAME."</div>";
$ns->tablerender(LAN_20, $text);
$text = "<div style='text-align:center'>".LAN_USER_49." ".SITENAME."</div>";
$ns->tablerender(LAN_USER_48, $text);
require_once(FOOTERF);
exit;
}
@ -120,7 +120,7 @@ if (isset($id))
if ($ret!='')
{
$text = "<div style='text-align:center'>".$ret."</div>";
$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 = "<div style='text-align:center'>".LAN_400."</div>";
$ns->tablerender(LAN_20, $text);
$text = "<div style='text-align:center'>".LAN_USER_51."</div>";
$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 "<div style='text-align:center'><b>".LAN_141."</b></div>";
echo "<div style='text-align:center'><b>".LAN_USER_53."</b></div>";
}
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 "<div class='nextprev'>&nbsp;".$tp->parseTemplate("{NEXTPREV={$parms}}")."</div>";