mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

LANS Clean Up #6 - User Class

Browse Source 
LANS Clean Up #6 - User Class - more to do within conflicting defines
lan_user.php
This commit is contained in:
MikeyGMT
2017-01-09 17:07:47 +00:00
parent 0fcba42399
commit c45ff67018
6 changed files with 110 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
e107_admin/userclass2.php
View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * 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 * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * 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( protected $fields = array(
'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), '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_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_icon' => array('title'=> LAN_ICON, '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_name' => array('title'=> LAN_NAME, '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_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'=> UCSLAN_79, 'type' => 'dropdown', 'tab'=>0,'data'=>'int', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ), 'userclass_type' => array('title'=> LAN_TYPE, '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_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'=> UCSLAN_34, 'type' => 'userclass', 'tab'=>0,'data'=>'int', 'width' => 'auto', 'thclass' => 'left'), 'userclass_visibility' => array('title'=> LAN_VISIBILITY, '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_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'), '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)) '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(); $frm = e107::getForm();
$mes->addWarning(UCSLAN_52."<br />".UCSLAN_53); $mes->addWarning(LAN_OPTIONS."<br /><br />".UCSLAN_53);
$text = "<h4>".LAN_PREFS."</h4> $text = "<h4>".LAN_PREFS."</h4>
<form method='post' action='".e_SELF."?mode=main&action=options' id='treesetForm'> <form method='post' action='".e_SELF."?mode=main&action=options' id='treesetForm'>
@@ -376,7 +376,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
} }
else else
{ {
$text .= UCSLAN_44; $text .= LAN_NONE;
} }
@@ -391,7 +391,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
<td>".$frm->select('init_class_stage', $initClassStages, $sel_stage)."<span class='field-help'>".UCSLAN_46."</span> <td>".$frm->select('init_class_stage', $initClassStages, $sel_stage)."<span class='field-help'>".UCSLAN_46."</span>
</td></tr></table> </td></tr></table>
<div class='buttons-bar'>". $frm->admin_button('set_initial_classes','no-value','create',LAN_UPDATE)."</div>"; <div class='buttons-bar' center>". $frm->admin_button('set_initial_classes','no-value','create',LAN_UPDATE)."</div>";
} }
else 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) // unset($pref['frontpage'][$class_id]); // (Should work with both 0.7 and 0.8 front page methods)
// save_prefs(); // save_prefs();
} }
$emessage->add(UCSLAN_3, E_MESSAGE_SUCCESS); $emessage->add(UCSL/AN_3, E_MESSAGE_SUCCESS);
} }
else else
{ {
$emessage->add(UCSLAN_10, E_MESSAGE_ERROR); $emessage->add(UCSL/AN_10, E_MESSAGE_ERROR);
} }
} }
else 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); $e_userclass->save_edited_class($class_record);
userclass2_adminlog('03',"ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")"); userclass2_adminlog('03',"ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")");
$do_tree = TRUE; $do_tree = TRUE;
//$message .= UCSLAN_5; //$message .= LAN_UPDATED.': '.LAN_USERCLASS;
$emessage->add(UCSLAN_5, E_MESSAGE_SUCCESS); $emessage->add(LAN_UPDATED.': '.LAN_USERCLASS, E_MESSAGE_SUCCESS);
} }
else else
{ // Creating new class { // Creating new class
@@ -815,8 +815,8 @@ if (isset($_POST['createclass'])) // Add or edit
$e_userclass->add_new_class($class_record); $e_userclass->add_new_class($class_record);
userclass2_adminlog("01","ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")"); userclass2_adminlog("01","ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")");
$do_tree = TRUE; $do_tree = TRUE;
//$message .= UCSLAN_6; //$message .= LAN_UPDATED.': '.LAN_USERCLASS;
$emessage->add(UCSLAN_6, E_MESSAGE_SUCCESS); $emessage->add(LAN_UPDATED.': '.LAN_USERCLASS, E_MESSAGE_SUCCESS);
} }
} }
else else
@@ -940,7 +940,7 @@ switch ($action)
$text .= " $text .= "
<tr> <tr>
<td>".UCSLAN_12."</td> <td>".LAN_NAME."</td>
<td>"; <td>";
if ($fullEdit) if ($fullEdit)
{ {
@@ -954,7 +954,7 @@ switch ($action)
</tr> </tr>
<tr> <tr>
<td>".UCSLAN_13."</td> <td>".LAN_DESCRIPTION."</td>
<td><input class='tbox' type='text' size='60' maxlength='85' name='userclass_description' value='{$userclass_description}' /> <td><input class='tbox' type='text' size='60' maxlength='85' name='userclass_description' value='{$userclass_description}' />
<div class='field-help'>".UCSLAN_31."</div></td> <div class='field-help'>".UCSLAN_31."</div></td>
</tr>"; </tr>";
@@ -962,7 +962,7 @@ switch ($action)
// Userclass icon // Userclass icon
$text .= " $text .= "
<tr> <tr>
<td>".UCSLAN_68."</td> <td>".LAN_ICON."</td>
<td>".$frm->iconpicker('userclass_icon', $userclass_icon, LAN_SELECT)." <td>".$frm->iconpicker('userclass_icon', $userclass_icon, LAN_SELECT)."
<div class='field-help'>".UCSLAN_69."</div></td> <div class='field-help'>".UCSLAN_69."</div></td>
</tr> </tr>
@@ -970,7 +970,7 @@ switch ($action)
$text .= " $text .= "
<tr> <tr>
<td>".UCSLAN_79."</td> <td>".LAN_TYPE."</td>
<td>"; <td>";
$classTypes = array(UC_TYPE_STD => UCSLAN_80, UC_TYPE_GROUP => UCSLAN_81); $classTypes = array(UC_TYPE_STD => UCSLAN_80, UC_TYPE_GROUP => UCSLAN_81);
if ($fullEdit) if ($fullEdit)
@@ -992,7 +992,7 @@ switch ($action)
// Who can manage class // Who can manage class
$text .= " $text .= "
<tr id='userclass_type_standard' ".(UC_TYPE_GROUP == $userclass_type ? " style='display:none'" : "")."> <tr id='userclass_type_standard' ".(UC_TYPE_GROUP == $userclass_type ? " style='display:none'" : "").">
<td>".UCSLAN_24."</td> <td>".LAN_MANAGER."</td>
<td>"; <td>";
$text .= "<select name='userclass_editclass' class='tbox'>".$e_userclass->vetted_tree('userclass_editclass',array($e_userclass,'select'), $userclass_editclass,'nobody,public,main,admin,classes,matchclass,member, no-excludes').'</select>'; $text .= "<select name='userclass_editclass' class='tbox'>".$e_userclass->vetted_tree('userclass_editclass',array($e_userclass,'select'), $userclass_editclass,'nobody,public,main,admin,classes,matchclass,member, no-excludes').'</select>';
$text .= "<div class='field-help'>".UCSLAN_32."</div></td> $text .= "<div class='field-help'>".UCSLAN_32."</div></td>
@@ -1012,7 +1012,7 @@ switch ($action)
$text .= " $text .= "
<tr> <tr>
<td>".UCSLAN_34."</td> <td>".LAN_VISIBILITY."</td>
<td>"; <td>";
$text .= "<select name='userclass_visibility' class='tbox'>".$e_userclass->vetted_tree('userclass_visibility',array($e_userclass,'select'), $userclass_visibility,'main,admin,classes,matchclass,public,member,nobody').'</select>'; $text .= "<select name='userclass_visibility' class='tbox'>".$e_userclass->vetted_tree('userclass_visibility',array($e_userclass,'select'), $userclass_visibility,'main,admin,classes,matchclass,public,member,nobody').'</select>';
$text .= "<div class='field-help'>".UCSLAN_33."</div></td> $text .= "<div class='field-help'>".UCSLAN_33."</div></td>
@@ -1021,7 +1021,7 @@ switch ($action)
$text .= " $text .= "
<tr> <tr>
<td>".UCSLAN_35."</td> <td>".LAN_PARENT."</td>
<td>"; <td>";
$text .= "<select name='userclass_parent' class='tbox'>".$e_userclass->vetted_tree('userclass_parent',array($e_userclass,'select'), $userclass_parent,'main,admin,nobody,public,classes,matchclass,member, no-excludes').'</select>'; $text .= "<select name='userclass_parent' class='tbox'>".$e_userclass->vetted_tree('userclass_parent',array($e_userclass,'select'), $userclass_parent,'main,admin,nobody,public,classes,matchclass,member, no-excludes').'</select>';
// .r_userclass("userclass_parent", $userclass_parent, "off", "admin,classes,matchclass,public,member"). // .r_userclass("userclass_parent", $userclass_parent, "off", "admin,classes,matchclass,public,member").
@@ -1035,9 +1035,9 @@ switch ($action)
if($params == 'edit') 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 .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel');
// $text .= "<input class='btn' type='submit' id='createclass' name='createclass' value='".UCSLAN_14."' />"; // $text .= "<input class='btn' type='submit' id='createclass' name='createclass' value='".LAN_UPDATE."' />";
// $text .= "&nbsp;&nbsp;<input class='btn' type='submit' id='updatecancel' name='updatecancel' value='".LAN_CANCEL."' />"; // $text .= "&nbsp;&nbsp;<input class='btn' type='submit' id='updatecancel' name='updatecancel' value='".LAN_CANCEL."' />";
$text .= " $text .= "
<input type='hidden' name='userclass_id' value='{$userclass_id}' /> <input type='hidden' name='userclass_id' value='{$userclass_id}' />
@@ -1045,7 +1045,7 @@ if($params == 'edit')
} }
else 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 .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel');
// $text .= "<input class='btn' type='submit' id='createclass' name='createclass' value='".UCSLAN_15."' /> // $text .= "<input class='btn' type='submit' id='createclass' name='createclass' value='".UCSLAN_15."' />
// &nbsp;&nbsp;<input class='btn' type='submit' id='updatecancel' name='updatecancel' value='".LAN_CANCEL."' />"; // &nbsp;&nbsp;<input class='btn' type='submit' id='updatecancel' name='updatecancel' value='".LAN_CANCEL."' />";
@@ -1097,7 +1097,7 @@ unset($title);
} }
else else
{ {
$text .= UCSLAN_44; $text .= LAN_NONE;
} }
@@ -1133,7 +1133,7 @@ unset($title);
case 'debug' : case 'debug' :
// if (!check_class(e_UC_MAINADMIN)) break; // Let ordinary admins see this if they know enough to specify the URL // 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 $text .= $e_userclass->show_graphical_tree(TRUE); // Print with debug options
$ns->tablerender(UCSLAN_21, $text); $ns->tablerender(LAN_SETTINGS, $text);
$text = "<table class='table adminlist'><tr><td colspan='5'>Class rights for first 20 users in database</td></tr> $text = "<table class='table adminlist'><tr><td colspan='5'>Class rights for first 20 users in database</td></tr>
<tr><td>User ID</td><td>Disp Name</td><td>Raw classes</td><td>Inherited classes</td><td>Editable classes</td></tr>"; <tr><td>User ID</td><td>Disp Name</td><td>Raw classes</td><td>Inherited classes</td><td>Editable classes</td></tr>";
@@ -1148,7 +1148,7 @@ unset($title);
</tr>"; </tr>";
} }
$text .= "</table>"; $text .= "</table>";
$ns->tablerender(UCSLAN_21, $text); $ns->tablerender(LAN_SETTINGS, $text);
break; // End of 'debug' break; // End of 'debug'
@@ -1201,7 +1201,7 @@ unset($title);
$mes = e107::getMessage(); $mes = e107::getMessage();
$mes->addWarning(UCSLAN_52."<br />".UCSLAN_53); $mes->addWarning(LAN_OPTIONS."<br />".UCSLAN_53);
$text = "<form method='post' action='".e_SELF."?options{$params}' id='treesetForm'> $text = "<form method='post' action='".e_SELF."?options{$params}' id='treesetForm'>
<table class='table adminform'> <table class='table adminform'>
@@ -1408,12 +1408,12 @@ function userclass2_adminmenu()
$var['list']['link'] = 'userclass2.php'; $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'; $var['config']['link'] = 'userclass2.php?config';
//DEPRECATED - use admin->users instead. //DEPRECATED - use admin->users instead.
// $var['membs']['text'] = UCSLAN_26; // $var['membs']['text'] = UCSL/AN_26;
// $var['membs']['link'] ='userclass2.php?membs'; // $var['membs']['link'] ='userclass2.php?membs';
@@ -1422,12 +1422,12 @@ function userclass2_adminmenu()
if (check_class(e_UC_MAINADMIN)) 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'; $var['options']['link'] ='userclass2.php?options';
if (defined('UC_DEBUG_OPTS')) if (defined('UC_DEBUG_OPTS'))
{ {
$var['debug']['text'] = UCSLAN_27; $var['debug']['text'] = UCSL/AN_27;
$var['debug']['link'] ='userclass2.php?debug'; $var['debug']['link'] ='userclass2.php?debug';
$var['test']['text'] = 'Test functions'; $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->fieldpref = (varset($user_pref['admin_userclass_columns'])) ? $user_pref['admin_userclass_columns'] : array("userclass_id","userclass_name","userclass_description");
$this->fields = array( $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_id' => array('title'=> LAN_ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'),
'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_name' => array('title'=> LAN_NAME, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), 'userclass_editclass' => array('title'=> LAN_MANAGER, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),
'userclass_parent' => array('title'=> UCSLAN_35, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), 'userclass_parent' => array('title'=> LAN_PARENT, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),
'userclass_visibility' => array('title'=> UCSLAN_34, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), 'userclass_visibility' => array('title'=> LAN_VISIBILITY, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),
'userclass_type' => array('title'=> UCSLAN_79, 'type' => 'method', 'width' => '10%', 'thclass' => 'left', 'class'=>'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)) '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', '*')) if (!$total = $sql->db_Select('userclass_classes', '*'))
{ {
$text = ""; $text = "";
$mes->add(UCSLAN_7, E_MESSAGE_INFO); $mes->add(LAN_NO_RECORDS_FOUND, E_MESSAGE_INFO);
} }
else else
{ {
$text = "<form method='post' action='".e_SELF."?".e_QUERY."'> $text = "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-userclass-list'> <fieldset id='core-userclass-list'>
<legend class='e-hideme'>".UCSLAN_5."</legend> <legend class='e-hideme'>".LAN_UPDATED.': '.LAN_USERCLASS."</legend>
<table class='table adminlist'>". <table class='table adminlist'>".
$frm->colGroup($this->fields,$this->fieldpref). $frm->colGroup($this->fields,$this->fieldpref).
$frm->thead($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref).

11
e107_admin/users.php
View File

@@ -1,9 +1,8 @@
<?php <?php
/* /*
* e107 website system * 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 * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -995,7 +994,7 @@ class users_admin_ui extends e_admin_ui
} }
if ($messaccess == '') $messaccess = UCSLAN_12."\n"; if ($messaccess == '') $messaccess = UCSLAN_12."\n";
$message = UCSLAN_3." ".$sysuser->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","<br />",$message),FALSE,LOG_TO_ROLLING); // $admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","User class change",str_replace("\n","<br />",$message),FALSE,LOG_TO_ROLLING);
$options['mail_subject'] = UCSLAN_2; $options['mail_subject'] = UCSLAN_2;
@@ -1075,9 +1074,9 @@ class users_admin_ui extends e_admin_ui
$text .= " <div class='buttons-bar center'> $text .= " <div class='buttons-bar center'>
".$frm->hidden('userid', $userid)." ".$frm->hidden('userid', $userid)."
".$frm->checkbox_label(UCSLAN_8.'&nbsp;&nbsp;', 'notifyuser', 1)." ".$frm->checkbox_label(USRLAN_255.'&nbsp;&nbsp;', 'notifyuser', 1)."
".$frm->admin_button('etrigger_updateclass', UCSLAN_7, 'update')." ".$frm->admin_button('etrigger_updateclass', LAN_NO_RECORDS_FOUND, 'update')."
".$frm->admin_button('etrigger_back', 'Back', 'cancel')." ".$frm->admin_button('etrigger_back', LAN_BACK, 'cancel')."
</div> </div>
</fieldset> </fieldset>
</form> </form>

4
e107_handlers/userclass_class.php
View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * 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 * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * 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) if ($this->class_tree[$listnum]['userclass_type'] == UC_TYPE_GROUP)
{ {
$name_line .= '<b>'.$this->class_tree[$listnum]['userclass_name'].'</b> '.UCSLAN_84; // Highlight groups $name_line .= '<b>'.$this->class_tree[$listnum]['userclass_name'].'</b> ('.UCSLAN_81.').'; // Highlight groups
} }
else else
{ {

3
e107_languages/English/admin/lan_admin.php
View File

@@ -359,7 +359,7 @@ define("LAN_UNCHECKALL", "Uncheck All");
define("LAN_DELCHECKED", "Delete Checked"); define("LAN_DELCHECKED", "Delete Checked");
define("LAN_USERCLASS", "Userclass"); define("LAN_USERCLASS", "Userclass");
define("LAN_MANAGER", "Manager");
define("LAN_HELP", "Help"); define("LAN_HELP", "Help");
define("LAN_CUSTOM", "Custom"); define("LAN_CUSTOM", "Custom");
@@ -385,6 +385,7 @@ define("LAN_ID", "ID");
define("LAN_VISIBILITY", "Visibility"); define("LAN_VISIBILITY", "Visibility");
define("LAN_VISIBLE_TO", "Visible To"); define("LAN_VISIBLE_TO", "Visible To");
define("LAN_PARENT", "Parent");
define("LAN_ICON", "Icon"); define("LAN_ICON", "Icon");
define("LAN_LOADING", "Loading..."); define("LAN_LOADING", "Loading...");

96
e107_languages/English/admin/lan_userclass2.php
View File

@@ -1,49 +1,50 @@
<?php <?php
/* /*
+ ----------------------------------------------------------------------------+ * e107 website system
| e107 website system - Language File. *
| * Copyright (C) 2008-2017 e107 Inc (e107.org)
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_userclass2.php,v $ * Released under the terms and conditions of the
| $Revision$ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
| $Date$ *
| $Author$ * Administration Area - User classes
+----------------------------------------------------------------------------+ *
*/ */
//define("UCSLAN_1", "Cleared all users from class."); //define("UCSLAN_1", "Cleared all users from class.");
//define("UCSLAN_2", "Class users updated."); //define("UCSLAN_2", "Class users updated.");
define("UCSLAN_3", "Class deleted."); //define("UCSLAN_3", "Class deleted.");//NOT USED
// define("UCSLAN_4", "Please tick the confirm box to delete this user class"); currently not in use //define("UCSLAN_4", "Please tick the confirm box to delete this user class"); currently not in use
define("UCSLAN_5", "Class updated."); //define("UCSLAN_5", "Class updated.");//LAN_UPDATED.': '.LAN_USERCLASS
define("UCSLAN_6", "Class saved to database."); //define("UCSLAN_6", "Class saved to database.");//LAN_UPDATED.': '.LAN_USERCLASS
define("UCSLAN_7", "No user classes yet."); //define("UCSLAN_7", "No user classes yet.");//LAN_NO_RECORDS_FOUND
define("UCSLAN_8", "Existing Classes"); //define("UCSLAN_8", "Existing Classes");//NOT USED
define("UCSLAN_9", "No Icon"); //define("UCSLAN_9", "No Icon");//NOT USED
define("UCSLAN_10", "Class not deleted - it is a core class, or is used in the definition of another class, as either parent or edit class"); define("UCSLAN_10", "Class not deleted - it is a core class, or is used in the definition of another class, as either parent or edit class");
define("UCSLAN_11", "tick to confirm"); //define("UCSLAN_11", "tick to confirm");//NOT USED
define("UCSLAN_12", "Class Name"); //define("UCSLAN_12", "Class Name");//LAN_NAME
define("UCSLAN_13", "Class Description"); //define("UCSLAN_13", "Class Description");//LAN_DESCRIPTION
define("UCSLAN_14", "Update User Class"); //define("UCSLAN_14", "Update User Class");//LAN_UPDATE
define("UCSLAN_15", "Create New Class"); //define("UCSLAN_15", "Create New Class");//LAN_CREATE
//define("UCSLAN_16", "Assign users to class"); //define("UCSLAN_16", "Assign users to class");
//define("UCSLAN_17", "Remove"); //define("UCSLAN_17", "Remove");
define("UCSLAN_18", "Clear Class"); //define("UCSLAN_18", "Clear Class");//NOT USED
//define("UCSLAN_19", "Assign users to"); //define("UCSLAN_19", "Assign users to");
define("UCSLAN_20", "class"); //define("UCSLAN_20", "class");//NOT USED
define("UCSLAN_21", "User Class Settings"); //define("UCSLAN_21", "User Class Settings");//LAN_SETTINGS
//define("UCSLAN_22", "Users - click to move ..."); //define("UCSLAN_22", "Users - click to move ...");
//define("UCSLAN_23", "Users in this class ..."); //define("UCSLAN_23", "Users in this class ...");
define("UCSLAN_24", "Class Manager"); //define("UCSLAN_24", "Class Manager");//LAN_MANAGER
define("UCSLAN_25", "Create/Edit Classes"); //define("UCSLAN_25", "Create/Edit Classes");//NOT USED
define("UCSLAN_26", "Class Membership"); //define("UCSLAN_26", "Class Membership");//NOT USED
define("UCSLAN_27", "Debug Help"); //define("UCSLAN_27", "Debug Help");//NOT USED
//define("UCSLAN_28", "Modify Class Membership"); //define("UCSLAN_28", "Modify Class Membership");
define("UCSLAN_29", "That class must not be deleted"); //define("UCSLAN_29", "That class must not be deleted");//NOT USED
define("UCSLAN_30", "Short name displayed in selectors"); define("UCSLAN_30", "Short name displayed in selectors");
define("UCSLAN_31", "Information about applicability of class"); define("UCSLAN_31", "Information about applicability of class");
define("UCSLAN_32", "Users in this class can add/remove themselves from the class being edited"); define("UCSLAN_32", "Users in this class can add/remove themselves from the class being edited");
define("UCSLAN_33", "Determines which users can see this class in drop-down lists"); define("UCSLAN_33", "Determines which users can see this class in drop-down lists");
define("UCSLAN_34", "Class Visibility"); //define("UCSLAN_34", "Class Visibility");//LAN_VISIBILITY
define("UCSLAN_35", "Class Parent"); //define("UCSLAN_35", "Class Parent");//LAN_PARENT
define("UCSLAN_36", "If the top of the tree is 'No One', permissions increase towards the top of the tree<br />If the top of the tree is 'Everyone', permissions increase as you go down the tree"); define("UCSLAN_36", "If the top of the tree is 'No One', permissions increase towards the top of the tree<br />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_37", "You must enter a name for the class");
define("UCSLAN_38", "Initial User Class"); define("UCSLAN_38", "Initial User Class");
@@ -52,57 +53,60 @@ define("UCSLAN_40", "Set initial classes");
define("UCSLAN_41", "Settings updated"); define("UCSLAN_41", "Settings updated");
define("UCSLAN_42", "Nothing changed - not updated"); define("UCSLAN_42", "Nothing changed - not updated");
define("UCSLAN_43", "Existing classes: "); 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_45", "Point at which classes set:");
define("UCSLAN_46", "(ignored if no verification)"); define("UCSLAN_46", "(ignored if no verification)");
define("UCSLAN_47", "Initial Signup"); define("UCSLAN_47", "Initial Signup");
define("UCSLAN_48", "Verification by email or admin"); 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_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_50", "Options/Setup");//NOT USED
define("UCSLAN_51", "User Class Functions"); //define("UCSLAN_51", "User Class Functions");//NOT USED
define("UCSLAN_52", "Setup Options"); //define("UCSLAN_52", "Setup Options");//LAN_OPTIONS
define("UCSLAN_53", "Caution! Only use these options if you understand what they do"); define("UCSLAN_53", "Caution! Only use these options when requested by support.");
define("UCSLAN_54", "Set a default user hierarchy"); define("UCSLAN_54", "Set a default user hierarchy");
define("UCSLAN_55", "Clear the user hierarchy"); define("UCSLAN_55", "Clear the user hierarchy");
define("UCSLAN_56", "(this sets a 'flat' user class structure)"); define("UCSLAN_56", "(this sets a 'flat' user class structure)");
define("UCSLAN_57", "(the hierarchy can be modified later)"); define("UCSLAN_57", "(the hierarchy can be modified later)");
define("UCSLAN_58", "Execute"); define("UCSLAN_58", "Execute");
define("UCSLAN_59", "Enable admin logging of user class edits"); //define("UCSLAN_59", "Enable admin logging of user class edits");//NOT USED
define("UCSLAN_60", "User Class Configuration options"); //define("UCSLAN_60", "User Class Configuration options");//NOT USED
define("UCSLAN_61", "User class setup"); //define("UCSLAN_61", "User class setup");//NOT USED
define("UCSLAN_62", "Create default class tree: "); define("UCSLAN_62", "Create default class tree: ");
define("UCSLAN_63", "That class name already exists - please choose another"); define("UCSLAN_63", "That class name already exists - please choose another");
define("UCSLAN_64", "completed"); define("UCSLAN_64", "completed");
define("UCSLAN_65", "Flatten user class hierarchy: "); define("UCSLAN_65", "Flatten user class hierarchy: ");
define("UCSLAN_66", "Confirm flatten user class hierarchy"); //define("UCSLAN_66", "Confirm flatten user class hierarchy");
define("UCSLAN_67", "Confirm set default user class hierarchy"); //define("UCSLAN_67", "Confirm set default user class hierarchy");
define("UCSLAN_68", "Class Icon"); //define("UCSLAN_68", "Class Icon");//LAN_ICON
define("UCSLAN_69", "Optional icon associated with class - directory "); define("UCSLAN_69", "Optional icon associated with class - directory ");
define("UCSLAN_70", "Rebuilding class hierarchy: "); define("UCSLAN_70", "Rebuilding class hierarchy: ");
define("UCSLAN_71", "User Class Maintenance"); define("UCSLAN_71", "User Class Maintenance");
define("UCSLAN_72", "Rebuild class hierarchy "); define("UCSLAN_72", "Rebuild class hierarchy ");
define("UCSLAN_73", "(This may be required if database corruption occurs)"); define("UCSLAN_73", "(This may be required if database corruption occurs)");
//userclass_class.php
define("UCSLAN_74", "Administrators and Moderators"); define("UCSLAN_74", "Administrators and Moderators");
define("UCSLAN_75", "Registered and logged in members"); define("UCSLAN_75", "Registered and logged in members");
define("UCSLAN_76", "Site Administrators"); 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_78", "Moderators for Forums and other areas");
define("UCSLAN_79", "Class Type");
//define("UCSLAN_79", "Class Type");
define("UCSLAN_80", "Standard"); define("UCSLAN_80", "Standard");
define("UCSLAN_81", "Group"); define("UCSLAN_81", "Group");
define("UCSLAN_82", "A group brings together a number of individual classes"); define("UCSLAN_82", "A group brings together a number of individual classes");
define("UCSLAN_83", "Classes in group"); 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_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_86", "Some settings not allowed for admin classes - they have been set to defaults. ");
define("UCSLAN_87", "Recently joined users"); define("UCSLAN_87", "Recently joined users");
define("UCSLAN_88", "Identified search bots"); define("UCSLAN_88", "Identified search bots");
define("UCSLAN_89", "Checked classes are members of the group"); define("UCSLAN_89", "Checked classes are members of the group");
define("UCSLAN_90", "You can't edit certain system user classes!"); 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
?> ?>

14
e107_languages/English/admin/lan_users.php
View File

@@ -2,16 +2,12 @@
/* /*
* e107 website system * 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 * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Language file - user admin * 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."); 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_252", "Resend account activation email to unactivated users.");
define("USRLAN_253", "Older than"); define("USRLAN_253", "Older than");
define("USRLAN_254", "Reset all passwords"); 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_1", "Sending notification email to");
define("UCSLAN_2", "Updated Privileges"); 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_4", "Your privileges have been updated at");
define("UCSLAN_5", "You now have access to the following area(s)"); define("UCSLAN_5", "You now have access to the following area(s)");
define("UCSLAN_6", "Set class for user"); define("UCSLAN_6", "Set class for user");
define("UCSLAN_7", "Set Classes"); 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_9", "Classes Updated.");
define("UCSLAN_10", "Regards,"); define("UCSLAN_10", "Regards,");
define("UCSLAN_11", "Class membership for user ID --UID-- changed to --CLASSES--"); define("UCSLAN_11", "Class membership for user ID --UID-- changed to --CLASSES--");