mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

EONE-24 (Bug) - fix userclass delete

Browse Source
This commit is contained in:
e107steved
2010-03-11 21:55:45 +00:00
parent 393922df67
commit 1cfd745b92
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/userclass_class.php
View File

@@ -55,17 +55,17 @@ define('UC_TYPE_GROUP', '1');
define('UC_CACHE_TAG', 'nomd5_classtree'); define('UC_CACHE_TAG', 'nomd5_classtree');
// FIXME - get rid of deprecated 'var' declarations, decide what should be public and what protected
class user_class class user_class
{ {
public $class_tree; // Simple array, filled with current tree. Additional field class_children is an array of child user classes (by ID) public $class_tree; // Simple array, filled with current tree. Additional field class_children is an array of child user classes (by ID)
var $class_parents; // Array of class IDs of 'parent' (i.e. top level) classes protected $class_parents; // Array of class IDs of 'parent' (i.e. top level) classes
var $fixed_classes = array(); // The 'predefined' core classes (constants beginning 'e_UC_') public $fixed_classes = array(); // The 'predefined' core classes (constants beginning 'e_UC_') (would be nice to have this R/O outside)
var $text_class_link = array(); // List of 'core' user classes and the related constants public $text_class_link = array(); // List of 'core' user classes and the related constants
var $sql_r; // We'll use our own DB to avoid interactions protected $sql_r; // We'll use our own DB to avoid interactions
var $isAdmin; // Set true if we're an instance of user_class_admin protected $isAdmin; // Set true if we're an instance of user_class_admin
// Constructor // Constructor
@@ -1400,9 +1400,9 @@ class user_class_admin extends user_class
public function queryCanDeleteClass($classID) public function queryCanDeleteClass($classID)
{ {
if (($classID >= e_UC_SPECIAL_BASE) && ($classID <= e_UC_SPECIAL_END)) return FALSE; // Don't allow deletion of fixed classes if (($classID >= e_UC_SPECIAL_BASE) && ($classID <= e_UC_SPECIAL_END)) return FALSE; // Don't allow deletion of fixed classes
if (isset($this->fixed_classes[$class_id])) return FALSE; // This picks up classes such as e_UC_PUBLIC outside the main range which can't be deleted if (isset($this->fixed_classes[$classID])) return FALSE; // This picks up classes such as e_UC_PUBLIC outside the main range which can't be deleted
if (!isset($this->class_tree[$class_id])) return FALSE; if (!isset($this->class_tree[$classID])) return FALSE;
if (count($this->class_tree[$class_id]['class_children'])) return FALSE; // Can't delete class with descendants if (count($this->class_tree[$classID]['class_children'])) return FALSE; // Can't delete class with descendants
foreach ($this->class_tree as $c) foreach ($this->class_tree as $c)
{ {
if ($c['userclass_editclass'] == $classID) return FALSE; if ($c['userclass_editclass'] == $classID) return FALSE;