mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 18:30:53 +02:00
Code Issues Releases Wiki Activity

Update userclass management on plugin install/uninstall

Browse Source
This commit is contained in:
e107steved
2008-12-29 22:30:16 +00:00
parent 455ced5329
commit b59c59ce1a
2 changed files with 177 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
e107_handlers/plugin_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
| $Revision: 1.61 $ | $Revision: 1.62 $
| $Date: 2008-12-29 20:55:27 $ | $Date: 2008-12-29 22:30:16 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -304,19 +304,19 @@ class e107plugin
function manage_userclass($action, $class_name, $class_description) function manage_userclass($action, $class_name, $class_description)
{ {
global $sql, $tp, $e107; global $sql, $tp, $e107;
if (!$e107->user_class->isAdmin)
{
$e107->user_class = new user_class_admin; // We need the extra methods of the admin extension
}
$class_name = strip_tags(strtoupper($class_name));
if ($action == 'add') if ($action == 'add')
{ {
$class_name = strip_tags(strtoupper($class_name));
if ($e107->user_class->ucGetClassIDFromName($class_name) !== FALSE) if ($e107->user_class->ucGetClassIDFromName($class_name) !== FALSE)
{ // Class already exists. { // Class already exists.
return TRUE; // That's probably OK return TRUE; // That's probably OK
} }
$i = 1; $i = $e107->user_class->findNewClassID();
while (isset($e107->user_class->class_tree[$i])) if ($i !== FALSE)
{
$i++;
}
if ($i < e_UC_SPECIAL_BASE)
{ {
$tmp = array(); $tmp = array();
$tmp['userclass_id'] = $i; $tmp['userclass_id'] = $i;
@@ -330,7 +330,7 @@ class e107plugin
$tmp['_FIELD_TYPES']['userclass_visibility'] = 'int'; $tmp['_FIELD_TYPES']['userclass_visibility'] = 'int';
$tmp['_FIELD_TYPES']['userclass_id'] = 'int'; $tmp['_FIELD_TYPES']['userclass_id'] = 'int';
$tmp['_FIELD_TYPES']['_DEFAULT'] = 'todb'; $tmp['_FIELD_TYPES']['_DEFAULT'] = 'todb';
return $sql->db_Insert('userclass_classes', $tmp); return $e107->user_class->add_new_class($tmp);
} }
else else
{ {
@@ -339,31 +339,16 @@ class e107plugin
} }
if ($action == 'remove') if ($action == 'remove')
{ {
if ($sql->db_Select('userclass_classes', 'userclass_id', "userclass_name = '{$class_name}'")) $classID = $e107->user_class->ucGetClassIDFromName($class_name);
echo "Class ID: {$classID}, name: {$class_name}<br />";
if (($classID !== FALSE)
&& ($e107->user_class->deleteClassAndUsers($classID) === TRUE))
{ {
$row = $sql->db_Fetch(); return TRUE;
$class_id = $row['userclass_id']; }
if ($sql->db_Delete('userclass_classes', "userclass_id = {$class_id}")) else
{ {
if ($sql->db_Select('user', 'user_id, user_class', "user_class REGEXP('^{$class_id}\.') OR user_class REGEXP('\.{$class_id}\.') OR user_class REGEXP('\.{$class_id}$')")) return FALSE;
{
$sql2 = new db;
while ($row = $sql->db_Fetch())
{
$classes = explode(".", $row['user_class']);
unset($classes[$class_id]);
foreach($classes as $k => $v)
{
if ($v = '')
{
unset($classes[$k]);
}
}
$newclass = '.'.implode('.', $classes).'.';
$sql2->db_Update('user', "user_class = '{$newclass}' WHERE user_id = {$row['user_id']}");
}
}
}
} }
} }
} }
@@ -1003,26 +988,27 @@ class e107plugin
$attrib = $uclass['@attributes']; $attrib = $uclass['@attributes'];
switch($function) switch($function)
{ {
case 'install': case 'install' :
case 'upgrade': case 'upgrade' :
// Add all active userclasses case 'refresh' :
// Add all active userclasses (code checks for already installed)
if(!isset($attrib['active']) || $attrib['active'] == 'true') if(!isset($attrib['active']) || $attrib['active'] == 'true')
{ {
$txt .= "Adding userclass ".$attrib['name']."<br />"; $txt .= 'Adding userclass '.$attrib['name'].'<br />';
$this->manage_userclass('add', $attrib['name'], $attrib['description']); $this->manage_userclass('add', $attrib['name'], $attrib['description']);
} }
//If upgrading, removing any inactive userclass //If upgrading, removing any inactive userclass
if($function == 'upgrade' && isset($attrib['active']) && $attrib['active'] == 'false') if($function == 'upgrade' && isset($attrib['active']) && $attrib['active'] == 'false')
{ {
$txt .= "Removing userclass ".$attrib['name']."<br />"; $txt .= 'Removing userclass '.$attrib['name'].'<br />';
$this->manage_userclass('remove', $attrib['name'], $attrib['description']); $this->manage_userclass('remove', $attrib['name'], $attrib['description']);
} }
break; break;
//If uninstalling, remove all userclasses (active or inactive) //If uninstalling, remove all userclasses (active or inactive)
case 'uninstall': case 'uninstall':
$txt .= "Removing userclass ".$attrib['name']."<br />"; $txt .= 'Removing userclass '.$attrib['name'].'<br />';
$this->manage_userclass('remove', $attrib['name'], $attrib['description']); $this->manage_userclass('remove', $attrib['name'], $attrib['description']);
break; break;
} }

265
e107_handlers/userclass_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
| $Revision: 1.26 $ | $Revision: 1.27 $
| $Date: 2008-12-29 09:31:36 $ | $Date: 2008-12-29 22:30:16 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -62,6 +62,7 @@ class user_class
var $text_class_link = array(); // List of 'core' user classes and the related constants var $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 var $sql_r; // We'll use our own DB to avoid interactions
var $isAdmin; // Set true if we're an instance of user_class_admin
// Constructor // Constructor
function user_class() function user_class()
@@ -69,6 +70,7 @@ class user_class
global $imode; global $imode;
$this->sql_r = new db; $this->sql_r = new db;
$this->isAdmin = FALSE;
$this->fixed_classes = array(e_UC_PUBLIC => UC_LAN_0, $this->fixed_classes = array(e_UC_PUBLIC => UC_LAN_0,
e_UC_GUEST => UC_LAN_1, e_UC_GUEST => UC_LAN_1,
@@ -665,6 +667,7 @@ class user_class
} }
$tmp = array_keys($tmp); $tmp = array_keys($tmp);
if ($asArray) { return $tmp; } if ($asArray) { return $tmp; }
if (count($tmp) == 0) { return ''; }
return implode(',',$tmp); return implode(',',$tmp);
} }
@@ -800,31 +803,32 @@ function r_userclass_radio($fieldname, $curval = '')
class user_class_admin extends user_class class user_class_admin extends user_class
{ {
var $field_list = array('userclass_name' => "varchar(100) NOT NULL default ''", var $field_list = array('userclass_name' => "varchar(100) NOT NULL default ''",
'userclass_description' => "varchar(250) NOT NULL default ''", 'userclass_description' => "varchar(250) NOT NULL default ''",
'userclass_editclass' => "tinyint(3) unsigned NOT NULL default '0'", 'userclass_editclass' => "tinyint(3) unsigned NOT NULL default '0'",
'userclass_parent' => "tinyint(3) unsigned NOT NULL default '0'", 'userclass_parent' => "tinyint(3) unsigned NOT NULL default '0'",
'userclass_accum' => "varchar(250) NOT NULL default ''", 'userclass_accum' => "varchar(250) NOT NULL default ''",
'userclass_visibility' => "tinyint(3) unsigned NOT NULL default '0'", 'userclass_visibility' => "tinyint(3) unsigned NOT NULL default '0'",
'userclass_type' =>"tinyint(1) unsigned NOT NULL default '0'", 'userclass_type' =>"tinyint(1) unsigned NOT NULL default '0'",
'userclass_icon' => "varchar(250) NOT NULL default ''" 'userclass_icon' => "varchar(250) NOT NULL default ''"
); // Note - 'userclass_id' intentionally not in this list ); // Note - 'userclass_id' intentionally not in this list
// Icons to use for graphical tree display // Icons to use for graphical tree display
// First index - no children, children // First index - no children, children
// Second index - not last item, last item // Second index - not last item, last item
// Third index - closed tree, open tree // Third index - closed tree, open tree
var $tree_icons = array( ); var $tree_icons = array( );
var $graph_debug = FALSE; // Shows extra info on graphical tree when TRUE var $graph_debug = FALSE; // Shows extra info on graphical tree when TRUE
function user_class_admin() function user_class_admin()
{ {
$this->user_class(); // Call constructor from ancestor class $this->user_class(); // Call constructor from ancestor class
$this->isAdmin = TRUE;
// Have to initialise the images this way - PHP4 won't take a nested array assignment in the variable list // Have to initialise the images this way - PHP4 won't take a nested array assignment in the variable list
$this->tree_icons = array( $this->tree_icons = array(
FALSE => array( // No children FALSE => array( // No children
FALSE => array( // Not last item FALSE => array( // Not last item
FALSE => '', // Closed tree - don't display FALSE => '', // Closed tree - don't display
@@ -847,52 +851,52 @@ class user_class_admin extends user_class
TRUE => 'minusbottom.gif' TRUE => 'minusbottom.gif'
)) ))
); );
} }
/* /*
Next three routines are used to update the database after adding/deleting a class Next three routines are used to update the database after adding/deleting a class
*/ */
function calc_tree() function calc_tree()
{
// echo "Calc Tree<br />";
$this->readTree(TRUE); // Make sure we have accurate data
foreach ($this->class_parents as $cp)
{ {
$rights = array(); // echo "Calc Tree<br />";
$this->rebuild_tree($cp,$rights); // increasing rights going down the tree $this->readTree(TRUE); // Make sure we have accurate data
foreach ($this->class_parents as $cp)
{
$rights = array();
$this->rebuild_tree($cp,$rights); // increasing rights going down the tree
}
} }
}
// Internal function, called recursively to rebuild the permissions tree where rights increase going down the tree // Internal function, called recursively to rebuild the permissions tree where rights increase going down the tree
// $parent is the class number being processed. // $parent is the class number being processed.
// $rights is the array of rights accumulated so far in the walk down the tree // $rights is the array of rights accumulated so far in the walk down the tree
function rebuild_tree($parent, $rights) function rebuild_tree($parent, $rights)
{
if ($this->class_tree[$parent]['userclass_parent'] == e_UC_NOBODY)
{ {
$this->topdown_tree($parent); if ($this->class_tree[$parent]['userclass_parent'] == e_UC_NOBODY)
return; {
} $this->topdown_tree($parent);
if ($this->class_tree[$parent]['userclass_type'] == UC_TYPE_GROUP) return;
{ }
echo "Bottom up - skip: {$parent}<br />"; if ($this->class_tree[$parent]['userclass_type'] == UC_TYPE_GROUP)
return; // Probably just stop here for a group class {
} // echo "Bottom up - skip: {$parent}<br />";
$rights[] = $parent; return; // Probably just stop here for a group class
$imp_rights = implode(',',$rights); }
if ($this->class_tree[$parent]['userclass_accum'] != $imp_rights) $rights[] = $parent;
{ $imp_rights = implode(',',$rights);
$this->class_tree[$parent]['userclass_accum'] = $imp_rights; if ($this->class_tree[$parent]['userclass_accum'] != $imp_rights)
if (!isset($this->class_tree[$cp]['change_flag'])) $this->class_tree[$parent]['change_flag'] = 'UPDATE'; {
} $this->class_tree[$parent]['userclass_accum'] = $imp_rights;
foreach ($this->class_tree[$parent]['class_children'] as $cc) if (!isset($this->class_tree[$cp]['change_flag'])) $this->class_tree[$parent]['change_flag'] = 'UPDATE';
{ }
$this->rebuild_tree($cc,$rights); // Recursive call foreach ($this->class_tree[$parent]['class_children'] as $cc)
} {
} $this->rebuild_tree($cc,$rights); // Recursive call
}
}
// Internal function, called recursively to rebuild the permissions tree where rights increase going up the tree // Internal function, called recursively to rebuild the permissions tree where rights increase going up the tree
@@ -1109,72 +1113,105 @@ class user_class_admin extends user_class
} }
// Add new class. Class ID must be in the passed record.
function add_new_class($classrec) // Return TRUE on success, FALSE on failure
{ function add_new_class($classrec)
// echo "Add new class<br />";
if ($classrec['userclass_type'] == UC_TYPE_GROUP)
{ // Need to make sure our ID is in the accumulation array
$temp = explode(',',$classrec['userclass_accum']);
if (!in_array($classrec['userclass_id'], $temp))
{
$temp[] = $classrec['userclass_id'];
$classrec['userclass_accum'] = implode(',',$temp);
}
}
$this->sql_r->db_Insert('userclass_classes',$this->copy_rec($classrec, TRUE));
$this->clearCache();
}
function save_edited_class($classrec)
{
// echo "Save edited class: ".implode(',', $classrec)."<br />";
if (!$classrec['userclass_id'])
{ {
echo "Programming bungle on save<br />"; // echo "Add new class<br />";
return; if (!isset($classrec['userclass_id']))
}
$qry = '';
$spacer = '';
if ($classrec['userclass_type'] == UC_TYPE_GROUP)
{ // Need to make sure our ID is in the accumulation array
$temp = explode(',',$classrec['userclass_accum']);
if (!in_array($classrec['userclass_id'], $temp))
{ {
$temp[] = $classrec['userclass_id']; return FALSE;
$classrec['userclass_accum'] = implode(',',$temp); }
if ($classrec['userclass_type'] == UC_TYPE_GROUP)
{ // Need to make sure our ID is in the accumulation array
$temp = explode(',',$classrec['userclass_accum']);
if (!in_array($classrec['userclass_id'], $temp))
{
$temp[] = $classrec['userclass_id'];
$classrec['userclass_accum'] = implode(',',$temp);
}
}
if ($this->sql_r->db_Insert('userclass_classes',$this->copy_rec($classrec, TRUE)) === FALSE)
{
return FALSE;
}
$this->clearCache();
return TRUE;
}
function save_edited_class($classrec)
{
// echo "Save edited class: ".implode(',', $classrec)."<br />";
if (!$classrec['userclass_id'])
{
echo "Programming bungle on save<br />";
return FALSE;
}
$qry = '';
$spacer = '';
if ($classrec['userclass_type'] == UC_TYPE_GROUP)
{ // Need to make sure our ID is in the accumulation array
$temp = explode(',',$classrec['userclass_accum']);
if (!in_array($classrec['userclass_id'], $temp))
{
$temp[] = $classrec['userclass_id'];
$classrec['userclass_accum'] = implode(',',$temp);
}
}
foreach ($this->field_list as $fl => $val)
{
if (isset($classrec[$fl]))
{
$qry .= $spacer."`".$fl."` = '".$classrec[$fl]."'";
$spacer = ", ";
}
}
if ($this->sql_r->db_Update('userclass_classes', $qry." WHERE `userclass_id`='{$classrec['userclass_id']}'") === FALSE)
{
return FALSE;
}
$this->clearCache();
return TRUE;
}
function delete_class($class_id)
{
if (isset($this->fixed_classes[$class_id])) return FALSE; // Some classes can't be deleted
// echo "Delete class {$class_id}<br />";
if (!isset($this->class_tree[$class_id])) return FALSE;
if (count($this->class_tree[$class_id]['class_children'])) return FALSE; // Can't delete class with descendants
foreach ($this->class_tree as $c)
{
if ($c['userclass_editclass'] == $class_id) return FALSE;
if ($c['userclass_visibility'] == $class_id) return FALSE;
}
if ($this->sql_r->db_Delete('userclass_classes', "`userclass_id`='{$class_id}'") === FALSE) return FALSE;
$this->clearCache();
$this->readTree(TRUE); // Re-read the class tree
return TRUE;
}
function deleteClassAndUsers($classID)
{
if ($this->delete_class($classID))
{
if ($this->sql_r->db_Select('user', 'user_id, user_class', "user_class REGEXP '(^|,){$classID}(,|$)'"))
{
$sql2 = new db;
while ($row = $this->sql_r->db_Fetch())
{
$newClass = $this->ucRemove($classID,$row['user_class']);
$sql2->db_Update('user', "user_class = '{$newClass}' WHERE user_id = {$row['user_id']}");
}
}
} }
} }
foreach ($this->field_list as $fl => $val)
{
if (isset($classrec[$fl]))
{
$qry .= $spacer."`".$fl."` = '".$classrec[$fl]."'";
$spacer = ", ";
}
}
$this->sql_r->db_Update('userclass_classes', $qry." WHERE `userclass_id`='{$classrec['userclass_id']}'");
$this->clearCache();
}
function delete_class($class_id)
{
if (isset($this->fixed_classes[$class_id])) return FALSE; // Some classes can't be deleted
if (!isset($this->class_tree[$class_id])) return FALSE;
if (count($this->class_tree[$class_id]['class_children'])) return FALSE; // Can't delete class with descendants
foreach ($this->class_tree as $c)
{
if ($c['userclass_editclass'] == $class_id) return FALSE;
if ($c['userclass_visibility'] == $class_id) return FALSE;
}
if (!$this->sql_r->db_Delete('userclass_classes', "`userclass_id`='{$class_id}'")) return FALSE;
$this->clearCache();
$this->readTree(TRUE); // Re-read the class tree
return TRUE;
}
// Certain fields on admin records have constraints on their values. // Certain fields on admin records have constraints on their values.