From c45ff67018a9605e19ac35730abaf0cdf52c8c3b Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Mon, 9 Jan 2017 17:07:47 +0000 Subject: [PATCH] LANS Clean Up #6 - User Class LANS Clean Up #6 - User Class - more to do within conflicting defines lan_user.php --- e107_admin/userclass2.php | 90 ++++++++--------- e107_admin/users.php | 11 +-- e107_handlers/userclass_class.php | 4 +- e107_languages/English/admin/lan_admin.php | 3 +- .../English/admin/lan_userclass2.php | 96 ++++++++++--------- e107_languages/English/admin/lan_users.php | 14 ++- 6 files changed, 110 insertions(+), 108 deletions(-) diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index d81d704ff..781458f5b 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2015 e107 Inc (e107.org) + * Copyright (C) 2008-2017 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -93,13 +93,13 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); protected $fields = array( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), 'userclass_id' => array('title'=> LAN_ID, 'type' =>'hidden', 'data'=>'int', 'width' => '5%', 'thclass' => 'left'), - 'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'icon', 'tab'=>0, 'data'=>'str', 'width' => '5%', 'thclass' => 'left', 'class' => 'center'), - 'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'tab'=>0,'data'=>'str', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left'), - 'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'tab'=>0,'data'=>'str', 'inline'=>true,'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('size'=>'xxlarge')), - 'userclass_type' => array('title'=> UCSLAN_79, 'type' => 'dropdown', 'tab'=>0,'data'=>'int', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ), - 'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('classlist'=>'nobody,public,main,admin,classes,matchclass,member, no-excludes')), - 'userclass_visibility' => array('title'=> UCSLAN_34, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_parent' => array('title'=> UCSLAN_35, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('classlist'=>'main,admin,nobody,public,classes,matchclass,member, no-excludes')), + 'userclass_icon' => array('title'=> LAN_ICON, 'type' => 'icon', 'tab'=>0, 'data'=>'str', 'width' => '5%', 'thclass' => 'left', 'class' => 'center'), + 'userclass_name' => array('title'=> LAN_NAME, 'type' => 'text', 'tab'=>0,'data'=>'str', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left'), + 'userclass_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'text', 'tab'=>0,'data'=>'str', 'inline'=>true,'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('size'=>'xxlarge')), + 'userclass_type' => array('title'=> LAN_TYPE, 'type' => 'dropdown', 'tab'=>0,'data'=>'int', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ), + 'userclass_editclass' => array('title'=> LAN_MANAGER, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('classlist'=>'nobody,public,main,admin,classes,matchclass,member, no-excludes')), + 'userclass_visibility' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left'), + 'userclass_parent' => array('title'=> LAN_PARENT, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('classlist'=>'main,admin,nobody,public,classes,matchclass,member, no-excludes')), 'userclass_perms' => array('title'=> "Perms", 'type' => 'hidden', 'tab'=>0,'data'=>'str', 'width' => 'auto', 'thclass' => 'left'), 'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'width' => '10%', 'thclass' => 'center last', 'forced'=>TRUE, 'class'=>'right', 'readParms' => array('deleteClass' => e_UC_NOBODY)) @@ -212,7 +212,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); $frm = e107::getForm(); - $mes->addWarning(UCSLAN_52."
".UCSLAN_53); + $mes->addWarning(LAN_OPTIONS."

".UCSLAN_53); $text = "

".LAN_PREFS."

