X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2FADMIN.php;h=09ed8c468cf0e67e8fa15497e233b042ec7db395;hb=f68dcbc83930b5a6e4eda9cb7637a08a66dee22c;hp=2adfef11ff311d376e8651b4eb780126f5965ed8;hpb=8dde86a6456cbde4ccc6005dabe97a268071c814;p=nucleus-jp%2Fnucleus-next.git diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index 2adfef1..09ed8c4 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -15,29 +15,29 @@ * @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'; - + 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'; + + static public $headMess; + static private $action; static private $skin; - static private $extrahead; static private $passvar; - static private $headMess; static private $aOptions; + static public $extrahead; + static public $blog; + static public $contents; + /** * Admin::$edit_actions */ @@ -92,9 +92,9 @@ class Admin 'changemembersettings', 'clearactionlog', 'memberedit' - ); - - static private $actions_needless_to_check = array( + ); + + static private $actions_needless_to_check = array( 'showlogin', 'login', 'overview', @@ -103,9 +103,11 @@ class Admin 'bookmarklet', 'blogsettings', 'banlist', + 'createaccount', 'deleteblog', 'editmembersettings', - 'browseownitems', + 'createaccount', + 'forgotpassword', 'browseowncomments', 'createitem', 'itemedit', @@ -147,19 +149,14 @@ class Admin 'activatesetpwd', ); - /** - * Admin::__construct() - * Class constructor - * - * @param void - * @return void - */ - static public function __construct() + static public function initialize() { - global $CONF, $member, $DIR_LIBS; + global $CONF, $DIR_LIBS, $manager; - /* 1. decide skinid to use */ - $skinid = $CONF['DefaultAdminSkin']; + /* 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(); @@ -168,36 +165,36 @@ class Admin $skinid = $memskin; } } + */ - /* 2. make an instance of skin object */ - if ( Skin::existsID($skinid) ) - { - self::$skin = new Skin($skinid); - } - else + /* NOTE: 2. make an instance of skin object */ + if ( !Skin::existsID($skinid) ) { - /* TODO: error */ + return FALSE; } - return; + + /* 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 */ static public function action($action) { - global $CONF, $manager; - $f = FALSE; - - // list of action aliases - $alias = array( - 'login' => 'overview', - '' => 'overview' - ); + global $CONF, $DIR_LIBS, $manager, $member; + /* 1. decide action name */ $customAction = postvar('customaction'); if ( !empty($customAction) ) { @@ -206,23 +203,28 @@ class Admin '' => $customAction ); } - if ( isset($alias[$action]) ) + else + { + $alias = array( + 'login' => 'overview', + '' => 'overview', + ); + } + if ( array_key_exists($action, $alias) && isset($alias[$action]) ) { $action = $alias[$action]; } $methodName = "action_{$action}"; - self::$action = strtolower($action); + /* 2. check the action */ $synonimActions = array( 'banlistnewfromitem', 'memberedit', 'login', ); - $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()) @@ -231,47 +233,36 @@ class Admin } } - if ( !method_exists(self, $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) ) - { - self::$action_parseSpecialskin; - $f = TRUE; - } - elseif ( method_exists(self, $methodName) ) + /* 3. parse according to the action */ + if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) ) { - call_user_func(array(self, $methodName)); - $f = TRUE; + /* TODO: what is this? + self::action_parseSpecialskin(); + */ } - - if ( $f ) + elseif ( method_exists('Admin', $methodName) ) { - exit; + call_user_func(array(__CLASS__, $methodName)); } - - $id = self::getAdminSkinID(); - self::$skin = new Skin($id); - - if ( self::$skin && self::existsSkinContents('adminerrorpage') ) + else if ( self::existsSkinContents('adminerrorpage') ) { self::error(_BADACTION . ENTITY::hsc($action)); - $f = TRUE; } - elseif ( $id != $CONF['DefaultAdminSkin'] ) + elseif ( $id != $CONF['AdminSkin'] ) { - self::$skin = new Skin($CONF['DefaultAdminSkin']); + self::$skin =& $manager->getSkin($CONF['AdminSkin'], 'AdminActions'); if ( self::$skin && self::existsSkinContents('adminerrorpage') ) { self::error(_BADACTION . ENTITY::hsc($action)); - $f = TRUE; } } - if ( $f ) + else { - exit; + self::error(_BADACTION . ENTITY::hsc($action)); } - self::error(_BADACTION . ENTITY::hsc($action)); - return; + exit; } - + /** * Action::existsSkinContents() * Check skin contents @@ -289,15 +280,16 @@ class Admin } else { - $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype='%s';"; + $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, 1, 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, self::$skin->id, sql_real_escape_string($action))); + return DB::getValue(sprintf($query, sql_table('skin'), self::$skin->getID(), DB::quoteValue($action))); } } return; @@ -312,9 +304,9 @@ class Admin */ static private function specialActionsAllow($action) { - $query = "SELECT sdesc as result FROM %s WHERE sdesc = %d AND stype = '%s';"; - $query = sprintf($query, sql_table('adminskin'), (integer) self::$skin->id, sql_real_escape_string($action)); - return quickQuery($query); + $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); } /** @@ -326,7 +318,7 @@ class Admin static private function action_showlogin() { global $error; - self::$action_login($error); + self::action_login($error); return; } @@ -343,7 +335,7 @@ class Admin // skip to overview when allowed if ( $member->isLoggedIn() && $member->canLogin() ) { - self::$action_overview(); + self::action_overview(); exit; } @@ -354,9 +346,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('showlogin'); - self::pagefoot(); } /** @@ -373,9 +363,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('overview'); - self::pagefoot(); return; } @@ -395,9 +383,7 @@ class Admin } $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('manage'); - self::pagefoot(); return; } @@ -418,9 +404,7 @@ class Admin $member->teamRights($blogid) or $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('itemlist'); - self::pagefoot(); return; } @@ -457,9 +441,7 @@ class Admin self::batchAskDeleteConfirmation('item', $selected); } - self::pagehead(); self::$skin->parse('batchitem'); - self::pagefoot(); return; } @@ -487,12 +469,22 @@ class Admin // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - self::batchAskDeleteConfirmation('comment',$selected); + self::batchAskDeleteConfirmation('comment', $selected); } - self::pagehead(); self::$skin->parse('batchcomment'); - self::pagefoot(); + return; + } + + /** + * Admin::setAdminAction() + * + * @param string $action + * @return void + */ + static public function setAdminAction($action) + { + self::$action = $action; return; } @@ -523,9 +515,7 @@ class Admin self::batchAskDeleteConfirmation('member',$selected); } - self::pagehead(); self::$skin->parse('batchmember'); - self::pagefoot(); return; } @@ -557,9 +547,7 @@ class Admin self::batchAskDeleteConfirmation('team',$selected); } - self::pagehead(); self::$skin->parse('batchteam'); - self::pagefoot(); return; } @@ -596,9 +584,7 @@ class Admin self::batchAskDeleteConfirmation('category', $selected); } - self::pagehead(); self::$skin->parse('batchcategory'); - self::pagefoot(); return; } @@ -614,9 +600,7 @@ class Admin static private function batchMoveSelectDestination($type, $ids) { $_POST['batchmove'] = $type; - self::pagehead(); self::$skin->parse('batchmove'); - self::pagefoot(); return; } @@ -633,9 +617,7 @@ class Admin { $_POST['batchmove'] = $type; global $manager; - self::pagehead(); self::$skin->parse('batchmovecat'); - self::pagefoot(); return; } @@ -650,96 +632,7 @@ class Admin */ static private function batchAskDeleteConfirmation($type, $ids) { - self::pagehead(); self::$skin->parse('batchdelete'); - self::pagefoot(); - return; - } - - /** - * Admin::selectBlogCategory() - * Inserts a HTML select element with choices for all categories to which the current - * member has access - * - * @see function selectBlog - * @param string $name name of weblod - * @param integer $selected - * @param integer $tabindex - * @param integer $showNewCat - * @param integer $iForcedBlogInclude ID for weblog always included - * @return void - * - * NOTE: callback from AdminAction - */ - static private function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) - { - Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude); - return; - } - - /** - * Admin::selectBlog() - * 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 string $name name of weblod - * @param string $mode - * @param integer $selected - * @param integer $tabindex - * @param integer $showNewCat - * @param integer $iForcedBlogInclude ID for weblog always included - * @param $iForcedBlogInclude - * ID of a blog that always needs to be included, without checking if the - * member is on the blog team (-1 = none) - * @return void - */ - static private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) - { - 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']) ) - { - $query = "SELECT bnumber FROM %s ORDER BY bname;"; - $query = sprintf($query, sql_table('blog')); - } - else - { - $query = "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;"; - $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID()); - } - - $rblogids = sql_query($query); - while ($o = sql_fetch_object($rblogids)) - { - if ( $o->bnumber != $iForcedBlogInclude ) - { - $aBlogIds[] = intval($o->bnumber); - } - } - - if ( count($aBlogIds) == 0 ) - { - return; - } - - /* TODO: we should consider to use the other way instead of this */ - $_REQUEST['selectData'] = array( - 'name' => $name, - 'tabindex' => $tabindex, - 'mode' => $mode, - 'selected' => $selected, - 'showNewCat' => $showNewCat, - 'aBlogIds' => $aBlogIds, - ); - self::$skin->parse('blogselectbox'); return; } @@ -753,9 +646,7 @@ class Admin { global $member, $manager, $CONF; - self::pagehead(); self::$skin->parse('browseownitems'); - self::pagefoot(); return; } @@ -775,18 +666,14 @@ class Admin $itemid = intRequestVar('itemid'); } - /* TODO: we consider to use the other way insterad of this */ - $_REQUEST['itemid'] = $itemid; - $_REQUEST['blogid'] = getBlogIdFromItemId($itemid); - // only allow if user is allowed to alter item $member->canAlterItem($itemid) or self::disallow(); - $blogid = getBlogIdFromItemId($itemid); + $item =& $manager->getItem($itemid, 1, 1); + $_REQUEST['itemid'] = $item['itemid']; + $_REQUEST['blogid'] = $item['blogid']; - self::pagehead(); self::$skin->parse('itemcommentlist'); - self::pagefoot(); return; } @@ -799,9 +686,7 @@ class Admin */ static private function action_browseowncomments() { - self::pagehead(); self::$skin->parse('browseowncomments'); - self::pagefoot(); return; } @@ -830,9 +715,72 @@ class Admin /* TODO: we consider to use the other way insterad of this */ $_REQUEST['blogid'] = $blogid; - self::pagehead(); self::$skin->parse('blogcommentlist'); - self::pagefoot(); + 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; } @@ -852,13 +800,31 @@ class Admin // check if allowed $member->teamRights($blogid) or self::disallow(); - $memberid = $member->getID(); - $blog =& $manager->getBlog($blogid); + $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::pagehead(); self::$skin->parse('createitem'); - self::pagefoot(); return; } @@ -878,11 +844,25 @@ class Admin $member->canAlterItem($itemid) or self::disallow(); $item =& $manager->getItem($itemid, 1, 1); - $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + $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::pagehead(); self::$skin->parse('itemedit'); - self::pagefoot(); return; } @@ -907,7 +887,7 @@ class Admin // delete actions are handled by itemdelete (which has confirmation) if ( $actiontype == 'delete' ) { - self::$action_itemdelete(); + self::action_itemdelete(); return; } @@ -924,7 +904,7 @@ class Admin } // create new category if needed - if ( strstr($catid,'newcat') ) + if ( i18n::strpos($catid,'newcat') === 0 ) { // get blogid list($blogid) = sscanf($catid,"newcat-%d"); @@ -940,20 +920,20 @@ class Admin } } - /* - 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; @@ -980,7 +960,7 @@ class Admin if ( $catid != intPostVar('catid') ) { - self::$action_categoryedit( + self::action_categoryedit( $catid, $blog->getID(), $CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid) @@ -989,10 +969,12 @@ 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; - self::$action_itemlist(getBlogIDFromItemID($itemid)); + self::action_itemlist(getBlogIDFromItemID($itemid)); } return; } @@ -1018,9 +1000,7 @@ class Admin self::error(_ERROR_NOSUCHITEM); } - self::pagehead(); self::$skin->parse('itemdelete'); - self::pagefoot(); return; } @@ -1032,20 +1012,20 @@ class Admin */ 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 self::disallow(); - // get blogid first - $blogid = getBlogIdFromItemId($itemid); + // get item first + $item =& $manager->getItem($itemid, 1, 1); // delete item (note: some checks will be performed twice) - self::deleteOneItem($itemid); + self::deleteOneItem($item['itemid']); - self::$action_itemlist($blogid); + self::action_itemlist($item['blogid']); return; } @@ -1056,7 +1036,7 @@ class Admin * @param integer $itemid ID for item * @return void */ - static private function deleteOneItem($itemid) + static public function deleteOneItem($itemid) { global $member, $manager; @@ -1067,13 +1047,13 @@ class Admin } // 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 - self::updateFuturePosted($blogid); + self::updateFuturePosted($item['itemid']); return; } @@ -1094,9 +1074,9 @@ class Admin $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(); } @@ -1121,9 +1101,7 @@ class Admin $member->canAlterItem($itemid) or self::disallow(); - self::pagehead(); self::$skin->parse('itemmove'); - self::pagefoot(); return; } @@ -1141,7 +1119,7 @@ class Admin $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'); @@ -1172,11 +1150,11 @@ class Admin if ( $catid != intRequestVar('catid') ) { - self::$action_categoryedit($catid, $blog->getID()); + self::action_categoryedit($catid, $blog->getID()); } else { - self::$action_itemlist(getBlogIDFromCatID($catid)); + self::action_itemlist(getBlogIDFromCatID($catid)); } return; } @@ -1190,7 +1168,7 @@ class Admin * @param integer $destCatid ID for category to which the item will be moved * @return void */ - static private function moveOneItem($itemid, $destCatid) + static public function moveOneItem($itemid, $destCatid) { global $member; @@ -1224,20 +1202,17 @@ class Admin 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)); - self::$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; } @@ -1257,9 +1232,11 @@ class Admin $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); + $comment = COMMENT::getComment($commentid); + $manager->notify('PrepareCommentForEdit', array('comment' => &$comment)); + + Admin::$contents = $comment; self::$skin->parse('commentedit'); - self::pagefoot(); return; } @@ -1307,25 +1284,23 @@ class Admin ); $manager->notify('PreUpdateComment', $data); - $query = "UPDATE %s SET cmail='%s', cemail = '%s', cbody= '%s' WHERE cnumber=%d;"; - $query = sprintf($query, sql_real_escape_string($url), sql_real_escape_string($url), sql_real_escape_string($url), (integer) $commentid); - sql_query($query); + $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 $query = "SELECT citem FROM %s WHERE cnumber=%d;"; $query = sprintf($query, sql_table('comment'), (integer) $commentid); - $res = sql_query($query); - $o = sql_fetch_object($res); - $itemid = $o->citem; + $itemid = DB::getValue($query); if ( $member->canAlterItem($itemid) ) { - self::$action_itemcommentlist($itemid); + self::action_itemcommentlist($itemid); } else { - self::$action_browseowncomments(); + self::action_browseowncomments(); } return; } @@ -1344,9 +1319,7 @@ class Admin $commentid = intRequestVar('commentid'); $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); self::$skin->parse('commentdelete'); - self::pagefoot(); return; } @@ -1366,9 +1339,7 @@ class Admin $query = "SELECT citem FROM %s WHERE cnumber=%d;"; $query = sprintf($query, sql_table('comment'), (integer) $commentid); - $res = sql_query($query); - $o = sql_fetch_object($res); - $itemid = $o->citem; + $itemid = DB::getValue($query); $error = self::deleteOneComment($commentid); if ( $error ) @@ -1378,11 +1349,11 @@ class Admin if ( $member->canAlterItem($itemid) ) { - self::$action_itemcommentlist($itemid); + self::action_itemcommentlist($itemid); } else { - self::$action_browseowncomments(); + self::action_browseowncomments(); } return; } @@ -1393,7 +1364,7 @@ class Admin * @param integer $commentid ID for comment * @return void */ - static private function deleteOneComment($commentid) + static public function deleteOneComment($commentid) { global $member, $manager; @@ -1413,7 +1384,7 @@ class Admin // delete the comments associated with the item $query = "DELETE FROM %s WHERE cnumber=%d;"; $query = sprintf($query, sql_table('comment'), (integer) $commentid); - sql_query($query); + DB::execute($query); $data = array( 'commentid' => $commentid @@ -1438,14 +1409,12 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('usermanagement'); - self::pagefoot(); return; } /** - * Admin:: + * Admin::action_memberedit() * Edit member settings * * @param void @@ -1453,7 +1422,7 @@ class Admin */ static private function action_memberedit() { - self::$action_editmembersettings(intRequestVar('memberid')); + self::action_editmembersettings(intRequestVar('memberid')); return; } @@ -1479,10 +1448,9 @@ class Admin // check if allowed ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('editmembersettings'); - self::pagefoot(); return; } @@ -1508,6 +1476,7 @@ class Admin $email = strip_tags(postVar('email')); $url = strip_tags(postVar('url')); $adminskin = intPostVar('adminskin'); + $bookmarklet = intPostVar('bookmarklet'); // 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) ) @@ -1520,7 +1489,7 @@ class Admin $notes = strip_tags(postVar('notes')); $locale = postVar('locale'); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); if ( $CONF['AllowLoginEdit'] || $member->isAdmin() ) { @@ -1582,8 +1551,8 @@ class Admin || (!$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 ) { self::error(_ERROR_ATLEASTONEADMIN); } @@ -1605,7 +1574,9 @@ class Admin $mem->setURL($url); $mem->setNotes($notes); $mem->setLocale($locale); - + $mem->setAdminSkin($adminskin); + $mem->setBookmarklet($bookmarklet); + // only allow super-admins to make changes to the admin status if ( $member->isAdmin() ) { @@ -1640,7 +1611,7 @@ class Admin { $member->logout(); } - self::$action_login(_MSG_ACTIVATION_SENT, 0); + self::action_login(_MSG_ACTIVATION_SENT, 0); return; } @@ -1649,11 +1620,11 @@ class Admin { $mem->newCookieKey(); $member->logout(); - self::$action_login(_MSG_LOGINAGAIN, 0); + self::action_login(_MSG_LOGINAGAIN, 0); } else { - self::$action_overview(_MSG_SETTINGSCHANGED); + self::action_overview(_MSG_SETTINGSCHANGED); } return; } @@ -1706,7 +1677,19 @@ class Admin ); $manager->notify('PostRegister', $data); - self::$action_usermanagement(); + self::action_usermanagement(); + return; + } + + /** + * Admin::action_forgotpassword() + * + * @param void + * @return void + */ + static private function action_forgotpassword() + { + self::$skin->parse('forgotpassword'); return; } @@ -1745,7 +1728,7 @@ class Admin self::error(_ERROR_ACTIVATE); } - $mem = Member::createFromId($info->vmember); + $mem =& $manager->getMember($info->vmember); if ( !$mem ) { @@ -1757,9 +1740,7 @@ class Admin $_POST['bNeedsPasswordChange'] = TRUE; self::$headMess = $message; - self::pagehead(); self::$skin->parse('activate'); - self::pagefoot(); return; } @@ -1786,7 +1767,7 @@ class Admin return self::showActivationPage($key, _ERROR_ACTIVATE); } - $mem = Member::createFromId($info->vmember); + $mem =& $manager->getMember($info->vmember); if ( !$mem ) { @@ -1843,9 +1824,7 @@ class Admin // do the activation Member::activate($key); - self::pagehead(); self::$skin->parse('activatesetpwd'); - self::pagefoot(); return; } @@ -1865,9 +1844,7 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('manageteam'); - self::pagefoot(); return; } @@ -1895,7 +1872,7 @@ class Admin self::error(_ERROR_ALREADYONTEAM); } - self::$action_manageteam(); + self::action_manageteam(); return; } @@ -1915,12 +1892,10 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - $teammem = Member::createFromID($memberid); + $teammem =& $manager->getMember($memberid); $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('teamdelete'); - self::pagefoot(); return; } @@ -1942,7 +1917,7 @@ class Admin { self::error($error); } - self::$action_manageteam(); + self::action_manageteam(); return; } @@ -1952,7 +1927,7 @@ class Admin * @param void * @return void */ - static private function deleteOneTeamMember($blogid, $memberid) + static public function deleteOneTeamMember($blogid, $memberid) { global $member, $manager; @@ -1967,7 +1942,7 @@ class Admin // check if: - there remains at least one blog admin // - (there remains at least one team member) - $tmem = Member::createFromID($memberid); + $tmem =& $manager->getMember($memberid); $data = array( @@ -1982,8 +1957,8 @@ class Admin // (check for at least two admins before deletion) $query = "SELECT * FROM %s WHERE tblog=%d and tadmin=1;"; $query = sprintf($query, sql_table('team'), (integer) $blogid); - $r = sql_query($query); - if ( sql_num_rows($r) < 2 ) + $r = DB::getResult($query); + if ( $r->rowCount() < 2 ) { return _ERROR_ATLEASTONEBLOGADMIN; } @@ -1991,7 +1966,7 @@ class Admin $query = "DELETE FROM %s WHERE tblog=%d AND tmember=%d;"; $query = sprintf($query, sql_table('team'), (integer) $blogid, (integer) $memberid); - sql_query($query); + DB::execute($query); $data = array( 'member' => &$tmem, @@ -2010,7 +1985,7 @@ class Admin */ static private function action_teamchangeadmin() { - global $member; + global $manager, $member; $blogid = intRequestVar('blogid'); $memberid = intRequestVar('memberid'); @@ -2018,15 +1993,15 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); // don't allow when there is only one admin at this moment if ( $mem->isBlogAdmin($blogid) ) { $query = "SELECT * FROM %s WHERE tblog=%d AND tadmin=1;"; $query = sprintf($query, sql_table('team'), (integer) $blogid); - $r = sql_query($query); - if ( sql_num_rows($r) == 1 ) + $r = DB::getResult($query); + if ( $r->rowCount() == 1 ) { self::error(_ERROR_ATLEASTONEBLOGADMIN); } @@ -2043,16 +2018,16 @@ class Admin $query = "UPDATE %s SET tadmin=%d WHERE tblog=%d and tmember=%d;"; $query = sprintf($query, (integer) $blogid, (integer) $newval, (integer) $blogid, (integer) $memberid); - sql_query($query); + DB::execute($query); // only show manageteam if member did not change its own admin privileges if ( $member->isBlogAdmin($blogid) ) { - self::$action_manageteam(); + self::action_manageteam(); } else { - self::$action_overview(_MSG_ADMINCHANGED); + self::action_overview(_MSG_ADMINCHANGED); } return; } @@ -2074,10 +2049,9 @@ class Admin $blog =& $manager->getBlog($blogid); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('blogsettings'); - self::pagefoot(); return; } @@ -2103,10 +2077,10 @@ class Admin self::error(_ERROR_BADCATEGORYNAME); } - $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d;"; - $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $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 ) { self::error(_ERROR_DUPCATEGORYNAME); } @@ -2114,7 +2088,7 @@ class Admin $blog =& $manager->getBlog($blogid); $newCatID = $blog->createNewCategory($cname, $cdesc); - self::$action_blogsettings(); + self::action_blogsettings(); return; } @@ -2151,10 +2125,9 @@ class Admin $_REQUEST['desturl'] = $desturl; $member->blogAdminRights($blogid) or self::disallow(); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('categoryedit'); - self::pagefoot(); return; } @@ -2181,17 +2154,17 @@ class Admin self::error(_ERROR_BADCATEGORYNAME); } - $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d AND not(catid=%d);"; - $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid, (integer) $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 ) { self::error(_ERROR_DUPCATEGORYNAME); } - $query = "UPDATE %s SET cname='%s', cdesc='%s' WHERE catid=%d;"; - $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), sql_real_escape_string($cdesc), (integer) $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'); @@ -2209,7 +2182,7 @@ class Admin } else { - self::$action_blogsettings(); + self::action_blogsettings(); } return; } @@ -2246,15 +2219,13 @@ class Admin // check if catid is the only category left for blogid $query = "SELECT catid FROM %s WHERE cblog=%d;"; $query = sprintf($query, sql_table('category'), $blogid); - $res = sql_query($query); - if ( sql_num_rows($res) == 1 ) + $res = DB::getResult($query); + if ( $res->rowCount() == 1 ) { self::error(_ERROR_DELETELASTCATEGORY); } - self::pagehead(); self::$skin->parse('categorydelete'); - self::pagefoot(); return; } @@ -2279,7 +2250,7 @@ class Admin self::error($error); } - self::$action_blogsettings(); + self::action_blogsettings(); return; } @@ -2290,7 +2261,7 @@ class Admin * @param String $catid category id for deleting * @return Void */ - static private function deleteOneCategory($catid) + static public function deleteOneCategory($catid) { global $manager, $member; @@ -2321,10 +2292,10 @@ class Admin // check if catid is the only category left for blogid $query = "SELECT catid FROM %s WHERE cblog=%d;"; - $query = sprintf(sql_table('category'), (integer) $blogid); + $query = sprintf($query, sql_table('category'), (integer) $blogid); - $res = sql_query($query); - if ( sql_num_rows($res) == 1 ) + $res = DB::getResult($query); + if ( $res->rowCount() == 1 ) { return _ERROR_DELETELASTCATEGORY; } @@ -2335,15 +2306,15 @@ class Admin // change category for all items to the default category $query = "UPDATE %s SET icat=%d WHERE icat=%d;"; $query =sprintf($query, sql_table('item'), (integer) $destcatid, (integer) $catid); - sql_query($query); + 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 %s WHERE catid=%d;"; - $query = sprintf($query, (integer) $catid); - sql_query($query); + $query = sprintf($query, sql_table('category'), (integer) $catid); + DB::execute($query); $data = array('catid' => $catid); $manager->notify('PostDeleteCategory', $data); @@ -2351,6 +2322,96 @@ class Admin } /** + * 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 * @@ -2439,7 +2500,7 @@ class Admin ); $manager->notify('PostPluginOptionsUpdate', $data); - self::$action_overview(_MSG_SETTINGSCHANGED); + self::action_overview(_MSG_SETTINGSCHANGED); return; } @@ -2465,9 +2526,7 @@ class Admin $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('deleteblog'); - self::pagefoot(); return; } @@ -2497,35 +2556,35 @@ class Admin // 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); $data = array('blogid' => $blogid); $manager->notify('PostDeleteBlog', $data); - self::$action_overview(_DELETED_BLOG); + self::action_overview(_DELETED_BLOG); return; } @@ -2543,11 +2602,9 @@ class Admin ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); - self::pagehead(); self::$skin->parse('memberdelete'); - self::pagefoot(); return; } @@ -2573,11 +2630,11 @@ class Admin if ( $member->isAdmin() ) { - self::$action_usermanagement(); + self::action_usermanagement(); } else { - self::$action_overview(_DELETED_MEMBER); + self::action_overview(_DELETED_MEMBER); } return; } @@ -2590,12 +2647,12 @@ class Admin * @params Integer $memberid member id * @return String null string or error messages */ - static private function deleteOneMember($memberid) + static public function deleteOneMember($memberid) { global $manager; $memberid = intval($memberid); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); if ( !$mem->canBeDeleted() ) { @@ -2608,19 +2665,19 @@ class Admin /* 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); @@ -2644,9 +2701,7 @@ class Admin // Only Super-Admins can do this $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('createnewlog'); - self::pagefoot(); return; } @@ -2689,27 +2744,27 @@ class Admin $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 %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('%s', '%s', '%s', '%s', '%s');"; - $query = sprintf(sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin); - sql_query($query); + $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 = sql_insert_id(); + $blogid = DB::getInsertId(); $blog =& $manager->getBlog($blogid); // create new category $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")'; - sql_query(sprintf($query, sql_table('category'), (integer) $blogid, $catdefname, $catdefdesc)); - $catid = sql_insert_id(); + $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); @@ -2718,7 +2773,7 @@ class Admin // create team member $query = "INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1);"; $query = sprintf($query, sql_table('team'), (integer) $member->getID(), (integer) $blogid); - sql_query($query); + 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.'); @@ -2749,9 +2804,7 @@ class Admin /* TODO: we should consider to use the other way insterad of this */ $_REQUEST['blogid'] = $blogid; $_REQUEST['catid'] = $catid; - self::pagehead(); self::$skin->parse('addnewlog'); - self::pagefoot(); return; } @@ -2774,7 +2827,7 @@ class Admin $blog->setURL(trim($burl)); $blog->writeSettings(); - self::$action_overview(_MSG_NEWBLOG); + self::action_overview(_MSG_NEWBLOG); return; } @@ -2792,9 +2845,7 @@ class Admin include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); self::$skin->parse('skinieoverview'); - self::pagefoot(); return; } @@ -2819,16 +2870,17 @@ class Admin $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) - /* TODO: remove this */ if ( !file_exists($skinFile) ) { $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml'; } + */ } else { @@ -2844,7 +2896,7 @@ class Admin $_REQUEST['tpltnames'] = $importer->getTemplateNames(); // clashes - $skinNameClashe = $importer->checkSkinNameClashes(); + $skinNameClashes = $importer->checkSkinNameClashes(); $templateNameClashes = $importer->checkTemplateNameClashes(); $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); @@ -2858,14 +2910,12 @@ class Admin self::error($error); } - self::pagehead(); self::$skin->parse('skinieimport'); - self::pagefoot(); return; } /** - * Admin:: + * Admin::action_skiniedoimport() * * @param void * @return void @@ -2873,61 +2923,62 @@ class Admin static private function action_skiniedoimport() { global $member, $DIR_LIBS, $DIR_SKINS; - + $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 ) { self::error($error); } - + $error = $importer->writeToDatabase($allowOverwrite); - + if ( $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(); - - self::pagehead(); + self::$skin->parse('skiniedoimport'); - self::pagefoot(); + return; } /** - * Admin:: + * Admin::action_skinieexport() * * @param void * @return void @@ -2935,15 +2986,15 @@ class Admin static private function action_skinieexport() { global $member, $DIR_LIBS; - + $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(); @@ -2952,14 +3003,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); } @@ -2968,12 +3019,13 @@ class Admin $exporter->addTemplate($templateId); } $exporter->setInfo($info); - + $exporter->export(); + return; } - + /** - * Admin:: + * Admin::action_templateoverview() * * @param void * @return void @@ -2981,18 +3033,17 @@ class Admin static private function action_templateoverview() { global $member, $manager; - + $member->isAdmin() or self::disallow(); - - self::pagehead(); + self::$skin->parse('templateoverview'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_templateedit() * - * @param void + * @param string $msg message for pageheader * @return void */ static private function action_templateedit($msg = '') @@ -3004,32 +3055,18 @@ class Admin } $templateid = intRequestVar('templateid'); - + $member->isAdmin() or self::disallow(); - - $extrahead = ''; - $extrahead .= ''; - - self::pagehead($extrahead); + + Admin::$extrahead .= "\n"; + Admin::$extrahead .= "\n"; + self::$skin->parse('templateedit'); - self::pagefoot(); + return; } - - /** - * - static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) { - static $count = 1; - if (!isset($template[$name])) $template[$name] = ''; - ?> - - - - isAdmin() or self::disallow(); - + $name = postVar('tname'); $desc = postVar('tdesc'); - + if ( !isValidTemplateName($name) ) { self::error(_ERROR_BADTEMPLATENAME); } - + if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) ) { self::error(_ERROR_DUPTEMPLATENAME); } - - $name = sql_real_escape_string($name); - $desc = sql_real_escape_string($desc); - + // 1. Remove all template parts - $query = 'DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid; - sql_query($query); - + $query = "DELETE FROM %s WHERE tdesc=%d;"; + $query = sprintf($query, sql_table('template'), (integer) $templateid); + DB::execute($query); + // 2. Update description - $query = 'UPDATE ' - . sql_table('template_desc') - . ' SET' - . " tdname='" . $name . "'," - . " tddesc='" . $desc . "'" - . " WHERE" - . " tdnumber=" . $templateid; - sql_query($query); - + $query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;"; + $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid); + DB::execute($query); + // 3. Add non-empty template parts - self::addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER')); - self::addToTemplate($templateid, 'ITEM', postVar('ITEM')); - self::addToTemplate($templateid, 'ITEM_FOOTER', postVar('ITEM_FOOTER')); - self::addToTemplate($templateid, 'MORELINK', postVar('MORELINK')); - self::addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK')); - self::addToTemplate($templateid, 'NEW', postVar('NEW')); - self::addToTemplate($templateid, 'COMMENTS_HEADER', postVar('COMMENTS_HEADER')); - self::addToTemplate($templateid, 'COMMENTS_BODY', postVar('COMMENTS_BODY')); - self::addToTemplate($templateid, 'COMMENTS_FOOTER', postVar('COMMENTS_FOOTER')); - self::addToTemplate($templateid, 'COMMENTS_CONTINUED', postVar('COMMENTS_CONTINUED')); - self::addToTemplate($templateid, 'COMMENTS_TOOMUCH', postVar('COMMENTS_TOOMUCH')); - self::addToTemplate($templateid, 'COMMENTS_AUTH', postVar('COMMENTS_AUTH')); - self::addToTemplate($templateid, 'COMMENTS_ONE', postVar('COMMENTS_ONE')); - self::addToTemplate($templateid, 'COMMENTS_MANY', postVar('COMMENTS_MANY')); - self::addToTemplate($templateid, 'COMMENTS_NONE', postVar('COMMENTS_NONE')); - self::addToTemplate($templateid, 'ARCHIVELIST_HEADER', postVar('ARCHIVELIST_HEADER')); + self::addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER')); + self::addToTemplate($templateid, 'ITEM', postVar('ITEM')); + self::addToTemplate($templateid, 'ITEM_FOOTER', postVar('ITEM_FOOTER')); + self::addToTemplate($templateid, 'MORELINK', postVar('MORELINK')); + self::addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK')); + self::addToTemplate($templateid, 'NEW', postVar('NEW')); + self::addToTemplate($templateid, 'COMMENTS_HEADER', postVar('COMMENTS_HEADER')); + self::addToTemplate($templateid, 'COMMENTS_BODY', postVar('COMMENTS_BODY')); + self::addToTemplate($templateid, 'COMMENTS_FOOTER', postVar('COMMENTS_FOOTER')); + self::addToTemplate($templateid, 'COMMENTS_CONTINUED', postVar('COMMENTS_CONTINUED')); + self::addToTemplate($templateid, 'COMMENTS_TOOMUCH', postVar('COMMENTS_TOOMUCH')); + self::addToTemplate($templateid, 'COMMENTS_AUTH', postVar('COMMENTS_AUTH')); + self::addToTemplate($templateid, 'COMMENTS_ONE', postVar('COMMENTS_ONE')); + self::addToTemplate($templateid, 'COMMENTS_MANY', postVar('COMMENTS_MANY')); + self::addToTemplate($templateid, 'COMMENTS_NONE', postVar('COMMENTS_NONE')); + self::addToTemplate($templateid, 'ARCHIVELIST_HEADER', postVar('ARCHIVELIST_HEADER')); self::addToTemplate($templateid, 'ARCHIVELIST_LISTITEM', postVar('ARCHIVELIST_LISTITEM')); - self::addToTemplate($templateid, 'ARCHIVELIST_FOOTER', postVar('ARCHIVELIST_FOOTER')); - self::addToTemplate($templateid, 'BLOGLIST_HEADER', postVar('BLOGLIST_HEADER')); - self::addToTemplate($templateid, 'BLOGLIST_LISTITEM', postVar('BLOGLIST_LISTITEM')); - self::addToTemplate($templateid, 'BLOGLIST_FOOTER', postVar('BLOGLIST_FOOTER')); - self::addToTemplate($templateid, 'CATLIST_HEADER', postVar('CATLIST_HEADER')); - self::addToTemplate($templateid, 'CATLIST_LISTITEM', postVar('CATLIST_LISTITEM')); - self::addToTemplate($templateid, 'CATLIST_FOOTER', postVar('CATLIST_FOOTER')); - self::addToTemplate($templateid, 'DATE_HEADER', postVar('DATE_HEADER')); - self::addToTemplate($templateid, 'DATE_FOOTER', postVar('DATE_FOOTER')); - self::addToTemplate($templateid, 'FORMAT_DATE', postVar('FORMAT_DATE')); - self::addToTemplate($templateid, 'FORMAT_TIME', postVar('FORMAT_TIME')); - self::addToTemplate($templateid, 'LOCALE', postVar('LOCALE')); - self::addToTemplate($templateid, 'SEARCH_HIGHLIGHT', postVar('SEARCH_HIGHLIGHT')); + self::addToTemplate($templateid, 'ARCHIVELIST_FOOTER', postVar('ARCHIVELIST_FOOTER')); + self::addToTemplate($templateid, 'BLOGLIST_HEADER', postVar('BLOGLIST_HEADER')); + self::addToTemplate($templateid, 'BLOGLIST_LISTITEM', postVar('BLOGLIST_LISTITEM')); + self::addToTemplate($templateid, 'BLOGLIST_FOOTER', postVar('BLOGLIST_FOOTER')); + self::addToTemplate($templateid, 'CATLIST_HEADER', postVar('CATLIST_HEADER')); + self::addToTemplate($templateid, 'CATLIST_LISTITEM', postVar('CATLIST_LISTITEM')); + self::addToTemplate($templateid, 'CATLIST_FOOTER', postVar('CATLIST_FOOTER')); + self::addToTemplate($templateid, 'DATE_HEADER', postVar('DATE_HEADER')); + self::addToTemplate($templateid, 'DATE_FOOTER', postVar('DATE_FOOTER')); + self::addToTemplate($templateid, 'FORMAT_DATE', postVar('FORMAT_DATE')); + self::addToTemplate($templateid, 'FORMAT_TIME', postVar('FORMAT_TIME')); + self::addToTemplate($templateid, 'LOCALE', postVar('LOCALE')); + self::addToTemplate($templateid, 'SEARCH_HIGHLIGHT', postVar('SEARCH_HIGHLIGHT')); self::addToTemplate($templateid, 'SEARCH_NOTHINGFOUND', postVar('SEARCH_NOTHINGFOUND')); - self::addToTemplate($templateid, 'POPUP_CODE', postVar('POPUP_CODE')); - self::addToTemplate($templateid, 'MEDIA_CODE', postVar('MEDIA_CODE')); - self::addToTemplate($templateid, 'IMAGE_CODE', postVar('IMAGE_CODE')); - - $pluginfields = array(); - $manager->notify( - 'TemplateExtraFields', - array( - 'fields'=>&$pluginfields - ) - ); - foreach ($pluginfields as $pfkey=>$pfvalue) + self::addToTemplate($templateid, 'POPUP_CODE', postVar('POPUP_CODE')); + self::addToTemplate($templateid, 'MEDIA_CODE', postVar('MEDIA_CODE')); + self::addToTemplate($templateid, 'IMAGE_CODE', postVar('IMAGE_CODE')); + + $data = array('fields' => array()); + $manager->notify('TemplateExtraFields', $data); + foreach ( $data['fields'] as $pfkey=>$pfvalue ) { - foreach ($pfvalue as $pffield=>$pfdesc) + foreach ( $pfvalue as $pffield => $pfdesc ) { self::addToTemplate($templateid, $pffield, postVar($pffield)); } } - + // jump back to template edit - self::$action_templateedit(_TEMPLATE_UPDATED); - + self::action_templateedit(_TEMPLATE_UPDATED); + return; } - + /** * Admin::addToTemplate() * @@ -3145,72 +3170,68 @@ class Admin return -1; } - $partname = sql_real_escape_string($partname); - $content = sql_real_escape_string($content); - - $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, '%s', '%s')"; - $query = sprintf($query, sql_table('template'), (integer) $id, $partname, $content); - sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error()); - return sql_insert_id(); + $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, %s, %s);"; + $query = sprintf($query, sql_table('template'), (integer) $id, DB::quoteValue($partname), DB::quoteValue($content)); + if ( DB::execute($query) === FALSE ) + { + $err = DB::getError(); + exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]); + } + return DB::getInsertId(); } /** - * Admin:: + * Admin::action_templatedelete() * * @param void * @return void */ - static private function action_templatedelete() { + static private function action_templatedelete() + { global $member, $manager; - + $member->isAdmin() or self::disallow(); - + $templateid = intRequestVar('templateid'); // TODO: check if template can be deleted - - self::pagehead(); + self::$skin->parse('templatedelete'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_templatedeleteconfirm() * * @param void * @return void */ - static private function action_templatedeleteconfirm() { + static private function action_templatedeleteconfirm() + { global $member, $manager; - + $templateid = intRequestVar('templateid'); - + $member->isAdmin() or self::disallow(); - - $manager->notify( - 'PreDeleteTemplate', - array( - 'templateid' => $templateid - ) - ); - + + $data = array('templateid' => $templateid); + $manager->notify('PreDeleteTemplate', $data); + // 1. delete description - sql_query('DELETE FROM ' . sql_table('template_desc') . ' WHERE tdnumber=' . $templateid); - + DB::execute('DELETE FROM ' . sql_table('template_desc') . ' WHERE tdnumber=' . $templateid); + // 2. delete parts - sql_query('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid); - - $manager->notify( - 'PostDeleteTemplate', - array( - 'templateid' => $templateid - ) - ); - - self::$action_templateoverview(); + DB::execute('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid); + + + $data = array('templateid' => $templateid); + $manager->notify('PostDeleteTemplate', $data); + + self::action_templateoverview(); + return; } - + /** - * Admin:: + * Admin::action_templatenew() * * @param void * @return void @@ -3218,29 +3239,30 @@ class Admin static private function action_templatenew() { global $member; - + $member->isAdmin() or self::disallow(); - + $name = postVar('name'); $desc = postVar('desc'); - + if ( !isValidTemplateName($name) ) { self::error(_ERROR_BADTEMPLATENAME); } - + if ( Template::exists($name) ) { self::error(_ERROR_DUPTEMPLATENAME); } - + $newTemplateId = Template::createNew($name, $desc); - - self::$action_templateoverview(); + + self::action_templateoverview(); + return; } - + /** - * Admin:: + * Admin::action_templateclone() * * @param void * @return void @@ -3248,20 +3270,21 @@ class Admin static private function action_templateclone() { global $member; - + $templateid = intRequestVar('templateid'); - + $member->isAdmin() or self::disallow(); - + // 1. read old template $name = Template::getNameFromId($templateid); $desc = Template::getDesc($templateid); - + // 2. create desc thing $name = "cloned" . $name; - + // if a template with that name already exists: - if (Template::exists($name)) { + if ( Template::exists($name) ) + { $i = 1; while (Template::exists($name . $i)) { @@ -3269,63 +3292,62 @@ class Admin } $name .= $i; } - + $newid = Template::createNew($name, $desc); - + // 3. create clone // go through parts of old template and add them to the new one - $que = 'SELECT ' - . ' tpartname,' - . ' tcontent ' - . 'FROM ' - . sql_table('template') - . ' WHERE' - . ' tdesc=' . intval($templateid); - $res = sql_query($que); - while ($o = sql_fetch_object($res)) { - self::addToTemplate($newid, $o->tpartname, $o->tcontent); + $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;"; + $query = sprintf($query, sql_table('template'), (integer) $templateid); + + $res = DB::getResult($query); + foreach ( $res as $row) + { + self::addToTemplate($newid, $row['tpartname'], $row['tcontent']); } - - self::$action_templateoverview(); + + self::action_templateoverview(); + return; } /** - * Admin:: + * Admin::action_admintemplateoverview() * * @param void * @return void */ static private function action_admintemplateoverview() { - global $member, $manager; + global $member; $member->isAdmin() or self::disallow(); - self::pagehead(); - self::$skin->parse('admintemplateoverview'); - self::pagefoot(); + self::$skin->parse('admntemplateoverview'); + return; } /** - * Admin:: + * Admin::action_admintemplateedit() * - * @param void + * @param string $msg message for pageheader * @return void */ static private function action_admintemplateedit($msg = '') { global $member, $manager; - if ($msg) { + if ( $msg ) + { self::$headMess = $msg; } $member->isAdmin() or self::disallow(); - $extrahead = '' . "\n"; - $extrahead .= ''; - self::pagehead($extrahead); + + Admin::$extrahead .= "\n"; + Admin::$extrahead .= '' . "\n"; + self::$skin->parse('admintemplateedit'); - self::pagefoot(); + return; } /** - * Admin:: + * Admin::action_admintemplateupdate() * * @param void * @return void @@ -3337,197 +3359,177 @@ class Admin $member->isAdmin() or self::disallow(); $name = postVar('tname'); $desc = postVar('tdesc'); - - if (!isValidTemplateName($name)) { + + if ( !isValidTemplateName($name) ) + { self::error(_ERROR_BADTEMPLATENAME); } - // if (!class_exists('Template')) { - // NP_SkinableAdmin::loadSkinableClass('Template'); - // } - if ((Template::getNameFromId($templateid) != $name) && Template::exists($name)) { + + if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) ) + { self::error(_ERROR_DUPTEMPLATENAME); } - $name = sql_real_escape_string($name); - $desc = sql_real_escape_string($desc); - + // 1. Remove all template parts - $query = 'DELETE ' - . 'FROM ' - . sql_table('admintemplate') . ' ' - . 'WHERE ' - . ' tdesc = %d'; - sql_query(sprintf($query, $templateid)); - + $query = "DELETE FROM %s WHERE tdesc=%d;"; + $query = sprintf($query, sql_table('template'), (integer) $templateid); + DB::execute($query); + // 2. Update description - $query = 'UPDATE ' - . sql_table('admintemplate_desc') . ' ' - . 'SET ' - . ' tdname = "' . sql_real_escape_string($name) . '", ' - . ' tddesc = "' . sql_real_escape_string($desc) . '" ' - . 'WHERE ' - . ' tdnumber = %d'; - sql_query(sprintf($query, $templateid)); - + $query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;"; + $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid); + DB::execute($query); + // 3. Add non-empty template parts - self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_HEAD', postVar('ADMINSKINTYPELIST_HEAD')); - self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_BODY', postVar('ADMINSKINTYPELIST_BODY')); - self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_FOOT', postVar('ADMINSKINTYPELIST_FOOT')); - self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON', postVar('ADMIN_CUSTOMHELPLINK_ICON')); - self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR', postVar('ADMIN_CUSTOMHELPLINK_ANCHOR')); - self::addToAdminTemplate($templateid, 'ADMIN_BLOGLINK', postVar('ADMIN_BLOGLINK')); - self::addToAdminTemplate($templateid, 'ADMIN_BATCHLIST', postVar('ADMIN_BATCHLIST')); - self::addToAdminTemplate($templateid, 'ACTIVATE_FORGOT_TITLE', postVar('ACTIVATE_FORGOT_TITLE')); - self::addToAdminTemplate($templateid, 'ACTIVATE_FORGOT_TEXT', postVar('ACTIVATE_FORGOT_TEXT')); - self::addToAdminTemplate($templateid, 'ACTIVATE_REGISTER_TITLE', postVar('ACTIVATE_REGISTER_TITLE')); - self::addToAdminTemplate($templateid, 'ACTIVATE_REGISTER_TEXT', postVar('ACTIVATE_REGISTER_TEXT')); - self::addToAdminTemplate($templateid, 'ACTIVATE_CHANGE_TITLE', postVar('ACTIVATE_CHANGE_TITLE')); - self::addToAdminTemplate($templateid, 'ACTIVATE_CHANGE_TEXT', postVar('ACTIVATE_CHANGE_TEXT')); - self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_EXPLUGNAME', postVar('TEMPLATE_EDIT_EXPLUGNAME')); - self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_ROW_HEAD', postVar('TEMPLATE_EDIT_ROW_HEAD')); - self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_ROW_TAIL', postVar('TEMPLATE_EDIT_ROW_TAIL')); - self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_HEAD', postVar('SPECIALSKINLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_BODY', postVar('SPECIALSKINLIST_BODY')); - self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_FOOT', postVar('SPECIALSKINLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SYSTEMINFO_GDSETTINGS', postVar('SYSTEMINFO_GDSETTINGS')); - self::addToAdminTemplate($templateid, 'BANLIST_DELETED_LIST', postVar('BANLIST_DELETED_LIST')); - self::addToAdminTemplate($templateid, 'INSERT_PLUGOPTION_TITLE', postVar('INSERT_PLUGOPTION_TITLE')); - self::addToAdminTemplate($templateid, 'INSERT_PLUGOPTION_BODY', postVar('INSERT_PLUGOPTION_BODY')); - self::addToAdminTemplate($templateid, 'INPUTYESNO_TEMPLATE_ADMIN', postVar('INPUTYESNO_TEMPLATE_ADMIN')); - self::addToAdminTemplate($templateid, 'INPUTYESNO_TEMPLATE_NORMAL', postVar('INPUTYESNO_TEMPLATE_NORMAL')); - self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_HEAD', postVar('ADMIN_SPECIALSKINLIST_HEAD')); - self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_BODY', postVar('ADMIN_SPECIALSKINLIST_BODY')); - self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_FOOT', postVar('ADMIN_SPECIALSKINLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SKINIE_EXPORT_LIST', postVar('SKINIE_EXPORT_LIST')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_HEAD', postVar('SHOWLIST_LISTPLUG_SELECT_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_BODY', postVar('SHOWLIST_LISTPLUG_SELECT_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_FOOT', postVar('SHOWLIST_LISTPLUG_SELECT_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM', postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY')); - self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT')); - self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_TITLE', postVar('PLUGIN_QUICKMENU_TITLE')); - self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_HEAD', postVar('PLUGIN_QUICKMENU_HEAD')); - self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_BODY', postVar('PLUGIN_QUICKMENU_BODY')); - self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT', postVar('PLUGIN_QUICKMENU_FOOT')); - - $pluginfields = array(); - $manager->notify( - 'TemplateExtraFields', - array( - 'fields' => &$pluginfields - ) - ); - foreach ($pluginfields as $pfkey => $pfvalue) { - foreach ($pfvalue as $pffield => $pfdesc) { + self::addToAdminTemplate($templateid, 'NORMALSKINLIST_HEAD', postVar('NORMALSKINLIST_HEAD')); + self::addToAdminTemplate($templateid, 'NORMALSKINLIST_BODY', postVar('NORMALSKINLIST_BODY')); + self::addToAdminTemplate($templateid, 'NORMALSKINLIST_FOOT', postVar('NORMALSKINLIST_FOOT')); + self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON', postVar('ADMIN_CUSTOMHELPLINK_ICON')); + self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR', postVar('ADMIN_CUSTOMHELPLINK_ANCHOR')); + self::addToAdminTemplate($templateid, 'ADMIN_BLOGLINK', postVar('ADMIN_BLOGLINK')); + self::addToAdminTemplate($templateid, 'ADMIN_BATCHLIST', postVar('ADMIN_BATCHLIST')); + self::addToAdminTemplate($templateid, 'ACTIVATE_FORGOT_TITLE', postVar('ACTIVATE_FORGOT_TITLE')); + self::addToAdminTemplate($templateid, 'ACTIVATE_FORGOT_TEXT', postVar('ACTIVATE_FORGOT_TEXT')); + self::addToAdminTemplate($templateid, 'ACTIVATE_REGISTER_TITLE', postVar('ACTIVATE_REGISTER_TITLE')); + self::addToAdminTemplate($templateid, 'ACTIVATE_REGISTER_TEXT', postVar('ACTIVATE_REGISTER_TEXT')); + self::addToAdminTemplate($templateid, 'ACTIVATE_CHANGE_TITLE', postVar('ACTIVATE_CHANGE_TITLE')); + self::addToAdminTemplate($templateid, 'ACTIVATE_CHANGE_TEXT', postVar('ACTIVATE_CHANGE_TEXT')); + self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_EXPLUGNAME', postVar('TEMPLATE_EDIT_EXPLUGNAME')); + self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_ROW_HEAD', postVar('TEMPLATE_EDIT_ROW_HEAD')); + self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_ROW_TAIL', postVar('TEMPLATE_EDIT_ROW_TAIL')); + self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_HEAD', postVar('SPECIALSKINLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_BODY', postVar('SPECIALSKINLIST_BODY')); + self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_FOOT', postVar('SPECIALSKINLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SYSTEMINFO_GDSETTINGS', postVar('SYSTEMINFO_GDSETTINGS')); + self::addToAdminTemplate($templateid, 'BANLIST_DELETED_LIST', postVar('BANLIST_DELETED_LIST')); + self::addToAdminTemplate($templateid, 'INSERT_PLUGOPTION_TITLE', postVar('INSERT_PLUGOPTION_TITLE')); + self::addToAdminTemplate($templateid, 'INSERT_PLUGOPTION_BODY', postVar('INSERT_PLUGOPTION_BODY')); + self::addToAdminTemplate($templateid, 'INPUTYESNO_TEMPLATE_ADMIN', postVar('INPUTYESNO_TEMPLATE_ADMIN')); + self::addToAdminTemplate($templateid, 'INPUTYESNO_TEMPLATE_NORMAL', postVar('INPUTYESNO_TEMPLATE_NORMAL')); + self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_HEAD', postVar('ADMIN_SPECIALSKINLIST_HEAD')); + self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_BODY', postVar('ADMIN_SPECIALSKINLIST_BODY')); + self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_FOOT', postVar('ADMIN_SPECIALSKINLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SKINIE_EXPORT_LIST', postVar('SKINIE_EXPORT_LIST')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_HEAD', postVar('SHOWLIST_LISTPLUG_SELECT_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_BODY', postVar('SHOWLIST_LISTPLUG_SELECT_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_FOOT', postVar('SHOWLIST_LISTPLUG_SELECT_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT', postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM', postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD', postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY', postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY')); + self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT', postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT')); + self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_TITLE', postVar('PLUGIN_QUICKMENU_TITLE')); + self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_HEAD', postVar('PLUGIN_QUICKMENU_HEAD')); + self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_BODY', postVar('PLUGIN_QUICKMENU_BODY')); + self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT', postVar('PLUGIN_QUICKMENU_FOOT')); + + $data = array('fields' => array()); + $manager->notify('AdminTemplateExtraFields', $data); + foreach ( $data['fields'] as $pfkey => $pfvalue ) + { + foreach ( $pfvalue as $pffield => $pfdesc ) + { self::addToAdminTemplate($templateid, $pffield, postVar($pffield)); } } - + // jump back to template edit - self::$action_admintemplateedit(_TEMPLATE_UPDATED); + self::action_admintemplateedit(_TEMPLATE_UPDATED); + return; } /** - * Admin:: + * Admin::addToAdminTemplate() * - * @param void - * @return void + * @param integer $id ID for template + * @param string $partname name of part for template + * @param void $contents content for part of template + * @return integer ID for newly inserted Template */ static private function addToAdminTemplate($id, $partname, $content) { - $partname = sql_real_escape_string($partname); - $content = sql_real_escape_string($content); - - - $id = intval($id); - // don't add empty parts: - if (!trim($content)) { + if ( !trim($content) ) + { return -1; } - $query = 'INSERT ' - . 'INTO ' - . sql_table('admintemplate') . ' ' - . '(' - . ' tdesc, ' - . ' tpartname, ' - . ' tcontent ' - . ') VALUES (' - . ' %d, ' - . ' "%s", ' - . ' "%s"' - . ')'; - sql_query(sprintf($query, $id, $partname, $content)) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error()); - return sql_insert_id(); + + $query = "INSERT INTO %s (tdesc, tpartname, tcontent ) VALUES (%d, %s, %s);"; + $query = sprintf($query, sql_table('template'), (integer) $id, DB::quoteValue($partname), DB::quoteValue($content)); + if ( DB::execute($query) === FALSE ) + { + $err = DB::getError(); + exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]); + } + return DB::getInsertId(); } /** - * Admin:: + * Admin::action_admintemplatedelete() * * @param void * @return void @@ -3536,14 +3538,14 @@ class Admin { global $member, $manager; $member->isAdmin() or self::disallow(); + // TODO: check if template can be deleted - self::pagehead(); self::$skin->parse('admintemplatedelete'); - self::pagefoot(); + return; } /** - * Admin:: + * Admin::action_admintemplatedeleteconfirm() * * @param void * @return void @@ -3551,36 +3553,32 @@ class Admin static private function action_admintemplatedeleteconfirm() { global $member, $manager; + $templateid = intRequestVar('templateid'); $member->isAdmin() or self::disallow(); - $manager->notify( - 'PreDeleteAdminTemplate', - array( - 'templateid' => $templateid - ) - ); - - $query = 'DELETE ' - . 'FROM ' - . ' %s ' - . 'WHERE ' - . ' %s = ' .intval($templateid); + + $data = array('templateid' => $templateid); + $manager->notify('PreDeleteAdminTemplate', $data); + // 1. delete description - sql_query(sprintf($query, sql_table('admintemplate_desc'), 'tdnumber')); + $query = "DELETE FROM %s WHERE tdnumber=%s;"; + $query = sprintf($query, sql_table('template_desc'), (integer) $templateid); + DB::execute($query); + // 2. delete parts - sql_query(sprintf($query, sql_table('admintemplate'), 'tdesc')); - - $manager->notify( - 'PostDeleteAdminTemplate', - array( - 'templateid' => $templateid - ) - ); - self::$action_admintemplateoverview(); + $query = "DELETE FROM %s WHERE tdesc=%d;"; + $query = sprintf($query, sql_table('template'), (integer) $templateid); + DB::execute($query); + + $data = array('templateid' => $templateid); + $manager->notify('PostDeleteAdminTemplate', $data); + + self::action_admintemplateoverview(); + return; } /** - * Admin:: + * Admin::action_admintemplatenew() * * @param void * @return void @@ -3591,20 +3589,27 @@ class Admin $member->isAdmin() or self::disallow(); $name = postVar('name'); $desc = postVar('desc'); - - if (!isValidTemplateName($name)) { + + if ( !isValidTemplateName($name) ) + { self::error(_ERROR_BADTEMPLATENAME); } - if (Template::exists($name)) { + else if ( !preg_match('#^admin/#', $name) ) + { + self::error(_ERROR_BADADMINTEMPLATENAME); + } + else if ( Template::exists($name) ) + { self::error(_ERROR_DUPTEMPLATENAME); } - + $newTemplateId = Template::createNew($name, $desc); - self::$action_admintemplateoverview(); + self::action_admintemplateoverview(); + return; } /** - * Admin:: + * Admin::action_admintemplateclone() * * @param void * @return void @@ -3614,46 +3619,44 @@ class Admin global $member; $templateid = intRequestVar('templateid'); $member->isAdmin() or self::disallow(); - - // if (!class_exists('Template')) { - // NP_SkinableAdmin::loadSkinableClass('Template'); - // } - + // 1. read old template $name = Template::getNameFromId($templateid); $desc = Template::getDesc($templateid); + // 2. create desc thing - $name = "cloned" . $name; - + $name = $name . "cloned"; + // if a template with that name already exists: - if (Template::exists($name)) { + if ( Template::exists($name) ) + { $i = 1; - while (Template::exists($name . $i)) { + while ( Template::exists($name . $i) ) + { $i++; } $name .= $i; } - - $newid = Template::admincreateNew($name, $desc); - + + $newid = Template::createNew($name, $desc); + // 3. create clone // go through parts of old template and add them to the new one - $que = 'SELECT ' - . ' tpartname, ' - . ' tcontent ' - . 'FROM ' - . sql_table('admintemplate') . ' ' - . 'WHERE ' - . ' tdesc = ' . intval($templateid); - $res = sql_query($que); - while ($o = sql_fetch_object($res)) { - self::addToAdminTemplate($newid, $o->tpartname, $o->tcontent); + $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;"; + $query = sprintf($query, sql_table('template'), (integer) $templateid); + + $res = DB::getResult($query); + foreach ( $res as $row ) + { + self::addToAdminTemplate($newid, $row['tpartname'], $row['tcontent']); } - self::$action_admintemplateoverview(); + + self::action_admintemplateoverview(); + return; } /** - * Admin:: + * Admin::action_skinoverview() * * @param void * @return void @@ -3661,16 +3664,15 @@ class Admin static private function action_skinoverview() { global $member, $manager; - + $member->isAdmin() or self::disallow(); - - self::pagehead(); + self::$skin->parse('skinoverview'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_skinnew() * * @param void * @return void @@ -3678,29 +3680,30 @@ class Admin static private function action_skinnew() { global $member; - + $member->isAdmin() or self::disallow(); - + $name = trim(postVar('name')); $desc = trim(postVar('desc')); - + if ( !isValidSkinName($name) ) { self::error(_ERROR_BADSKINNAME); } - + if ( SKIN::exists($name) ) { self::error(_ERROR_DUPSKINNAME); } - + $newId = SKIN::createNew($name, $desc); - - self::$action_skinoverview(); + + self::action_skinoverview(); + return; } - + /** - * Admin:: + * Admin::action_skinedit() * * @param void * @return void @@ -3708,51 +3711,46 @@ class Admin static private function action_skinedit() { global $member, $manager; - -// $skinid = intRequestVar('skinid'); - + $member->isAdmin() or self::disallow(); - -// $skin = new SKIN($skinid); - - self::pagehead(); + self::$skin->parse('skinedit'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_skineditgeneral() * * @param void * @return void */ static private function action_skineditgeneral() { - global $member; - + global $manager, $member; + $skinid = intRequestVar('skinid'); - + $member->isAdmin() or self::disallow(); - - $name = postVar('name'); - $desc = postVar('desc'); - $type = postVar('type'); - $inc_mode = postVar('inc_mode'); - $inc_prefix = postVar('inc_prefix'); - - $skin = new Skin($skinid); - + + $name = postVar('name'); + $desc = postVar('desc'); + $type = postVar('type'); + $inc_mode = postVar('inc_mode'); + $inc_prefix = postVar('inc_prefix'); + + $skin =& $manager->getSkin($skinid); + // 1. Some checks if ( !isValidSkinName($name) ) { self::error(_ERROR_BADSKINNAME); } - + if ( ($skin->getName() != $name) && SKIN::exists($name) ) { self::error(_ERROR_DUPSKINNAME); } - + if ( !$type ) { $type = 'text/html'; @@ -3761,95 +3759,98 @@ class Admin { $inc_mode = 'normal'; } - + // 2. Update description $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix); - - self::$action_skinedit(); - + + self::action_skinedit(); + return; } - + static private function action_skinedittype($msg = '') { global $member, $manager; - + $member->isAdmin() or self::disallow(); - - if ($msg) { + + if ( $msg ) + { self::$headMess = $msg; } - $skinid = intRequestVar('skinid'); - $type = requestVar('type'); - $type = trim($type); - $type = strtolower($type); - + + $skinid = intRequestVar('skinid'); + $type = requestVar('type'); + $type = trim($type); + $type = strtolower($type); + if ( !isValidShortName($type) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); } - - self::pagehead(); + self::$skin->parse('skinedittype'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_skinupdate() * * @param void * @return void */ static private function action_skinupdate() { - global $member; - + global $manager, $member; + $skinid = intRequestVar('skinid'); $content = trim(postVar('content')); $type = postVar('type'); - + $member->isAdmin() or self::disallow(); - - $skin = new SKIN($skinid); + + $skin =& $manager->getSKIN($skinid); $skin->update($type, $content); - - self::$action_skinedittype(_SKIN_UPDATED); + + self::action_skinedittype(_SKIN_UPDATED); + return; } - + /** - * Admin:: + * Admin::action_skindelete() * * @param void * @return void */ static private function action_skindelete() { - global $member, $manager, $CONF; - + global $manager, $member, $CONF; + $skinid = intRequestVar('skinid'); - + $member->isAdmin() or self::disallow(); - + // don't allow default skin to be deleted if ( $skinid == $CONF['BaseSkin'] ) { self::error(_ERROR_DEFAULTSKIN); } - + // don't allow deletion of default skins for blogs - $query = 'SELECT bname FROM ' . sql_table('blog') . ' WHERE bdefskin=' . $skinid; - $r = sql_query($query); - if ( $o = sql_fetch_object($r) ) + $query = "SELECT bname FROM %s WHERE bdefskin=%d"; + $query = sprintf($query, sql_table('blog'), (integer) $skinid); + + $name = DB::getValue($query); + if ( $name ) { - self::error(_ERROR_SKINDEFDELETE . Entity::hsc($o->bname)); + self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name)); } - - self::pagehead(); + self::$skin->parse('skindelete'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_skindeleteconfirm() * * @param void * @return void @@ -3857,158 +3858,155 @@ class Admin static private function action_skindeleteconfirm() { global $member, $CONF, $manager; - + $skinid = intRequestVar('skinid'); - + $member->isAdmin() or self::disallow(); - + // don't allow default skin to be deleted if ( $skinid == $CONF['BaseSkin'] ) { self::error(_ERROR_DEFAULTSKIN); } - + // don't allow deletion of default skins for blogs - $query = 'SELECT' - . ' bname ' - . 'FROM ' - . sql_table('blog') . ' ' - . 'WHERE' - . ' bdefskin=' . $skinid; - $r = sql_query($query); - if ( $o = sql_fetch_object($r) ) - { - self::error(_ERROR_SKINDEFDELETE .$o->bname); + $query = "SELECT bname FROM %s WHERE bdefskin=%d;"; + $query = sprintf($query, sql_table('blog'), (integer) $skinid); + + $name = DB::getValue($query); + if ( $name ) + { + self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name)); } - - $manager->notify( - 'PreDeleteSkin', - array( - 'skinid' => $skinid - ) - ); - + + $data = array('skinid' => $skinid); + $manager->notify('PreDeleteSkin', $data); + // 1. delete description - sql_query('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid); - + $query = "DELETE FROM %s WHERE sdnumber=%d;"; + $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); + DB::execute($query); + // 2. delete parts - sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid); - - $manager->notify( - 'PostDeleteSkin', - array( - 'skinid' => $skinid - ) - ); - - self::$action_skinoverview(); + $query = "DELETE FROM %s WHERE sdesc=%d;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid); + DB::execute($query); + + $data = array('skinid' => $skinid); + $manager->notify('PostDeleteSkin', $data); + + self::action_skinoverview(); + return; } - + /** - * Admin:: + * Admin::action_skinremovetype() * * @param void * @return void */ - static private function action_skinremovetype() { + static private function action_skinremovetype() + { global $member, $manager, $CONF; - + $member->isAdmin() or self::disallow(); - + $skinid = intRequestVar('skinid'); $skintype = requestVar('type'); - + if ( !isValidShortName($skintype) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - - + // don't allow default skinparts to be deleted + /* TODO: this array should be retrieved from Action class */ if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - - self::pagehead(); + self::$skin->parse('skinremovetype'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_skinremovetypeconfirm() * * @param void * @return void */ - static private function action_skinremovetypeconfirm() { + static private function action_skinremovetypeconfirm() + { global $member, $CONF, $manager; - + $member->isAdmin() or self::disallow(); - + $skinid = intRequestVar('skinid'); $skintype = requestVar('type'); - + if ( !isValidShortName($skintype) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - + // don't allow default skinparts to be deleted + /* TODO: this array should be retrieved from Action class */ if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - - $manager->notify( - 'PreDeleteSkinPart', - array( - 'skinid' => $skinid, - 'skintype' => $skintype - ) + + $data = array( + 'skinid' => $skinid, + 'skintype' => $skintype ); - + $manager->notify('PreDeleteSkinPart', $data); // delete part - sql_query("DELETE FROM " . sql_table('skin') . " WHERE sdesc=" . $skinid . " AND stype='" . $skintype . "'"); - - $manager->notify( - 'PostDeleteSkinPart', - array( - 'skinid' => $skinid, - 'skintype' => $skintype - ) + $query = "DELETE FROM %s WHERE sdesc=%d AND stype=%s;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) ); + DB::execute($query); + + $data = array( + 'skinid' => $skinid, + 'skintype' => $skintype ); - - self::$action_skinedit(); + $manager->notify('PostDeleteSkinPart', $data); + + self::action_skinedit(); + return; } /** - * Admin:: + * Admin::action_skinclone() * * @param void * @return void */ static private function action_skinclone() { - global $member; - + global $manager, $member; + $member->isAdmin() or self::disallow(); - + $skinid = intRequestVar('skinid'); - + // 1. read skin to clone - $skin = new SKIN($skinid); - - $name = "clone_" . $skin->getName(); - + $skin =& $manager->getSkin($skinid); + + $name = "{$skin->getName()}_clone"; + // if a skin with that name already exists: - if (Skin::exists($name)) { + if ( Skin::exists($name) ) + { $i = 1; - while (Skin::exists($name . $i)) + while ( Skin::exists($name . $i) ) + { $i++; + } $name .= $i; } - + // 2. create skin desc $newid = Skin::createNew( $name, @@ -4017,19 +4015,21 @@ class Admin $skin->getIncludeMode(), $skin->getIncludePrefix() ); - - + // 3. clone - $query = "SELECT stype FROM " . sql_table('skin') . " WHERE sdesc = " . $skinid; - $res = sql_query($query); - while ($row = sql_fetch_assoc($res)) { - self::$skinclonetype($skin, $newid, $row['stype']); + $query = "SELECT stype FROM %s WHERE sdesc=%d;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid); + + $res = DB::getResult($query); + foreach ( $res as $row ) + { + self::skinclonetype($skin, $newid, $row['stype']); } - - self::$action_skinoverview(); - + + self::action_skinoverview(); + return; } - + /** * Admin::skinclonetype() * @@ -4041,35 +4041,35 @@ class Admin static private function skinclonetype($skin, $newid, $type) { $newid = intval($newid); - $content = $skin->getContent($type); + $content = $skin->getContentFromDB($type); if ( $content ) { - $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')"; - $query = sprintf($query, sql_table('skin'), (integer) $newid, $content, $type); - sql_query($query); + $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)"; + $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type)); + DB::execute($query); } return; } /** - * Admin:: + * Admin::action_adminskinoverview() * * @param void * @return void */ - static private function action_adminskinoverview() { + static private function action_adminskinoverview() + { global $member, $manager; - + $member->isAdmin() or self::disallow(); - - self::pagehead(); + self::$skin->parse('adminskinoverview'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_adminskinnew() * * @param void * @return void @@ -4080,19 +4080,27 @@ class Admin $member->isAdmin() or self::disallow(); $name = trim(postVar('name')); $desc = trim(postVar('desc')); - - if (!isValidSkinName($name)) { + + if ( !isValidSkinName($name) ) + { self::error(_ERROR_BADSKINNAME); } - if (SkinSKIN::exists($name)) { + else if ( !preg_match('#^admin/#', $name) ) + { + self::error(_ERROR_BADADMINSKINNAME); + } + else if ( Skin::exists($name) ) + { self::error(_ERROR_DUPSKINNAME); } + /* TODO: $newId is not reused... */ $newId = Skin::createNew($name, $desc); - self::$action_adminskinoverview(); + self::action_adminskinoverview(); + return; } - + /** - * Admin:: + * Admin::action_adminskinedit() * * @param void * @return void @@ -4100,100 +4108,110 @@ class Admin static private function action_adminskinedit() { global $member, $manager; - + $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('adminskinedit'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_adminskineditgeneral() * * @param void * @return void */ static private function action_adminskineditgeneral() { - global $member; - + global $manager, $member; + $skinid = intRequestVar('skinid'); - + $member->isAdmin() or self::disallow(); - - $name = postVar('name'); - $desc = postVar('desc'); - $type = postVar('type'); - $inc_mode = postVar('inc_mode'); - $inc_prefix = postVar('inc_prefix'); - - $skin = new Skin($skinid); - + + $name = postVar('name'); + $desc = postVar('desc'); + $type = postVar('type'); + $inc_mode = postVar('inc_mode'); + $inc_prefix = postVar('inc_prefix'); + + $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin'); + // 1. Some checks - if (!isValidSkinName($name)) { + if ( !isValidSkinName($name) ) + { self::error(_ERROR_BADSKINNAME); } - if (($skin->getName() != $name) && Skin::exists($name)) { + if ( ($skin->getName() != $name) && Skin::exists($name) ) + { self::error(_ERROR_DUPSKINNAME); } - if (!$type) { + if ( !$type ) + { $type = 'text/html'; } - if (!$inc_mode) { + if ( !$inc_mode ) + { $inc_mode = 'normal'; } // 2. Update description $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix); - self::$action_adminskinedit(); + self::action_adminskinedit(); + return; } - + /** - * Admin:: + * Admin::action_adminskinedittype() * - * @param void + * @param string $msg message for pageheader * @return void */ static private function action_adminskinedittype($msg = '') { global $member, $manager; - + $member->isAdmin() or self::disallow(); - if ($msg) { + + if ( $msg ) + { self::$headMess = $msg; } $type = requestVar('type'); $type = trim($type); $type = strtolower($type); - if (!isValidShortName($type)) { + + if ( !isValidShortName($type) ) + { self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); } - self::pagehead(); + self::$skin->parse('adminskinedittype'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_adminskinupdate() * * @param void * @return void */ static private function action_adminskinupdate() { - global $member; - $skinid = intRequestVar('skinid'); + global $manager, $member; + + $skinid = intRequestVar('skinid'); $content = trim(postVar('content')); - $type = postVar('type'); - + $type = postVar('type'); + $member->isAdmin() or self::disallow(); - - $skin = new Skin($skinid); + + $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin'); $skin->update($type, $content); - self::$action_adminskinedittype(_SKIN_UPDATED); + self::action_adminskinedittype(_SKIN_UPDATED); + return; } - + /** - * Admin:: + * Admin::action_adminskindelete() * * @param void * @return void @@ -4202,14 +4220,15 @@ class Admin { global $member, $manager, $CONF; $member->isAdmin() or self::disallow(); + + /* TODO: needless variable $skinid... */ $skinid = intRequestVar('skinid'); - self::pagehead(); self::$skin->parse('adminskindelete'); - self::pagefoot(); + return; } /** - * Admin:: + * Admin::action_adminskindeleteconfirm() * * @param void * @return void @@ -4217,42 +4236,50 @@ class Admin static private function action_adminskindeleteconfirm() { global $member, $CONF, $manager; + $member->isAdmin() or self::disallow(); $skinid = intRequestVar('skinid'); + // don't allow default skin to be deleted - if ($skinid == $CONF['DefaultAdminSkin']) { + if ( $skinid == $CONF['AdminSkin'] ) + { self::error(_ERROR_DEFAULTSKIN); } - // don't allow deletion of default skins for members + + /* + * TODO: NOT Implemented + * don't allow deletion of default skins for members $memberDefaults = $member->getAdminSkin(); - foreach ($memberDefaults as $memID => $adminskin) { - if ($skinid == $adminskin) { - $mem = MEMBER::createFromID($memID); + foreach ( $memberDefaults as $memID => $adminskin ) + { + if ( $skinid == $adminskin ) + { + $mem =& $manager->getMember($memID); self::error(_ERROR_SKINDEFDELETE . $mem->displayname); } } - $manager->notify( - 'PreDeleteAdminSkin', - array( - 'skinid' => intval($skinid) - ) - ); - $query = 'DELETE FROM %s WHERE %s = ' . intval($skinid); + */ + + $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid)); + // 1. delete description - sql_query(sprintf($query, sql_table('adminskin_desc'), 'sdnumber')); + $query = "DELETE FROM %s WHERE sdnumber=%d;"; + $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); + DB::execute($query); + // 2. delete parts - sql_query(sprintf($query, sql_table('adminskin'), 'sdesc')); - $manager->notify( - 'PostDeleteAdminSkin', - array( - 'skinid' => intval($skinid) - ) - ); - self::$action_adminskinoverview(); + $query = "DELETE FROM %s WHERE sdesc=%d;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid); + + DB::execute($query); + + $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid)); + self::action_adminskinoverview(); + return; } - + /** - * Admin:: + * Admin::action_adminskinremovetype() * * @param void * @return void @@ -4262,18 +4289,21 @@ class Admin global $member, $manager, $CONF; $member->isAdmin() or self::disallow(); - $skinid = intRequestVar('skinid'); - $skintype = requestVar('type'); - if (!isValidShortName($skintype)) { + + $skinid = intRequestVar('skinid'); + $skintype = requestVar('type'); + + if ( !isValidShortName($skintype) ) + { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - self::pagehead(); + self::$skin->parse('adminskinremovetype'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_adminskinremovetypeconfirm() * * @param void * @return void @@ -4281,55 +4311,67 @@ class Admin static private function action_adminskinremovetypeconfirm() { global $member, $CONF, $manager; - + $member->isAdmin() or self::disallow(); - $skinid = intRequestVar('skinid'); - $skintype = requestVar('type'); - if (!isValidShortName($skintype)) { + + $skinid = intRequestVar('skinid'); + $skintype = requestVar('type'); + + if ( !isValidShortName($skintype) ) + { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - $manager->notify( - 'PreDeleteAdminSkinPart', - array( - 'skinid' => $skinid, - 'skintype' => $skintype - ) + + $data =array( + 'skinid' => $skinid, + 'skintype' => $skintype ); + $manager->notify('PreDeleteAdminSkinPart', $data); + // delete part - $query = 'DELETE FROM %s WHERE sdesc = %d AND stype ="%s"'; - sql_query(sprintf($query, sql_table('adminskin'), intval($skinid), $skintype )); - $manager->notify( - 'PostDeleteAdminSkinPart', - array( - 'skinid' => $skinid, - 'skintype' => $skintype - ) + $query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s ;'; + $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) ); + DB::execute($query); + + $data = array( + 'skinid' => $skinid, + 'skintype' => $skintype ); - self::$action_adminskinedit(); + $manager->notify('PostDeleteAdminSkinPart', $data); + + self::action_adminskinedit(); + return; } /** - * Admin:: + * Admin::action_adminskinclone() * * @param void * @return void */ static private function action_adminskinclone() { - global $member; + global $manager, $member; + $member->isAdmin() or self::disallow(); + $skinid = intRequestVar('skinid'); + // 1. read skin to clone - $skin = new Skin($skinid); - $name = "clone_" . $skin->getName(); + $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin'); + $name = "{$skin->getName()}_clone"; + // if a skin with that name already exists: - if (Skin::exists($name)) { + if ( Skin::exists($name) ) + { $i = 1; - while (Skin::exists($name . $i)) { + while ( Skin::exists($name . $i) ) + { $i++; } $name .= $i; } + // 2. create skin desc $newid = Skin::createNew( $name, @@ -4338,48 +4380,43 @@ class Admin $skin->getIncludeMode(), $skin->getIncludePrefix() ); - $query = 'SELECT ' - . ' stype ' - . 'FROM ' - . sql_table('adminskin') . ' ' - . 'WHERE ' - . ' sdesc = ' . $skinid; - $res = sql_query($query); - while ($row = sql_fetch_assoc($res)) { - self::$skinclonetype($skin, $newid, $row['stype']); + + // 3. clone + $query = "SELECT stype FROM %s WHERE sdesc=%d;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid); + + $res = DB::getResult($query); + foreach ( $res as $row ) + { + self::skinclonetype($skin, $newid, $row['stype']); } - self::$action_adminskinoverview(); + self::action_adminskinoverview(); + return; } - + /** - * Admin:: + * Admin::adminskinclonetype() * - * @param void + * @param string $skin an instance of Skin class + * @param integer $newid ID for new skin + * @param string $type skin type * @return void */ static private function adminskinclonetype($skin, $newid, $type) { - $newid = intval($newid); - $content = $skin->getContent($type); - if ($content) { - $query = 'INSERT ' - . 'INTO ' - . sql_table('adminskin') . ' ' - . '(' - . ' sdesc, ' - . ' scontent, ' - . ' stype' - . ') VALUES (' - . intval($newid) . ', ' - . '"' . sql_real_escape_string($content) . '", ' - . '"' . sql_real_escape_string($type) . '" ' - . ')'; - sql_query($query); + $content = $skin->getContentFromDB($type); + + if ( $content ) + { + $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)"; + $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type)); + DB::execute($query); } + return; } - + /** - * Admin:: + * Admin::action_adminskinieoverview() * * @param void * @return void @@ -4387,110 +4424,160 @@ class Admin static private function action_adminskinieoverview() { global $member, $DIR_LIBS, $manager; + $member->isAdmin() or self::disallow(); + // load skinie class include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); + self::$skin->parse('adminskinieoverview'); - self::pagefoot(); - + return; } /** - * Admin:: + * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!! + * Admin::action_adminskinieimport() * * @param void * @return void */ static private function action_adminskinieimport() { - global $DIR_LIBS, $DIR_ADMINSKINS, $manager, $member; + global $DIR_LIBS, $DIR_SKINS, $manager, $member; + $member->isAdmin() or self::disallow(); + // load skinie class include_once($DIR_LIBS . 'skinie.php'); - $skinFileRaw= postVar('skinfile'); - $mode = postVar('mode'); - $importer = new SKINIMPORT(); + + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); + + $importer = new SKINIMPORT(); + // get full filename - if ($mode == 'file') { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml'; + if ( $mode == 'file' ) + { + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml"; + // backwards compatibilty (in v2.0, exports were saved as skindata.xml) - if (!file_exists($skinFile)) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml'; + if ( !file_exists($skinFile) ) + { + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml"; } - } else { + } + else + { $skinFile = $skinFileRaw; } + // read only metadata $error = $importer->readFile($skinFile, 1); - if ($error) { + if ( $error ) + { self::error($error); } - - $_REQUEST['skininfo'] = $importer->getInfo(); - $_REQUEST['skinnames'] = $importer->getSkinNames(); - $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - + + /* TODO: we should consider to use the other way instead 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); - $_REQUEST['skinclashes'] = $skinNameClashes; - $_REQUEST['tpltclashes'] = $templateNameClashes; - $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; + $skinNameClashes = $importer->checkSkinNameClashes(); + $templateNameClashes = $importer->checkTemplateNameClashes(); + $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); + /* TODO: we should consider to use the other way instead of this */ + $_REQUEST['skinclashes'] = $skinNameClashes; + $_REQUEST['tpltclashes'] = $templateNameClashes; + $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; - self::pagehead(); - self::$skin->parse('adminskinieimport'); - self::pagefoot(); + if ( !is_object(self::$skin) ) + { + self::action_adminskiniedoimport(); + } + else + { + self::$skin->parse('adminskinieimport'); + } + return; } - + /** - * Admin:: + * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!! + * Admin::action_adminskiniedoimport() * * @param void * @return void */ static private function action_adminskiniedoimport() { - global $DIR_LIBS, $DIR_ADMINSKINS, $member; + global $DIR_LIBS, $DIR_SKINS, $manager, $member; + $member->isAdmin() or self::disallow(); + // load skinie class include_once($DIR_LIBS . 'skinie.php'); - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); - $allowOverwrite = intPostVar('overwrite'); + + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); + $allowOverwrite = intPostVar('overwrite'); + // get full filename - if ($mode == 'file') { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml'; + if ( $mode == 'file' ) + { + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml"; // backwards compatibilty (in v2.0, exports were saved as skindata.xml) - if (!file_exists($skinFile)) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml'; + if ( !file_exists($skinFile) ) + { + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml"; } - } else { + } + else + { $skinFile = $skinFileRaw; } + $importer = new SKINIMPORT(); - $error = $importer->readFile($skinFile); - if ($error) { + + $error = $importer->readFile($skinFile); + if ( $error ) + { self::error($error); } + $error = $importer->writeToDatabase($allowOverwrite); - if ($error) { + if ( $error ) + { self::error($error); } - - $_REQUEST['skininfo'] = $importer->getInfo(); - $_REQUEST['skinnames'] = $importer->getSkinNames(); - $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - - self::pagehead(); - self::$skin->parse('adminskiniedoimport'); - self::pagefoot(); - + + /* TODO: we should consider to use the other way instead of this */ + $_REQUEST['skininfo'] = $importer->getInfo(); + $_REQUEST['skinnames'] = $importer->getSkinNames(); + $_REQUEST['tpltnames'] = $importer->getTemplateNames(); + + if ( !is_object(self::$skin) ) + { + global $DIR_SKINS; + $query = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'"; + $query = sprintf($query, sql_table('skin_desc')); + $res = intval(DB::getValue($query)); + $query = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'"; + $query = sprintf($query, sql_table('config'), $res); + DB::execute($query); + $skin =& $manager->Skin(0, 'AdminActions', 'AdminSkin'); + $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn'); + } + else + { + self::$skin->parse('adminskiniedoimport'); + } + return; } /** - * Admin:: + * Admin::action_adminskinieexport() * * @param void * @return void @@ -4498,47 +4585,54 @@ class Admin static private function action_adminskinieexport() { global $member, $DIR_PLUGINS; + $member->isAdmin() or self::disallow(); + // load skinie class - $aSkins = requestIntArray('skin'); - $aTemplates = requestIntArray('template'); - if (!is_array($aTemplates)) { - $aTemplates = array(); - } + $aSkins = requestIntArray('skin'); if (!is_array($aSkins)) { $aSkins = array(); } - $skinList = array_keys($aSkins); + $skinList = array_keys($aSkins); + + $aTemplates = requestIntArray('template'); + if (!is_array($aTemplates)) + { + $aTemplates = array(); + } $templateList = array_keys($aTemplates); - + $info = postVar('info'); - - $exporter = new SkinEXPORT(); - foreach ($skinList as $skinId) { + + include_libs('skinie.php'); + $exporter = new SkinExport(); + foreach ( $skinList as $skinId ) + { $exporter->addSkin($skinId); } - foreach ($templateList as $templateId) { + foreach ( $templateList as $templateId ) + { $exporter->addTemplate($templateId); } $exporter->setInfo($info); $exporter->export(); - + return; } - + /** * Admin::action_settingsedit() * * @param Void * @return Void */ - static private function action_settingsedit() { + static private function action_settingsedit() + { global $member, $manager, $CONF, $DIR_NUCLEUS, $DIR_MEDIA; - + $member->isAdmin() or self::disallow(); - - self::pagehead(); + self::$skin->parse('settingsedit'); - self::pagefoot(); + return; } /** @@ -4548,7 +4642,8 @@ class Admin * @param void * @return void */ - static private function action_settingsupdate() { + static private function action_settingsupdate() + { global $member, $CONF; $member->isAdmin() or self::disallow(); @@ -4560,49 +4655,51 @@ class Admin } // save settings - self::updateConfig('DefaultBlog', postVar('DefaultBlog')); - self::updateConfig('BaseSkin', postVar('BaseSkin')); - self::updateConfig('IndexURL', postVar('IndexURL')); - self::updateConfig('AdminURL', postVar('AdminURL')); - self::updateConfig('PluginURL', postVar('PluginURL')); - self::updateConfig('SkinsURL', postVar('SkinsURL')); - self::updateConfig('ActionURL', postVar('ActionURL')); - self::updateConfig('Locale', postVar('Locale')); - self::updateConfig('AdminEmail', postVar('AdminEmail')); - self::updateConfig('SessionCookie', postVar('SessionCookie')); - self::updateConfig('AllowMemberCreate',postVar('AllowMemberCreate')); - self::updateConfig('AllowMemberMail', postVar('AllowMemberMail')); - self::updateConfig('NonmemberMail', postVar('NonmemberMail')); - self::updateConfig('ProtectMemNames', postVar('ProtectMemNames')); - self::updateConfig('SiteName', postVar('SiteName')); - self::updateConfig('NewMemberCanLogon',postVar('NewMemberCanLogon')); - self::updateConfig('DisableSite', postVar('DisableSite')); - self::updateConfig('DisableSiteURL', postVar('DisableSiteURL')); - self::updateConfig('LastVisit', postVar('LastVisit')); - self::updateConfig('MediaURL', postVar('MediaURL')); - self::updateConfig('AllowedTypes', postVar('AllowedTypes')); - self::updateConfig('AllowUpload', postVar('AllowUpload')); - self::updateConfig('MaxUploadSize', postVar('MaxUploadSize')); - self::updateConfig('MediaPrefix', postVar('MediaPrefix')); - self::updateConfig('AllowLoginEdit', postVar('AllowLoginEdit')); - self::updateConfig('DisableJsTools', postVar('DisableJsTools')); - self::updateConfig('CookieDomain', postVar('CookieDomain')); - self::updateConfig('CookiePath', postVar('CookiePath')); - self::updateConfig('CookieSecure', postVar('CookieSecure')); - self::updateConfig('URLMode', postVar('URLMode')); - self::updateConfig('CookiePrefix', postVar('CookiePrefix')); + self::updateConfig('DefaultBlog', postVar('DefaultBlog')); + self::updateConfig('BaseSkin', postVar('BaseSkin')); + self::updateConfig('IndexURL', postVar('IndexURL')); + self::updateConfig('AdminURL', postVar('AdminURL')); + self::updateConfig('PluginURL', postVar('PluginURL')); + self::updateConfig('SkinsURL', postVar('SkinsURL')); + self::updateConfig('ActionURL', postVar('ActionURL')); + self::updateConfig('Locale', postVar('Locale')); + self::updateConfig('AdminEmail', postVar('AdminEmail')); + self::updateConfig('SessionCookie', postVar('SessionCookie')); + self::updateConfig('AllowMemberCreate', postVar('AllowMemberCreate')); + self::updateConfig('AllowMemberMail', postVar('AllowMemberMail')); + self::updateConfig('NonmemberMail', postVar('NonmemberMail')); + self::updateConfig('ProtectMemNames', postVar('ProtectMemNames')); + self::updateConfig('SiteName', postVar('SiteName')); + self::updateConfig('NewMemberCanLogon', postVar('NewMemberCanLogon')); + self::updateConfig('DisableSite', postVar('DisableSite')); + self::updateConfig('DisableSiteURL', postVar('DisableSiteURL')); + self::updateConfig('LastVisit', postVar('LastVisit')); + self::updateConfig('MediaURL', postVar('MediaURL')); + self::updateConfig('AllowedTypes', postVar('AllowedTypes')); + self::updateConfig('AllowUpload', postVar('AllowUpload')); + self::updateConfig('MaxUploadSize', postVar('MaxUploadSize')); + self::updateConfig('MediaPrefix', postVar('MediaPrefix')); + self::updateConfig('AllowLoginEdit', postVar('AllowLoginEdit')); + self::updateConfig('DisableJsTools', postVar('DisableJsTools')); + self::updateConfig('CookieDomain', postVar('CookieDomain')); + self::updateConfig('CookiePath', postVar('CookiePath')); + self::updateConfig('CookieSecure', postVar('CookieSecure')); + self::updateConfig('URLMode', postVar('URLMode')); + self::updateConfig('CookiePrefix', postVar('CookiePrefix')); self::updateConfig('DebugVars', postVar('DebugVars')); - self::updateConfig('DefaultListSize', postVar('DefaultListSize')); - self::updateConfig('AdminCSS', postVar('AdminCSS')); - + self::updateConfig('DefaultListSize', postVar('DefaultListSize')); + self::updateConfig('AdminCSS', postVar('AdminCSS')); + self::updateConfig('AdminSkin', postVar('adminskin')); + self::updateConfig('BookmarkletSkin', postVar('bookmarklet')); + // load new config and redirect (this way, the new locale will be used is necessary) // note that when changing cookie settings, this redirect might cause the user // to have to log in again. getConfig(); redirect($CONF['AdminURL'] . '?action=manage'); - exit; + return; } - + /** * Admin::action_systemoverview() * Output system overview @@ -4612,11 +4709,10 @@ class Admin */ static private function action_systemoverview() { - self::pagehead(); self::$skin->parse('systemoverview'); - self::pagefoot(); + return; } - + /** * Admin::updateConfig() * @@ -4626,14 +4722,14 @@ class Admin */ static private function updateConfig($name, $val) { - $name = sql_real_escape_string($name); - $val = trim(sql_real_escape_string($val)); - - $query = "UPDATE %s SET value='%s' WHERE name='%s'"; - $query = sprintf($query, sql_table('config'), $val, $name); -// sql_query($query) or die("Query error: " . sql_error()); - sql_query($query) or die(_ADMIN_SQLDIE_QUERYERROR . sql_error()); - return sql_insert_id(); + $query = "UPDATE %s SET value=%s WHERE name=%s"; + $query = sprintf($query, sql_table('config'), DB::quoteValue($val), DB::quoteValue($name)); + if ( DB::execute($query) === FALSE ) + { + $err = DB::getError(); + die(_ADMIN_SQLDIE_QUERYERROR . $err[2]); + } + return DB::getInsertId(); } /** @@ -4643,12 +4739,11 @@ class Admin * @param string $msg message that will be shown * @return void */ - static private function error($msg) + static public function error($msg) { - self::pagehead(); - self::parse('adminerrorpage'); - self::pagefoot(); - exit; + self::$headMess = $msg; + self::$skin->parse('adminerrorpage'); + return; } /** @@ -4658,316 +4753,30 @@ class Admin * @param void * @return void */ - static private function disallow() + static public function disallow() { ActionLog::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI')); self::error(_ERROR_DISALLOWED); return; } - + /** - * Admin::pagehead() - * Output admin page head - * - * @param void + * Admin::action_PluginAdmin() + * Output pluginadmin + * + * @param string $skinContents + * @param string $extrahead * @return void */ - static private function pagehead($extrahead = '') + static public function action_PluginAdmin($skinContents, $extrahead = '') { - global $member, $nucleus, $CONF, $manager; - - if ( self::existsSkinContents('pagehead') ) - { - if ( isset($extrahead) && !empty($extrahead) ) - { - self::$extrahead = $extrahead; - } - self::parse('pagehead'); - } - else - { - $data = array( - 'extrahead' => &$extrahead, - 'action' => self::$action - ); - - $manager->notify('AdminPrePageHead', $data); - - $baseUrl = Entity::hsc($CONF['AdminURL']); - - /* - * TODO: obsoleted - if ( !array_key_exists('AdminCSS', $CONF) ) - { - sql_query("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')"); - $CONF['AdminCSS'] = 'original'; - } - */ - - /* HTTP 1.1 application for no caching */ - header("Cache-Control: no-cache, must-revalidate"); - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - - $root_element = 'html'; - $charset = i18n::get_current_charset(); - $locale = preg_replace('#_#', '-', i18n::get_current_locale()); - $xml_version_info = self::xml_version_info; - $formal_public_identifier = self::formal_public_identifier; - $system_identifier = self::system_identifier; - $xhtml_namespace = self::xhtml_namespace; - - echo "\n"; - echo "\n"; - echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n"; - echo "\n"; - echo '' . Entity::hsc($CONF['SiteName']) . " - Admin\n"; - /* - * TODO: obsoleted - echo "\n"; - */ - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "{$extrahead}\n"; - echo "\n\n"; - echo "\n"; - echo "
\n"; - echo "
\n"; - echo '

' . Entity::hsc($CONF['SiteName']) . "

\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - if ( $member->isLoggedIn() ) - { - echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - " . _LOGOUT. "
\n"; - echo "" . _ADMINHOME . " - "; - } - else - { - echo '' . _NOTLOGGEDIN . "
\n"; - } - echo ""._YOURSITE."
\n"; - echo '('; - - if (array_key_exists('codename', $nucleus) && $nucleus['codename'] != '' ) - { - $codenamestring = ' "' . $nucleus['codename'].'"'; - } - else - { - $codenamestring = ''; - } - - if ( $member->isLoggedIn() && $member->isAdmin() ) - { - $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel()); - echo 'Nucleus CMS ' . $nucleus['version'] . $codenamestring . ''; - - $newestVersion = getLatestVersion(); - $newestCompare = str_replace('/', '.', $newestVersion); - $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']); - - if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 ) - { - echo "
\n"; - echo ''; - echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion; - echo ""; - } - } - else - { - echo "Nucleus CMS {$nucleus['version']}{$codenamestring}"; - } - echo ')'; - echo '
'; - } + self::$extrahead .= $extrahead; + self::$skin->parse('pluginadmin', $skinContents); return; } /** - * Admin::pagefoot() - * Output admin page foot include quickmenu - * - * @param void - * @return void - */ - static private function pagefoot() - { - global $action, $member, $manager; - - if ( self::existsSkinContents('pagefoot') ) - { - self::parse('pagefoot'); - exit; - } - else - { - $data = array( - 'action' => self::$action - ); - - $manager->notify('AdminPrePageFoot', $data); - - if ( $member->isLoggedIn() && ($action != 'showlogin') ) - { - echo '

' . _LOGOUT . "

\n"; - echo "\n"; - } - - echo "
\n"; - echo 'Nucleus CMS © 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT; - echo '-'; - echo '' . _ADMINPAGEFOOT_DONATE . "\n"; - echo "
\n"; - - echo "
\n"; - - if ( ($action != 'showlogin') && ($member->isLoggedIn()) ) - { - echo "\n"; - - echo '

' . _QMENU_ADD . "

\n"; - echo "
\n"; - echo "

\n"; - echo "\n"; - - $showAll = requestVar('showall'); - - if ( ($member->isAdmin()) && ($showAll == 'yes') ) - { - // Super-Admins have access to all blogs! (no add item support though) - $query = "SELECT bnumber as value, bname as text FROM %s ORDER BY bname;"; - $query = sprintf($query, sql_table('blog')); - } - else - { - $query = "SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;"; - $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID()); - } - $template['name'] = 'blogid'; - $template['tabindex'] = 15000; - $template['extra'] = _QMENU_ADD_SELECT; - $template['selected'] = -1; - $template['shorten'] = 10; - $template['shortenel'] = ''; - $template['javascript'] = 'onchange="return form.submit()"'; - showlist($query, 'select', $template); - - echo "

\n"; - echo "
\n"; - - echo "

{$member->getDisplayName()}

\n"; - echo "\n"; - - if ( $member->isAdmin() ) - { - echo '

' . _QMENU_MANAGE . "

\n"; - echo "\n"; - - echo "

" . _QMENU_LAYOUT . "

\n"; - echo "\n"; - } - - $data = array('options' => array()); - - $manager->notify('QuickMenu', $data); - - if ( count($data['options']) > 0 ) - { - echo "

" . _QMENU_PLUGINS . "

\n"; - echo "\n"; - } - } - else if ( ($action == 'activate') || ($action == 'activatesetpwd') ) - { - - echo '

' . _QMENU_ACTIVATE . '

' . _QMENU_ACTIVATE_TEXT; - } - else - { - echo '

' . _QMENU_INTRO . '

' . _QMENU_INTRO_TEXT; - } - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "\n"; - } - return; - } - - /** - * Admin:: - * - * @param void - * @return void - */ - static private function action_regfile() - { - global $member, $CONF; - - $blogid = intRequestVar('blogid'); - - $member->teamRights($blogid) or self::disallow(); - - // header-code stolen from phpMyAdmin - // REGEDIT and bookmarklet code stolen from GreyMatter - - $sjisBlogName = sprintf(_WINREGFILE_TEXT, getBlogNameFromID($blogid)); - - - header('Content-Type: application/octetstream'); - header('Content-Disposition: filename="nucleus.reg"'); - header('Pragma: no-cache'); - header('Expires: 0'); - - echo "REGEDIT4\n"; - echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\" . $sjisBlogName . "]\n"; - echo '@="' . $CONF['AdminURL'] . "bookmarklet.php?action=contextmenucode&blogid=".intval($blogid)."\"\n"; - echo '"contexts"=hex:31'; - } - - /** - * Admin:: + * Admin::action_bookmarklet() * * @param void * @return void @@ -4975,19 +4784,16 @@ class Admin static private function action_bookmarklet() { global $member, $manager; - - $member->teamRights($blogid) or self::disallow(); - + $blogid = intRequestVar('blogid'); - - self::pagehead(); + $member->teamRights($blogid) or self::disallow(); + self::$skin->parse('bookmarklet'); - self::pagefoot(); - + return; } - + /** - * Admin:: + * Admin::action_actionlog() * * @param void * @return void @@ -4995,53 +4801,49 @@ class Admin static private function action_actionlog() { global $member, $manager; - + $member->isAdmin() or self::disallow(); - - self::pagehead(); + self::$skin->parse('actionlog'); - self::pagefoot(); - + return; } - + /** - * Admin:: + * Admin::action_banlist() * * @param void * @return void */ - static private function action_banlist() { + static private function action_banlist() + { global $member, $manager; - - $member->blogAdminRights($blogid) or self::disallow(); - + $blogid = intRequestVar('blogid'); - - self::pagehead(); + $member->blogAdminRights($blogid) or self::disallow(); + self::$skin->parse('banlist'); - self::pagefoot(); - + return; } - + /** - * Admin:: + * Admin::action_banlistdelete() * * @param void * @return void */ - static private function action_banlistdelete() { + static private function action_banlistdelete() + { global $member, $manager; - + $blogid = intRequestVar('blogid'); $member->blogAdminRights($blogid) or self::disallow(); - - self::pagehead(); + self::$skin->parse('banlistdelete'); - self::pagefoot(); + return; } - + /** - * Admin:: + * Admin::action_banlistdeleteconfirm() * * @param void * @return void @@ -5049,20 +4851,20 @@ class Admin static private function action_banlistdeleteconfirm() { global $member, $manager; - + + $blogid = intPostVar('blogid'); + $allblogs = postVar('allblogs'); + $iprange = postVar('iprange'); + $member->blogAdminRights($blogid) or self::disallow(); - - $blogid = intPostVar('blogid'); - $allblogs = postVar('allblogs'); - $iprange = postVar('iprange'); - + $deleted = array(); - + if ( !$allblogs ) { if ( Ban::removeBan($blogid, $iprange) ) { - array_push($deleted, $blogid); + $deleted[] = $blogid; } } else @@ -5073,81 +4875,90 @@ class Admin { if ( Ban::removeBan($blogje, $iprange) ) { - array_push($deleted, $blogje); + $deleted[] = $blogje; } } } - + if ( sizeof($deleted) == 0 ) { self::error(_ERROR_DELETEBAN); } - - self::pagehead(); + + /* TODO: we should use other ways */ + $_REQUEST['delblogs'] = $deleted; + self::$skin->parse('banlistdeleteconfirm'); - self::pagefoot(); - + return; } - + /** - * Admin:: + * Admin::action_banlistnewfromitem() * * @param void * @return void */ static private function action_banlistnewfromitem() { - self::$action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid'))); + global $manager; + + $itemid = intRequestVar('itemid'); + $item =& $manager->getItem($itemid, 1, 1); + self::action_banlistnew($item['blogid']); + return; } - + /** - * Admin:: + * Admin::action_banlistnew() * - * @param void + * @param integer $blogid ID for weblog * @return void */ static private function action_banlistnew($blogid = '') { global $member, $manager; - + if ( $blogid == '' ) { $blogid = intRequestVar('blogid'); } - + $ip = requestVar('ip'); - + $member->blogAdminRights($blogid) or self::disallow(); - + + /* TODO: we should consider to use the other way instead of this */ $_REQUEST['blogid'] = $blogid; - - self::pagehead(); + self::$skin->parse('banlistnew'); - self::pagefoot(); + + return; } /** - * Admin:: + * Admin::action_banlistadd() * * @param void * @return void */ - static private function action_banlistadd() { + static private function action_banlistadd() + { global $member; - - $blogid = intPostVar('blogid'); - $allblogs = postVar('allblogs'); - $iprange = postVar('iprange'); + + $blogid = intPostVar('blogid'); + $allblogs = postVar('allblogs'); + $iprange = postVar('iprange'); + if ( $iprange == "custom" ) { $iprange = postVar('customiprange'); } $reason = postVar('reason'); - + $member->blogAdminRights($blogid) or self::disallow(); - + // TODO: check IP range validity - + if ( !$allblogs ) { if ( !Ban::addBan($blogid, $iprange, $reason) ) @@ -5172,11 +4983,12 @@ class Admin self::error(_ERROR_ADDBAN); } } - self::$action_banlist(); + self::action_banlist(); + return; } - + /** - * Admin:: + * Admin::action_clearactionlog() * * @param void * @return void @@ -5184,16 +4996,17 @@ class Admin static private function action_clearactionlog() { global $member; - + $member->isAdmin() or self::disallow(); - + ActionLog::clear(); - - self::$action_manage(_MSG_ACTIONLOGCLEARED); + + self::action_manage(_MSG_ACTIONLOGCLEARED); + return; } - + /** - * Admin:: + * Admin::action_backupoverview() * * @param void * @return void @@ -5201,12 +5014,11 @@ class Admin static private function action_backupoverview() { global $member, $manager; - + $member->isAdmin() or self::disallow(); - - self::pagehead(); + self::$skin->parse('backupoverview'); - self::pagefoot(); + return; } /** @@ -5265,9 +5077,7 @@ class Admin { self::error($message); } - self::pagehead(); self::$skin->parse('backuprestore'); - self::pagefoot(); return; } @@ -5286,14 +5096,12 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('pluginlist'); - self::pagefoot(); return; } /** - * Admin:: + * Admin::action_pluginhelp() * * @param void * @return void @@ -5301,22 +5109,21 @@ class Admin static private function action_pluginhelp() { global $member, $manager, $DIR_PLUGINS, $CONF; - + // check if allowed $member->isAdmin() or self::disallow(); - + $plugid = intGetVar('plugid'); - + if ( !$manager->pidInstalled($plugid) ) { self::error(_ERROR_NOSUCHPLUGIN); } - - self::pagehead(); + self::$skin->parse('pluginhelp'); - self::pagefoot(); + return; } - + /** * Admin::action_pluginadd() * @@ -5344,31 +5151,20 @@ class Admin } // get number of currently installed plugins - $res = sql_query('SELECT * FROM ' . sql_table('plugin')); - $numCurrent = sql_num_rows($res); + $res = DB::getResult('SELECT * FROM ' . sql_table('plugin')); + $numCurrent = $res->rowCount(); // plugin will be added as last one in the list $newOrder = $numCurrent + 1; - $manager->notify( - 'PreAddPlugin', - array( - 'file' => &$name - ) - ); + $data = array('file' => &$name); + $manager->notify('PreAddPlugin', $data); // do this before calling getPlugin (in case the plugin id is used there) - $query = 'INSERT INTO ' - . sql_table('plugin') - . ' (' - . ' porder,' - . ' pfile' - . ') VALUES (' - . $newOrder . ',' - . '"' . sql_real_escape_string($name) . '"' - . ')'; - sql_query($query); - $iPid = sql_insert_id(); + $query = "INSERT INTO %s (porder, pfile) VALUES (%d, %s);"; + $query = sprintf($query, sql_table('plugin'), (integer) $newOrder, DB::quoteValue($name)); + DB::execute($query); + $iPid = DB::getInsertId(); $manager->clearCachedInfo('installedPlugins'); @@ -5378,7 +5174,11 @@ class Admin // check if it got loaded (could have failed) if ( !$plugin ) { - sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid)); + $query = "DELETE FROM %s WHERE pid=%d;"; + $query = sprintf($query, sql_table('plugin'), (integer) $iPid); + + DB::execute($query); + $manager->clearCachedInfo('installedPlugins'); self::error(_ERROR_PLUGIN_LOAD); } @@ -5406,8 +5206,8 @@ class Admin $pluginList = $plugin->getPluginDep(); foreach ( $pluginList as $pluginName ) { - $res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"'); - if (sql_num_rows($res) == 0) + $res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName)); + if ($res->rowCount() == 0) { // uninstall plugin again... self::deleteOnePlugin($plugin->getID()); @@ -5418,15 +5218,11 @@ class Admin // call the install method of the plugin $plugin->install(); - $manager->notify( - 'PostAddPlugin', - array( - 'plugin' => &$plugin - ) - ); + $data = array('plugin' => &$plugin); + $manager->notify('PostAddPlugin', $data); // update all events - self::$action_pluginupdate(); + self::action_pluginupdate(); return; } @@ -5445,22 +5241,22 @@ class Admin $member->isAdmin() or self::disallow(); // delete everything from plugin_events - sql_query('DELETE FROM '.sql_table('plugin_event')); + DB::execute('DELETE FROM '.sql_table('plugin_event')); // loop over all installed plugins - $res = sql_query('SELECT pid, pfile FROM '.sql_table('plugin')); - while ( $o = sql_fetch_object($res) ) + $res = DB::getResult('SELECT pid, pfile FROM '.sql_table('plugin')); + foreach ( $res as $row ) { - $pid = $o->pid; - $plug =& $manager->getPlugin($o->pfile); + $pid = $row['pid']; + $plug =& $manager->getPlugin($row['pfile']); if ( $plug ) { $eventList = $plug->getEventList(); foreach ( $eventList as $eventName ) { - $query = "INSERT INTO %s (pid, event) VALUES (%d, '%s')"; - $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, sql_real_escape_string($eventName)); - sql_query($query); + $query = "INSERT INTO %s (pid, event) VALUES (%d, %s)"; + $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, DB::quoteValue($eventName)); + DB::execute($query); } } } @@ -5469,7 +5265,7 @@ class Admin } /** - * Admin:: + * Admin::action_plugindelete() * * @param void * @return void @@ -5477,24 +5273,23 @@ class Admin static private function action_plugindelete() { global $member, $manager; - + // check if allowed $member->isAdmin() or self::disallow(); - + $pid = intGetVar('plugid'); - + if ( !$manager->pidInstalled($pid) ) { self::error(_ERROR_NOSUCHPLUGIN); } - - self::pagehead(); + self::$skin->parse('plugindelete'); - self::pagefoot(); + return; } /** - * Admin:: + * Admin::action_plugindeleteconfirm() * * @param void * @return void @@ -5502,71 +5297,64 @@ class Admin static private function action_plugindeleteconfirm() { global $member, $manager, $CONF; - + // check if allowed $member->isAdmin() or self::disallow(); - + $pid = intPostVar('plugid'); - + $error = self::deleteOnePlugin($pid, 1); - if ($error) { + if ( $error ) + { self::error($error); } - + redirect($CONF['AdminURL'] . '?action=pluginlist'); -// self::$action_pluginlist(); + return; } - + /** * Admin:: * * @param void * @return void */ - static private function deleteOnePlugin($pid, $callUninstall = 0) + static public function deleteOnePlugin($pid, $callUninstall = 0) { global $manager; - + $pid = intval($pid); - + if ( !$manager->pidInstalled($pid) ) { return _ERROR_NOSUCHPLUGIN; } - - $name = quickQuery('SELECT pfile as result FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid); - -/* // call the unInstall method of the plugin - if ($callUninstall) { - $plugin =& $manager->getPlugin($name); - if ($plugin) $plugin->unInstall(); - }*/ - + + $query = "SELECT pfile as result FROM %s WHERE pid=%d;"; + $query = sprintf($query, sql_table('plugin'), (integer) $pid); + $name = DB::getValue($query); + // check dependency before delete - $res = sql_query('SELECT pfile FROM ' . sql_table('plugin')); - while ($o = sql_fetch_object($res)) + $res = DB::getResult('SELECT pfile FROM ' . sql_table('plugin')); + foreach ( $res as $row ) { - $plug =& $manager->getPlugin($o->pfile); - if ($plug) + $plug =& $manager->getPlugin($row['pfile']); + if ( $plug ) { $depList = $plug->getPluginDep(); - foreach ($depList as $depName) + foreach ( $depList as $depName ) { - if ($name == $depName) + if ( $name == $depName ) { - return sprintf(_ERROR_DELREQPLUGIN, $o->pfile); + return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']); } } } } - - $manager->notify( - 'PreDeletePlugin', - array( - 'plugid' => $pid - ) - ); - + + $data = array('plugid' => $pid); + $manager->notify('PreDeletePlugin', $data); + // call the unInstall method of the plugin if ( $callUninstall ) { @@ -5576,47 +5364,42 @@ class Admin $plugin->unInstall(); } } - + // delete all subscriptions - sql_query('DELETE FROM ' . sql_table('plugin_event') . ' WHERE pid=' . $pid); - + DB::execute('DELETE FROM ' . sql_table('plugin_event') . ' WHERE pid=' . $pid); + // delete all options // get OIDs from plugin_option_desc - $res = sql_query('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid); + $res = DB::getResult('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid); $aOIDs = array(); - while ($o = sql_fetch_object($res)) + foreach ( $res as $row ) { - array_push($aOIDs, $o->oid); + array_push($aOIDs, $row['oid']); } - + // delete from plugin_option and plugin_option_desc - sql_query('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid); + DB::execute('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid); if (count($aOIDs) > 0) { - sql_query('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',',$aOIDs) . ')'); + DB::execute('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',', $aOIDs) . ')'); } - + // update order numbers - $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid); - $o = sql_fetch_object($res); - sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=(porder - 1) WHERE porder>' . $o->porder); - + $res = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid); + DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=(porder - 1) WHERE porder>' . $res); + // delete row - sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid); - + DB::execute('DELETE FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid); + $manager->clearCachedInfo('installedPlugins'); - $manager->notify( - 'PostDeletePlugin', - array( - 'plugid' => $pid - ) - ); - + $data = array('plugid' => $pid); + $manager->notify('PostDeletePlugin', $data); + return ''; } - + /** - * Admin:: + * Admin::action_pluginup() * * @param void * @return void @@ -5624,36 +5407,35 @@ class Admin static private function action_pluginup() { global $member, $manager, $CONF; - + // check if allowed $member->isAdmin() or self::disallow(); - + $plugid = intGetVar('plugid'); - + if ( !$manager->pidInstalled($plugid) ) { self::error(_ERROR_NOSUCHPLUGIN); } - + // 1. get old order number - $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid); - $o = sql_fetch_object($res); - $oldOrder = $o->porder; - + $oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid); + // 2. calculate new order number $newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1; - + // 3. update plug numbers - sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder); - sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid); - - //self::$action_pluginlist(); + DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder); + DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid); + + //self::action_pluginlist(); // To avoid showing ticket in the URL, redirect to pluginlist, instead. redirect($CONF['AdminURL'] . '?action=pluginlist'); + return; } - + /** - * Admin:: + * Admin::action_plugindown() * * @param void * @return void @@ -5661,34 +5443,33 @@ class Admin static private function action_plugindown() { global $member, $manager, $CONF; - + // check if allowed $member->isAdmin() or self::disallow(); - + $plugid = intGetVar('plugid'); if ( !$manager->pidInstalled($plugid) ) { self::error(_ERROR_NOSUCHPLUGIN); } - + // 1. get old order number - $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid); - $o = sql_fetch_object($res); - $oldOrder = $o->porder; - - $res = sql_query('SELECT * FROM ' . sql_table('plugin')); - $maxOrder = sql_num_rows($res); - + $oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid); + + $res = DB::getResult('SELECT * FROM ' . sql_table('plugin')); + $maxOrder = $res->rowCount(); + // 2. calculate new order number $newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder; - + // 3. update plug numbers - sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder); - sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid); - - //self::$action_pluginlist(); + DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder); + DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid); + + //self::action_pluginlist(); // To avoid showing ticket in the URL, redirect to pluginlist, instead. redirect($CONF['AdminURL'] . '?action=pluginlist'); + return; } /** @@ -5701,28 +5482,28 @@ class Admin * @return void * */ - static public function action_pluginoptions($message = '') + static private function action_pluginoptions($message = '') { global $member, $manager; // check if allowed $member->isAdmin() or self::disallow(); -// $pid = (integer) requestVar('plugid'); $pid = intRequestVar('plugid'); if ( !$manager->pidInstalled($pid) ) { self::error(_ERROR_NOSUCHPLUGIN); } - + if ( isset($message) ) { self::$headMess = $message; } - $extrahead = "\n"; - self::pagehead($extrahead); + $plugname = $manager->getPluginNameFromPid($pid); + $plugin = $manager->getPlugin($plugname); + Admin::$extrahead .= "\n"; + self::$skin->parse('pluginoptions'); - self::pagefoot(); return; } @@ -5735,7 +5516,7 @@ class Admin * @param void * @return void */ - static public function action_pluginoptionsupdate() + static private function action_pluginoptionsupdate() { global $member, $manager; @@ -5743,7 +5524,7 @@ class Admin $member->isAdmin() or self::disallow(); $pid = intRequestVar('plugid'); -// $pid = (integer) requestVar('plugid'); + if ( !$manager->pidInstalled($pid) ) { self::error(_ERROR_NOSUCHPLUGIN); @@ -5751,208 +5532,91 @@ class Admin $aOptions = requestArray('plugoption'); NucleusPlugin::apply_plugin_options($aOptions); - - $manager->notify( - 'PostPluginOptionsUpdate', - array( - 'context' => 'global', - 'plugid' => $pid - ) - ); - - self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED); - return; - } - - /** - * Admin::_insertPluginOptions() - * - * Output plugin option field - * - * @access public - * @param string $context plugin option context - * @param integer $contextid plugin option context id - * @return void - */ - static public function _insertPluginOptions($context, $contextid = 0) - { - // get all current values for this contextid - // (note: this might contain doubles for overlapping contextids) - $aIdToValue = array(); - $res = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE ocontextid=' . intval($contextid)); - while ( $object = sql_fetch_object($res) ) - { - $aIdToValue[$object->oid] = $object->ovalue; - } - - // get list of oids per pid - $query = 'SELECT ' - . ' * ' - . 'FROM ' - . sql_table('plugin_option_desc') . ', ' - . sql_table('plugin') . ' ' - . 'WHERE ' - . ' opid = pid ' - . 'and ocontext = "' . sql_real_escape_string($context) . '" ' - . 'ORDER BY ' - . ' porder, oid ASC'; - $res = sql_query($query); - $aOptions = array(); - while ( $object = sql_fetch_object($res) ) - { - if ( !in_array($object->oid, array_keys($aIdToValue)) ) - { - $value = $object->odef; - } - else - { - $value = $aIdToValue[$object->oid]; - } - - array_push( - $aOptions, - array( - 'pid' => $object->pid, - 'pfile' => $object->pfile, - 'oid' => $object->oid, - 'value' => $value, - 'name' => $object->oname, - 'description' => $object->odesc, - 'type' => $object->otype, - 'typeinfo' => $object->oextra, - 'contextid' => $contextid, - 'extra' => '' - ) - ); - } - global $manager; - $manager->notify( - 'PrePluginOptionsEdit', - array( - 'context' => $context, - 'contextid' => $contextid, - 'options' =>& $aOptions - ) + $data = array( + 'context' => 'global', + 'plugid' => $pid ); + $manager->notify('PostPluginOptionsUpdate', $data); - self::$aOptions = $aOptions; - self::$skin->parse('insertpluginoptions'); + self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED); return; } /** - * Admin:: + * Admin::action_parseSpecialskin() * * @param void * @return void */ static private function action_parseSpecialskin() { - self::pagehead(); self::$skin->parse(self::$action); - self::pagefoot(); - } - - /* - * TODO: I guess this method was simply copied from Skin class... - static private function parse($type) - { - global $manager, $CONF; - - if ( $type == 'pagehead' ) - { - $data = array( - 'skin' => &self::$skin, - 'type' => $type - ); - - $manager->notify('InitAdminSkinParse', $data); - sendContentType(self::$skin->getContentType(), 'skin', i18n::get_current_charset()); - } - - $contents = self::$skin->getContent($type); - - if ( !$contents ) - { - echo _ERROR_SKIN; - return; - } - - $actions = self::$skin->getAllowedActionsForType($type); - - if ( $type == 'pagehead' ) - { - $data = array( - 'skin' => &self::$skin, - 'type' => $type, - 'contents' => &$contents - ); - - $manager->notify('PreAdminSkinParse', $data); - } - - PARSER::setProperty('IncludeMode', self::$skin->getIncludeMode()); - PARSER::setProperty('IncludePrefix', self::$skin->getIncludePrefix()); - - if ( $type == 'createitem' || $type == 'itemedit' ) - { - // TODO: where is this class??? - $handler = new Factory(intRequestVar('blogid'), $type, self::$skin, $this); - $actions = array_merge($actions, $handler->actions); - } - else - { - // TODO: why??? - $actions = array_merge($actions, self::$skin->getAllowedActionsForType($type)); - } - - $parser = new Parser($actions, $handler); - $handler->setParser($parser); - $handler->setSkin(self::$skin); - $parser->parse($contents); - - if ( $type == 'pagefoot' ) - { - $data = array( - 'skin' => &self::$skin, - 'type' => $type, - ); - - $manager->notify('PostAdminSkinParse', $data); - } return; } - */ /** - * Admin:: + * Admin::getAdminskinIDFromName() * - * @param void - * @return void + * @param string $skinname name of skin + * @return integer ID for skin */ static private function getAdminskinIDFromName($skinname) { - $query = "SELECT 'sdnumber' as result FROM %s WHERE sdname = '%s';"; - $admnSknID = quickQuery(sprintf($query, sql_table('skin_desc'), mysql_real_escape_string($skinname))); + $query = "SELECT 'sdnumber' as result FROM %s WHERE sdname = %s;"; + $query = sprintf($query, sql_table('skin_desc'), DB::quoteValue($skinname)); + $admnSknID = DB::getValue($query); return (integer) $adminSkinID; } /** - * Admin:: + * Admin::getAdminskinNameFromID() * - * @param void - * @return void + * @param integer $skinid ID for skin + * @return integer ID for skin */ static private function getAdminskinNameFromID($skinid) { - $query = "SELECT sdname as result FROM %s WHERE sdnumber = '%d';"; - $admnSknID = quickQuery(sprintf($query, sql_table('skin_desc'), (integer) $skinid)); + $query = "SELECT sdname as result FROM %s WHERE sdnumber = %d;"; + $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); + $admnSknID = DB::getValue($query); return (integer) $adminSkinID; } /** - * Admin:: + * Admin::getAdminextrahead() + */ + static public function getAdminextrahead() + { + return self::$extrahead; + } + + /** + * Admin::getAdminpassvar() + */ + static public function getAdminpassvar() + { + return self::$passvar; + } + + /** + * Admin::getAdminAction() + */ + static public function getAdminAction() + { + return self::$action; + } + + /** + * Admin::getAdminaOption() + */ + static public function getAdminaOption() + { + return self::$aOptions; + } + + /** + * Admin::action_importAdmin() * * @param void * @return void @@ -5962,7 +5626,7 @@ class Admin global $DIR_ADMINSKINS, $action; if ( $action == 'adminskinieimport' ) { - self::_doAdminskinimport(); + self::doAdminskinimport(); } $skn = array(); if ( $action == 'showlogin' ) @@ -5987,21 +5651,21 @@ class Admin self::$skin = (object) $skn; $handler = new AdminActions($actnName, self::$skin, $this); - $actions = Skin::getAllowedActionsForType($actnName); - $parser = new PARSER($actions, $handler); - $handler->setParser($parser); - $handler->setSkin(self::$skin); + $parser = new PARSER($handler); + $parser->setSkin(self::$skin); $parser->parse($contents); + + return; } /** - * Admin:: + * Admin::doAdminskinimport() * * @param void * @return void */ - static private function _doAdminskinimport() + static private function doAdminskinimport() { global $DIR_LIBS, $DIR_ADMINSKINS, $CONF, $member; @@ -6040,12 +5704,4 @@ class Admin header('Location: ' . $CONF['AdminURL']); exit; } - - /** - * Returns a link to a weblog - * @param object BLOG - */ - static private function bloglink(&$blog) { - return ''. Entity::hsc( $blog->getName() ) .''; - } }