diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index 894371a72..e0e9d8619 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -82,7 +82,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); protected $listOrder = "CASE WHEN userclass_id = 250 THEN 1 WHEN userclass_id =254 THEN 2 WHEN userclass_id = 253 THEN 3 WHEN userclass_id < 250 THEN 4 END, userclass_id DESC "; // protected $sortField = 'somefield_order'; // protected $orderStep = 10; - // protected $tabs = array('Tabl 1','Tab 2'); // Use 'tab'=>0 OR 'tab'=>1 in the $fields below to enable. + protected $tabs = null;// Use 'tab'=>0 OR 'tab'=>1 in the $fields below to enable. // protected $listQry = "SELECT * FROM `#generic` WHERE gen_type='wmessage' "; // Example Custom Query. LEFT JOINS allowed. Should be without any Order or Limit. @@ -93,13 +93,14 @@ 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', 'data'=>'str', 'width' => '5%', 'thclass' => 'left', 'class' => 'center'), - 'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'data'=>'str', 'inline'=>true, 'width' => 'auto', 'thclass' => 'left'), - 'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'data'=>'str', 'inline'=>true,'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('size'=>'xxlarge')), - 'userclass_type' => array('title'=> UCSLAN_79, 'type' => 'dropdown', 'data'=>'int', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ), - 'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', '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', 'data'=>'int', 'width' => 'auto', 'thclass' => 'left'), - 'userclass_parent' => array('title'=> UCSLAN_35, 'type' => 'userclass', 'data'=>'int', 'width' => 'auto', 'thclass' => 'left', 'writeParms'=>array('classlist'=>'main,admin,nobody,public,classes,matchclass,member, no-excludes')), + '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_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)) ); @@ -113,6 +114,15 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); public function init() { + if(E107_DBG_BASIC && intval($_GET['id']) === 254) // Experimental + { + e107::getMessage()->addDebug("Experimental Feature active"); + $this->tabs = array(LAN_GENERAL,"Administrator Permissions"); + $this->fields['userclass_perms']['type'] = 'method'; + $this->fields['userclass_perms']['tab'] = 1; + } + + // Listen for submitted data. $this->initialPageSubmit(); $this->optionsPageSubmit(); @@ -144,10 +154,22 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); public function afterCreate($new_data, $old_data, $id) { e107::getUserClass()->clearCache(); + $e_userclass = $this->getUserClassAdmin(); + $e_userclass->calc_tree(); + $e_userclass->save_tree(); } public function beforeUpdate($new_data, $old_data, $id) { + + + if(!empty($new_data['perms'])) + { + $new_data['userclass_perms'] = implode(".",$new_data['perms']); + } + + e107::getMessage()->addDebug(print_a($new_data,true)); + return $new_data; } @@ -461,11 +483,31 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); return $text; } + } + + function userclass_perms($curVal,$mode) + { + if($mode == 'read') + { + // $uid = $this->getController()->getModel()->get('user_id'); + // return e107::getUserPerms()->renderPerms($curVal,$uid); + } + if($mode == 'write') + { + $prm = e107::getUserPerms(); + return $prm->renderPermTable('tabs',$curVal); + + } + } } + + + + new uclass_admin(); require_once(e_ADMIN."auth.php"); diff --git a/e107_handlers/model_class.php b/e107_handlers/model_class.php index 135ee9fb1..8ea531030 100644 --- a/e107_handlers/model_class.php +++ b/e107_handlers/model_class.php @@ -2706,6 +2706,7 @@ class e_front_model extends e_model if(!$this->data_has_changed && !$force) { $this->addMessageInfo(LAN_NO_CHANGE); + return 0; } $sql = e107::getDb(); diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index 35e45d983..4566fca31 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -1245,7 +1245,7 @@ class e_userperms protected $full_perms = array(); protected $permSectionDiz = array( - 'core' => ADMSLAN_74, + 'core' => LAN_GENERAL, 'plugin' => ADLAN_CL_7, 'language' => ADLAN_132, 'main' => ADMSLAN_58 @@ -1446,8 +1446,10 @@ class e_userperms $icon_16 = ""; $icon_32 = ""; } - - $par = " + + $class = getperms($arg, $perms) ? 'active' : ''; + + $par = " ".$icon_16." ".$frm->checkbox('perms[]', $arg, getperms($arg, $perms))." ".$frm->label($label,'perms[]', $arg)." @@ -1618,6 +1620,40 @@ class e_userperms function renderPermTable($type,$a_perms='') { + + + + if($type == 'tabs') + { + $groupedList = $this->getPermList('grouped'); + $tab = array(); + foreach($groupedList as $section=>$list) + { + $text = ''; + // $text .= "\t\t

".$prm->renderSectionDiz($section)."

"; //XXX Lan - General + $text .= "\t\t + + + + + + "; + + foreach($list as $key=>$diz) + { + $text .= $this->checkb($key, $a_perms, $diz); + } + + $text .= "
"; + + $tab[] = array('caption'=>$this->renderSectionDiz($section), 'text'=>$text); + + } + + // return print_a($groupedList); + return e107::getForm()->tabs($tab); + } + $groupedList = $this->getPermList($type); if($type != 'grouped') diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 7aa06528c..48667cde8 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -414,6 +414,6 @@ define("LAN_CONTROL_PANEL", "[x]'s Control Panel"); define("LAN_CUSTOM_URL", "Custom URL"); define("LAN_CUSTOM_URL_DISABLED", "Disabled or Enter Custom URL"); - +define("LAN_GENERAL", "General"); // TODO - move e_form related LANS below, add new lan_form.php file (for both front/back-end) diff --git a/e107_languages/English/admin/lan_administrator.php b/e107_languages/English/admin/lan_administrator.php index 7d9f7876c..3b9b50359 100644 --- a/e107_languages/English/admin/lan_administrator.php +++ b/e107_languages/English/admin/lan_administrator.php @@ -79,7 +79,6 @@ define("ADMSLAN_71", "Click here to display privileges"); define("ADMSLAN_72", "Admin ID: --ID-- name: --NAME-- new permissions: "); define("ADMSLAN_73", "Admin ID: --ID-- name: --NAME--"); -define("ADMSLAN_74", "General"); // define("ADMSLAN_75", ""); //define("ADMSLAN_76", "Manage language-packs");//ADLAN_132