Thread: [xoops-svn] SF.net SVN: xoops:[7813] XoopsCore/branches/2.6.x/2.6.0/htdocs

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7813
          http://xoops.svn.sourceforge.net/xoops/?rev=7813&view=rev
Author:   trabis
Date:     2011-10-08 18:30:34 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
More updated kernel classes

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/notification.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/online.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/class/message.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php
===================================================================

--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php	2011-10-08 13:56:08 UTC (rev 7812)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php	2011-10-08 18:30:34 UTC (rev 7813)
@@ -59,8 +59,10 @@
 
     /**
      * Constructor
+     *
+     * @param XoopsDatabase|null $db
      */
-    public function __construct($db)
+    public function __construct($db = null)
     {
         $this->_gHandler = new XoopsGroupHandler($db);
         $this->_uHandler = new XoopsUserHandler($db);
@@ -383,10 +385,10 @@
      *
      * @param string $fieldName name of the field to update
      * @param string $fieldValue updated value for the field
-     * @param object $criteria {@link CriteriaElement} object
+     * @param CriteriaElement|null $criteria {@link CriteriaElement} object
      * @return bool TRUE if success or unchanged, FALSE on failure
      */
-    public function updateUsersByField($fieldName, $fieldValue, $criteria = null)
+    public function updateUsersByField($fieldName, $fieldValue, CriteriaElement $criteria = null)
     {
         return $this->_uHandler->updateAll($fieldName, $fieldValue, $criteria);
     }
@@ -410,7 +412,7 @@
      * Get a list of users belonging to certain groups and matching criteria
      * Temporary solution
      *
-     * @param int $groups IDs of groups
+     * @param array $groups IDs of groups
      * @param CriteriaElement|null $criteria {@link CriteriaElement} object
      * @param bool $asobject return the users as objects?
      * @param bool $id_as_key use the UID as key for the array if $asobject is TRUE
@@ -463,7 +465,7 @@
      * Get count of users belonging to certain groups and matching criteria
      * Temporary solution
      *
-     * @param int $groups IDs of groups
+     * @param array $groups IDs of groups
      * @param CriteriaElement|null $criteria
      * @return int count of users
      */

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php	2011-10-08 13:56:08 UTC (rev 7812)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php	2011-10-08 18:30:34 UTC (rev 7813)
@@ -26,25 +26,25 @@
 class XoopsModule extends XoopsObject
 {
     /**
-     *
      * @var string
      */
-    var $modinfo;
+    public $modinfo;
+
     /**
      *
      * @var string
      */
-    var $adminmenu;
+    public $adminmenu;
     /**
     *
     * @var array
     */
-    var $_msg;
+    private $_msg;
 
     /**
      * Constructor
      */
-    function __construct()
+    public function __construct()
     {
         $this->initVar('mid', XOBJ_DTYPE_INT, null, false);
         $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, true, 150);
@@ -68,9 +68,9 @@
      * @param string $dirname Directory Name
      * @param boolean $verbose
      */
-    function loadInfoAsVar($dirname, $verbose = true)
+    public function loadInfoAsVar($dirname, $verbose = true)
     {
-            $dirname = basename($dirname);
+        $dirname = basename($dirname);
         if (!isset($this->modinfo)) {
             $this->loadInfo($dirname, $verbose);
         }
@@ -99,7 +99,7 @@
      * @param string $str message to add
      * @access public
      */
-    function setMessage($str)
+    public function setMessage($str)
     {
         $this->_msg[] = trim($str);
     }
@@ -110,7 +110,7 @@
      * @return array an array of messages
      * @access public
      */
-    function getMessages()
+    public function getMessages()
     {
         return $this->_msg;
     }
@@ -122,7 +122,7 @@
      * @param   mix     $value
      * @return  bool
      **/
-    function setInfo($name, $value)
+    public function setInfo($name, $value)
     {
         if (empty($name)) {
             $this->modinfo = $value;
@@ -139,7 +139,7 @@
      * @return array |string    Array of module information.
      * If {@link $name} is set, returns a single module information item as string.
      */
-    function getInfo($name = null)
+    public function getInfo($name = null)
     {
         if (!isset($this->modinfo)) {
             $this->loadInfo($this->getVar('dirname'));
@@ -159,7 +159,7 @@
      *
      * @return string FALSE on fail
      */
-    function mainLink()
+    public function mainLink()
     {
         if ($this->getVar('hasmain') == 1) {
             $ret = '<a href="' . XOOPS_URL . '/modules/' . $this->getVar('dirname') . '/">' . $this->getVar('name') . '</a>';
@@ -173,7 +173,7 @@
      *
      * @return string
      */
-    function subLink()
+    public function subLink()
     {
         $ret = array();
         if ($this->getInfo('sub') && is_array($this->getInfo('sub'))) {
@@ -189,7 +189,7 @@
     /**
      * Load the admin menu for the module
      */
-    function loadAdminMenu()
+    public function loadAdminMenu()
     {
         if ($this->getInfo('adminmenu') && $this->getInfo('adminmenu') != '' && file_exists(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/' . $this->getInfo('adminmenu'))) {
             $adminmenu = array();
@@ -203,7 +203,7 @@
      *
      * @return string
      */
-    function getAdminMenu()
+    public function getAdminMenu()
     {
         if (!isset($this->adminmenu)) {
             $this->loadAdminMenu();
@@ -216,8 +216,9 @@
      *
      * @param string $dirname Module directory
      * @param bool $verbose Give an error on fail?
+     * @return bool
      */
-    function loadInfo($dirname, $verbose = true)
+    public function loadInfo($dirname, $verbose = true)
     {
         $dirname = basename($dirname);
         global $xoopsConfig;
@@ -248,7 +249,7 @@
      * @param integer $userid
      * @return mixed Search result.
      */
-    function search($term = '', $andor = 'AND', $limit = 0, $offset = 0, $userid = 0)
+    public function search($term = '', $andor = 'AND', $limit = 0, $offset = 0, $userid = 0)
     {
         if ($this->getVar('hassearch') != 1) {
             return false;
@@ -263,125 +264,143 @@
             return false;
         }
         if (function_exists($search['func'])) {
-            $func = $search['func'];
+            $func = (string)$search['func'];
             return $func($term, $andor, $limit, $offset, $userid);
         }
         return false;
     }
 
     /**
-     * Returns Class Base Variable mid
+     * @param string $format
+     * @return mixed
      */
-    function id($format = 'N')
+    public function id($format = 'n')
     {
         return $this->getVar('mid', $format);
     }
 
     /**
-     * Returns Class Base Variable mid
+     * @param string $format
+     * @return mixed
      */
-    function mid($format = '')
+    public function mid($format = '')
     {
         return $this->getVar('mid', $format);
     }
 
     /**
-     * Returns Class Base Variable name
+     * @param string $format
+     * @return mixed
      */
-    function name($format = '')
+    public function name($format = '')
     {
         return $this->getVar('name', $format);
     }
 
     /**
-     * Returns Class Base Variable version
+     * @param string $format
+     * @return mixed
      */
-    function version($format = '')
+    public function version($format = '')
     {
         return $this->getVar('version', $format);
     }
 
     /**
-     * Returns Class Base Variable last_update
+     * @param string $format
+     * @return mixed
      */
-    function last_update($format = '')
+    public function last_update($format = '')
     {
         return $this->getVar('last_update', $format);
     }
 
     /**
-     * Returns Class Base Variable weight
+     * @param string $format
+     * @return mixed
      */
-    function weight($format = '')
+    public function weight($format = '')
     {
         return $this->getVar('weight', $format);
     }
 
     /**
-     * Returns Class Base Variable isactive
+     * @param string $format
+     * @return mixed
      */
-    function isactive($format = '')
+    public function isactive($format = '')
     {
         return $this->getVar('isactive', $format);
     }
 
     /**
-     * Returns Class Base Variable dirname
+     * @param string $format
+     * @return mixed
      */
-    function dirname($format = '')
+    public function dirname($format = '')
     {
         return $this->getVar('dirname', $format);
     }
 
     /**
-     * Returns Class Base Variable hasmain
+     * @param string $format
+     * @return mixed
      */
-    function hasmain($format = '')
+    public function hasmain($format = '')
     {
         return $this->getVar('hasmain', $format);
     }
 
     /**
-     * Returns Class Base Variable hasadmin
+     * @param string $format
+     * @return mixed
      */
-    function hasadmin($format = '')
+    public function hasadmin($format = '')
     {
         return $this->getVar('hasadmin', $format);
     }
 
     /**
-     * Returns Class Base Variable hassearch
+     * @param string $format
+     * @return mixed
      */
-    function hassearch($format = '')
+    public function hassearch($format = '')
     {
         return $this->getVar('hassearch', $format);
     }
 
     /**
-     * Returns Class Base Variable hasconfig
+     * @param string $format
+     * @return mixed
      */
-    function hasconfig($format = '')
+    public function hasconfig($format = '')
     {
         return $this->getVar('hasconfig', $format);
     }
 
     /**
-     * Returns Class Base Variable hascomments
+     * @param string $format
+     * @return mixed
      */
-    function hascomments($format = '')
+    public function hascomments($format = '')
     {
         return $this->getVar('hascomments', $format);
     }
 
     /**
-     * Returns Class Base Variable hasnotification
+     * @param string $format
+     * @return mixed
      */
-    function hasnotification($format = '')
+    public function hasnotification($format = '')
     {
         return $this->getVar('hasnotification', $format);
     }
 
-    function getByDirName($dirname)
+    /**
+     * @param $dirname
+     * @return XoopsModule
+     */
+    public function getByDirName($dirname)
     {
         $modhandler = xoops_gethandler('module');
         $inst = $modhandler->getByDirname($dirname);
@@ -399,7 +418,7 @@
  * @author Kazumi Ono <on...@xo...>
  * @copyright (c) 2000-2003 The Xoops Project - www.xoops.org
  */
-class XoopsModuleHandler extends XoopsObjectHandler
+class XoopsModuleHandler extends XoopsPersistableObjectHandler
 {
     /**
      * holds an array of cached module references, indexed by module id
@@ -407,7 +426,7 @@
      * @var array
      * @access private
      */
-    var $_cachedModule_mid = array();
+    private $_cachedModule_mid = array();
 
     /**
      * holds an array of cached module references, indexed by module dirname
@@ -415,55 +434,43 @@
      * @var array
      * @access private
      */
-    var $_cachedModule_dirname = array();
+    private $_cachedModule_dirname = array();
 
     /**
-     * Create a new {@link XoopsModule} object
+     * Constructor
      *
-     * @param boolean $isNew Flag the new object as "new"
-     * @return object
+     * @param XoopsDatabase|null $db {@link XoopsDatabase}
      */
-    function create($isNew = true)
+    public function __construct(XoopsDatabase $db = null)
     {
-        $module = new XoopsModule();
-        if ($isNew) {
-            $module->setNew();
-        }
-        return $module;
+        parent::__construct($db, 'modules', 'XoopsModule', 'mid', 'dirname');
     }
 
     /**
      * Load a module from the database
      *
      * @param int $id ID of the module
-     * @return object FALSE on fail
+     * @return XoopsModule|false on fail
      */
     function get($id)
     {
         static $_cachedModule_dirname;
         static $_cachedModule_mid;
         $id = intval($id);
-        $module = false;
         if ($id > 0) {
             if (!empty($_cachedModule_mid[$id])) {
                 return $_cachedModule_mid[$id];
             } else {
-                $sql = 'SELECT * FROM ' . $this->db->prefix('modules') . ' WHERE mid = ' . $id;
-                if (!$result = $this->db->query($sql)) {
-                    return $module;
+                $module = parent::get($id);
+                if (!is_object($module)) {
+                    return false;
                 }
-                $numrows = $this->db->getRowsNum($result);
-                if ($numrows == 1) {
-                    $module = new XoopsModule();
-                    $myrow = $this->db->fetchArray($result);
-                    $module->assignVars($myrow);
-                    $_cachedModule_mid[$id] = &$module;
-                    $_cachedModule_dirname[$module->getVar('dirname')] = &$module;
-                    return $module;
-                }
+                $_cachedModule_mid[$id] = $module;
+                $_cachedModule_dirname[$module->getVar('dirname')] = $module;
+                return $module;
             }
         }
-        return $module;
+        return false;
     }
 
     /**
@@ -472,31 +479,24 @@
      * @param string $dirname
      * @return object FALSE on fail
      */
-    function getByDirname($dirname)
+    public function getByDirname($dirname)
     {
-        $dirname = basename($dirname);
-        //could not we check for spaces instead??
-        if (strpos(strtolower($dirname), ' union ')) {
-            return false;
-        }
+        $dirname = basename(trim($dirname));
         static $_cachedModule_mid;
         static $_cachedModule_dirname;
         if (!empty($_cachedModule_dirname[$dirname])) {
             return $_cachedModule_dirname[$dirname];
         } else {
-            $module = false;
-            $sql = "SELECT * FROM " . $this->db->prefix('modules') . " WHERE dirname = '" . trim($dirname) . "'";
-            if (!$result = $this->db->query($sql)) {
-                return $module;
+            $myts = MyTextSanitizer::getInstance();
+            $criteria = new Criteria('dirname', $myts->addSlashes($dirname));
+            $modules = $this->getObjects($criteria);
+            if (count($modules) == 1 && is_object($modules[0])) {
+                $module = $modules[0];
+            } else {
+                return false;
             }
-            $numrows = $this->db->getRowsNum($result);
-            if ($numrows == 1) {
-                $module = new XoopsModule();
-                $myrow = $this->db->fetchArray($result);
-                $module->assignVars($myrow);
-                $_cachedModule_dirname[$dirname] = $module;
-                $_cachedModule_mid[$module->getVar('mid')] = $module;
-            }
+            $_cachedModule_dirname[$dirname] = $module;
+            $_cachedModule_mid[$module->getVar('mid')] = $module;
             return $module;
         }
     }
@@ -504,40 +504,18 @@
     /**
      * Write a module to the database
      *
-     * @param object $ &$module reference to a {@link XoopsModule}
+     * @param XoopsModule &$module reference to a {@link XoopsModule}
      * @return bool
      */
-    function insert(&$module)
+    public function insert(XoopsModule &$module)
     {
-        /**
-         *
-         * @TODO : Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
-         */
-        if (!is_a($module, 'xoopsmodule')) {
+        if (!parent::insert($module)) {
             return false;
         }
-        if (!$module->isDirty()) {
-            return true;
-        }
-        if (!$module->cleanVars()) {
-            return false;
-        }
-        foreach ($module->cleanVars as $k => $v) {
-            ${$k} = $v;
-        }
-        if ($module->isNew()) {
-            $mid = $this->db->genId('modules_mid_seq');
-            $sql = sprintf("INSERT INTO %s (mid, name, version, last_update, weight, isactive, dirname, hasmain, hasadmin, hassearch, hasconfig, hascomments, hasnotification) VALUES (%u, %s, %u, %u, %u, %u, %s, %u, %u, %u, %u, %u, %u)", $this->db->prefix('modules'), $mid, $this->db->quoteString($name), $version, time(), $weight, 1, $this->db->quoteString($dirname), $hasmain, $hasadmin, $hassearch, $hasconfig, $hascomments, $hasnotification);
-        } else {
-            $sql = sprintf("UPDATE %s SET name = %s, dirname = %s, version = %u, last_update = %u, weight = %u, isactive = %u, hasmain = %u, hasadmin = %u, hassearch = %u, hasconfig = %u, hascomments = %u, hasnotification = %u WHERE mid = %u", $this->db->prefix('modules'), $this->db->quoteString($name), $this->db->quoteString($dirname), $version, time(), $weight, $isactive, $hasmain, $hasadmin, $hassearch, $hasconfig, $hascomments, $hasnotification, $mid);
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        if (empty($mid)) {
-            $mid = $this->db->getInsertId();
-        }
-        $module->assignVar('mid', $mid);
+
+        $dirname = $module->getvar('dirname');
+        $mid = $module->getvar('mid');
+
         if (!empty($this->_cachedModule_dirname[$dirname])) {
             unset($this->_cachedModule_dirname[$dirname]);
         }
@@ -550,22 +528,15 @@
     /**
      * Delete a module from the database
      *
-     * @param object $ &$module
+     * @param XoopsModule &$module
      * @return bool
      */
-    function delete(&$module)
+    public function delete(XoopsModule &$module)
     {
-        /**
-         *
-         * @TODO : Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
-         */
-        if (!is_a($module, 'xoopsmodule')) {
+        if (!parent::delete($module)) {
             return false;
         }
-        $sql = sprintf("DELETE FROM %s WHERE mid = %u", $this->db->prefix('modules'), $module->getVar('mid'));
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
+
         // delete admin permissions assigned for this module
         $sql = sprintf("DELETE FROM %s WHERE gperm_name = 'module_admin' AND gperm_itemid = %u", $this->db->prefix('group_permission'), $module->getVar('mid'));
         $this->db->query($sql);
@@ -612,11 +583,11 @@
     /**
      * Load some modules
      *
-     * @param object $criteria {@link CriteriaElement}
+     * @param CriteriaElement|null $criteria {@link CriteriaElement}
      * @param boolean $id_as_key Use the ID as key into the array
      * @return array
      */
-    function getObjects($criteria = null, $id_as_key = false)
+    public function getObjects(CriteriaElement $criteria = null, $id_as_key = false)
     {
         $ret = array();
         $limit = $start = 0;
@@ -645,35 +616,17 @@
     }
 
     /**
-     * Count some modules
-     *
-     * @param object $criteria {@link CriteriaElement}
-     * @return int
-     */
-    function getCount($criteria = null)
-    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('modules');
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            return 0;
-        }
-        list ($count) = $this->db->fetchRow($result);
-        return $count;
-    }
-
-    /**
      * returns an array of module names
      *
-     * @param bool $criteria
+     * @param CriteriaElement|null $criteria
      * @param boolean $dirname_as_key if true, array keys will be module directory names
      *          if false, array keys will be module id
      * @return array
      */
-    function getList($criteria = null, $dirname_as_key = false)
+    function getList(CriteriaElement $criteria = null, $dirname_as_key = false)
     {
         $ret = array();
+        //TODO we could use getAll to save memory(trabis)
         $modules = $this->getObjects($criteria, true);
         foreach (array_keys($modules) as $i) {
             if (!$dirname_as_key) {

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/notification.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/notification.php	2011-10-08 13:56:08 UTC (rev 7812)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/notification.php	2011-10-08 18:30:34 UTC (rev 7813)
@@ -29,17 +29,16 @@
  * @package     kernel
  * @subpackage  notification
  *
- * @author	    Michael van Dam	<mv...@ca...>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author        Michael van Dam    <mv...@ca...>
+ * @copyright    copyright (c) 2000-2003 XOOPS.org
  */
 class XoopsNotification extends XoopsObject
 {
     /**
      * Constructor
      **/
-    function XoopsNotification()
+    public function __construct()
     {
-        $this->XoopsObject();
         $this->initVar('not_id', XOBJ_DTYPE_INT, NULL, false);
         $this->initVar('not_modid', XOBJ_DTYPE_INT, NULL, false);
         $this->initVar('not_category', XOBJ_DTYPE_TXTBOX, null, false, 30);
@@ -58,65 +57,73 @@
 
 
     /**
-     * Returns Class Base Variable not_id
+     * @param string $format
+     * @return mixed
      */
-    function id($format = 'N')
+    public function id($format = 'n')
     {
         return $this->getVar('not_id', $format);
     }
 
     /**
-     * Returns Class Base Variable not_id
+     * @param string $format
+     * @return mixed
      */
-    function not_id($format = '')
+    public function not_id($format = '')
     {
         return $this->getVar('not_id', $format);
     }
 
     /**
-     * Returns Class Base Variable not_modid
+     * @param string $format
+     * @return mixed
      */
-    function not_modid($format = '')
+    public function not_modid($format = '')
     {
         return $this->getVar('not_modid', $format);
     }
 
     /**
-     * Returns Class Base Variable mid
+     * @param string $format
+     * @return mixed
      */
-    function not_category($format = '')
+    public function not_category($format = '')
     {
         return $this->getVar('not_category', $format);
     }
 
     /**
-     * Returns Class Base Variable not_itemid
+     * @param string $format
+     * @return mixed
      */
-    function not_itemid($format = '')
+    public function not_itemid($format = '')
     {
         return $this->getVar('not_itemid', $format);
     }
 
     /**
-     * Returns Class Base Variable not_event
+     * @param string $format
+     * @return mixed
      */
-    function not_event($format = '')
+    public function not_event($format = '')
     {
         return $this->getVar('not_event', $format);
     }
 
     /**
-     * Returns Class Base Variable not_uid
+     * @param string $format
+     * @return mixed
      */
-    function not_uid($format = '')
+    public function not_uid($format = '')
     {
         return $this->getVar('not_uid', $format);
     }
 
     /**
-     * Returns Class Base Variable not_mode
+     * @param string $format
+     * @return mixed
      */
-    function not_mode($format = '')
+    public function not_mode($format = '')
     {
         return $this->getVar('not_mode', $format);
     }
@@ -129,11 +136,16 @@
      * @param  string  $subject       Subject line for notification message
      * @param  array   $tags Array of substitutions for template variables
      *
-     * @return  bool	true if success, false if error
+     * @return  bool    true if success, false if error
      **/
-    function notifyUser($template_dir, $template, $subject, $tags)
+    public function notifyUser($template_dir, $template, $subject, $tags)
     {
-        // Check the user's notification preference.
+        /**
+         * @var $member_handler XoopsMemberHandler
+         * @var $config_handler XoopsConfigHandler
+         */
+
+         // Check the user's notification preference.
         $member_handler = xoops_gethandler('member');
         $user = $member_handler->getUser($this->getVar('not_uid'));
         if (!is_object($user)) {
@@ -144,24 +156,24 @@
         $xoopsMailer = xoops_getMailer();
         include_once $GLOBALS['xoops']->path('include/notification_constants.php');
         switch ($method) {
-            case XOOPS_NOTIFICATION_METHOD_PM:
-                $xoopsMailer->usePM();
-                $config_handler = xoops_gethandler('config');
-                $xoopsMailerConfig = $config_handler->getConfigsByCat(XOOPS_CONF_MAILER);
-                $xoopsMailer->setFromUser($member_handler->getUser($xoopsMailerConfig['fromuid']));
-                foreach ($tags as $k => $v) {
-                    $xoopsMailer->assign($k, $v);
-                }
-                break;
-            case XOOPS_NOTIFICATION_METHOD_EMAIL:
-                $xoopsMailer->useMail();
-                foreach ($tags as $k => $v) {
-                    $xoopsMailer->assign($k, preg_replace("/&amp;/i", '&', $v));
-                }
-                break;
-            default:
-                return true; // report error in user's profile??
-                break;
+        case XOOPS_NOTIFICATION_METHOD_PM:
+            $xoopsMailer->usePM();
+            $config_handler = xoops_gethandler('config');
+            $xoopsMailerConfig = $config_handler->getConfigsByCat(XOOPS_CONF_MAILER);
+            $xoopsMailer->setFromUser($member_handler->getUser($xoopsMailerConfig['fromuid']));
+            foreach ($tags as $k => $v) {
+                $xoopsMailer->assign($k, $v);
+            }
+            break;
+        case XOOPS_NOTIFICATION_METHOD_EMAIL:
+            $xoopsMailer->useMail();
+            foreach ($tags as $k => $v) {
+                $xoopsMailer->assign($k, preg_replace("/&amp;/i", '&', $v));
+            }
+            break;
+        default:
+            return true; // report error in user's profile??
+            break;
         }
 
         // Set up the mailer
@@ -204,124 +216,29 @@
  * @package     kernel
  * @subpackage  notification
  *
- * @author	    Michael van Dam <mv...@ca...>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
+ * @author        Michael van Dam <mv...@ca...>
+ * @copyright    copyright (c) 2000-2003 XOOPS.org
  */
-class XoopsNotificationHandler extends XoopsObjectHandler
+class XoopsNotificationHandler extends XoopsPersistableObjectHandler
 {
     /**
-     * Create a {@link XoopsNotification}
+     * Constructor
      *
-     * @param	bool    $isNew  Flag the object as "new"?
-     *
-     * @return	object
+     * @param XoopsDatabase|null $db {@link XoopsDatabase}
      */
-    function create($isNew = true)
+    public function __construct(XoopsDatabase $db = null)
     {
-        $notification = new XoopsNotification();
-        if ($isNew) {
-            $notification->setNew();
-        }
-        return $notification;
+        parent::__construct($db, 'xoopsnotifications', 'XoopsNotification', 'not_id', 'not_itemid');
     }
 
     /**
-     * Retrieve a {@link XoopsNotification}
-     *
-     * @param   int $id ID
-     *
-     * @return  object  {@link XoopsNotification}, FALSE on fail
-     **/
-    function get($id)
-    {
-        $notification = false;
-        $id = intval($id);
-        if ($id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('xoopsnotifications') . ' WHERE not_id=' . $id;
-            if (!$result = $this->db->query($sql)) {
-                return $notification;
-            }
-            $numrows = $this->db->getRowsNum($result);
-            if ($numrows == 1) {
-                $notification = new XoopsNotification();
-                $notification->assignVars($this->db->fetchArray($result));
-            }
-        }
-        return $notification;
-    }
-
-    /**
-     * Write a notification(subscription) to database
-     *
-     * @param   object  &$notification
-     *
-     * @return  bool
-     **/
-    function insert(&$notification)
-    {
-        /**
-         * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
-         */
-        if (!is_a($notification, 'xoopsnotification')) {
-            return false;
-        }
-        if (!$notification->isDirty()) {
-            return true;
-        }
-        if (!$notification->cleanVars()) {
-            return false;
-        }
-        foreach ($notification->cleanVars as $k => $v) {
-            ${$k} = $v;
-        }
-        if ($notification->isNew()) {
-            $not_id = $this->db->genId('xoopsnotifications_not_id_seq');
-            $sql = sprintf("INSERT INTO %s (not_id, not_modid, not_itemid, not_category, not_uid, not_event, not_mode) VALUES (%u, %u, %u, %s, %u, %s, %u)", $this->db->prefix('xoopsnotifications'), $not_id, $not_modid, $not_itemid, $this->db->quoteString($not_category), $not_uid, $this->db->quoteString($not_event), $not_mode);
-        } else {
-            $sql = sprintf("UPDATE %s SET not_modid = %u, not_itemid = %u, not_category = %s, not_uid = %u, not_event = %s, not_mode = %u WHERE not_id = %u", $this->db->prefix('xoopsnotifications'), $not_modid, $not_itemid, $this->db->quoteString($not_category), $not_uid, $this->db->quoteString($not_event), $not_mode, $not_id);
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-        if (empty($not_id)) {
-            $not_id = $this->db->get...
 
[truncated message content]

Thread: [xoops-svn] SF.net SVN: xoops:[7813] XoopsCore/branches/2.6.x/2.6.0/htdocs

The world's leading content management systems (CMS) written in PHP

xoops-cvs2