X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2FADMIN.php;h=8fa73100c7d9987f044e92d49dfb4b66fee2b793;hb=c4a6f69c983f5f173cb346b96f446ae725d27c19;hp=1c0ab0f1899db5d4a197105cd2c4d6051383366e;hpb=f94a3aae08a0d625bf32364739cb161ceefb8bd5;p=nucleus-jp%2Fnucleus-next.git diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index 1c0ab0f..8fa7310 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -15,759 +15,692 @@ * @license http://nucleuscms.org/license.txt GNU General Public License * @copyright Copyright (C) 2002-2012 The Nucleus Group * @version $Id: ADMIN.php 1661 2012-02-12 11:55:39Z sakamocchi $ - * */ if ( !function_exists('requestVar') ) exit; require_once dirname(__FILE__) . '/showlist.php'; -/** - * Builds the admin area and executes admin actions - */ class Admin { - private $xml_version_info = '1.0'; - private $formal_public_identifier = '-//W3C//DTD XHTML 1.0 Strict//EN'; - private $system_identifier = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'; - private $xhtml_namespace = 'http://www.w3.org/1999/xhtml'; - - /** - * @var string $action action currently being executed ($action=xxxx -> action_xxxx method) - */ - public $action; - - /** - * @var object $adminSkin - */ - public $adminSkin; + static private $xml_version_info = '1.0'; + static private $formal_public_identifier = '-//W3C//DTD XHTML 1.0 Strict//EN'; + static private $system_identifier = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'; + static private $xhtml_namespace = 'http://www.w3.org/1999/xhtml'; - /** - * @var string $extrahead - */ - public $extrahead; + static public $headMess; + static private $action; + static private $skin; + static private $passvar; + static private $aOptions; + + static public $extrahead; + static public $blog; + static public $contents; + /** - * @var bool $passvar - */ - public $passvar; - + * Admin::$edit_actions + */ + static private $edit_actions = array( + 'adminskinoverview', + 'adminskinieoverview', + 'adminskinedittype', + 'adminskinremovetype', + 'adminskindelete', + 'adminskinedit', + 'adminskinieimport', + 'adminskiniedoimport', + 'admintemplateedit', + 'admintemplateoverview', + 'admintemplatedelete' + ); + /** - * @var string $headMess - */ - public $headMess; - - public $aOptions; + * Admin::$skinless_actions + */ + static private $skinless_actions = array( + 'plugindeleteconfirm', + 'pluginoptionsupdate', + 'skinremovetypeconfirm', + 'skinclone', + 'skindeleteconfirm', + 'skinnew', + 'skineditgeneral', + 'skinieexport', + 'skinupdate', + 'templateupdate', + 'templatedeleteconfirm', + 'templatenew', + 'templateclone', + 'adminskinremovetypeconfirm', + 'adminskinclone', + 'adminskindeleteconfirm', + 'adminskinnew', + 'adminskineditgeneral', + 'adminskinieexport', + 'adminskinupdate', + 'admintemplateupdate', + 'admintemplatedeleteconfirm', + 'admintemplatenew', + 'admintemplateclone', + 'blogsettingsupdate', + 'settingsupdate', + 'addnewlog2', + 'additem', + 'itemdeleteconfirm', + 'itemupdate', + 'changemembersettings', + 'clearactionlog', + 'memberedit' + ); - /** - * Class constructor - */ - /* function ADMIN() { - } */ - function __construct() - { - global $member, $DIR_LIBS; - $query = 'SELECT ' - . ' COUNT(*) as result ' - . 'FROM ' - . sql_table('adminskin_desc'); - if ( !(quickQuery($query)) ) - { - $this->action_importAdmin(); - } - if ( !isset($adminSkinid) || !($adminSkinid) ) - { - $adminSkinid = self::getAdminSkinID(); - } - if ( Skin::existsID($adminSkinid) ) - { - $this->adminSkin = new Skin($adminSkinid); - } - else - { - $this->adminSkin = 0; - } - } + static private $actions_needless_to_check = array( + 'showlogin', + 'login', + 'overview', + 'itemlist', + 'blogcommentlist', + 'bookmarklet', + 'blogsettings', + 'banlist', + 'createaccount', + 'deleteblog', + 'editmembersettings', + 'createaccount', + 'forgotpassword', + 'browseowncomments', + 'createitem', + 'itemedit', + 'itemmove', + 'categoryedit', + 'categorydelete', + 'manage', + 'actionlog', + 'settingsedit', + 'backupoverview', + 'pluginlist', + 'createnewlog', + 'usermanagement', + 'skinoverview', + 'templateoverview', + 'skinieoverview', + 'itemcommentlist', + 'commentedit', + 'commentdelete', + 'banlistnewfromitem', + 'banlistdelete', + 'itemdelete', + 'manageteam', + 'teamdelete', + 'banlistnew', + 'memberedit', + 'memberdelete', + 'pluginhelp', + 'pluginoptions', + 'plugindelete', + 'skinedittype', + 'skinremovetype', + 'skindelete', + 'skinedit', + 'templateedit', + 'templatedelete', + 'activate', + 'systemoverview', + 'activatesetpwd', + ); - static private function getAdminSkinID() + static public function initialize() { - global $CONF, $member, $manager; - if (isset($member) && $member->isLoggedIn()) { + global $CONF, $DIR_LIBS, $manager; + + /* NOTE: 1. decide which skinid to use */ + $skinid = $CONF['AdminSkin']; + /* + * NOTE: this is temporary escaped because not implemented yet + if (isset($member) && $member->isLoggedIn()) + { $memskin = $member->getAdminSkin(); - if ($memskin) { - return $memskin; + if ( $memskin ) + { + $skinid = $memskin; } } - return $CONF['DefaultAdminSkin']; - } - - function getAdminskinEditActions() - { - return array( - 'adminskinoverview', - 'adminskinieoverview', - 'adminskinedittype', - 'adminskinremovetype', - 'adminskindelete', - 'adminskinedit', - 'adminskinieimport', - 'adminskiniedoimport', - 'admintemplateedit', - 'admintemplateoverview', - 'admintemplatedelete', - ); - } - - function getSkinlessActions() - { - return array( - 'plugindeleteconfirm', - 'pluginoptionsupdate', - 'skinremovetypeconfirm', - 'skinclone', - 'skindeleteconfirm', - 'skinnew', - 'skineditgeneral', - 'skinieexport', - 'skinupdate', - 'templateupdate', - 'templatedeleteconfirm', - 'templatenew', - 'templateclone', - 'adminskinremovetypeconfirm', - 'adminskinclone', - 'adminskindeleteconfirm', - 'adminskinnew', - 'adminskineditgeneral', - 'adminskinieexport', - 'adminskinupdate', - 'admintemplateupdate', - 'admintemplatedeleteconfirm', - 'admintemplatenew', - 'admintemplateclone', - 'blogsettingsupdate', - 'settingsupdate', - 'addnewlog2', - 'additem', - 'itemdeleteconfirm', - 'itemupdate', - 'changemembersettings', - 'clearactionlog', - 'memberedit', - ); + */ + + /* NOTE: 2. make an instance of skin object */ + if ( !Skin::existsID($skinid) ) + { + return FALSE; + } + + /* NOTE: 3. initializing each members */ + self::$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin'); + self::$action = ''; + self::$extrahead = ''; + self::$passvar = ''; + self::$headMess = ''; + self::$aOptions = ''; + return TRUE; } /** + * Admin::action() * Executes an action * - * @param string $action action to be performed + * @param string $action action to be performed + * @return void */ - function action($action) + static public function action($action) { - global $CONF, $manager; - $f = false; + global $CONF, $DIR_LIBS, $manager, $member; - // list of action aliases - $alias = array( - 'login' => 'overview', - '' => 'overview' - ); - + /* 1. decide action name */ $customAction = postvar('customaction'); if ( !empty($customAction) ) { $alias = array( - 'login' => $customAction, - '' => $customAction + 'login' => $customAction, + '' => $customAction + ); + } + else + { + $alias = array( + 'login' => 'overview', + '' => 'overview', ); } - if ( isset($alias[$action]) ) + if ( array_key_exists($action, $alias) && isset($alias[$action]) ) { $action = $alias[$action]; } - $methodName = 'action_' . $action; - - $this->action = strtolower($action); - - // check ticket. All actions need a ticket, unless they are considered to be safe (a safe action - // is an action that requires user interaction before something is actually done) - // all safe actions are in this array: - $aActionsNotToCheck = array( - 'showlogin', - 'login', - 'overview', - 'itemlist', - 'blogcommentlist', - 'bookmarklet', - 'blogsettings', - 'banlist', - 'deleteblog', - 'editmembersettings', - 'browseownitems', - 'browseowncomments', - 'createitem', - 'itemedit', - 'itemmove', - 'categoryedit', - 'categorydelete', - 'manage', - 'actionlog', - 'settingsedit', - 'backupoverview', - 'pluginlist', - 'createnewlog', - 'usermanagement', - 'skinoverview', - 'templateoverview', - 'skinieoverview', - 'itemcommentlist', - 'commentedit', - 'commentdelete', + $methodName = "action_{$action}"; + self::$action = strtolower($action); + + /* 2. check the action */ + $synonimActions = array( 'banlistnewfromitem', - 'banlistdelete', - 'itemdelete', - 'manageteam', - 'teamdelete', - 'banlistnew', 'memberedit', - 'memberdelete', - 'pluginhelp', - 'pluginoptions', - 'plugindelete', - 'skinedittype', - 'skinremovetype', - 'skindelete', - 'skinedit', - 'templateedit', - 'templatedelete', - 'activate', - 'systemoverview', - 'activatesetpwd', + 'login', ); - $synonimActions = array( - 'banlistnewfromitem', - 'memberedit', - 'login', - ); -/* - // the rest of the actions needs to be checked - $aActionsToCheck = array('additem', 'itemupdate', 'itemmoveto', 'categoryupdate', 'categorydeleteconfirm', 'itemdeleteconfirm', 'commentdeleteconfirm', 'teamdeleteconfirm', 'memberdeleteconfirm', 'templatedeleteconfirm', 'skindeleteconfirm', 'banlistdeleteconfirm', 'plugindeleteconfirm', 'batchitem', 'batchcomment', 'batchmember', 'batchcategory', 'batchteam', 'regfile', 'commentupdate', 'banlistadd', 'changemembersettings', 'clearactionlog', 'settingsupdate', 'blogsettingsupdate', 'categorynew', 'teamchangeadmin', 'teamaddmember', 'memberadd', 'addnewlog', 'addnewlog2', 'backupcreate', 'backuprestore', 'pluginup', 'plugindown', 'pluginupdate', 'pluginadd', 'pluginoptionsupdate', 'skinupdate', 'skinclone', 'skineditgeneral', 'templateclone', 'templatenew', 'templateupdate', 'skinieimport', 'skinieexport', 'skiniedoimport', 'skinnew', 'deleteblogconfirm', 'activatesetpwd'); -*/ - $adminskinEditActions = $this->getAdminskinEditActions(); - $skinLessActions = $this->getSkinlessActions(); - $allowActions = array_merge($synonimActions, $this->getSkinlessActions()); - $aActionsNotToCheck = array_merge($aActionsNotToCheck, $adminskinEditActions, $allowActions); - if (!in_array($this->action, $aActionsNotToCheck) && !$this->existsSkinContents($action) ) + $allowActions = array_merge($synonimActions, self::$skinless_actions); + $aActionsNotToCheck = array_merge(self::$actions_needless_to_check, self::$edit_actions, $allowActions); + if ( !in_array(self::$action, $aActionsNotToCheck) && !self::existsSkinContents($action) ) { if (!$manager->checkTicket()) { - $this->error(_ERROR_BADTICKET); + self::error(_ERROR_BADTICKET); } } - if ( !$this->adminSkin && $CONF['DefaultAdminSkin'] ) - { - $this->adminSkin = new Skin($CONF['DefaultAdminSkin']); - } - - if ( !method_exists($this, $methodName) && !in_array($this->action, $allowActions) && $this->existsSkinContents($action) ) + + /* 3. parse according to the action */ + if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) ) { - $this->action_parseSpecialskin; - $f = true; + /* TODO: what is this? + self::action_parseSpecialskin(); + */ } - elseif ( method_exists($this, $methodName) ) + elseif ( method_exists('Admin', $methodName) ) { - call_user_func(array(&$this, $methodName)); - $f = true; - } - if ($f) { - exit; + call_user_func(array(__CLASS__, $methodName)); } - $id = self::getAdminSkinID(); - $this->adminSkin = new Skin($id); - if ( $this->adminSkin && $this->existsSkinContents('adminerrorpage') ) + else if ( self::existsSkinContents('adminerrorpage') ) { - $this->error(_BADACTION . ENTITY::hsc($action)); - $f = true; + self::error(_BADACTION . ENTITY::hsc($action)); } - elseif ( $id != $CONF['DefaultAdminSkin'] ) + elseif ( $id != $CONF['AdminSkin'] ) { - $this->adminSkin = new Skin($CONF['DefaultAdminSkin']); - if ( $this->adminSkin && $this->existsSkinContents('adminerrorpage') ) + self::$skin =& $manager->getSkin($CONF['AdminSkin'], 'AdminActions'); + if ( self::$skin && self::existsSkinContents('adminerrorpage') ) { - $this->error(_BADACTION . ENTITY::hsc($action)); - $f = true; + self::error(_BADACTION . ENTITY::hsc($action)); } } - if ($f) + else { - exit; + self::error(_BADACTION . ENTITY::hsc($action)); } - $this->error(_BADACTION . ENTITY::hsc($action)); + exit; } - + /** + * Action::existsSkinContents() * Check skin contents * - * @param string action type - * @return bool + * @param string $action action type + * @return boolean */ - function existsSkinContents($action) + static private function existsSkinContents($action) { - $nsActions = $this->getSkinlessActions(); - $in_array = in_array($action, $nsActions); - if ($in_array) { + $in_array = in_array($action, self::$skinless_actions); + + if ( $in_array ) + { return $in_array; - } else { - $query = 'SELECT ' - . ' scontent as result ' - . 'FROM ' - . sql_table('adminskin') . ' ' - . 'WHERE ' - . ' sdesc = %d ' - . 'AND stype = "%s"'; - if ( is_object($this->adminSkin) ) + } + else + { + $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype=%s"; + /* TODO: skinid should be a default */ + if ( !is_object(self::$skin) ) { - return quickQuery(sprintf($query, $this->adminSkin->id, sql_real_escape_string($action))); + global $CONF; + return DB::getValue(sprintf($query, sql_table('skin'), $CONF['AdminSkin'], DB::quoteValue($action))); } else { - return quickQuery(sprintf($query, 1, sql_real_escape_string($action))); + return DB::getValue(sprintf($query, sql_table('skin'), self::$skin->getID(), DB::quoteValue($action))); } } + return; } /** + * Action::specialActionsAllow() * Check exists specialskinparts * - * @param string action type - * @return bool + * @param string $action action type + * @return boolean */ - function specialActionsAllow($action) + static private function specialActionsAllow($action) { - $query = 'SELECT ' - . ' sdesc as result ' - . 'FROM ' - . sql_table('adminskin') . ' ' - . 'WHERE ' - . ' sdesc = %d ' - . 'AND stype = "%s"'; - return quickQuery(sprintf($query, $this->adminSkin->id, sql_real_escape_string($action))); + $query = "SELECT sdesc as result FROM %s WHERE sdesc = %d AND stype = %s"; + $query = sprintf($query, sql_table('skin'), (integer) self::$skin->id, DB::quoteValue($action)); + return DB::getValue($query); } /** - * @todo document this + * Action::action_showlogin() + * + * @param void + * @return void */ - function action_showlogin() + static private function action_showlogin() { global $error; - $this->action_login($error); + self::action_login($error); + return; } - + /** - * @todo document this + * Action::action_login() + * + * @param string $msg message for pageheader + * @param integer $passvars ??? */ - function action_login($msg = '', $passvars = 1) + static private function action_login($msg = '', $passvars = 1) { global $member; - + // skip to overview when allowed if ( $member->isLoggedIn() && $member->canLogin() ) { - $this->action_overview(); + self::action_overview(); exit; } - - $this->passvar = $passvars; + + /* TODO: needless variable??? */ + self::$passvar = $passvars; if ( $msg ) { - $this->headMess = $msg; + self::$headMess = $msg; } - - $this->pagehead(); - $this->parse('showlogin'); - $this->pagefoot(); + + self::$skin->parse('showlogin'); } - + /** + * Action::action_overview() * provides a screen with the overview of the actions available - * @todo document parameter + * + * @param string $msg message for pageheader + * @return void */ - function action_overview($msg = '') + static private function action_overview($msg = '') { if ( $msg ) { - $this->headMess = $msg; + self::$headMess = $msg; } - - $this->pagehead(); - $this->parse('overview'); - $this->pagefoot(); + + self::$skin->parse('overview'); + return; } - + /** - * @todo document this + * Admin::action_manage() + * + * @param string $msg message for pageheader + * @retrn void */ - function action_manage($msg = '') + static private function action_manage($msg = '') { global $member; - + if ( $msg ) { - $this->headMess = $msg; + self::$headMess = $msg; } - $member->isAdmin() or $this->disallow(); - - $this->pagehead(); - $this->parse('manage'); - $this->pagefoot(); + $member->isAdmin() or self::disallow(); + + self::$skin->parse('manage'); + return; } - + /** - * @todo document this + * Action::action_itemlist() + * + * @param integer id for weblod + * @return void */ - function action_itemlist($blogid = '') + static private function action_itemlist($blogid = '') { global $member, $manager, $CONF; - + if ( $blogid == '' ) { $blogid = intRequestVar('blogid'); } - - $member->teamRights($blogid) or $member->isAdmin() or $this->disallow(); - - $this->pagehead(); - $this->parse('itemlist'); - $this->pagefoot(); + + $member->teamRights($blogid) or $member->isAdmin() or self::disallow(); + + self::$skin->parse('itemlist'); + return; } - + /** - * @todo document this + * Action::action_batchitem() + * + * @param void + * @return void */ - function action_batchitem() + static private function action_batchitem() { global $member, $manager; - - // check if logged in - $member->isLoggedIn() or $this->disallow(); - - // more precise check will be done for each performed operation - - // get array of itemids from request - $selected = requestIntArray('batch'); - $action = requestVar('batchaction'); - - // Show error when no items were selected + + $member->isLoggedIn() or self::disallow(); + + $selected = requestIntArray('batch'); + $action = requestVar('batchaction'); + if ( !is_array($selected) || sizeof($selected) == 0 ) { - $this->error(_BATCH_NOSELECTION); + self::error(_BATCH_NOSELECTION); } - + // On move: when no destination blog/category chosen, show choice now $destCatid = intRequestVar('destcatid'); if ( ($action == 'move') && (!$manager->existsCategory($destCatid)) ) { - $this->batchMoveSelectDestination('item', $selected); + self::batchMoveSelectDestination('item', $selected); } - + // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - $this->batchAskDeleteConfirmation('item',$selected); + self::batchAskDeleteConfirmation('item', $selected); } - - $this->pagehead(); - $this->parse('batchitem'); - $this->pagefoot(); + + self::$skin->parse('batchitem'); + return; } - + /** - * @todo document this + * Action::action_batchcomment() + * + * @param void + * @return void */ - function action_batchcomment() + static private function action_batchcomment() { global $member; - - // check if logged in - $member->isLoggedIn() or $this->disallow(); - - // more precise check will be done for each performed operation - - // get array of itemids from request - $selected = requestIntArray('batch'); - $action = requestVar('batchaction'); - + + $member->isLoggedIn() or self::disallow(); + + $selected = requestIntArray('batch'); + $action = requestVar('batchaction'); + // Show error when no items were selected if ( !is_array($selected) || sizeof($selected) == 0 ) { - $this->error(_BATCH_NOSELECTION); + self::error(_BATCH_NOSELECTION); } - + // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - $this->batchAskDeleteConfirmation('comment',$selected); + self::batchAskDeleteConfirmation('comment', $selected); } - - $this->pagehead(); - $this->parse('batchcomment'); - $this->pagefoot(); + + self::$skin->parse('batchcomment'); + return; } - + + /** + * Admin::setAdminAction() + * + * @param string $action + * @return void + */ + static public function setAdminAction($action) + { + self::$action = $action; + return; + } + /** - * @todo document this + * Admin::action_batchmember() + * + * @param void + * @return void */ - function action_batchmember() + static private function action_batchmember() { global $member; - - // check if logged in and admin - ($member->isLoggedIn() && $member->isAdmin()) or $this->disallow(); - - // get array of itemids from request - $selected = requestIntArray('batch'); - $action = requestVar('batchaction'); - + + ($member->isLoggedIn() && $member->isAdmin()) or self::disallow(); + + $selected = requestIntArray('batch'); + $action = requestVar('batchaction'); + // Show error when no members selected if ( !is_array($selected) || sizeof($selected) == 0 ) { - $this->error(_BATCH_NOSELECTION); + self::error(_BATCH_NOSELECTION); } - + // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - $this->batchAskDeleteConfirmation('member',$selected); + self::batchAskDeleteConfirmation('member',$selected); } - - $this->pagehead(); - $this->parse('batchmember'); - $this->pagefoot(); + + self::$skin->parse('batchmember'); + return; } - + /** - * @todo document this + * Admin::action_batchteam() + * + * @param void + * @return void */ - function action_batchteam() + static private function action_batchteam() { global $member; - + $blogid = intRequestVar('blogid'); - - // check if logged in and admin - ($member->isLoggedIn() && $member->blogAdminRights($blogid)) or $this->disallow(); - - // get array of itemids from request - $selected = requestIntArray('batch'); - $action = requestVar('batchaction'); - - // Show error when no members selected + + ($member->isLoggedIn() && $member->blogAdminRights($blogid)) or self::disallow(); + + $selected = requestIntArray('batch'); + $action = requestVar('batchaction'); + if ( !is_array($selected) || sizeof($selected) == 0 ) { - $this->error(_BATCH_NOSELECTION); + self::error(_BATCH_NOSELECTION); } - + // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - $this->batchAskDeleteConfirmation('team',$selected); + self::batchAskDeleteConfirmation('team',$selected); } - - $this->pagehead(); - $this->parse('batchmember'); - $this->pagefoot(); + + self::$skin->parse('batchteam'); + return; } - + /** - * @todo document this + * Admin::action_batchcategory() + * + * @param void + * @return void */ - function action_batchcategory() + static private function action_batchcategory() { global $member, $manager; - - // check if logged in - $member->isLoggedIn() or $this->disallow(); - - // more precise check will be done for each performed operation - - // get array of itemids from request - $selected = requestIntArray('batch'); - $action = requestVar('batchaction'); - - // Show error when no items were selected + + $member->isLoggedIn() or self::disallow(); + + $selected = requestIntArray('batch'); + $action = requestVar('batchaction'); + if ( !is_array($selected) || sizeof($selected) == 0 ) { - $this->error(_BATCH_NOSELECTION); + self::error(_BATCH_NOSELECTION); } - + // On move: when no destination blog chosen, show choice now $destBlogId = intRequestVar('destblogid'); if ( ($action == 'move') && (!$manager->existsBlogID($destBlogId)) ) { - $this->batchMoveCategorySelectDestination('category', $selected); + self::batchMoveCategorySelectDestination('category', $selected); } - + // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - $this->batchAskDeleteConfirmation('category', $selected); + self::batchAskDeleteConfirmation('category', $selected); } - - $this->pagehead(); - $this->parse('batchcategory'); - $this->pagefoot(); + + self::$skin->parse('batchcategory'); + return; } - + /** - * @todo document this + * Admin::batchMoveSelectDestination() + * + * @param string $type type of batch action + * @param integer $ids needless??? + * @return void + * + * TODO: remove needless argument */ - function batchMoveSelectDestination($type, $ids) + static private function batchMoveSelectDestination($type, $ids) { - $this->pagehead(); - $this->parse('batchmove'); - $this->pagefoot(); - exit; + $_POST['batchmove'] = $type; + self::$skin->parse('batchmove'); + return; } - + /** - * @todo document this + * Admin::batchMoveCategorySelectDestination() + * + * @param string $type type of batch action + * @param integer $ids needless??? + * @return void + * + * TODO: remove needless argument */ - function batchMoveCategorySelectDestination($type, $ids) + static private function batchMoveCategorySelectDestination($type, $ids) { + $_POST['batchmove'] = $type; global $manager; - $this->pagehead(); - $this->parse('batchmovecat'); - $this->pagefoot(); - exit; + self::$skin->parse('batchmovecat'); + return; } - + /** - * @todo document this + * Admin::batchAskDeleteConfirmation() + * + * @param string $type type of batch action + * @param integer $ids needless??? + * @return void + * + * TODO: remove needless argument */ - function batchAskDeleteConfirmation($type, $ids) + static private function batchAskDeleteConfirmation($type, $ids) { - $this->pagehead(); - $this->parse('batchdelete'); - $this->pagefoot(); - exit; + self::$skin->parse('batchdelete'); + return; } - - + /** - * Inserts a HTML select element with choices for all categories to which the current - * member has access - * @see function selectBlog + * Admin::action_browseownitems() + * + * @param void + * @return void */ - function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) + static private function action_browseownitems() { - Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude); + global $member, $manager, $CONF; + + self::$skin->parse('browseownitems'); + return; } - + /** - * Inserts a HTML select element with choices for all blogs to which the user has access - * mode = 'blog' => shows blognames and values are blogids - * mode = 'category' => show category names and values are catids - * - * @param $iForcedBlogInclude - * ID of a blog that always needs to be included, without checking if the - * member is on the blog team (-1 = none) - * @todo document parameters + * Admin::action_itemcommentlist() + * Show all the comments for a given item + * + * @param integer $itemid ID for item + * @return void */ - function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) + static private function action_itemcommentlist($itemid = '') { - global $member, $CONF; - - // 0. get IDs of blogs to which member can post items (+ forced blog) - $aBlogIds = array(); - if ( $iForcedBlogInclude != -1 ) - { - $aBlogIds[] = intval($iForcedBlogInclude); - } - - if ( ($member->isAdmin()) && ($CONF['ShowAllBlogs']) ) - { - $queryBlogs = 'SELECT bnumber FROM '.sql_table('blog').' ORDER BY bname'; - } - else - { - $queryBlogs = 'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID(); - } - $rblogids = sql_query($queryBlogs); - while ($o = sql_fetch_object($rblogids)) - { - if ( $o->bnumber != $iForcedBlogInclude ) - { - $aBlogIds[] = intval($o->bnumber); - } - } - - if ( count($aBlogIds) == 0 ) - { - return; - } - - $_REQUEST['selectData'] = array( - 'name' => $name, - 'tabindex' => $tabindex, - 'mode' => $mode, - 'selected' => $selected, - 'showNewCat' => $showNewCat, - 'aBlogIds' => $aBlogIds, - ); - $this->parse('blogselectbox'); - } - - /** - * @todo document this - */ - function action_browseownitems() { global $member, $manager, $CONF; - - $this->pagehead(); - $this->parse('browseownitems'); - $this->pagefoot(); - } - - /** - * Show all the comments for a given item - * @param int $itemid - */ - function action_itemcommentlist($itemid = '') { - global $member, $manager, $CONF; - + if ( $itemid == '' ) { $itemid = intRequestVar('itemid'); } - $_REQUEST['itemid'] = $itemid; - $_REQUEST['blogid'] = getBlogIdFromItemId($itemid); // only allow if user is allowed to alter item - $member->canAlterItem($itemid) or $this->disallow(); - - $blogid = getBlogIdFromItemId($itemid); - - $this->pagehead(); - $this->parse('itemcommentlist'); - $this->pagefoot(); + $member->canAlterItem($itemid) or self::disallow(); + + $item =& $manager->getItem($itemid, 1, 1); + $_REQUEST['itemid'] = $item['itemid']; + $_REQUEST['blogid'] = $item['blogid']; + + self::$skin->parse('itemcommentlist'); + return; } - + /** + * Admin::action_browseowncomments() * Browse own comments + * + * @param void + * @return void */ - function action_browseowncomments() { - $this->pagehead(); - $this->parse('browseowncomments'); - $this->pagefoot(); + static private function action_browseowncomments() + { + self::$skin->parse('browseowncomments'); + return; } - + /** + * Admin::action_blogcommentlist() * Browse all comments for a weblog - * @param int $blogid + * + * @param integer $blogid ID for weblog + * @return void */ - function action_blogcommentlist($blogid = '') + static private function action_blogcommentlist($blogid = '') { global $member, $manager, $CONF; - + if ( $blogid == '' ) { $blogid = intRequestVar('blogid'); @@ -776,122 +709,232 @@ class Admin { $blogid = intval($blogid); } - - $member->teamRights($blogid) or $member->isAdmin() or $this->disallow(); - + + $member->teamRights($blogid) or $member->isAdmin() or self::disallow(); + + /* TODO: we consider to use the other way insterad of this */ $_REQUEST['blogid'] = $blogid; - - $this->pagehead(); - $this->parse('blogcommentlist'); - $this->pagefoot(); + + self::$skin->parse('blogcommentlist'); + return; } - + + /** + * Admin::action_createaccount() + * + * @param void + * @return void + */ + static private function action_createaccount() + { + global $CONF; + + if ( $CONF['AllowMemberCreate'] != 1 ) + { + self::$skin->parse('createaccountdisable'); + return; + } + + $name = ''; + $realname =''; + $email = ''; + $url = ''; + + $contents = array( + 'name' => '', + 'realname' => '', + 'email' => '', + 'url' => '' + ); + + if ( array_key_exists('showform', $_POST) && $_POST['showform'] == 1 ) + { + $action = new Action(); + $message = $action->createAccount(); + if ( $message === 1 ) + { + self::$headMess = $message; + self::$skin->parse('createaccountsuccess'); + return; + } + + /* TODO: validation */ + if ( array_key_exists('name', $_POST) ) + { + $contents['name'] = $_POST['name']; + } + if ( array_key_exists('realname', $_POST) ) + { + $contents['realname'] = $_POST['realname']; + } + if ( array_key_exists('email', $_POST) ) + { + $contents['email'] = $_POST['email']; + } + if ( array_key_exists('url', $_POST) ) + { + $contents['url'] = $_POST['url']; + } + + self::$contents = $contents; + + } + + self::$skin->parse('createaccountinput'); + return; + } + /** + * Admin::action_createitem() * Provide a page to item a new item to the given blog + * + * @param void + * @return void */ - function action_createitem() + static private function action_createitem() { global $member, $manager; - + $blogid = intRequestVar('blogid'); - + // check if allowed - $member->teamRights($blogid) or $this->disallow(); - - $memberid = $member->getID(); - + $member->teamRights($blogid) or self::disallow(); + $blog =& $manager->getBlog($blogid); - - $this->pagehead(); - $this->parse('createitem'); - $this->pagefoot(); + $contents = array(); + + $data = array( + 'blog' => &$blog, + 'contents' => &$contents + ); + $manager->notify('PreAddItemForm', $data); + + if ( $blog->convertBreaks() ) + { + if ( array_key_exists('body', $contents) && !empty($contents['body']) ) + { + $contents['body'] = removeBreaks($contents['body']); + } + if ( array_key_exists('more', $contents) && !empty($contents['more']) ) + { + $contents['more'] = removeBreaks($contents['more']); + } + } + + self::$blog = &$blog; + self::$contents = &$contents; + + self::$skin->parse('createitem'); + return; } - + /** - * @todo document this + * Admin::action_itemedit() + * + * @param void + * @return void */ - function action_itemedit() + static private function action_itemedit() { global $member, $manager; - + $itemid = intRequestVar('itemid'); - + // only allow if user is allowed to alter item - $member->canAlterItem($itemid) or $this->disallow(); - + $member->canAlterItem($itemid) or self::disallow(); + $item =& $manager->getItem($itemid, 1, 1); - $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); - $this->pagehead(); - $this->parse('itemedit'); - $this->pagefoot(); + $blog =& $manager->getBlog($item['blogid']); + $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$item)); + + if ( $blog->convertBreaks() ) + { + if ( array_key_exists('body', $item) && !empty($item['body']) ) + { + $item['body'] = removeBreaks($item['body']); + } + if ( array_key_exists('more', $item) && !empty($item['more']) ) + { + $item['more'] = removeBreaks($item['more']); + } + } + + self::$blog = &$blog; + self::$contents = &$item; + + self::$skin->parse('itemedit'); + return; } - + /** - * @todo document this + * Admin::action_itemupdate() + * + * @param void + * @return void */ - function action_itemupdate() + static private function action_itemupdate() { global $member, $manager, $CONF; - + $itemid = intRequestVar('itemid'); $catid = postVar('catid'); - + // only allow if user is allowed to alter item - $member->canUpdateItem($itemid, $catid) or $this->disallow(); - + $member->canUpdateItem($itemid, $catid) or self::disallow(); + $actiontype = postVar('actiontype'); - + // delete actions are handled by itemdelete (which has confirmation) if ( $actiontype == 'delete' ) { - $this->action_itemdelete(); + self::action_itemdelete(); return; } - - $body = postVar('body'); - $title = postVar('title'); - $more = postVar('more'); - $closed = intPostVar('closed'); - $draftid = intPostVar('draftid'); - + + $body = postVar('body'); + $title = postVar('title'); + $more = postVar('more'); + $closed = intPostVar('closed'); + $draftid = intPostVar('draftid'); + // default action = add now if ( !$actiontype ) { $actiontype='addnow'; } - + // create new category if needed - if ( strstr($catid,'newcat') ) + if ( i18n::strpos($catid,'newcat') === 0 ) { // get blogid list($blogid) = sscanf($catid,"newcat-%d"); - + // create $blog =& $manager->getBlog($blogid); $catid = $blog->createNewCategory(); - + // show error when sth goes wrong if ( !$catid ) { - $this->doError(_ERROR_CATCREATEFAIL); + self::doError(_ERROR_CATCREATEFAIL); } } - - /* - set some variables based on actiontype - - actiontypes: - draft items -> addnow, addfuture, adddraft, delete - non-draft items -> edit, changedate, delete - - variables set: - $timestamp: set to a nonzero value for future dates or date changes - $wasdraft: set to 1 when the item used to be a draft item - $publish: set to 1 when the edited item is not a draft - */ + + /** + * set some variables based on actiontype + * + * actiontypes: + * draft items -> addnow, addfuture, adddraft, delete + * non-draft items -> edit, changedate, delete + * + * variables set: + * $timestamp: set to a nonzero value for future dates or date changes + * $wasdraft: set to 1 when the item used to be a draft item + * $publish: set to 1 when the edited item is not a draft + */ $blogid = getBlogIDFromItemID($itemid); - $blog =& $manager->getBlog($blogid); - + $blog =& $manager->getBlog($blogid); + $wasdrafts = array('adddraft', 'addfuture', 'addnow'); $wasdraft = in_array($actiontype, $wasdrafts) ? 1 : 0; $publish = ($actiontype != 'adddraft' && $actiontype != 'backtodrafts') ? 1 : 0; @@ -903,23 +946,21 @@ class Admin { $timestamp =0; } - + // edit the item for real Item::update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp); - - $this->updateFuturePosted($blogid); - + + self::updateFuturePosted($blogid); + if ( $draftid > 0 ) { // delete permission is checked inside Item::delete() Item::delete($draftid); } - - // show category edit window when we created a new category - // ($catid will then be a new category ID, while postVar('catid') will be 'newcat-x') + if ( $catid != intPostVar('catid') ) { - $this->action_categoryedit( + self::action_categoryedit( $catid, $blog->getID(), $CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid) @@ -928,11 +969,14 @@ class Admin else { // TODO: set start item correctly for itemlist - $item = Item::getItem($itemid, 0, 0); - $cnt = quickQuery('SELECT COUNT(*) FROM ' . sql_table('item') . ' WHERE unix_timestamp(itime) <= ' . $item['timestamp']); + $item =& $manager->getitem($itemid, 1, 1); + $query = "SELECT COUNT(*) FROM %s WHERE unix_timestamp(itime) <= '%s';"; + $query = sprintf($query, sql_table('item'), $item['timestamp']); + $cnt = DB::getValue($query); $_REQUEST['start'] = $cnt + 1; - $this->action_itemlist(getBlogIDFromItemID($itemid)); + self::action_itemlist(getBlogIDFromItemID($itemid)); } + return; } /** @@ -942,92 +986,97 @@ class Admin * @param Void * @return Void */ - function action_itemdelete() + static private function action_itemdelete() { global $member, $manager; $itemid = intRequestVar('itemid'); // only allow if user is allowed to alter item - $member->canAlterItem($itemid) or $this->disallow(); + $member->canAlterItem($itemid) or self::disallow(); if ( !$manager->existsItem($itemid,1,1) ) { - $this->error(_ERROR_NOSUCHITEM); + self::error(_ERROR_NOSUCHITEM); } - $this->pagehead(); - $this->parse('itemdelete'); - $this->pagefoot(); + self::$skin->parse('itemdelete'); return; } /** - * @todo document this + * Admin::action_itemdeleteconfirm() + * + * @param void + * @return void */ - function action_itemdeleteconfirm() + static private function action_itemdeleteconfirm() { - global $member; - + global $member, $manager; + $itemid = intRequestVar('itemid'); - + // only allow if user is allowed to alter item - $member->canAlterItem($itemid) or $this->disallow(); - - // get blogid first - $blogid = getBlogIdFromItemId($itemid); - + $member->canAlterItem($itemid) or self::disallow(); + + // get item first + $item =& $manager->getItem($itemid, 1, 1); + // delete item (note: some checks will be performed twice) - $this->deleteOneItem($itemid); - - $this->action_itemlist($blogid); + self::deleteOneItem($item['itemid']); + + self::action_itemlist($item['blogid']); + return; } - + /** + * Admin::deleteOneItem() * Deletes one item and returns error if something goes wrong - * @param int $itemid + * + * @param integer $itemid ID for item + * @return void */ - function deleteOneItem($itemid) + static public function deleteOneItem($itemid) { global $member, $manager; - + // only allow if user is allowed to alter item (also checks if itemid exists) if ( !$member->canAlterItem($itemid) ) { return _ERROR_DISALLOWED; } - + // need to get blogid before the item is deleted - $blogid = getBlogIDFromItemId($itemid); - + $item =& $manager->getItem($itemid, 1, 1); + $manager->loadClass('ITEM'); - Item::delete($itemid); - + Item::delete($item['itemid']); + // update blog's futureposted - $this->updateFuturePosted($blogid); + self::updateFuturePosted($item['itemid']); + return; } - + /** * Admin::updateFuturePosted() * Update a blog's future posted flag * * @param integer $blogid * @return void - * */ - function updateFuturePosted($blogid) + static private function updateFuturePosted($blogid) { global $manager; - $blogid = intval($blogid); - $blog =& $manager->getBlog($blogid); - $currenttime = $blog->getCorrectTime(time()); + $blogid = intval($blogid); + $blog =& $manager->getBlog($blogid); + $currenttime = $blog->getCorrectTime(time()); $query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'"; $query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime)); - $result = sql_query($query); + $result = DB::getResult($query); - if ( sql_num_rows($result) > 0 ) + if ( $result->rowCount() > 0 ) { $blog->setFuturePost(); } @@ -1039,442 +1088,471 @@ class Admin } /** - * @todo document this + * Admin::action_itemmove() + * + * @param void + * @return void */ - function action_itemmove() + static private function action_itemmove() { global $member, $manager; - + $itemid = intRequestVar('itemid'); - - // only allow if user is allowed to alter item - $member->canAlterItem($itemid) or $this->disallow(); - - $this->pagehead(); - $this->parse('itemmove'); - $this->pagefoot(); + + $member->canAlterItem($itemid) or self::disallow(); + + self::$skin->parse('itemmove'); + return; } - + /** - * @todo document this + * Admin::action_itemmoveto() + * + * @param void + * @return void */ - function action_itemmoveto() + static private function action_itemmoveto() { global $member, $manager; - + $itemid = intRequestVar('itemid'); $catid = requestVar('catid'); - + // create new category if needed - if ( strstr($catid,'newcat') ) + if ( i18n::strpos($catid,'newcat') === 0 ) { // get blogid list($blogid) = sscanf($catid,'newcat-%d'); - + // create $blog =& $manager->getBlog($blogid); $catid = $blog->createNewCategory(); - + // show error when sth goes wrong if ( !$catid ) { - $this->doError(_ERROR_CATCREATEFAIL); + self::doError(_ERROR_CATCREATEFAIL); } } - + // only allow if user is allowed to alter item - $member->canUpdateItem($itemid, $catid) or $this->disallow(); - + $member->canUpdateItem($itemid, $catid) or self::disallow(); + $old_blogid = getBlogIDFromItemId($itemid); - + Item::move($itemid, $catid); - + // set the futurePosted flag on the blog - $this->updateFuturePosted(getBlogIDFromItemId($itemid)); - + self::updateFuturePosted(getBlogIDFromItemId($itemid)); + // reset the futurePosted in case the item is moved from one blog to another - $this->updateFuturePosted($old_blogid); - + self::updateFuturePosted($old_blogid); + if ( $catid != intRequestVar('catid') ) { - $this->action_categoryedit($catid, $blog->getID()); + self::action_categoryedit($catid, $blog->getID()); } else { - $this->action_itemlist(getBlogIDFromCatID($catid)); + self::action_itemlist(getBlogIDFromCatID($catid)); } + return; } - + /** + * Admin::moveOneItem() * Moves one item to a given category (category existance should be checked by caller) * errors are returned - * @param int $itemid - * @param int $destCatid category ID to which the item will be moved + * + * @param integer $itemid ID for item + * @param integer $destCatid ID for category to which the item will be moved + * @return void */ - function moveOneItem($itemid, $destCatid) + static public function moveOneItem($itemid, $destCatid) { global $member; - + // only allow if user is allowed to move item if ( !$member->canUpdateItem($itemid, $destCatid) ) { return _ERROR_DISALLOWED; } - + Item::move($itemid, $destCatid); + return; } - + /** + * Admin::action_additem() * Adds a item to the chosen blog + * + * @param void + * @return void */ - function action_additem() + static private function action_additem() { global $manager, $CONF; - + $manager->loadClass('ITEM'); - + $result = Item::createFromRequest(); - + if ( $result['status'] == 'error' ) { - $this->error($result['message']); + self::error($result['message']); } - - $blogid = getBlogIDFromItemID($result['itemid']); - $blog =& $manager->getBlog($blogid); - $btimestamp = $blog->getCorrectTime(); - $item = $manager->getItem(intval($result['itemid']), 1, 1); - + + $item =& $manager->getItem($result['itemid'], 0, 0); + if ( $result['status'] == 'newcategory' ) { - $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . intval($blogid)); - $this->action_categoryedit($result['catid'], $blogid, $distURI); + $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $item['blogid']); + self::action_categoryedit($result['catid'], $item['blogid'], $distURI); } else { - $methodName = 'action_itemList'; - call_user_func(array(&$this, $methodName), $blogid); + $methodName = 'action_itemlist'; + self::action_itemlist($item['blogid']); } + return; } - + /** + * Admin::action_commentedit() * Allows to edit previously made comments - **/ - function action_commentedit() + * + * @param void + * @return void + */ + static private function action_commentedit() { - global $member, $manager; - + $commentid = intRequestVar('commentid'); - - $member->canAlterComment($commentid) or $this->disallow(); - - $this->pagehead(); - $this->parse('commentedit'); - $this->pagefoot(); + + $member->canAlterComment($commentid) or self::disallow(); + + self::$skin->parse('commentedit'); + return; } - + /** - * @todo document this + * Admin::action_commentupdate() + * + * @param void + * @return void */ - function action_commentupdate() + static private function action_commentupdate() { global $member, $manager; - + $commentid = intRequestVar('commentid'); - - $member->canAlterComment($commentid) or $this->disallow(); - - $url = postVar('url'); - $email = postVar('email'); - $body = postVar('body'); - - # replaced eregi() below with preg_match(). ereg* functions are deprecated in PHP 5.3.0 - # original eregi: eregi("[a-zA-Z0-9|\.,;:!\?=\/\\]{90,90}", $body) != FALSE - # important note that '\' must be matched with '\\\\' in preg* expressions - + + $member->canAlterComment($commentid) or self::disallow(); + + $url = postVar('url'); + $email = postVar('email'); + $body = postVar('body'); + // intercept words that are too long if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE) { - $this->error(_ERROR_COMMENT_LONGWORD); + self::error(_ERROR_COMMENT_LONGWORD); } - + // check length if ( i18n::strlen($body) < 3 ) { - $this->error(_ERROR_COMMENT_NOCOMMENT); + self::error(_ERROR_COMMENT_NOCOMMENT); } - + if ( i18n::strlen($body) > 5000 ) { - $this->error(_ERROR_COMMENT_TOOLONG); + self::error(_ERROR_COMMENT_TOOLONG); } - + // prepare body $body = Comment::prepareBody($body); - + // call plugins - $manager->notify( - 'PreUpdateComment', - array( - 'body' => &$body - ) + $data = array( + 'body' => &$body ); - - $query = 'UPDATE ' . sql_table('comment') - . " SET " - . " cmail = '" . sql_real_escape_string($url) . "'," - . " cemail = '" . sql_real_escape_string($email) . "'," - . " cbody = '" . sql_real_escape_string($body) . "'" - . " WHERE " - . " cnumber = " . $commentid; - sql_query($query); - + $manager->notify('PreUpdateComment', $data); + + $query = "UPDATE %s SET cmail=%s, cemail=%s, cbody=%s WHERE cnumber=%d;"; + $query = sprintf($query, sql_table('comment'), DB::quoteValue($url), DB::quoteValue($email), DB::quoteValue($body), (integer) $commentid); + DB::execute($query); + // get itemid - $res = sql_query('SELECT citem FROM '.sql_table('comment').' WHERE cnumber=' . $commentid); - $o = sql_fetch_object($res); - $itemid = $o->citem; - + $query = "SELECT citem FROM %s WHERE cnumber=%d;"; + $query = sprintf($query, sql_table('comment'), (integer) $commentid); + + $itemid = DB::getValue($query); + if ( $member->canAlterItem($itemid) ) { - $this->action_itemcommentlist($itemid); + self::action_itemcommentlist($itemid); } else { - $this->action_browseowncomments(); + self::action_browseowncomments(); } + return; } /** * Admin::action_commentdelete() * Update comment * - * @param Void - * @return Void + * @param void + * @return void */ - function action_commentdelete() + static private function action_commentdelete() { global $member, $manager; $commentid = intRequestVar('commentid'); - $member->canAlterComment($commentid) or $this->disallow(); - - $this->pagehead(); - $this->parse('commentdelete'); - $this->pagefoot(); + $member->canAlterComment($commentid) or self::disallow(); + + self::$skin->parse('commentdelete'); return; } /** - * @todo document this + * Admin::action_commentdeleteconfirm() + * + * @param void + * @return void */ - function action_commentdeleteconfirm() + static private function action_commentdeleteconfirm() { global $member; - + $commentid = intRequestVar('commentid'); - + // get item id first - $res = sql_query('SELECT citem FROM '.sql_table('comment') .' WHERE cnumber=' . $commentid); - $o = sql_fetch_object($res); - $itemid = $o->citem; - - $error = $this->deleteOneComment($commentid); + $query = "SELECT citem FROM %s WHERE cnumber=%d;"; + $query = sprintf($query, sql_table('comment'), (integer) $commentid); + + $itemid = DB::getValue($query); + + $error = self::deleteOneComment($commentid); if ( $error ) { - $this->doError($error); + self::doError($error); } - + if ( $member->canAlterItem($itemid) ) { - $this->action_itemcommentlist($itemid); + self::action_itemcommentlist($itemid); } else { - $this->action_browseowncomments(); + self::action_browseowncomments(); } + return; } - + /** - * @todo document this + * Admin::deleteOneComment() + * + * @param integer $commentid ID for comment + * @return void */ - function deleteOneComment($commentid) { + static public function deleteOneComment($commentid) + { global $member, $manager; - - $commentid = intval($commentid); - + + $commentid = (integer) $commentid; + if ( !$member->canAlterComment($commentid) ) { return _ERROR_DISALLOWED; } - - $manager->notify( - 'PreDeleteComment', - array( - 'commentid' => $commentid - ) + + $data = array( + 'commentid' => $commentid ); - + + $manager->notify('PreDeleteComment', $data); + // delete the comments associated with the item - $query = 'DELETE FROM ' . sql_table('comment') . ' WHERE cnumber=' . $commentid; - sql_query($query); - - $manager->notify( - 'PostDeleteComment', - array( - 'commentid' => $commentid - ) + $query = "DELETE FROM %s WHERE cnumber=%d;"; + $query = sprintf($query, sql_table('comment'), (integer) $commentid); + DB::execute($query); + + $data = array( + 'commentid' => $commentid ); - + + $manager->notify('PostDeleteComment', $data); + return ''; } - + /** + * Admin::action_usermanagement() * Usermanagement main + * + * @param void + * @return void */ - function action_usermanagement() + static private function action_usermanagement() { global $member, $manager; - + // check if allowed - $member->isAdmin() or $this->disallow(); - - $this->pagehead(); - $this->parse('usermanagement'); - $this->pagefoot(); + $member->isAdmin() or self::disallow(); + + self::$skin->parse('usermanagement'); + return; } - + /** + * Admin::action_memberedit() * Edit member settings + * + * @param void + * @return void */ - function action_memberedit() + static private function action_memberedit() { - $this->action_editmembersettings(intRequestVar('memberid')); + self::action_editmembersettings(intRequestVar('memberid')); + return; } - + /** - * @todo document this + * Admin::action_editmembersettings() + * + * @param integer $memberid ID for member + * @return void + * */ - function action_editmembersettings($memberid = '') { + static private function action_editmembersettings($memberid = '') + { global $member, $manager, $CONF; if ( $memberid == '' ) { $memberid = $member->getID(); } + + /* TODO: we should consider to use the other way insterad of this */ $_REQUEST['memberid'] = $memberid; - + // check if allowed - ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow(); + ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); - $extrahead = ''; - $this->pagehead($extrahead); - $this->parse('editmembersettings'); - $this->pagefoot(); + Admin::$extrahead .= "\n"; + + self::$skin->parse('editmembersettings'); + return; } /** - * @todo document this + * Admin::action_changemembersettings() + * + * @param void + * @return void */ - function action_changemembersettings() { + static private function action_changemembersettings() + { global $member, $CONF, $manager; - + $memberid = intRequestVar('memberid'); - + // check if allowed - ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow(); - - $name = trim(strip_tags(postVar('name'))); - $realname = trim(strip_tags(postVar('realname'))); - $password = postVar('password'); - $repeatpassword = postVar('repeatpassword'); - $email = strip_tags(postVar('email')); - $url = strip_tags(postVar('url')); - $adminskin = intPostVar('adminskin'); - - # replaced eregi() below with preg_match(). ereg* functions are deprecated in PHP 5.3.0 - # original eregi: !eregi("^https?://", $url) - + ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); + + $name = trim(strip_tags(postVar('name'))); + $realname = trim(strip_tags(postVar('realname'))); + $password = postVar('password'); + $repeatpassword = postVar('repeatpassword'); + $email = strip_tags(postVar('email')); + $url = strip_tags(postVar('url')); + $adminskin = intPostVar('adminskin'); + // begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it. if ( !preg_match('#^https?://#', $url) ) { $url = 'http://' . $url; } - - $admin = postVar('admin'); - $canlogin = postVar('canlogin'); - $notes = strip_tags(postVar('notes')); - $locale = postVar('locale'); - - $mem = Member::createFromID($memberid); - - if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { - + + $admin = postVar('admin'); + $canlogin = postVar('canlogin'); + $notes = strip_tags(postVar('notes')); + $locale = postVar('locale'); + + $mem =& $manager->getMember($memberid); + + if ( $CONF['AllowLoginEdit'] || $member->isAdmin() ) + { if ( !isValidDisplayName($name) ) { - $this->error(_ERROR_BADNAME); + self::error(_ERROR_BADNAME); } - + if ( ($name != $mem->getDisplayName()) && Member::exists($name) ) { - $this->error(_ERROR_NICKNAMEINUSE); + self::error(_ERROR_NICKNAMEINUSE); } - + if ( $password != $repeatpassword ) { - $this->error(_ERROR_PASSWORDMISMATCH); + self::error(_ERROR_PASSWORDMISMATCH); } - + if ( $password && (i18n::strlen($password) < 6) ) { - $this->error(_ERROR_PASSWORDTOOSHORT); + self::error(_ERROR_PASSWORDTOOSHORT); } if ( $password ) { $pwdvalid = true; $pwderror = ''; - $manager->notify( - 'PrePasswordSet', - array( - 'password' => $password, - 'errormessage' => &$pwderror, - 'valid' => &$pwdvalid - ) + + $data = array( + 'password' => $password, + 'errormessage' => &$pwderror, + 'valid' => &$pwdvalid ); + $manager->notify('PrePasswordSet', $data); + if ( !$pwdvalid ) { - $this->error($pwderror); + self::error($pwderror); } } } if ( !NOTIFICATION::address_validation($email) ) { - $this->error(_ERROR_BADMAILADDRESS); + self::error(_ERROR_BADMAILADDRESS); } if ( !$realname ) { - $this->error(_ERROR_REALNAMEMISSING); + self::error(_ERROR_REALNAMEMISSING); } if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) ) { - $this->error(_ERROR_NOSUCHTRANSLATION); + self::error(_ERROR_NOSUCHTRANSLATION); } - + // check if there will remain at least one site member with both the logon and admin rights // (check occurs when taking away one of these rights from such a member) if ( (!$admin && $mem->isAdmin() && $mem->canLogin()) || (!$canlogin && $mem->isAdmin() && $mem->canLogin()) ) { - $r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1'); - if ( sql_num_rows($r) < 2 ) + $r = DB::getResult('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1'); + if ( $r->rowCount() < 2 ) { - $this->error(_ERROR_ATLEASTONEADMIN); + self::error(_ERROR_ATLEASTONEADMIN); } } - + if ( $CONF['AllowLoginEdit'] || $member->isAdmin() ) { $mem->setDisplayName($name); @@ -1483,69 +1561,65 @@ class Admin $mem->setPassword($password); } } - + $oldEmail = $mem->getEmail(); - + $mem->setRealName($realname); $mem->setEmail($email); $mem->setURL($url); $mem->setNotes($notes); $mem->setLocale($locale); - - + // only allow super-admins to make changes to the admin status if ( $member->isAdmin() ) { $mem->setAdmin($admin); $mem->setCanLogin($canlogin); } - + $autosave = postVar('autosave'); $mem->setAutosave($autosave); - + $mem->write(); - + // store plugin options $aOptions = requestArray('plugoption'); NucleusPlugin::apply_plugin_options($aOptions); - $manager->notify( - 'PostPluginOptionsUpdate', - array( - 'context' => 'member', - 'memberid' => $memberid, - 'member' => &$mem - ) + $data = array( + 'context' => 'member', + 'memberid' => $memberid, + 'member' => &$mem ); - + $manager->notify('PostPluginOptionsUpdate', $data); + // if email changed, generate new password if ( $oldEmail != $mem->getEmail() ) { $mem->sendActivationLink('addresschange', $oldEmail); // logout member $mem->newCookieKey(); - + // only log out if the member being edited is the current member. if ( $member->getID() == $memberid ) { $member->logout(); } - $this->action_login(_MSG_ACTIVATION_SENT, 0); + self::action_login(_MSG_ACTIVATION_SENT, 0); return; } - - - if ( ( $mem->getID() == $member->getID() ) - && ( $mem->getDisplayName() != $member->getDisplayName() ) - ) + + if ( ($mem->getID() == $member->getID()) + && ($mem->getDisplayName() != $member->getDisplayName()) ) { $mem->newCookieKey(); $member->logout(); - $this->action_login(_MSG_LOGINAGAIN, 0); + self::action_login(_MSG_LOGINAGAIN, 0); } else { - $this->action_overview(_MSG_SETTINGSCHANGED); + self::action_overview(_MSG_SETTINGSCHANGED); } + return; } /** @@ -1554,345 +1628,378 @@ class Admin * @param void * @return void * - */ - function action_memberadd() + */ + static private function action_memberadd() { global $member, $manager; // check if allowed - $member->isAdmin() or $this->disallow(); + $member->isAdmin() or self::disallow(); if ( postVar('password') != postVar('repeatpassword') ) { - $this->error(_ERROR_PASSWORDMISMATCH); + self::error(_ERROR_PASSWORDMISMATCH); } if ( i18n::strlen(postVar('password')) < 6 ) { - $this->error(_ERROR_PASSWORDTOOSHORT); + self::error(_ERROR_PASSWORDTOOSHORT); } $res = Member::create( - postVar('name'), - postVar('realname'), - postVar('password'), - postVar('email'), - postVar('url'), - postVar('admin'), - postVar('canlogin'), - postVar('notes') - ); + postVar('name'), + postVar('realname'), + postVar('password'), + postVar('email'), + postVar('url'), + postVar('admin'), + postVar('canlogin'), + postVar('notes') + ); + if ( $res != 1 ) { - $this->error($res); + self::error($res); } // fire PostRegister event $newmem = new Member(); $newmem->readFromName(postVar('name')); - $manager->notify( - 'PostRegister', - array( - 'member' => &$newmem - ) + $data = array( + 'member' => &$newmem ); + $manager->notify('PostRegister', $data); - $this->action_usermanagement(); + self::action_usermanagement(); return; } - + + /** + * Admin::action_forgotpassword() + * + * @param void + * @return void + */ + static private function action_forgotpassword() + { + self::$skin->parse('forgotpassword'); + return; + } + /** + * Admin::action_activate() * Account activation - * - * @author dekarma + * + * @param void + * @return void */ - function action_activate() + static private function action_activate() { - $key = getVar('key'); - $this->_showActivationPage($key); + self::showActivationPage($key); + return; } - + /** - * @todo document this + * Admin::showActivationPage() + * + * @param void + * @return void */ - function _showActivationPage($key, $message = '') + static private function showActivationPage($key, $message = '') { global $manager; - + // clean up old activation keys Member::cleanupActivationTable(); - + // get activation info $info = Member::getActivationInfo($key); - + if ( !$info ) { - $this->error(_ERROR_ACTIVATE); + self::error(_ERROR_ACTIVATE); } - - $mem = Member::createFromId($info->vmember); - + + $mem =& $manager->getMember($info->vmember); + if ( !$mem ) { - $this->error(_ERROR_ACTIVATE); + self::error(_ERROR_ACTIVATE); } - $_POST['ackey'] = $key; - $this->headMess = $message; - $_POST['bNeedsPasswordChange'] = true; - $this->pagehead(); - $this->parse('activate'); - $this->pagefoot(); - + + /* TODO: we should consider to use the other way insterad of this */ + $_POST['ackey'] = $key; + $_POST['bNeedsPasswordChange'] = TRUE; + + self::$headMess = $message; + self::$skin->parse('activate'); + return; } - + /** + * Admin::action_activatesetpwd() * Account activation - set password part - * - * @author dekarma + * + * @param void + * @return void */ - function action_activatesetpwd() + static private function action_activatesetpwd() { - + global $manager; $key = postVar('key'); - + // clean up old activation keys Member::cleanupActivationTable(); - + // get activation info $info = Member::getActivationInfo($key); - + if ( !$info || ($info->type == 'addresschange') ) { - return $this->_showActivationPage($key, _ERROR_ACTIVATE); + return self::showActivationPage($key, _ERROR_ACTIVATE); } - - $mem = Member::createFromId($info->vmember); - + + $mem =& $manager->getMember($info->vmember); + if ( !$mem ) { - return $this->_showActivationPage($key, _ERROR_ACTIVATE); + return self::showActivationPage($key, _ERROR_ACTIVATE); } - - $password = postVar('password'); - $repeatpassword = postVar('repeatpassword'); - + + $password = postVar('password'); + $repeatpassword = postVar('repeatpassword'); + if ( $password != $repeatpassword ) { - return $this->_showActivationPage($key, _ERROR_PASSWORDMISMATCH); + return self::showActivationPage($key, _ERROR_PASSWORDMISMATCH); } - + if ( $password && (i18n::strlen($password) < 6) ) { - return $this->_showActivationPage($key, _ERROR_PASSWORDTOOSHORT); + return self::showActivationPage($key, _ERROR_PASSWORDTOOSHORT); } if ( $password ) { $pwdvalid = true; $pwderror = ''; - global $manager; - $manager->notify( - 'PrePasswordSet', - array( - 'password' => $password, - 'errormessage' => &$pwderror, - 'valid' => &$pwdvalid - ) + + $data = array( + 'password' => $password, + 'errormessage' => &$pwderror, + 'valid' => &$pwdvalid ); + $manager->notify('PrePasswordSet', $data); if ( !$pwdvalid ) { - return $this->_showActivationPage($key,$pwderror); + return self::showActivationPage($key,$pwderror); } } - + $error = ''; - $manager->notify( - 'ValidateForm', - array( - 'type' => 'activation', - 'member' => $mem, - 'error' => &$error - ) + $data = array( + 'type' => 'activation', + 'member' => $mem, + 'error' => &$error ); + $manager->notify('ValidateForm', $data); if ( $error != '' ) { - return $this->_showActivationPage($key, $error); + return self::showActivationPage($key, $error); } - - + // set password $mem->setPassword($password); $mem->write(); - + // do the activation Member::activate($key); - - $this->pagehead(); - $this->parse('activatesetpwd'); - $this->pagefoot(); + + self::$skin->parse('activatesetpwd'); + return; } - + /** + * Admin::action_manageteam() * Manage team + * + * @param void + * @return void */ - function action_manageteam() + static private function action_manageteam() { global $member, $manager; - + $blogid = intRequestVar('blogid'); - + // check if allowed - $member->blogAdminRights($blogid) or $this->disallow(); - - $this->pagehead(); - $this->parse('manageteam'); - $this->pagefoot(); + $member->blogAdminRights($blogid) or self::disallow(); + + self::$skin->parse('manageteam'); + return; } - + /** + * Admin::action_teamaddmember() * Add member to team + * + * @param void + * @return void */ - function action_teamaddmember() + static private function action_teamaddmember() { global $member, $manager; - - $memberid = intPostVar('memberid'); - $blogid = intPostVar('blogid'); - $admin = intPostVar('admin'); - + + $memberid = intPostVar('memberid'); + $blogid = intPostVar('blogid'); + $admin = intPostVar('admin'); + // check if allowed - $member->blogAdminRights($blogid) or $this->disallow(); - + $member->blogAdminRights($blogid) or self::disallow(); + $blog =& $manager->getBlog($blogid); if ( !$blog->addTeamMember($memberid, $admin) ) { - $this->error(_ERROR_ALREADYONTEAM); + self::error(_ERROR_ALREADYONTEAM); } - - $this->action_manageteam(); - + + self::action_manageteam(); + return; } - + /** - * @todo document this + * Admin::action_teamdelete() + * + * @param void + * @return void */ - function action_teamdelete() + static private function action_teamdelete() { global $member, $manager; - - $memberid = intRequestVar('memberid'); - $blogid = intRequestVar('blogid'); - + + $memberid = intRequestVar('memberid'); + $blogid = intRequestVar('blogid'); + // check if allowed - $member->blogAdminRights($blogid) or $this->disallow(); - - $teammem = Member::createFromID($memberid); - $blog =& $manager->getBlog($blogid); - - $this->pagehead(); - $this->parse('teamdelete'); - $this->pagefoot(); + $member->blogAdminRights($blogid) or self::disallow(); + + $teammem =& $manager->getMember($memberid); + $blog =& $manager->getBlog($blogid); + + self::$skin->parse('teamdelete'); + return; } - + /** - * @todo document this + * Admin::action_teamdeleteconfirm() + * + * @param void + * @return void */ - function action_teamdeleteconfirm() + static private function action_teamdeleteconfirm() { global $member; - + $memberid = intRequestVar('memberid'); $blogid = intRequestVar('blogid'); - - $error = $this->deleteOneTeamMember($blogid, $memberid); + + $error = self::deleteOneTeamMember($blogid, $memberid); if ( $error ) { - $this->error($error); + self::error($error); } - $this->action_manageteam(); + self::action_manageteam(); + return; } - + /** - * @todo document this + * Admin::deleteOneTeamMember() + * + * @param void + * @return void */ - function deleteOneTeamMember($blogid, $memberid) + static public function deleteOneTeamMember($blogid, $memberid) { global $member, $manager; - + $blogid = intval($blogid); $memberid = intval($memberid); - + // check if allowed if ( !$member->blogAdminRights($blogid) ) { return _ERROR_DISALLOWED; } - + // check if: - there remains at least one blog admin // - (there remains at least one team member) - $tmem = Member::createFromID($memberid); - - $manager->notify( - 'PreDeleteTeamMember', - array( - 'member' => &$tmem, - 'blogid' => $blogid - ) - ); - + $tmem =& $manager->getMember($memberid); + + + $data = array( + 'member' => &$tmem, + 'blogid' => $blogid + ); $manager->notify('PreDeleteTeamMember', $data); + if ( $tmem->isBlogAdmin($blogid) ) { + /* TODO: why we did double check? */ // check if there are more blog members left and at least one admin // (check for at least two admins before deletion) - $query = 'SELECT * FROM ' . sql_table('team') . ' WHERE tblog=' . $blogid . ' and tadmin=1'; - $r = sql_query($query); - if ( sql_num_rows($r) < 2 ) + $query = "SELECT * FROM %s WHERE tblog=%d and tadmin=1;"; + $query = sprintf($query, sql_table('team'), (integer) $blogid); + $r = DB::getResult($query); + if ( $r->rowCount() < 2 ) { return _ERROR_ATLEASTONEBLOGADMIN; } } - - $query = 'DELETE FROM ' . sql_table('team') . " WHERE tblog=$blogid and tmember=$memberid"; - sql_query($query); - - $manager->notify( - 'PostDeleteTeamMember', - array( - 'member' => &$tmem, - 'blogid' => $blogid - ) + + $query = "DELETE FROM %s WHERE tblog=%d AND tmember=%d;"; + $query = sprintf($query, sql_table('team'), (integer) $blogid, (integer) $memberid); + DB::execute($query); + + $data = array( + 'member' => &$tmem, + 'blogid' => $blogid ); - + $manager->notify('PostDeleteTeamMember', $data); + return ''; } - + /** - * @todo document this + * Admin::action_teamchangeadmin() + * + * @param void + * @return void */ - function action_teamchangeadmin() + static private function action_teamchangeadmin() { - global $member; - - $blogid = intRequestVar('blogid'); - $memberid = intRequestVar('memberid'); - + global $manager, $member; + + $blogid = intRequestVar('blogid'); + $memberid = intRequestVar('memberid'); + // check if allowed - $member->blogAdminRights($blogid) or $this->disallow(); - - $mem = Member::createFromID($memberid); - + $member->blogAdminRights($blogid) or self::disallow(); + + $mem =& $manager->getMember($memberid); + // don't allow when there is only one admin at this moment if ( $mem->isBlogAdmin($blogid) ) { - $r = sql_query('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1"); - if ( sql_num_rows($r) == 1 ) + $query = "SELECT * FROM %s WHERE tblog=%d AND tadmin=1;"; + $query = sprintf($query, sql_table('team'), (integer) $blogid); + $r = DB::getResult($query); + if ( $r->rowCount() == 1 ) { - $this->error(_ERROR_ATLEASTONEBLOGADMIN); + self::error(_ERROR_ATLEASTONEBLOGADMIN); } } - + if ( $mem->isBlogAdmin($blogid) ) { $newval = 0; @@ -1901,80 +2008,93 @@ class Admin { $newval = 1; } - - $query = 'UPDATE ' . sql_table('team') . " SET tadmin=$newval WHERE tblog=$blogid and tmember=$memberid"; - sql_query($query); - + + $query = "UPDATE %s SET tadmin=%d WHERE tblog=%d and tmember=%d;"; + $query = sprintf($query, (integer) $blogid, (integer) $newval, (integer) $blogid, (integer) $memberid); + DB::execute($query); + // only show manageteam if member did not change its own admin privileges if ( $member->isBlogAdmin($blogid) ) { - $this->action_manageteam(); + self::action_manageteam(); } else { - $this->action_overview(_MSG_ADMINCHANGED); + self::action_overview(_MSG_ADMINCHANGED); } + return; } - + /** - * @todo document this + * Admin::action_blogsettings() + * + * @param void + * @return void */ - function action_blogsettings() + static private function action_blogsettings() { global $member, $manager; - + $blogid = intRequestVar('blogid'); - + // check if allowed - $member->blogAdminRights($blogid) or $this->disallow(); - + $member->blogAdminRights($blogid) or self::disallow(); + $blog =& $manager->getBlog($blogid); - - $extrahead = ''; - $this->pagehead($extrahead); - $this->parse('blogsettings'); - $this->pagefoot(); + + Admin::$extrahead .= "\n"; + + self::$skin->parse('blogsettings'); + return; } - + /** - * @todo document this + * Admin::action_categorynew() + * + * @param void + * @return void */ - function action_categorynew() + static private function action_categorynew() { global $member, $manager; - + $blogid = intRequestVar('blogid'); - - $member->blogAdminRights($blogid) or $this->disallow(); - + + $member->blogAdminRights($blogid) or self::disallow(); + $cname = postVar('cname'); $cdesc = postVar('cdesc'); - + if ( !isValidCategoryName($cname) ) { - $this->error(_ERROR_BADCATEGORYNAME); + self::error(_ERROR_BADCATEGORYNAME); } - - $query = 'SELECT * FROM ' . sql_table('category') . ' WHERE cname=\'' . sql_real_escape_string($cname) . '\' and cblog=' . intval($blogid); - $res = sql_query($query); - if ( sql_num_rows($res) > 0 ) + + $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;"; + $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid); + $res = DB::getResult($query); + if ( $res->rowCount() > 0 ) { - $this->error(_ERROR_DUPCATEGORYNAME); + self::error(_ERROR_DUPCATEGORYNAME); } - - $blog =& $manager->getBlog($blogid); - $newCatID = $blog->createNewCategory($cname, $cdesc); - - $this->action_blogsettings(); + + $blog =& $manager->getBlog($blogid); + $newCatID = $blog->createNewCategory($cname, $cdesc); + + self::action_blogsettings(); + return; } - + /** - * @todo document this + * Admin::action_categoryedit() + * + * @param void + * @return void */ - function action_categoryedit($catid = '', $blogid = '', $desturl = '') + static private function action_categoryedit($catid = '', $blogid = '', $desturl = '') { global $member, $manager; - + if ( $blogid == '' ) { $blogid = intGetVar('blogid'); @@ -1991,67 +2111,63 @@ class Admin { $catid = intval($catid); } - $_REQUEST['blogid'] = $blogid; - $_REQUEST['catid'] = $catid; - $_REQUEST['desturl'] = $desturl; - $member->blogAdminRights($blogid) or $this->disallow(); - - $extrahead = ''; - $this->pagehead($extrahead); - $this->parse('categoryedit'); - $this->pagefoot(); + + /* TODO: we should consider to use the other way insterad of this */ + $_REQUEST['blogid'] = $blogid; + $_REQUEST['catid'] = $catid; + $_REQUEST['desturl'] = $desturl; + $member->blogAdminRights($blogid) or self::disallow(); + + Admin::$extrahead .= "\n"; + + self::$skin->parse('categoryedit'); + return; } - + /** - * @todo document this + * Admin::action_categoryupdate() + * + * @param void + * @return void */ - function action_categoryupdate() + static private function action_categoryupdate() { global $member, $manager; - - $blogid = intPostVar('blogid'); - $catid = intPostVar('catid'); - $cname = postVar('cname'); - $cdesc = postVar('cdesc'); - $desturl = postVar('desturl'); - - $member->blogAdminRights($blogid) or $this->disallow(); - + + $blogid = intPostVar('blogid'); + $catid = intPostVar('catid'); + $cname = postVar('cname'); + $cdesc = postVar('cdesc'); + $desturl = postVar('desturl'); + + $member->blogAdminRights($blogid) or self::disallow(); + if ( !isValidCategoryName($cname) ) { - $this->error(_ERROR_BADCATEGORYNAME); + self::error(_ERROR_BADCATEGORYNAME); } - - $query = "SELECT *" - . " FROM " . sql_table('category') - . " WHERE cname='" . sql_real_escape_string($cname) . "'" - . " and cblog=" . intval($blogid) - . " and not(catid=" . intval($catid) . ")"; - $res = sql_query($query); - if ( sql_num_rows($res) > 0 ) + + $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);"; + $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid, (integer) $catid); + $res = DB::getResult($query); + if ( $res->rowCount() > 0 ) { - $this->error(_ERROR_DUPCATEGORYNAME); + self::error(_ERROR_DUPCATEGORYNAME); } - - $query = 'UPDATE '.sql_table('category').' SET' - . " cname='" . sql_real_escape_string($cname) . "'," - . " cdesc='" . sql_real_escape_string($cdesc) . "'" - . " WHERE catid=" . intval($catid); - - sql_query($query); - + + $query = "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;"; + $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), DB::quoteValue($cdesc), (integer) $catid); + DB::execute($query); + // store plugin options $aOptions = requestArray('plugoption'); NucleusPlugin::apply_plugin_options($aOptions); - $manager->notify( - 'PostPluginOptionsUpdate', - array( - 'context' => 'category', - 'catid' => $catid - ) + $data = array( + 'context' => 'category', + 'catid' => $catid ); - - + $manager->notify('PostPluginOptionsUpdate', $data); + if ( $desturl ) { redirect($desturl); @@ -2059,69 +2175,76 @@ class Admin } else { - $this->action_blogsettings(); + self::action_blogsettings(); } + return; } - + /** - * @todo document this + * Admin::action_categorydelete() + * + * @param void + * @return void */ - function action_categorydelete() + static private function action_categorydelete() { global $member, $manager; - - $blogid = intRequestVar('blogid'); - $catid = intRequestVar('catid'); - - $member->blogAdminRights($blogid) or $this->disallow(); - + + $blogid = intRequestVar('blogid'); + $catid = intRequestVar('catid'); + + $member->blogAdminRights($blogid) or self::disallow(); + $blog =& $manager->getBlog($blogid); - + // check if the category is valid if ( !$blog->isValidCategory($catid) ) { - $this->error(_ERROR_NOSUCHCATEGORY); + self::error(_ERROR_NOSUCHCATEGORY); } - + // don't allow deletion of default category if ( $blog->getDefaultCategory() == $catid ) { - $this->error(_ERROR_DELETEDEFCATEGORY); + self::error(_ERROR_DELETEDEFCATEGORY); } - + // check if catid is the only category left for blogid - $query = 'SELECT catid FROM ' . sql_table('category') . ' WHERE cblog=' . $blogid; - $res = sql_query($query); - if ( sql_num_rows($res) == 1 ) + $query = "SELECT catid FROM %s WHERE cblog=%d;"; + $query = sprintf($query, sql_table('category'), $blogid); + $res = DB::getResult($query); + if ( $res->rowCount() == 1 ) { - $this->error(_ERROR_DELETELASTCATEGORY); + self::error(_ERROR_DELETELASTCATEGORY); } - - - $this->pagehead(); - $this->parse('categorydelete'); - $this->pagefoot(); + + self::$skin->parse('categorydelete'); + return; } - + /** - * @todo document this + * Admin::action_categorydeleteconfirm() + * + * @param void + * @return void */ - function action_categorydeleteconfirm() + static private function action_categorydeleteconfirm() { global $member, $manager; - + $blogid = intRequestVar('blogid'); $catid = intRequestVar('catid'); - - $member->blogAdminRights($blogid) or $this->disallow(); - - $error = $this->deleteOneCategory($catid); + + $member->blogAdminRights($blogid) or self::disallow(); + + $error = self::deleteOneCategory($catid); if ( $error ) { - $this->error($error); + self::error($error); } - - $this->action_blogsettings(); + + self::action_blogsettings(); + return; } /** @@ -2131,90 +2254,176 @@ class Admin * @param String $catid category id for deleting * @return Void */ - function deleteOneCategory($catid) + static public function deleteOneCategory($catid) { global $manager, $member; $catid = intval($catid); $blogid = getBlogIDFromCatID($catid); - + if ( !$member->blogAdminRights($blogid) ) { return ERROR_DISALLOWED; } - + // get blog $blog =& $manager->getBlog($blogid); - + // check if the category is valid if ( !$blog || !$blog->isValidCategory($catid) ) { return _ERROR_NOSUCHCATEGORY; } - + $destcatid = $blog->getDefaultCategory(); - + // don't allow deletion of default category if ( $blog->getDefaultCategory() == $catid ) { return _ERROR_DELETEDEFCATEGORY; } - + // check if catid is the only category left for blogid - $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid; - $res = sql_query($query); - if ( sql_num_rows($res) == 1 ) + $query = "SELECT catid FROM %s WHERE cblog=%d;"; + $query = sprintf($query, sql_table('category'), (integer) $blogid); + + $res = DB::getResult($query); + if ( $res->rowCount() == 1 ) { return _ERROR_DELETELASTCATEGORY; } - - $manager->notify( - 'PreDeleteCategory', - array( - 'catid' => $catid - ) - ); - + + $data = array('catid' => $catid); + $manager->notify('PreDeleteCategory', $data); + // change category for all items to the default category - $query = 'UPDATE ' . sql_table('item') . " SET icat=$destcatid WHERE icat=$catid"; - sql_query($query); + $query = "UPDATE %s SET icat=%d WHERE icat=%d;"; + $query =sprintf($query, sql_table('item'), (integer) $destcatid, (integer) $catid); + DB::execute($query); // delete all associated plugin options - NucleusPlugin::delete_option_values('category', $catid); + NucleusPlugin::delete_option_values('category', (integer) $catid); // delete category - $query = 'DELETE FROM ' . sql_table('category') . ' WHERE catid=' . $catid; - sql_query($query); + $query = "DELETE FROM %s WHERE catid=%d;"; + $query = sprintf($query, sql_table('category'), (integer) $catid); + DB::execute($query); - $manager->notify( - 'PostDeleteCategory', - array( - 'catid' => $catid - ) - ); + $data = array('catid' => $catid); + $manager->notify('PostDeleteCategory', $data); return; } /** + * Admin::moveOneCategory() + * Delete a category by its id + * + * @param int $catid category id for move + * @param int $destblogid blog id for destination + * @return void + */ + static public function moveOneCategory($catid, $destblogid) + { + global $manager, $member; + $catid = intval($catid); + $destblogid = intval($destblogid); + $blogid = getBlogIDFromCatID($catid); + // mover should have admin rights on both blogs + if (!$member->blogAdminRights($blogid)) { + return _ERROR_DISALLOWED; + } + if (!$member->blogAdminRights($destblogid)) { + return _ERROR_DISALLOWED; + } + // cannot move to self + if ($blogid == $destblogid) { + return _ERROR_MOVETOSELF; + } + // get blogs + $blog =& $manager->getBlog($blogid); + $destblog =& $manager->getBlog($destblogid); + // check if the category is valid + if (!$blog || !$blog->isValidCategory($catid)) { + return _ERROR_NOSUCHCATEGORY; + } + // don't allow default category to be moved + if ($blog->getDefaultCategory() == $catid) { + return _ERROR_MOVEDEFCATEGORY; + } + $manager->notify( + 'PreMoveCategory', + array( + 'catid' => &$catid, + 'sourceblog' => &$blog, + 'destblog' => &$destblog + ) + ); + // update comments table (cblog) + $query = 'SELECT ' + . ' inumber ' + . 'FROM ' + . sql_table('item') . ' ' + . 'WHERE ' + . ' icat = %d'; + $items = sql_query(sprintf($query, $catid)); + while ($oItem = sql_fetch_object($items)) { + $query = 'UPDATE ' + . sql_table('comment') . ' ' + . 'SET ' + . ' cblog = %d' . ' ' + . 'WHERE ' + . ' citem = %d'; + sql_query(sprintf($query, $destblogid, $oItem->inumber)); + } + + // update items (iblog) + $query = 'UPDATE ' + . sql_table('item') . ' ' + . 'SET ' + . ' iblog = %d ' + . 'WHERE ' + . ' icat = %d'; + sql_query(sprintf($query, $destblogid, $catid)); + + // move category + $query = 'UPDATE ' + . sql_table('category') . ' ' + . 'SET ' + . ' cblog = %d' . ' ' + . 'WHERE ' + . ' catid = %d'; + sql_query(sprintf($query, $destblogid, $catid)); + $manager->notify( + 'PostMoveCategory', + array( + 'catid' => &$catid, + 'sourceblog' => &$blog, + 'destblog' => $destblog + ) + ); + return; + } + + /** * Admin::action_blogsettingsupdate * Updating blog settings * * @param Void * @return Void */ - function action_blogsettingsupdate() + static private function action_blogsettingsupdate() { global $member, $manager; $blogid = intRequestVar('blogid'); - $member->blogAdminRights($blogid) or $this->disallow(); + $member->blogAdminRights($blogid) or self::disallow(); $blog =& $manager->getBlog($blogid); $notify_address = trim(postVar('notify')); - $shortname = trim(postVar('shortname')); - $updatefile = trim(postVar('update')); + $shortname = trim(postVar('shortname')); + $updatefile = trim(postVar('update')); $notifyComment = intPostVar('notifyComment'); $notifyVote = intPostVar('notifyVote'); @@ -2236,22 +2445,22 @@ class Admin if ( $notify_address && !NOTIFICATION::address_validation($notify_address) ) { - $this->error(_ERROR_BADNOTIFY); + self::error(_ERROR_BADNOTIFY); } if ( !isValidShortName($shortname) ) { - $this->error(_ERROR_BADSHORTBLOGNAME); + self::error(_ERROR_BADSHORTBLOGNAME); } if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) ) { - $this->error(_ERROR_DUPSHORTBLOGNAME); + self::error(_ERROR_DUPSHORTBLOGNAME); } // check if update file is writable if ( $updatefile && !is_writeable($updatefile) ) { - $this->error(_ERROR_UPDATEFILE); + self::error(_ERROR_UPDATEFILE); } $blog->setName(trim(postVar('name'))); @@ -2276,41 +2485,42 @@ class Admin // store plugin options $aOptions = requestArray('plugoption'); NucleusPlugin::apply_plugin_options($aOptions); - $manager->notify( - 'PostPluginOptionsUpdate', - array( - 'context' => 'blog', - 'blogid' => $blogid, - 'blog' => &$blog - ) + + $data = array( + 'context' => 'blog', + 'blogid' => $blogid, + 'blog' => &$blog ); + $manager->notify('PostPluginOptionsUpdate', $data); - $this->action_overview(_MSG_SETTINGSCHANGED); + self::action_overview(_MSG_SETTINGSCHANGED); return; } - + /** - * @todo document this + * Admin::action_deleteblog() + * + * @param void + * @return void */ - function action_deleteblog() + static private function action_deleteblog() { global $member, $CONF, $manager; - + $blogid = intRequestVar('blogid'); - - $member->blogAdminRights($blogid) or $this->disallow(); - + + $member->blogAdminRights($blogid) or self::disallow(); + // check if blog is default blog if ( $CONF['DefaultBlog'] == $blogid ) { - $this->error(_ERROR_DELDEFBLOG); + self::error(_ERROR_DELDEFBLOG); } - + $blog =& $manager->getBlog($blogid); - - $this->pagehead(); - $this->parse('deleteblog'); - $this->pagefoot(); + + self::$skin->parse('deleteblog'); + return; } /** @@ -2320,106 +2530,106 @@ class Admin * @param Void * @return Void */ - function action_deleteblogconfirm() + static private function action_deleteblogconfirm() { global $member, $CONF, $manager; $blogid = intRequestVar('blogid'); - $manager->notify( - 'PreDeleteBlog', - array( - 'blogid' => $blogid - ) - ); - $member->blogAdminRights($blogid) or $this->disallow(); + + $data = array('blogid' => $blogid); + $manager->notify('PreDeleteBlog', $data); + + $member->blogAdminRights($blogid) or self::disallow(); // check if blog is default blog if ( $CONF['DefaultBlog'] == $blogid ) { - $this->error(_ERROR_DELDEFBLOG); + self::error(_ERROR_DELDEFBLOG); } // delete all comments $query = 'DELETE FROM ' . sql_table('comment') . ' WHERE cblog='.$blogid; - sql_query($query); + DB::execute($query); // delete all items $query = 'DELETE FROM ' . sql_table('item') . ' WHERE iblog=' . $blogid; - sql_query($query); + DB::execute($query); // delete all team members $query = 'DELETE FROM ' . sql_table('team') . ' WHERE tblog=' . $blogid; - sql_query($query); + DB::execute($query); // delete all bans $query = 'DELETE FROM ' . sql_table('ban') . ' WHERE blogid=' . $blogid; - sql_query($query); + DB::execute($query); // delete all categories $query = 'DELETE FROM ' . sql_table('category') . ' WHERE cblog=' . $blogid; - sql_query($query); + DB::execute($query); // delete all associated plugin options NucleusPlugin::delete_option_values('blog', $blogid); // delete the blog itself $query = 'DELETE FROM ' . sql_table('blog') . ' WHERE bnumber=' . $blogid; - sql_query($query); + DB::execute($query); - $manager->notify( - 'PostDeleteBlog', - array( - 'blogid' => $blogid - ) - ); + $data = array('blogid' => $blogid); + $manager->notify('PostDeleteBlog', $data); - $this->action_overview(_DELETED_BLOG); + self::action_overview(_DELETED_BLOG); return; } /** - * @todo document this + * Admin::action_memberdelete() + * + * @param void + * @return void */ - function action_memberdelete() + static private function action_memberdelete() { global $member, $manager; - + $memberid = intRequestVar('memberid'); - - ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow(); - - $mem = Member::createFromID($memberid); - - $this->pagehead(); - $this->parse('memberdelete'); - $this->pagefoot(); + + ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); + + $mem =& $manager->getMember($memberid); + + self::$skin->parse('memberdelete'); + return; } - + /** - * @todo document this + * Admin::action_memberdeleteconfirm() + * + * @param void + * @return void */ - function action_memberdeleteconfirm() + static private function action_memberdeleteconfirm() { global $member; - + $memberid = intRequestVar('memberid'); - - ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow(); - - $error = $this->deleteOneMember($memberid); + + ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); + + $error = self::deleteOneMember($memberid); if ( $error ) { - $this->error($error); + self::error($error); } - + if ( $member->isAdmin() ) { - $this->action_usermanagement(); + self::action_usermanagement(); } else { - $this->action_overview(_DELETED_MEMBER); + self::action_overview(_DELETED_MEMBER); } + return; } /** @@ -2430,368 +2640,354 @@ class Admin * @params Integer $memberid member id * @return String null string or error messages */ - function deleteOneMember($memberid) + static public function deleteOneMember($memberid) { global $manager; $memberid = intval($memberid); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); if ( !$mem->canBeDeleted() ) { return _ERROR_DELETEMEMBER; } - $manager->notify( - 'PreDeleteMember', - array( - 'member' => &$mem - ) - ); + $data = array('member' => &$mem); + $manager->notify('PreDeleteMember', $data); /* unlink comments from memberid */ if ( $memberid ) { - $query = "UPDATE %s SET cmember=0, cuser='%s' WHERE cmember=%d"; - $query = sprintf($query, sql_table('comment'), sql_real_escape_string($mem->getDisplayName()), $memberid); - sql_query($query); + $query = "UPDATE %s SET cmember=0, cuser=%s WHERE cmember=%d;"; + $query = sprintf($query, sql_table('comment'), DB::quoteValue($mem->getDisplayName()), $memberid); + DB::execute($query); } $query = 'DELETE FROM ' . sql_table('member') . ' WHERE mnumber=' . $memberid; - sql_query($query); + DB::execute($query); $query = 'DELETE FROM ' . sql_table('team') . ' WHERE tmember=' . $memberid; - sql_query($query); + DB::execute($query); $query = 'DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . $memberid; - sql_query($query); + DB::execute($query); // delete all associated plugin options NucleusPlugin::delete_option_values('member', $memberid); - $manager->notify( - 'PostDeleteMember', - array( - 'member' => &$mem - ) - ); + $data = array('member' => &$mem); + $manager->notify('PostDeleteMember', $data); return ''; } /** - * @todo document this + * Admin::action_createnewlog() + * + * @param void + * @return void */ - function action_createnewlog() + static private function action_createnewlog() { global $member, $CONF, $manager; - + // Only Super-Admins can do this - $member->isAdmin() or $this->disallow(); - - $this->pagehead(); - $this->parse('createnewlog'); - $this->pagefoot(); + $member->isAdmin() or self::disallow(); + + self::$skin->parse('createnewlog'); + return; } - + /** - * @todo document this + * Admin::action_addnewlog() + * + * @param void + * @return void */ - function action_addnewlog() + static private function action_addnewlog() { global $member, $manager, $CONF; - + // Only Super-Admins can do this - $member->isAdmin() or $this->disallow(); - - $bname = trim(postVar('name')); - $bshortname = trim(postVar('shortname')); - $btimeoffset = postVar('timeoffset'); - $bdesc = trim(postVar('desc')); - $bdefskin = postVar('defskin'); - + $member->isAdmin() or self::disallow(); + + $bname = trim(postVar('name')); + $bshortname = trim(postVar('shortname')); + $btimeoffset = postVar('timeoffset'); + $bdesc = trim(postVar('desc')); + $bdefskin = postVar('defskin'); + if ( !isValidShortName($bshortname) ) { - $this->error(_ERROR_BADSHORTBLOGNAME); + self::error(_ERROR_BADSHORTBLOGNAME); } - + if ( $manager->existsBlog($bshortname) ) { - $this->error(_ERROR_DUPSHORTBLOGNAME); + self::error(_ERROR_DUPSHORTBLOGNAME); } - - $manager->notify( - 'PreAddBlog', - array( - 'name' => &$bname, - 'shortname' => &$bshortname, - 'timeoffset' => &$btimeoffset, - 'description' => &$bdesc, - 'defaultskin' => &$bdefskin - ) + + $data = array( + 'name' => &$bname, + 'shortname' => &$bshortname, + 'timeoffset' => &$btimeoffset, + 'description' => &$bdesc, + 'defaultskin' => &$bdefskin ); - - + $manager->notify('PreAddBlog', $data); + // add slashes for sql queries - $bname = sql_real_escape_string($bname); - $bshortname = sql_real_escape_string($bshortname); - $btimeoffset = sql_real_escape_string($btimeoffset); - $bdesc = sql_real_escape_string($bdesc); - $bdefskin = sql_real_escape_string($bdefskin); - + $bname = DB::quoteValue($bname); + $bshortname = DB::quoteValue($bshortname); + $btimeoffset = DB::quoteValue($btimeoffset); + $bdesc = DB::quoteValue($bdesc); + $bdefskin = DB::quoteValue($bdefskin); + // create blog - $query = 'INSERT ' - . 'INTO ' - . sql_table('blog') - . '(' - . ' bname, ' - . ' bshortname, ' - . ' bdesc, ' - . ' btimeoffset, ' - . ' bdefskin' - . ') VALUES (' - . "'" . $bname . "'," - . "'" . $bshortname . "'," - . "'" . $bdesc . "'," - . "'" . $btimeoffset . "'," - . "'" . $bdefskin . "'" - . ")"; - sql_query($query); - $blogid = sql_insert_id(); + $query = "INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s);"; + $query = sprintf($query, sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin); + DB::execute($query); + + $blogid = DB::getInsertId(); $blog =& $manager->getBlog($blogid); - + // create new category - $catdefname = (defined('_EBLOGDEFAULTCATEGORY_NAME') ? _EBLOGDEFAULTCATEGORY_NAME : 'General'); - $catdefdesc = (defined('_EBLOGDEFAULTCATEGORY_DESC') ? _EBLOGDEFAULTCATEGORY_DESC : 'Items that do not fit in other categories'); - $sql = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")'; - sql_query(sprintf($sql, sql_table('category'), $blogid, $catdefname, $catdefdesc)); - $catid = sql_insert_id(); - + $catdefname = (!defined('_EBLOGDEFAULTCATEGORY_NAME') ? 'General' : _EBLOGDEFAULTCATEGORY_NAME); + $catdefdesc = (!defined('_EBLOGDEFAULTCATEGORY_DESC') ? 'Items that do not fit in other categories' : _EBLOGDEFAULTCATEGORY_DESC); + + $query = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)'; + DB::execute(sprintf($query, sql_table('category'), (integer) $blogid, DB::quoteValue($catdefname), DB::quoteValue($catdefdesc))); + $catid = DB::getInsertId(); + // set as default category $blog->setDefaultCategory($catid); $blog->writeSettings(); - + // create team member - $memberid = $member->getID(); - $query = 'INSERT ' - . 'INTO ' - . sql_table('team') - . '(' - . ' tmember, ' - . ' tblog, ' - . ' tadmin' - . ') VALUES (' - . '%d, ' - . '%d, ' - . ' 1' - . ')'; - sql_query(sprintf($query), $memberid, $blogid); - + $query = "INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1);"; + $query = sprintf($query, sql_table('team'), (integer) $member->getID(), (integer) $blogid); + DB::execute($query); + $itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item'); $itemdefbody = (defined('_EBLOG_FIRSTITEM_BODY') ? _EBLOG_FIRSTITEM_BODY : 'This is the first item in your weblog. Feel free to delete it.'); - + $blog->additem( $blog->getDefaultCategory(), $itemdeftitle,$itemdefbody, '', $blogid, - $memberid, + $member->getID(), $blog->getCorrectTime(), 0, 0, 0 ); - $manager->notify( - 'PostAddBlog', - array( - 'blog' => &$blog - ) - ); - - $manager->notify( - 'PostAddCategory', - array( - 'blog' => &$blog, - 'name' => _EBLOGDEFAULTCATEGORY_NAME, - 'description' => _EBLOGDEFAULTCATEGORY_DESC, - 'catid' => $catid - ) + + $data = array('blog' => &$blog); + $manager->notify('PostAddBlog', $data); + + $data = array( + 'blog' => &$blog, + 'name' => _EBLOGDEFAULTCATEGORY_NAME, + 'description' => _EBLOGDEFAULTCATEGORY_DESC, + 'catid' => $catid ); - + $manager->notify('PostAddCategory', $data); + + /* TODO: we should consider to use the other way insterad of this */ $_REQUEST['blogid'] = $blogid; $_REQUEST['catid'] = $catid; - $this->pagehead(); - $this->parse('addnewlog'); - $this->pagefoot(); + self::$skin->parse('addnewlog'); + return; } - + /** - * @todo document this + * Admin::action_addnewlog2() + * + * @param void + * @return void */ - function action_addnewlog2() + static private function action_addnewlog2() { global $member, $manager; $blogid = intRequestVar('blogid'); - - $member->blogAdminRights($blogid) or $this->disallow(); - - $burl = requestVar('url'); - + + $member->blogAdminRights($blogid) or self::disallow(); + + $burl = requestVar('url'); + $blog =& $manager->getBlog($blogid); $blog->setURL(trim($burl)); $blog->writeSettings(); - - $this->action_overview(_MSG_NEWBLOG); + + self::action_overview(_MSG_NEWBLOG); + return; } - + /** - * @todo document this + * Admin::action_skinieoverview() + * + * @param void + * @return void */ - function action_skinieoverview() + static private function action_skinieoverview() { global $member, $DIR_LIBS, $manager; - - $member->isAdmin() or $this->disallow(); - - // load skinie class + + $member->isAdmin() or self::disallow(); + include_once($DIR_LIBS . 'skinie.php'); - - $this->pagehead(); - $this->parse('skinieoverview'); - $this->pagefoot(); - + + self::$skin->parse('skinieoverview'); + return; } - + /** - * @todo document this + * Admin::action_skinieimport() + * + * @param void + * @return void */ - function action_skinieimport() { + static private function action_skinieimport() + { global $member, $DIR_LIBS, $DIR_SKINS, $manager; - - $member->isAdmin() or $this->disallow(); - + + $member->isAdmin() or self::disallow(); + // load skinie class include_once($DIR_LIBS . 'skinie.php'); - - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); - + + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); + $importer = new SkinImport(); - + // get full filename - if ($mode == 'file') + if ( $mode == 'file' ) { $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml'; - + + /* TODO: remove this // backwards compatibilty (in v2.0, exports were saved as skindata.xml) if ( !file_exists($skinFile) ) { $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml'; } - } else { + */ + } + else + { $skinFile = $skinFileRaw; } - + // read only metadata $error = $importer->readFile($skinFile, 1); - - $_REQUEST['skininfo'] = $importer->getInfo(); - $_REQUEST['skinnames'] = $importer->getSkinNames(); - $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - + + /* TODO: we should consider to use the other way insterad of this */ + $_REQUEST['skininfo'] = $importer->getInfo(); + $_REQUEST['skinnames'] = $importer->getSkinNames(); + $_REQUEST['tpltnames'] = $importer->getTemplateNames(); + // clashes - $skinNameClashes = $importer->checkSkinNameClashes(); - $templateNameClashes = $importer->checkTemplateNameClashes(); - $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); - + $skinNameClashes = $importer->checkSkinNameClashes(); + $templateNameClashes = $importer->checkTemplateNameClashes(); + $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); + + /* TODO: we should consider to use the other way insterad of this */ $_REQUEST['skinclashes'] = $skinNameClashes; $_REQUEST['tpltclashes'] = $templateNameClashes; $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; if ( $error ) { - $this->error($error); + self::error($error); } - - $this->pagehead(); - $this->parse('skinieimport'); - $this->pagefoot(); + + self::$skin->parse('skinieimport'); + return; } - + /** - * @todo document this + * Admin::action_skiniedoimport() + * + * @param void + * @return void */ - function action_skiniedoimport() + static private function action_skiniedoimport() { global $member, $DIR_LIBS, $DIR_SKINS; - - $member->isAdmin() or $this->disallow(); - + + $member->isAdmin() or self::disallow(); + // load skinie class include_once($DIR_LIBS . 'skinie.php'); - - $skinFileRaw= postVar('skinfile'); - $mode = postVar('mode'); - + + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); + $allowOverwrite = intPostVar('overwrite'); - + // get full filename if ( $mode == 'file' ) { $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml'; - + + /* TODO: remove this // backwards compatibilty (in v2.0, exports were saved as skindata.xml) if ( !file_exists($skinFile) ) { $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml'; } - + */ } else { $skinFile = $skinFileRaw; } - + $importer = new SkinImport(); - - $error = $importer->readFile($skinFile); - + + $error = $importer->readFile($skinFile); + if ( $error ) { - $this->error($error); + self::error($error); } - + $error = $importer->writeToDatabase($allowOverwrite); - + if ( $error ) { - $this->error($error); + self::error($error); } - + + /* TODO: we should consider to use the other way insterad of this */ $_REQUEST['skininfo'] = $importer->getInfo(); $_REQUEST['skinnames'] = $importer->getSkinNames(); $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - - $this->pagehead(); - $this->parse('skiniedoimport'); - $this->pagefoot(); + + self::$skin->parse('skiniedoimport'); + return; } /** - * @todo document this + * Admin::action_skinieexport() + * + * @param void + * @return void */ - function action_skinieexport() + static private function action_skinieexport() { global $member, $DIR_LIBS; - - $member->isAdmin() or $this->disallow(); - - // load skinie class + + $member->isAdmin() or self::disallow(); + + // load skinie class include_once($DIR_LIBS . 'skinie.php'); - - $aSkins = requestIntArray('skin'); - $aTemplates = requestIntArray('template'); - + + $aSkins = requestIntArray('skin'); + $aTemplates = requestIntArray('template'); + if ( !is_array($aTemplates) ) { $aTemplates = array(); @@ -2800,14 +2996,14 @@ class Admin { $aSkins = array(); } - - $skinList = array_keys($aSkins); - $templateList = array_keys($aTemplates); - + + $skinList = array_keys($aSkins); + $templateList = array_keys($aTemplates); + $info = postVar('info'); - + $exporter = new SkinExport(); - foreach ($skinList as $skinId) + foreach ( $skinList as $skinId ) { $exporter->addSkin($skinId); } @@ -2816,158 +3012,140 @@ class Admin $exporter->addTemplate($templateId); } $exporter->setInfo($info); - + $exporter->export(); + return; } - + /** - * @todo document this + * Admin::action_templateoverview() + * + * @param void + * @return void */ - function action_templateoverview() + static private function action_templateoverview() { global $member, $manager; - - $member->isAdmin() or $this->disallow(); - - $this->pagehead(); - $this->parse('templateoverview'); - $this->pagefoot(); + + $member->isAdmin() or self::disallow(); + + self::$skin->parse('templateoverview'); + return; } - + /** - * @todo document this + * Admin::action_templateedit() + * + * @param string $msg message for pageheader + * @return void */ - function action_templateedit($msg = '') + static private function action_templateedit($msg = '') { global $member, $manager; if ( $msg ) { - $this->headMess = $msg; + self::$headMess = $msg; } $templateid = intRequestVar('templateid'); - - $member->isAdmin() or $this->disallow(); - - $extrahead = ''; - $extrahead .= ''; - - $this->pagehead($extrahead); - $this->parse('templateedit'); - $this->pagefoot(); + + $member->isAdmin() or self::disallow(); + + Admin::$extrahead .= "\n"; + Admin::$extrahead .= "\n"; + + self::$skin->parse('templateedit'); + return; } - - /** - * @todo document this - * - function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) { - static $count = 1; - if (!isset($template[$name])) $template[$name] = ''; - ?> -