@@ -376,7 +376,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); } else { - $text .= UCSLAN_44; + $text .= LAN_NONE; } @@ -391,7 +391,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); ".$frm->select('init_class_stage', $initClassStages, $sel_stage)."".UCSLAN_46." -
". $frm->admin_button('set_initial_classes','no-value','create',LAN_UPDATE)."
"; +
". $frm->admin_button('set_initial_classes','no-value','create',LAN_UPDATE)."
"; } else { @@ -718,16 +718,16 @@ if (isset($_POST['etrigger_delete']) && !empty($_POST['etrigger_delete'])) // unset($pref['frontpage'][$class_id]); // (Should work with both 0.7 and 0.8 front page methods) // save_prefs(); } - $emessage->add(UCSLAN_3, E_MESSAGE_SUCCESS); + $emessage->add(UCSL/AN_3, E_MESSAGE_SUCCESS); } else { - $emessage->add(UCSLAN_10, E_MESSAGE_ERROR); + $emessage->add(UCSL/AN_10, E_MESSAGE_ERROR); } } else { - $emessage->add(UCSLAN_10, E_MESSAGE_ERROR); + $emessage->add(UCSL/AN_10, E_MESSAGE_ERROR); } }*/ @@ -794,8 +794,8 @@ if (isset($_POST['createclass'])) // Add or edit $e_userclass->save_edited_class($class_record); userclass2_adminlog('03',"ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")"); $do_tree = TRUE; - //$message .= UCSLAN_5; - $emessage->add(UCSLAN_5, E_MESSAGE_SUCCESS); + //$message .= LAN_UPDATED.': '.LAN_USERCLASS; + $emessage->add(LAN_UPDATED.': '.LAN_USERCLASS, E_MESSAGE_SUCCESS); } else { // Creating new class @@ -815,8 +815,8 @@ if (isset($_POST['createclass'])) // Add or edit $e_userclass->add_new_class($class_record); userclass2_adminlog("01","ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")"); $do_tree = TRUE; - //$message .= UCSLAN_6; - $emessage->add(UCSLAN_6, E_MESSAGE_SUCCESS); + //$message .= LAN_UPDATED.': '.LAN_USERCLASS; + $emessage->add(LAN_UPDATED.': '.LAN_USERCLASS, E_MESSAGE_SUCCESS); } } else @@ -940,7 +940,7 @@ switch ($action) $text .= " - ".UCSLAN_12." + ".LAN_NAME." "; if ($fullEdit) { @@ -954,7 +954,7 @@ switch ($action) - ".UCSLAN_13." + ".LAN_DESCRIPTION."
".UCSLAN_31."
"; @@ -962,7 +962,7 @@ switch ($action) // Userclass icon $text .= " - ".UCSLAN_68." + ".LAN_ICON." ".$frm->iconpicker('userclass_icon', $userclass_icon, LAN_SELECT)."
".UCSLAN_69."
@@ -970,7 +970,7 @@ switch ($action) $text .= " - ".UCSLAN_79." + ".LAN_TYPE." "; $classTypes = array(UC_TYPE_STD => UCSLAN_80, UC_TYPE_GROUP => UCSLAN_81); if ($fullEdit) @@ -992,7 +992,7 @@ switch ($action) // Who can manage class $text .= " - ".UCSLAN_24." + ".LAN_MANAGER." "; $text .= "'; $text .= "
".UCSLAN_32."
@@ -1012,7 +1012,7 @@ switch ($action) $text .= " - ".UCSLAN_34." + ".LAN_VISIBILITY." "; $text .= "'; $text .= "
".UCSLAN_33."
@@ -1021,7 +1021,7 @@ switch ($action) $text .= " - ".UCSLAN_35." + ".LAN_PARENT." "; $text .= "'; // .r_userclass("userclass_parent", $userclass_parent, "off", "admin,classes,matchclass,public,member"). @@ -1035,9 +1035,9 @@ switch ($action) if($params == 'edit') { - $text .= $frm->admin_button('createclass', UCSLAN_14, 'create'); + $text .= $frm->admin_button('createclass', LAN_UPDATE, 'create'); $text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel'); - // $text .= ""; + // $text .= ""; // $text .= "  "; $text .= " @@ -1045,7 +1045,7 @@ if($params == 'edit') } else { - $text .= $frm->admin_button('createclass', UCSLAN_15, 'create'); + $text .= $frm->admin_button('createclass', LAN_CREATE, 'create'); $text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel'); // $text .= " //   "; @@ -1097,7 +1097,7 @@ unset($title); } else { - $text .= UCSLAN_44; + $text .= LAN_NONE; } @@ -1133,7 +1133,7 @@ unset($title); case 'debug' : // if (!check_class(e_UC_MAINADMIN)) break; // Let ordinary admins see this if they know enough to specify the URL $text .= $e_userclass->show_graphical_tree(TRUE); // Print with debug options - $ns->tablerender(UCSLAN_21, $text); + $ns->tablerender(LAN_SETTINGS, $text); $text = ""; @@ -1148,7 +1148,7 @@ unset($title); "; } $text .= "
Class rights for first 20 users in database
User IDDisp NameRaw classesInherited classesEditable classes
"; - $ns->tablerender(UCSLAN_21, $text); + $ns->tablerender(LAN_SETTINGS, $text); break; // End of 'debug' @@ -1201,7 +1201,7 @@ unset($title); $mes = e107::getMessage(); - $mes->addWarning(UCSLAN_52."
".UCSLAN_53); + $mes->addWarning(LAN_OPTIONS."
".UCSLAN_53); $text = " @@ -1408,12 +1408,12 @@ function userclass2_adminmenu() $var['list']['link'] = 'userclass2.php'; - $var['config']['text'] = LAN_CREATE; // UCSLAN_25; + $var['config']['text'] = LAN_CREATE; // UCSL/AN_25; $var['config']['link'] = 'userclass2.php?config'; //DEPRECATED - use admin->users instead. -// $var['membs']['text'] = UCSLAN_26; +// $var['membs']['text'] = UCSL/AN_26; // $var['membs']['link'] ='userclass2.php?membs'; @@ -1422,12 +1422,12 @@ function userclass2_adminmenu() if (check_class(e_UC_MAINADMIN)) { - $var['options']['text'] = LAN_PREFS; // UCSLAN_50; + $var['options']['text'] = LAN_PREFS; // UCSL/AN_50; $var['options']['link'] ='userclass2.php?options'; if (defined('UC_DEBUG_OPTS')) { - $var['debug']['text'] = UCSLAN_27; + $var['debug']['text'] = UCSL/AN_27; $var['debug']['link'] ='userclass2.php?debug'; $var['test']['text'] = 'Test functions'; @@ -1460,14 +1460,14 @@ class uclass_manager $this->fieldpref = (varset($user_pref['admin_userclass_columns'])) ? $user_pref['admin_userclass_columns'] : array("userclass_id","userclass_name","userclass_description"); $this->fields = array( - 'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'icon', 'width' => '5%', 'thclass' => 'center', 'class' => 'center'), + 'userclass_icon' => array('title'=> LAN_ICON, 'type' => 'icon', 'width' => '5%', 'thclass' => 'center', 'class' => 'center'), 'userclass_id' => array('title'=> LAN_ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'), - 'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_parent' => array('title'=> UCSLAN_35, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_visibility' => array('title'=> UCSLAN_34, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_type' => array('title'=> UCSLAN_79, 'type' => 'method', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ), + 'userclass_name' => array('title'=> LAN_NAME, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), + 'userclass_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), + 'userclass_editclass' => array('title'=> LAN_MANAGER, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), + 'userclass_parent' => array('title'=> LAN_PARENT, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), + 'userclass_visibility' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), + 'userclass_type' => array('title'=> LAN_TYPE, 'type' => 'method', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ), 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'thclass' => 'center last', 'forced'=>TRUE, 'class'=>'right', 'readParms' => array('deleteClass' => e_UC_NOBODY)) ); @@ -1491,14 +1491,14 @@ class uclass_manager if (!$total = $sql->db_Select('userclass_classes', '*')) { $text = ""; - $mes->add(UCSLAN_7, E_MESSAGE_INFO); + $mes->add(LAN_NO_RECORDS_FOUND, E_MESSAGE_INFO); } else { $text = "
- ".UCSLAN_5." + ".LAN_UPDATED.': '.LAN_USERCLASS."
". $frm->colGroup($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref). diff --git a/e107_admin/users.php b/e107_admin/users.php index 93253a5f2..5846bb195 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -1,9 +1,8 @@ getName().",\n\n".UCSLAN_4." ".SITENAME."\n( ".SITEURL." )\n\n".UCSLAN_5.": \n\n".$messaccess."\n".UCSLAN_10."\n".SITEADMIN; + $message = USRLAN_256." ".$sysuser->getName().",\n\n".UCSLAN_4." ".SITENAME."\n( ".SITEURL." )\n\n".UCSLAN_5.": \n\n".$messaccess."\n".UCSLAN_10."\n".SITEADMIN; // $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","User class change",str_replace("\n","
",$message),FALSE,LOG_TO_ROLLING); $options['mail_subject'] = UCSLAN_2; @@ -1075,9 +1074,9 @@ class users_admin_ui extends e_admin_ui $text .= "
".$frm->hidden('userid', $userid)." - ".$frm->checkbox_label(UCSLAN_8.'  ', 'notifyuser', 1)." - ".$frm->admin_button('etrigger_updateclass', UCSLAN_7, 'update')." - ".$frm->admin_button('etrigger_back', 'Back', 'cancel')." + ".$frm->checkbox_label(USRLAN_255.'  ', 'notifyuser', 1)." + ".$frm->admin_button('etrigger_updateclass', LAN_NO_RECORDS_FOUND, 'update')." + ".$frm->admin_button('etrigger_back', LAN_BACK, 'cancel')."
diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php index b73471a84..b18ab31b4 100644 --- a/e107_handlers/userclass_class.php +++ b/e107_handlers/userclass_class.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2013 e107 Inc (e107.org) + * Copyright (C) 2008-2017 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -1509,7 +1509,7 @@ class user_class_admin extends user_class if ($this->class_tree[$listnum]['userclass_type'] == UC_TYPE_GROUP) { - $name_line .= ''.$this->class_tree[$listnum]['userclass_name'].' '.UCSLAN_84; // Highlight groups + $name_line .= ''.$this->class_tree[$listnum]['userclass_name'].' ('.UCSLAN_81.').'; // Highlight groups } else { diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 0dd68a477..ec23cb25a 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -359,7 +359,7 @@ define("LAN_UNCHECKALL", "Uncheck All"); define("LAN_DELCHECKED", "Delete Checked"); define("LAN_USERCLASS", "Userclass"); - +define("LAN_MANAGER", "Manager"); define("LAN_HELP", "Help"); define("LAN_CUSTOM", "Custom"); @@ -385,6 +385,7 @@ define("LAN_ID", "ID"); define("LAN_VISIBILITY", "Visibility"); define("LAN_VISIBLE_TO", "Visible To"); +define("LAN_PARENT", "Parent"); define("LAN_ICON", "Icon"); define("LAN_LOADING", "Loading..."); diff --git a/e107_languages/English/admin/lan_userclass2.php b/e107_languages/English/admin/lan_userclass2.php index 92b94c8a9..82f99e60e 100644 --- a/e107_languages/English/admin/lan_userclass2.php +++ b/e107_languages/English/admin/lan_userclass2.php @@ -1,49 +1,50 @@ If the top of the tree is 'Everyone', permissions increase as you go down the tree"); define("UCSLAN_37", "You must enter a name for the class"); define("UCSLAN_38", "Initial User Class"); @@ -52,57 +53,60 @@ define("UCSLAN_40", "Set initial classes"); define("UCSLAN_41", "Settings updated"); define("UCSLAN_42", "Nothing changed - not updated"); define("UCSLAN_43", "Existing classes: "); -define("UCSLAN_44", "None"); +//define("UCSLAN_44", "None");//LAN_NONE define("UCSLAN_45", "Point at which classes set:"); define("UCSLAN_46", "(ignored if no verification)"); define("UCSLAN_47", "Initial Signup"); define("UCSLAN_48", "Verification by email or admin"); define("UCSLAN_49", "These classes are set for any newly signed up user - either immediately, or once their site membership has been verified"); -define("UCSLAN_50", "Options/Setup"); -define("UCSLAN_51", "User Class Functions"); -define("UCSLAN_52", "Setup Options"); -define("UCSLAN_53", "Caution! Only use these options if you understand what they do"); +//define("UCSLAN_50", "Options/Setup");//NOT USED +//define("UCSLAN_51", "User Class Functions");//NOT USED +//define("UCSLAN_52", "Setup Options");//LAN_OPTIONS +define("UCSLAN_53", "Caution! Only use these options when requested by support."); define("UCSLAN_54", "Set a default user hierarchy"); define("UCSLAN_55", "Clear the user hierarchy"); define("UCSLAN_56", "(this sets a 'flat' user class structure)"); define("UCSLAN_57", "(the hierarchy can be modified later)"); define("UCSLAN_58", "Execute"); -define("UCSLAN_59", "Enable admin logging of user class edits"); -define("UCSLAN_60", "User Class Configuration options"); -define("UCSLAN_61", "User class setup"); +//define("UCSLAN_59", "Enable admin logging of user class edits");//NOT USED +//define("UCSLAN_60", "User Class Configuration options");//NOT USED +//define("UCSLAN_61", "User class setup");//NOT USED define("UCSLAN_62", "Create default class tree: "); define("UCSLAN_63", "That class name already exists - please choose another"); define("UCSLAN_64", "completed"); define("UCSLAN_65", "Flatten user class hierarchy: "); -define("UCSLAN_66", "Confirm flatten user class hierarchy"); -define("UCSLAN_67", "Confirm set default user class hierarchy"); -define("UCSLAN_68", "Class Icon"); +//define("UCSLAN_66", "Confirm flatten user class hierarchy"); +//define("UCSLAN_67", "Confirm set default user class hierarchy"); +//define("UCSLAN_68", "Class Icon");//LAN_ICON define("UCSLAN_69", "Optional icon associated with class - directory "); define("UCSLAN_70", "Rebuilding class hierarchy: "); define("UCSLAN_71", "User Class Maintenance"); define("UCSLAN_72", "Rebuild class hierarchy "); define("UCSLAN_73", "(This may be required if database corruption occurs)"); + +//userclass_class.php define("UCSLAN_74", "Administrators and Moderators"); define("UCSLAN_75", "Registered and logged in members"); define("UCSLAN_76", "Site Administrators"); -define("UCSLAN_77", "Main site Administrators"); +define("UCSLAN_77", "Main Site Administrators"); define("UCSLAN_78", "Moderators for Forums and other areas"); -define("UCSLAN_79", "Class Type"); + +//define("UCSLAN_79", "Class Type"); define("UCSLAN_80", "Standard"); define("UCSLAN_81", "Group"); define("UCSLAN_82", "A group brings together a number of individual classes"); define("UCSLAN_83", "Classes in group"); -define("UCSLAN_84", " (Group)"); +//define("UCSLAN_84", " (Group)");//UCSLAN_81 define("UCSLAN_85", "You have assigned all available classes; please reassign one which is not in use"); define("UCSLAN_86", "Some settings not allowed for admin classes - they have been set to defaults. "); define("UCSLAN_87", "Recently joined users"); define("UCSLAN_88", "Identified search bots"); define("UCSLAN_89", "Checked classes are members of the group"); define("UCSLAN_90", "You can't edit certain system user classes!"); -define("UCSLAN_91", ""); +//define("UCSLAN_91", "");//NOT USED -define("UCSLAN_UPDATE", "Update"); +//define("UCSLAN_UPDATE", "Update");//NOT USED ... LAN_UPDATE ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php index 9d9d493d1..664a38b30 100644 --- a/e107_languages/English/admin/lan_users.php +++ b/e107_languages/English/admin/lan_users.php @@ -2,16 +2,12 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2017 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 admin * - * $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_users.php,v $ - * $Revision$ - * $Date$ - * $Author$ * */ define("USRLAN_1", "Options Saved."); @@ -279,16 +275,18 @@ define("USRLAN_251", "Leave blank for no change"); define("USRLAN_252", "Resend account activation email to unactivated users."); define("USRLAN_253", "Older than"); define("USRLAN_254", "Reset all passwords"); +define("USRLAN_255", "Notify User"); +define("USRLAN_256", "Dear"); -// These need review - there are duplicates above - they come from admin/lan_userclass.php. +// These need review - there are duplicates above - they come from admin/lan_userclass.php and are unconsistent with userclass defines. TODO LANS define("UCSLAN_1", "Sending notification email to"); define("UCSLAN_2", "Updated Privileges"); -define("UCSLAN_3", "Dear"); +//define("UCSLAN_3", "Dear");//USRLAN_256 define("UCSLAN_4", "Your privileges have been updated at"); define("UCSLAN_5", "You now have access to the following area(s)"); define("UCSLAN_6", "Set class for user"); define("UCSLAN_7", "Set Classes"); -define("UCSLAN_8", "Notify User"); +//define("UCSLAN_8", "Notify User");//incorrect//USRLAN_255 define("UCSLAN_9", "Classes Updated."); define("UCSLAN_10", "Regards,"); define("UCSLAN_11", "Class membership for user ID --UID-- changed to --CLASSES--");