From 570901ba4e526be37afd0cbbe018cb0500a7cda1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 5 Sep 2011 01:22:27 -0400 Subject: Refactor a bit * move a lot of stuff out of MessageManager * move models from lib to models --- src/lib/Auth.class.php | 110 -------------------------------------- src/lib/ContactMethod.class.php | 30 ----------- src/lib/Database.class.php | 4 +- src/lib/Group.class.php | 23 -------- src/lib/Login.class.php | 2 + src/lib/MessageHandler.class.php | 49 ----------------- src/lib/MessageManager.class.php | 14 ----- src/lib/Model.class.php | 3 -- src/lib/PluginManager.class.php | 16 +++--- src/lib/SenderBroadcast.class.php | 7 --- src/lib/SenderPrivate.class.php | 7 --- src/lib/User.class.php | 25 --------- 12 files changed, 12 insertions(+), 278 deletions(-) delete mode 100644 src/lib/Auth.class.php delete mode 100644 src/lib/ContactMethod.class.php delete mode 100644 src/lib/Group.class.php delete mode 100644 src/lib/MessageHandler.class.php delete mode 100644 src/lib/Model.class.php delete mode 100644 src/lib/SenderBroadcast.class.php delete mode 100644 src/lib/SenderPrivate.class.php delete mode 100644 src/lib/User.class.php (limited to 'src/lib') diff --git a/src/lib/Auth.class.php b/src/lib/Auth.class.php deleted file mode 100644 index e49ebf7..0000000 --- a/src/lib/Auth.class.php +++ /dev/null @@ -1,110 +0,0 @@ -mm = $mm; - $this->uid = $uid; - } - public function getUID() { - return $this->uid; - } - - /**********************************************************************\ - * The 'auth' table. * - \**********************************************************************/ - - // Row Type //////////////////////////////////////////////////////////// - /** - * @return 0=unverified 1=user 2=admin 3=group - */ - protected function getType() { - $type = $this->mm->getStatus($this->uid); - return $type; - } - protected function setType($type) { - $logged_in_uid = $this->mm->isLoggedIn(); - $logged_in_obj = $this->mm->getAuthObj($logged_in_uid); - $is_admin = $logged_in_obj->isAdmin(); - if (!$is_admin) return false; - - return $this->mm->setStatus($this->uid, $type); - } - public function isUser() { - $type = $this->getType(); - return ($type===1) || ($type===2); - } - public function isAdmin() { - $type = $this->getType(); - return ($type===2); - } - public function isGroup() { - $type = $this->getType(); - return ($type===3); - } - public function setUser($is_user) { - $is_user = ($is_user?true:false); - if ($this->isUser() != $is_user) { - $this->setType($is_user?1:0); - } - } - public function setAdmin($is_admin) { - $is_admin = ($is_admin?true:false); - $is_user = $this->isUser(); - $this->setType($is_admin?2:($is_user?1:0)); - } - - // Permissions ///////////////////////////////////////////////////////// - public function canRead() { - $logged_in_uid = $this->mm->isLoggedIn(); - $is_me = ($logged_in_uid === $this->uid); - - $logged_in_obj = $this->mm->getAuthObj($logged_in_uid); - $is_user = $logged_in_obj->isUser(); - - return ($is_me || $is_user); - } - public function canEdit() { - $logged_in_uid = $this->mm->isLoggedIn(); - $is_me = ($logged_in_uid === $this->uid); - - $logged_in_obj = $this->mm->getAuthObj($logged_in_uid); - $is_admin = $logged_in_obj->isAdmin(); - - return ($is_me || $is_admin); - } - - // [user|group]name //////////////////////////////////////////////////// - public function getName() { - if (!$this->canRead()) return false; - return $this->mm->getUsername($this->uid); - } - public function setName($new_name) { - if (!$this->canEdit()) return false; - return $this->mm->setUsername($this->uid, $new_name); - } - - /**********************************************************************\ - * The 'users' table. * - \**********************************************************************/ - - public function getConf($setting) { - if (!$this->canRead()) return false; - return $this->mm->getUserConf($this->uid, $setting); - } - public function setConf($setting, $value) { - if (!$this->canEdit()) return false; - return $this->mm->setUserConf($this->uid, $setting, $value); - } - public function getConfArray($setting) { - $string = $this->getConf($setting); - return $this->mm->valueToArray($string); - } - public function setConfArray($setting, $list) { - $string = $this->mm->arrayToValue($list); - return $this->setConf($setting, $string); - } -} diff --git a/src/lib/ContactMethod.class.php b/src/lib/ContactMethod.class.php deleted file mode 100644 index b01e7d3..0000000 --- a/src/lib/ContactMethod.class.php +++ /dev/null @@ -1,30 +0,0 @@ -verb_slug = $verb_slug; - $this->addr_slug = $addr_slug; - $this->verb_text = $verb_text; - $this->addr_text = $addr_text; - - global $CONTACT_METHODS; - $CONTACT_METHODS[$verb_slug] = $this; - } - public function setHandler($handler) { - $this->handler = $handler; - } -} diff --git a/src/lib/Database.class.php b/src/lib/Database.class.php index 03c227f..b7e5bcd 100644 --- a/src/lib/Database.class.php +++ b/src/lib/Database.class.php @@ -381,7 +381,7 @@ class Database { * key-value store in the database. */ public static function arrayToValue($list) { - $out_list = $this->sanitizeArray($list); + $out_list = self::sanitizeArray($list); return ','.implode(',', $out_list).','; } /** @@ -389,7 +389,7 @@ class Database { */ public static function valueToArray($value) { $raw_list = explode(',', $value); - $out_list = $this->sanitizeArray($raw_list); + $out_list = self::sanitizeArray($raw_list); return $out_list; } diff --git a/src/lib/Group.class.php b/src/lib/Group.class.php deleted file mode 100644 index 96c5e2c..0000000 --- a/src/lib/Group.class.php +++ /dev/null @@ -1,23 +0,0 @@ -uid; - } - - /**********************************************************************\ - * The 'auth' table. * - \**********************************************************************/ - - /**********************************************************************\ - * The 'users' table. * - \**********************************************************************/ - - public function getMembers() { - return $this->mm->getUsersInGroup($this->getName()); - } -} diff --git a/src/lib/Login.class.php b/src/lib/Login.class.php index 26d11dd..14e3ecb 100644 --- a/src/lib/Login.class.php +++ b/src/lib/Login.class.php @@ -1,6 +1,8 @@ database()->getUID($username); diff --git a/src/lib/MessageHandler.class.php b/src/lib/MessageHandler.class.php deleted file mode 100644 index 1fa9faf..0000000 --- a/src/lib/MessageHandler.class.php +++ /dev/null @@ -1,49 +0,0 @@ - $type) { - $value = $m->getPluginConf($plugin, $param); - if ($value!==false) { - switch ($type) { - case 'text': - case 'password': - $value = "$value"; - break; - case 'int': - $value = (int)$value; - break; - } - $obj->configSet($param, $value); - } - } - return $obj; - } - public function main() { - global $BASE; - - $private_senders = array(); - $broadcast_senders = array(); - - $plugin_list = $m->getSysConf('plugins'); - $plugins = explode(',', $plugin_list); - foreach ($plugins as $plugin) { - require_once("$plugin.class.php"); - if (is_subclass_of($plugin, 'SenderPrivate')) { - $private_senders[] = $this->loadPlugin($plugin); - } - if (is_subclass_of($plugin, 'SenderBroadcast')) { - $broadcast_senders[] = $this->loadPlugin($plugin); - } - } - //foreach ($private_senders) - } -} \ No newline at end of file diff --git a/src/lib/MessageManager.class.php b/src/lib/MessageManager.class.php index 645643e..d327eb7 100644 --- a/src/lib/MessageManager.class.php +++ b/src/lib/MessageManager.class.php @@ -82,18 +82,4 @@ class MessageManager { } return $this->base; } - - public function getAuthObj($uid) { - if (!isset($this->users[$uid])) { - $is_group = ($this->database()->getStatus($uid)===3); - if ($is_group) { - require_once('Group.class.php'); - $this->users[$uid] = new Group($uid); - } else { - require_once('User.class.php'); - $this->users[$uid] = new User($uid); - } - } - return $this->users[$uid]; - } } diff --git a/src/lib/Model.class.php b/src/lib/Model.class.php deleted file mode 100644 index 523976e..0000000 --- a/src/lib/Model.class.php +++ /dev/null @@ -1,3 +0,0 @@ -database(); require_once("$plugin_name.class.php"); $obj = new $plugin_name; $params = call_user_func("$plugin_name::configList"); foreach ($params as $param => $type) { - $value = $mm->getPluginConf($plugin_name, $param); + $value = $db->getPluginConf($plugin_name, $param); if ($value!==false) { switch ($type) { case 'text': @@ -52,18 +52,18 @@ class PluginManager { * Return an array of enabled plugin names. */ public function getActivePlugins() { - global $mm; - $string = $mm->getSysConf('plugins'); - return $mm->valueToArray($string); + global $mm; $db = $mm->database(); + $string = $db->getSysConf('plugins'); + return $db->valueToArray($string); } /** * Set the enabled plugins. */ public function setActivePlugins($plugins) { - global $mm; - $string = $mm->arrayToValue($plugins); - return $mm->setSysConf('plugins', $string); + global $mm; $db = $mm->database(); + $string = $db->arrayToValue($plugins); + return $db->setSysConf('plugins', $string); } /** diff --git a/src/lib/SenderBroadcast.class.php b/src/lib/SenderBroadcast.class.php deleted file mode 100644 index 7510ff2..0000000 --- a/src/lib/SenderBroadcast.class.php +++ /dev/null @@ -1,7 +0,0 @@ -uid; - } - - /**********************************************************************\ - * The 'auth' table. * - \**********************************************************************/ - - public function setPassword($password) { - if (!$this->canEdit()) return false; - return $this->mm->setPassword($this->uid, $password); - } - - /**********************************************************************\ - * The 'users' table. * - \**********************************************************************/ - -} -- cgit v1.2.3-2-g168b