X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2FADMIN.php;h=839a8dbbc42cd1e92a9c355df9e7fad0808df56e;hb=eb080ad31a3105dac5cb1ba827ca2475df51b205;hp=26f0fe2fdf467fb22db317be871a19c2b92b8adb;hpb=2c104e1a1e48d3a92dc7908c23b3f1df85bdad47;p=nucleus-jp%2Fnucleus-next.git diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index 26f0fe2..839a8db 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -26,14 +26,18 @@ class Admin 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 */ @@ -88,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', @@ -99,9 +103,11 @@ class Admin 'bookmarklet', 'blogsettings', 'banlist', + 'createaccount', 'deleteblog', 'editmembersettings', - 'browseownitems', + 'createaccount', + 'forgotpassword', 'browseowncomments', 'createitem', 'itemedit', @@ -145,21 +151,20 @@ class Admin static public function initialize() { - global $CONF, $DIR_LIBS; + global $CONF, $DIR_LIBS, $manager, $member; /* NOTE: 1. decide which skinid to use */ - $skinid = $CONF['DefaultAdminSkin']; + $skinid = $CONF['AdminSkin']; /* - * NOTE: this is temporary escaped because not implemented yet + * NOTE: this is temporary escaped because not implemented yet*/ if (isset($member) && $member->isLoggedIn()) { $memskin = $member->getAdminSkin(); - if ( $memskin ) + if ( $memskin && Skin::existsID($memskin)) { $skinid = $memskin; } } - */ /* NOTE: 2. make an instance of skin object */ if ( !Skin::existsID($skinid) ) @@ -168,7 +173,7 @@ class Admin } /* NOTE: 3. initializing each members */ - self::$skin = new Skin($skinid, 'AdminActions', 'AdminSkin'); + self::$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin'); self::$action = ''; self::$extrahead = ''; self::$passvar = ''; @@ -201,7 +206,7 @@ class Admin { $alias = array( 'login' => 'overview', - '' => 'overview' + '' => 'overview', ); } if ( array_key_exists($action, $alias) && isset($alias[$action]) ) @@ -224,9 +229,10 @@ class Admin if (!$manager->checkTicket()) { self::error(_ERROR_BADTICKET); + return; } } - + /* 3. parse according to the action */ if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) ) { @@ -236,25 +242,28 @@ class Admin } elseif ( method_exists('Admin', $methodName) ) { - call_user_func(array(self, $methodName)); + call_user_func(array(__CLASS__, $methodName)); } else if ( self::existsSkinContents('adminerrorpage') ) { self::error(_BADACTION . ENTITY::hsc($action)); + return; } - 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)); + return; } } else { self::error(_BADACTION . ENTITY::hsc($action)); + return; } - exit; + return; } /** @@ -274,16 +283,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) ) { global $CONF; - return quickQuery(sprintf($query, sql_table('skin'), $CONF['DefaultAdminSkin'], sql_real_escape_string($action))); + return DB::getValue(sprintf($query, sql_table('skin'), $CONF['AdminSkin'], DB::quoteValue($action))); } else { - return quickQuery(sprintf($query, sql_table('skin'), self::$skin->getID(), sql_real_escape_string($action))); + return DB::getValue(sprintf($query, sql_table('skin'), self::$skin->getID(), DB::quoteValue($action))); } } return; @@ -298,9 +307,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('skin'), (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); } /** @@ -329,8 +338,8 @@ class Admin // skip to overview when allowed if ( $member->isLoggedIn() && $member->canLogin() ) { - self::$action_overview(); - exit; + self::action_overview(); + return; } /* TODO: needless variable??? */ @@ -340,9 +349,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('showlogin'); - self::pagefoot(); } /** @@ -359,9 +366,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('overview'); - self::pagefoot(); return; } @@ -381,9 +386,7 @@ class Admin } $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('manage'); - self::pagefoot(); return; } @@ -404,9 +407,7 @@ class Admin $member->teamRights($blogid) or $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('itemlist'); - self::pagefoot(); return; } @@ -428,6 +429,7 @@ class Admin if ( !is_array($selected) || sizeof($selected) == 0 ) { self::error(_BATCH_NOSELECTION); + return; } // On move: when no destination blog/category chosen, show choice now @@ -443,9 +445,7 @@ class Admin self::batchAskDeleteConfirmation('item', $selected); } - self::pagehead(); self::$skin->parse('batchitem'); - self::pagefoot(); return; } @@ -468,17 +468,16 @@ class Admin if ( !is_array($selected) || sizeof($selected) == 0 ) { self::error(_BATCH_NOSELECTION); + return; } // 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; } @@ -513,6 +512,7 @@ class Admin if ( !is_array($selected) || sizeof($selected) == 0 ) { self::error(_BATCH_NOSELECTION); + return; } // On delete: check if confirmation has been given @@ -521,9 +521,7 @@ class Admin self::batchAskDeleteConfirmation('member',$selected); } - self::pagehead(); self::$skin->parse('batchmember'); - self::pagefoot(); return; } @@ -547,6 +545,7 @@ class Admin if ( !is_array($selected) || sizeof($selected) == 0 ) { self::error(_BATCH_NOSELECTION); + return; } // On delete: check if confirmation has been given @@ -555,9 +554,7 @@ class Admin self::batchAskDeleteConfirmation('team',$selected); } - self::pagehead(); self::$skin->parse('batchteam'); - self::pagefoot(); return; } @@ -579,6 +576,7 @@ class Admin if ( !is_array($selected) || sizeof($selected) == 0 ) { self::error(_BATCH_NOSELECTION); + return; } // On move: when no destination blog chosen, show choice now @@ -594,9 +592,7 @@ class Admin self::batchAskDeleteConfirmation('category', $selected); } - self::pagehead(); self::$skin->parse('batchcategory'); - self::pagefoot(); return; } @@ -612,9 +608,7 @@ class Admin static private function batchMoveSelectDestination($type, $ids) { $_POST['batchmove'] = $type; - self::pagehead(); self::$skin->parse('batchmove'); - self::pagefoot(); return; } @@ -631,9 +625,7 @@ class Admin { $_POST['batchmove'] = $type; global $manager; - self::pagehead(); self::$skin->parse('batchmovecat'); - self::pagefoot(); return; } @@ -648,96 +640,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 public 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; } @@ -751,9 +654,7 @@ class Admin { global $member, $manager, $CONF; - self::pagehead(); self::$skin->parse('browseownitems'); - self::pagefoot(); return; } @@ -773,18 +674,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; } @@ -797,9 +694,7 @@ class Admin */ static private function action_browseowncomments() { - self::pagehead(); self::$skin->parse('browseowncomments'); - self::pagefoot(); return; } @@ -828,9 +723,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; } @@ -850,13 +808,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; } @@ -875,19 +851,26 @@ class Admin // only allow if user is allowed to alter item $member->canAlterItem($itemid) or self::disallow(); - $itemid = intRequestVar('itemid'); - $blogid = getBlogIDFromItemID($itemid); - $item =& $manager->getItem($itemid, 1, 1); - $manager->notify( - 'PrepareItemForEdit', - array( - 'item' => &$item - ) - ); + $item =& $manager->getItem($itemid, 1, 1); + $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; } @@ -912,7 +895,7 @@ class Admin // delete actions are handled by itemdelete (which has confirmation) if ( $actiontype == 'delete' ) { - self::$action_itemdelete(); + self::action_itemdelete(); return; } @@ -945,20 +928,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; @@ -985,7 +968,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) @@ -994,10 +977,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; } @@ -1021,11 +1006,10 @@ class Admin if ( !$manager->existsItem($itemid,1,1) ) { self::error(_ERROR_NOSUCHITEM); + return; } - self::pagehead(); self::$skin->parse('itemdelete'); - self::pagefoot(); return; } @@ -1037,20 +1021,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; } @@ -1061,7 +1045,7 @@ class Admin * @param integer $itemid ID for item * @return void */ - static private function deleteOneItem($itemid) + static public function deleteOneItem($itemid) { global $member, $manager; @@ -1072,13 +1056,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; } @@ -1099,9 +1083,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(); } @@ -1126,9 +1110,7 @@ class Admin $member->canAlterItem($itemid) or self::disallow(); - self::pagehead(); self::$skin->parse('itemmove'); - self::pagefoot(); return; } @@ -1177,11 +1159,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; } @@ -1195,7 +1177,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; @@ -1227,22 +1209,20 @@ class Admin if ( $result['status'] == 'error' ) { self::error($result['message']); + return; } - $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; } @@ -1262,9 +1242,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; } @@ -1290,17 +1272,20 @@ class Admin if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE) { self::error(_ERROR_COMMENT_LONGWORD); + return; } // check length if ( i18n::strlen($body) < 3 ) { self::error(_ERROR_COMMENT_NOCOMMENT); + return; } if ( i18n::strlen($body) > 5000 ) { self::error(_ERROR_COMMENT_TOOLONG); + return; } // prepare body @@ -1312,25 +1297,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; } @@ -1349,9 +1332,7 @@ class Admin $commentid = intRequestVar('commentid'); $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); self::$skin->parse('commentdelete'); - self::pagefoot(); return; } @@ -1371,9 +1352,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 ) @@ -1383,11 +1362,11 @@ class Admin if ( $member->canAlterItem($itemid) ) { - self::$action_itemcommentlist($itemid); + self::action_itemcommentlist($itemid); } else { - self::$action_browseowncomments(); + self::action_browseowncomments(); } return; } @@ -1398,7 +1377,7 @@ class Admin * @param integer $commentid ID for comment * @return void */ - static private function deleteOneComment($commentid) + static public function deleteOneComment($commentid) { global $member, $manager; @@ -1418,7 +1397,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 @@ -1443,9 +1422,7 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('usermanagement'); - self::pagefoot(); return; } @@ -1458,7 +1435,7 @@ class Admin */ static private function action_memberedit() { - self::$action_editmembersettings(intRequestVar('memberid')); + self::action_editmembersettings(intRequestVar('memberid')); return; } @@ -1484,10 +1461,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; } @@ -1513,6 +1489,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) ) @@ -1525,28 +1502,32 @@ class Admin $notes = strip_tags(postVar('notes')); $locale = postVar('locale'); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); if ( $CONF['AllowLoginEdit'] || $member->isAdmin() ) { if ( !isValidDisplayName($name) ) { self::error(_ERROR_BADNAME); + return; } if ( ($name != $mem->getDisplayName()) && Member::exists($name) ) { self::error(_ERROR_NICKNAMEINUSE); + return; } if ( $password != $repeatpassword ) { self::error(_ERROR_PASSWORDMISMATCH); + return; } if ( $password && (i18n::strlen($password) < 6) ) { self::error(_ERROR_PASSWORDTOOSHORT); + return; } if ( $password ) @@ -1564,6 +1545,7 @@ class Admin if ( !$pwdvalid ) { self::error($pwderror); + return; } } } @@ -1571,14 +1553,17 @@ class Admin if ( !NOTIFICATION::address_validation($email) ) { self::error(_ERROR_BADMAILADDRESS); + return; } if ( !$realname ) { self::error(_ERROR_REALNAMEMISSING); + return; } if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) ) { self::error(_ERROR_NOSUCHTRANSLATION); + return; } // check if there will remain at least one site member with both the logon and admin rights @@ -1587,10 +1572,11 @@ 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); + return; } } @@ -1610,7 +1596,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() ) { @@ -1645,7 +1633,7 @@ class Admin { $member->logout(); } - self::$action_login(_MSG_ACTIVATION_SENT, 0); + self::action_login(_MSG_ACTIVATION_SENT, 0); return; } @@ -1654,11 +1642,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; } @@ -1680,11 +1668,13 @@ class Admin if ( postVar('password') != postVar('repeatpassword') ) { self::error(_ERROR_PASSWORDMISMATCH); + return; } if ( i18n::strlen(postVar('password')) < 6 ) { self::error(_ERROR_PASSWORDTOOSHORT); + return; } $res = Member::create( @@ -1701,6 +1691,7 @@ class Admin if ( $res != 1 ) { self::error($res); + return; } // fire PostRegister event @@ -1711,7 +1702,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; } @@ -1748,13 +1751,15 @@ class Admin if ( !$info ) { self::error(_ERROR_ACTIVATE); + return; } - $mem = Member::createFromId($info->vmember); + $mem =& $manager->getMember($info->vmember); if ( !$mem ) { self::error(_ERROR_ACTIVATE); + return; } /* TODO: we should consider to use the other way insterad of this */ @@ -1762,9 +1767,7 @@ class Admin $_POST['bNeedsPasswordChange'] = TRUE; self::$headMess = $message; - self::pagehead(); self::$skin->parse('activate'); - self::pagefoot(); return; } @@ -1791,7 +1794,7 @@ class Admin return self::showActivationPage($key, _ERROR_ACTIVATE); } - $mem = Member::createFromId($info->vmember); + $mem =& $manager->getMember($info->vmember); if ( !$mem ) { @@ -1848,9 +1851,7 @@ class Admin // do the activation Member::activate($key); - self::pagehead(); self::$skin->parse('activatesetpwd'); - self::pagefoot(); return; } @@ -1870,9 +1871,7 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('manageteam'); - self::pagefoot(); return; } @@ -1898,9 +1897,10 @@ class Admin if ( !$blog->addTeamMember($memberid, $admin) ) { self::error(_ERROR_ALREADYONTEAM); + return; } - self::$action_manageteam(); + self::action_manageteam(); return; } @@ -1920,12 +1920,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; } @@ -1946,8 +1944,9 @@ class Admin if ( $error ) { self::error($error); + return; } - self::$action_manageteam(); + self::action_manageteam(); return; } @@ -1957,7 +1956,7 @@ class Admin * @param void * @return void */ - static private function deleteOneTeamMember($blogid, $memberid) + static public function deleteOneTeamMember($blogid, $memberid) { global $member, $manager; @@ -1972,7 +1971,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( @@ -1987,8 +1986,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; } @@ -1996,7 +1995,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, @@ -2015,7 +2014,7 @@ class Admin */ static private function action_teamchangeadmin() { - global $member; + global $manager, $member; $blogid = intRequestVar('blogid'); $memberid = intRequestVar('memberid'); @@ -2023,17 +2022,18 @@ 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); + return; } } @@ -2048,16 +2048,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; } @@ -2079,10 +2079,9 @@ class Admin $blog =& $manager->getBlog($blogid); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('blogsettings'); - self::pagefoot(); return; } @@ -2106,20 +2105,22 @@ class Admin if ( !isValidCategoryName($cname) ) { self::error(_ERROR_BADCATEGORYNAME); + return; } - $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); + return; } $blog =& $manager->getBlog($blogid); $newCatID = $blog->createNewCategory($cname, $cdesc); - self::$action_blogsettings(); + self::action_blogsettings(); return; } @@ -2156,10 +2157,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; } @@ -2184,19 +2184,21 @@ class Admin if ( !isValidCategoryName($cname) ) { self::error(_ERROR_BADCATEGORYNAME); + return; } - $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); + return; } - $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'); @@ -2210,12 +2212,11 @@ class Admin if ( $desturl ) { redirect($desturl); - exit; - } - else - { - self::$action_blogsettings(); + return; } + + self::action_blogsettings(); + return; } @@ -2240,26 +2241,27 @@ class Admin if ( !$blog->isValidCategory($catid) ) { self::error(_ERROR_NOSUCHCATEGORY); + return; } // don't allow deletion of default category if ( $blog->getDefaultCategory() == $catid ) { self::error(_ERROR_DELETEDEFCATEGORY); + return; } // 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); + return; } - self::pagehead(); self::$skin->parse('categorydelete'); - self::pagefoot(); return; } @@ -2282,9 +2284,10 @@ class Admin if ( $error ) { self::error($error); + return; } - self::$action_blogsettings(); + self::action_blogsettings(); return; } @@ -2295,7 +2298,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; @@ -2326,10 +2329,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; } @@ -2340,15 +2343,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); @@ -2356,6 +2359,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 * @@ -2397,21 +2490,25 @@ class Admin if ( $notify_address && !NOTIFICATION::address_validation($notify_address) ) { self::error(_ERROR_BADNOTIFY); + return; } if ( !isValidShortName($shortname) ) { self::error(_ERROR_BADSHORTBLOGNAME); + return; } if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) ) { self::error(_ERROR_DUPSHORTBLOGNAME); + return; } // check if update file is writable if ( $updatefile && !is_writeable($updatefile) ) { self::error(_ERROR_UPDATEFILE); + return; } $blog->setName(trim(postVar('name'))); @@ -2444,7 +2541,7 @@ class Admin ); $manager->notify('PostPluginOptionsUpdate', $data); - self::$action_overview(_MSG_SETTINGSCHANGED); + self::action_overview(_MSG_SETTINGSCHANGED); return; } @@ -2466,13 +2563,12 @@ class Admin if ( $CONF['DefaultBlog'] == $blogid ) { self::error(_ERROR_DELDEFBLOG); + return; } $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('deleteblog'); - self::pagefoot(); return; } @@ -2498,39 +2594,40 @@ class Admin if ( $CONF['DefaultBlog'] == $blogid ) { self::error(_ERROR_DELDEFBLOG); + return; } // 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; } @@ -2548,11 +2645,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; } @@ -2574,15 +2669,18 @@ class Admin if ( $error ) { self::error($error); + return; } if ( $member->isAdmin() ) { - self::$action_usermanagement(); + self::action_usermanagement(); + return; } else { - self::$action_overview(_DELETED_MEMBER); + self::action_overview(_DELETED_MEMBER); + return; } return; } @@ -2595,12 +2693,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() ) { @@ -2613,19 +2711,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); @@ -2649,9 +2747,7 @@ class Admin // Only Super-Admins can do this $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('createnewlog'); - self::pagefoot(); return; } @@ -2677,11 +2773,13 @@ class Admin if ( !isValidShortName($bshortname) ) { self::error(_ERROR_BADSHORTBLOGNAME); + return; } if ( $manager->existsBlog($bshortname) ) { self::error(_ERROR_DUPSHORTBLOGNAME); + return; } $data = array( @@ -2694,27 +2792,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); @@ -2723,7 +2821,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.'); @@ -2754,9 +2852,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; } @@ -2779,7 +2875,7 @@ class Admin $blog->setURL(trim($burl)); $blog->writeSettings(); - self::$action_overview(_MSG_NEWBLOG); + self::action_overview(_MSG_NEWBLOG); return; } @@ -2797,9 +2893,7 @@ class Admin include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); self::$skin->parse('skinieoverview'); - self::pagefoot(); return; } @@ -2811,62 +2905,21 @@ class Admin */ static private function action_skinieimport() { - global $member, $DIR_LIBS, $DIR_SKINS, $manager; + global $member; $member->isAdmin() or self::disallow(); - // load skinie class - include_once($DIR_LIBS . 'skinie.php'); - - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); - - $importer = new SkinImport(); - - // 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; - } - - // read only metadata - $error = $importer->readFile($skinFile, 1); - - /* TODO: we should consider to use the other way insterad of this */ - $_REQUEST['skininfo'] = $importer->getInfo(); - $_REQUEST['skinnames'] = $importer->getSkinNames(); - $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - - // clashes - $skinNameClashe = $importer->checkSkinNameClashes(); - $templateNameClashes = $importer->checkTemplateNameClashes(); - $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); - - /* TODO: we should consider to use the other way insterad of this */ - $_REQUEST['skinclashes'] = $skinNameClashes; - $_REQUEST['tpltclashes'] = $templateNameClashes; - $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); + $error = self::skinieimport($mode, $skinFileRaw); if ( $error ) { self::error($error); + return; } - self::pagehead(); self::$skin->parse('skinieimport'); - self::pagefoot(); return; } @@ -2885,56 +2938,21 @@ class Admin // load skinie class include_once($DIR_LIBS . 'skinie.php'); - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); - + $mode = postVar('mode'); + $skinFileRaw = postVar('skinfile'); $allowOverwrite = intPostVar('overwrite'); - // get full filename - if ( $mode == 'file' ) + $error = self::skinieedoimport($mode, $skinFileRaw, $allowOverwrite); + if ( $error ) { - $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); - - if ( $error ) - { - self::error($error); - } - - $error = $importer->writeToDatabase($allowOverwrite); - - if ( $error ) - { - self::error($error); + self::error($msg); + return; } - /* 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::action_skinieexport() * @@ -2943,42 +2961,16 @@ class Admin */ static private function action_skinieexport() { - global $member, $DIR_LIBS; + global $member; $member->isAdmin() or self::disallow(); - // load skinie class - include_once($DIR_LIBS . 'skinie.php'); - - $aSkins = requestIntArray('skin'); - $aTemplates = requestIntArray('template'); - - if ( !is_array($aTemplates) ) - { - $aTemplates = array(); - } - if ( !is_array($aSkins) ) - { - $aSkins = array(); - } - - $skinList = array_keys($aSkins); - $templateList = array_keys($aTemplates); - + $aSkins = requestIntArray('skin'); + $aTemplates = requestIntArray('template'); $info = postVar('info'); - $exporter = new SkinExport(); - foreach ( $skinList as $skinId ) - { - $exporter->addSkin($skinId); - } - foreach ($templateList as $templateId) - { - $exporter->addTemplate($templateId); - } - $exporter->setInfo($info); + self::skinieexport($aSkins, $aTemplates, $info); - $exporter->export(); return; } @@ -2994,9 +2986,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('templateoverview'); - self::pagefoot(); return; } @@ -3018,30 +3008,14 @@ class Admin $member->isAdmin() or self::disallow(); - $extrahead = "\n"; - $extrahead .= '\n"; + Admin::$extrahead .= "\n"; + Admin::$extrahead .= "\n"; - self::pagehead($extrahead); self::$skin->parse('templateedit'); - self::pagefoot(); return; } /** - * TODO: remove this - * - static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) { - static $count = 1; - if (!isset($template[$name])) $template[$name] = ''; - ?> - - - - parse('templatedelete'); - self::pagefoot(); return; } @@ -3197,16 +3169,16 @@ class Admin $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); + DB::execute('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid); $data = array('templateid' => $templateid); $manager->notify('PostDeleteTemplate', $data); - self::$action_templateoverview(); + self::action_templateoverview(); return; } @@ -3228,16 +3200,18 @@ class Admin if ( !isValidTemplateName($name) ) { self::error(_ERROR_BADTEMPLATENAME); + return; } if ( Template::exists($name) ) { self::error(_ERROR_DUPTEMPLATENAME); + return; } $newTemplateId = Template::createNew($name, $desc); - self::$action_templateoverview(); + self::action_templateoverview(); return; } @@ -3280,13 +3254,13 @@ class Admin $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;"; $query = sprintf($query, sql_table('template'), (integer) $templateid); - $res = sql_query($query); - while ( $o = sql_fetch_object($res) ) + $res = DB::getResult($query); + foreach ( $res as $row) { - self::addToTemplate($newid, $o->tpartname, $o->tcontent); + self::addToTemplate($newid, $row['tpartname'], $row['tcontent']); } - self::$action_templateoverview(); + self::action_templateoverview(); return; } @@ -3298,11 +3272,9 @@ class Admin */ static private function action_admintemplateoverview() { - global $member, $manager; + global $member; $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('admntemplateoverview'); - self::pagefoot(); return; } @@ -3320,11 +3292,11 @@ class Admin self::$headMess = $msg; } $member->isAdmin() or self::disallow(); - $extrahead = "\n"; - $extrahead .= '' . "\n"; - self::pagehead($extrahead); + + Admin::$extrahead .= "\n"; + Admin::$extrahead .= '' . "\n"; + self::$skin->parse('admintemplateedit'); - self::pagefoot(); return; } @@ -3345,29 +3317,29 @@ class Admin if ( !isValidTemplateName($name) ) { self::error(_ERROR_BADTEMPLATENAME); + return; } if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) ) { self::error(_ERROR_DUPTEMPLATENAME); + return; } - $name = sql_real_escape_string($name); - $desc = sql_real_escape_string($desc); // 1. Remove all template parts $query = "DELETE FROM %s WHERE tdesc=%d;"; - $query = sprintf($query, (integer) $templateid); - sql_query($query); + $query = sprintf($query, sql_table('template'), (integer) $templateid); + DB::execute($query); // 2. Update description - $query = 'UPDATE %s SET tdname=%s tddesc=%s WHERE tdnumber=%d;'; - $query = sprintf($query, sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $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::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, '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')); @@ -3472,7 +3444,7 @@ class Admin self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT', postVar('PLUGIN_QUICKMENU_FOOT')); $data = array('fields' => array()); - $manager->notify('TemplateExtraFields', $data); + $manager->notify('AdminTemplateExtraFields', $data); foreach ( $data['fields'] as $pfkey => $pfvalue ) { foreach ( $pfvalue as $pffield => $pfdesc ) @@ -3482,7 +3454,7 @@ class Admin } // jump back to template edit - self::$action_admintemplateedit(_TEMPLATE_UPDATED); + self::action_admintemplateedit(_TEMPLATE_UPDATED); return; } @@ -3502,10 +3474,14 @@ class Admin return -1; } - $query = "INSERT INTO (tdesc, tpartname, tcontent ) VALUES (%d, '%s', '%s');"; - $query = sprintf($query, sql_table('template'), (integer) $id, sql_real_escape_string($partname), sql_real_escape_string($contents)); - 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(); } /** @@ -3520,9 +3496,7 @@ class Admin $member->isAdmin() or self::disallow(); // TODO: check if template can be deleted - self::pagehead(); self::$skin->parse('admintemplatedelete'); - self::pagefoot(); return; } @@ -3545,17 +3519,17 @@ class Admin // 1. delete description $query = "DELETE FROM %s WHERE tdnumber=%s;"; $query = sprintf($query, sql_table('template_desc'), (integer) $templateid); - sql_query($query); + DB::execute($query); // 2. delete parts $query = "DELETE FROM %s WHERE tdesc=%d;"; $query = sprintf($query, sql_table('template'), (integer) $templateid); - sql_query(); + DB::execute($query); $data = array('templateid' => $templateid); $manager->notify('PostDeleteAdminTemplate', $data); - self::$action_admintemplateoverview(); + self::action_admintemplateoverview(); return; } @@ -3575,14 +3549,21 @@ class Admin if ( !isValidTemplateName($name) ) { self::error(_ERROR_BADTEMPLATENAME); + return; } - if ( Template::exists($name) ) + else if ( !preg_match('#^admin/#', $name) ) + { + self::error(_ERROR_BADADMINTEMPLATENAME); + return; + } + else if ( Template::exists($name) ) { self::error(_ERROR_DUPTEMPLATENAME); + return; } $newTemplateId = Template::createNew($name, $desc); - self::$action_admintemplateoverview(); + self::action_admintemplateoverview(); return; } @@ -3603,7 +3584,7 @@ class Admin $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) ) @@ -3616,20 +3597,20 @@ class Admin $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 - $query = "SELECT tpartname, tcontent FROM %sWHERE tdesc=%d;"; + $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;"; $query = sprintf($query, sql_table('template'), (integer) $templateid); - $res = sql_query($query); - while ( $o = sql_fetch_object($res) ) + $res = DB::getResult($query); + foreach ( $res as $row ) { - self::addToAdminTemplate($newid, $o->tpartname, $o->tcontent); + self::addToAdminTemplate($newid, $row['tpartname'], $row['tcontent']); } - self::$action_admintemplateoverview(); + self::action_admintemplateoverview(); return; } @@ -3645,9 +3626,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('skinoverview'); - self::pagefoot(); return; } @@ -3669,16 +3648,17 @@ class Admin if ( !isValidSkinName($name) ) { self::error(_ERROR_BADSKINNAME); + return; } - - if ( SKIN::exists($name) ) + else if ( SKIN::exists($name) ) { self::error(_ERROR_DUPSKINNAME); + return; } - $newId = SKIN::createNew($name, $desc); + SKIN::createNew($name, $desc); - self::$action_skinoverview(); + self::action_skinoverview(); return; } @@ -3690,13 +3670,11 @@ class Admin */ static private function action_skinedit() { - global $member, $manager; + global $member; $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('skinedit'); - self::pagefoot(); return; } @@ -3714,44 +3692,20 @@ class Admin $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); - - // 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'; - } - if ( !$inc_mode ) + $error = self::skineditgeneral($skinid); + if ( $error ) { - $inc_mode = 'normal'; + self::error($error); + return; } - // 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; + global $member; $member->isAdmin() or self::disallow(); @@ -3760,19 +3714,17 @@ class Admin self::$headMess = $msg; } - $skinid = intRequestVar('skinid'); - $type = requestVar('type'); - $type = trim($type); - $type = strtolower($type); + $type = requestVar('type'); + $type = trim($type); + $type = strtolower($type); if ( !isValidShortName($type) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); + return; } - self::pagehead(); self::$skin->parse('skinedittype'); - self::pagefoot(); return; } @@ -3784,7 +3736,7 @@ class Admin */ static private function action_skinupdate() { - global $member; + global $manager, $member; $skinid = intRequestVar('skinid'); $content = trim(postVar('content')); @@ -3792,10 +3744,10 @@ class Admin $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; } @@ -3807,31 +3759,31 @@ class Admin */ static private function action_skindelete() { - global $member, $manager, $CONF; - - $skinid = intRequestVar('skinid'); + global $CONF, $member; $member->isAdmin() or self::disallow(); + $skinid = intRequestVar('skinid'); + // don't allow default skin to be deleted if ( $skinid == $CONF['BaseSkin'] ) { self::error(_ERROR_DEFAULTSKIN); + return; } // don't allow deletion of default skins for blogs $query = "SELECT bname FROM %s WHERE bdefskin=%d"; $query = sprintf($query, sql_table('blog'), (integer) $skinid); - $r = sql_query($query); - if ( $o = sql_fetch_object($r) ) + $name = DB::getValue($query); + if ( $name ) { - self::error(_ERROR_SKINDEFDELETE . Entity::hsc($o->bname)); + self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name)); + return; } - self::pagehead(); self::$skin->parse('skindelete'); - self::pagefoot(); return; } @@ -3843,45 +3795,33 @@ class Admin */ static private function action_skindeleteconfirm() { - global $member, $CONF, $manager; - - $skinid = intRequestVar('skinid'); + global $member, $CONF; $member->isAdmin() or self::disallow(); + $skinid = intRequestVar('skinid'); + // don't allow default skin to be deleted if ( $skinid == $CONF['BaseSkin'] ) { self::error(_ERROR_DEFAULTSKIN); + return; } // don't allow deletion of default skins for blogs $query = "SELECT bname FROM %s WHERE bdefskin=%d;"; $query = sprintf($query, sql_table('blog'), (integer) $skinid); - $r = sql_query($query); - if ( $o = sql_fetch_object($r) ) - { - self::error(_ERROR_SKINDEFDELETE .$o->bname); + $name = DB::getValue($query); + if ( $name ) + { + self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name)); + return; } - $data = array('skinid' => $skinid); - $manager->notify('PreDeleteSkin', $data); - - // 1. delete description - $query = "DELETE FROM %s WHERE sdnumber=%d;"; - $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); - sql_query($query); - - // 2. delete parts - $query = "DELETE FROM %s WHERE sdesc=%d;"; - $query = sprintf($query, sql_table('skin'), (integer) $skinid); - sql_query($query); - - $data = array('skinid' => $skinid); - $manager->notify('PostDeleteSkin', $data); + self::skindeleteconfirm($skinid); - self::$action_skinoverview(); + self::action_skinoverview(); return; } @@ -3893,7 +3833,7 @@ class Admin */ static private function action_skinremovetype() { - global $member, $manager, $CONF; + global $member, $CONF; $member->isAdmin() or self::disallow(); @@ -3903,18 +3843,10 @@ class Admin if ( !isValidShortName($skintype) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); + return; } - // 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; } @@ -3926,46 +3858,24 @@ class Admin */ static private function action_skinremovetypeconfirm() { - global $member, $CONF, $manager; + global $member; $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')) ) + $error = self::skinremovetypeconfirm($skinid, $skintype); + if ( $error ) { - self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); + self::error($error); + return; } - $data = array( - 'skinid' => $skinid, - 'skintype' => $skintype - ); - $manager->notify('PreDeleteSkinPart', $data); - - // delete part - $query = "DELETE FROM %s WHERE sdesc=%d AND stype='%s';"; - $query = sprintf($query, sql_table('skin'), (integer) $skinid, (integer) $skintype); - sql_query($query); - - $data = array( - 'skinid' => $skinid, - 'skintype' => $skintype - ); - $manager->notify('PostDeleteSkinPart', $data); - - self::$action_skinedit(); + self::action_skinedit(); return; } - + /** * Admin::action_skinclone() * @@ -3980,62 +3890,9 @@ class Admin $skinid = intRequestVar('skinid'); - // 1. read skin to clone - $skin = new Skin($skinid); - - $name = "clone_{$skin->getName()}"; - - // if a skin with that name already exists: - if ( Skin::exists($name) ) - { - $i = 1; - while (Skin::exists($name . $i)) - $i++; - $name .= $i; - } - - // 2. create skin desc - $newid = Skin::createNew( - $name, - $skin->getDescription(), - $skin->getContentType(), - $skin->getIncludeMode(), - $skin->getIncludePrefix() - ); - - // 3. clone - $query = "SELECT stype FROM %s WHERE sdesc=%d;"; - $query = sprintf($query, sql_table('skin'), (integer) $skinid); - - $res = sql_query($query); - while ( $row = sql_fetch_assoc($res) ) - { - self::$skinclonetype($skin, $newid, $row['stype']); - } - - self::$action_skinoverview(); - return; - } - - /** - * Admin::skinclonetype() - * - * @param String $skin Skin object - * @param Integer $newid ID for this clone - * @param String $type type of skin - * @return Void - */ - static private function skinclonetype($skin, $newid, $type) - { - $newid = intval($newid); - $content = $skin->getContent($type); + self::skinclone($skinid); - 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); - } + self::action_skinoverview(); return; } @@ -4047,13 +3904,11 @@ class Admin */ static private function action_adminskinoverview() { - global $member, $manager; + global $member; $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('adminskinoverview'); - self::pagefoot(); return; } @@ -4066,21 +3921,31 @@ class Admin static private function action_adminskinnew() { global $member; + $member->isAdmin() or self::disallow(); + $name = trim(postVar('name')); $desc = trim(postVar('desc')); if ( !isValidSkinName($name) ) { self::error(_ERROR_BADSKINNAME); + return; } - if ( Skin::exists($name) ) + else if ( !preg_match('#^admin/#', $name) ) + { + self::error(_ERROR_BADADMINSKINNAME); + return; + } + else if ( Skin::exists($name) ) { self::error(_ERROR_DUPSKINNAME); + return; } - /* TODO: $newId is not reused... */ - $newId = Skin::createNew($name, $desc); - self::$action_adminskinoverview(); + + Skin::createNew($name, $desc); + + self::action_adminskinoverview(); return; } @@ -4092,12 +3957,12 @@ class Admin */ static private function action_adminskinedit() { - global $member, $manager; + global $member; $member->isAdmin() or self::disallow(); - self::pagehead(); + self::$skin->parse('adminskinedit'); - self::pagefoot(); + return; } @@ -4115,34 +3980,14 @@ class Admin $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, 'AdminActions', 'AdminSkin'); - - // 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'; - } - if ( !$inc_mode ) + $error = self::skineditgeneral($skinid, 'AdminActions'); + if ( $error ) { - $inc_mode = 'normal'; + self::error($error); + return; } - // 2. Update description - $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix); - self::$action_adminskinedit(); + + self::action_adminskinedit(); return; } @@ -4154,7 +3999,7 @@ class Admin */ static private function action_adminskinedittype($msg = '') { - global $member, $manager; + global $member; $member->isAdmin() or self::disallow(); @@ -4169,11 +4014,10 @@ class Admin if ( !isValidShortName($type) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); + return; } - self::pagehead(); self::$skin->parse('adminskinedittype'); - self::pagefoot(); return; } @@ -4185,16 +4029,18 @@ class Admin */ static private function action_adminskinupdate() { - global $member; - $skinid = intRequestVar('skinid'); - $content = trim(postVar('content')); - $type = postVar('type'); + global $manager, $member; + + $skinid = intRequestVar('skinid'); + $content = trim(postVar('content')); + $type = postVar('type'); $member->isAdmin() or self::disallow(); - $skin = new Skin($skinid, 'Admin', 'AdminSkin'); + $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin'); $skin->update($type, $content); - self::$action_adminskinedittype(_SKIN_UPDATED); + + self::action_adminskinedittype(_SKIN_UPDATED); return; } @@ -4206,14 +4052,34 @@ class Admin */ static private function action_adminskindelete() { - global $member, $manager, $CONF; + global $CONF, $member; + $member->isAdmin() or self::disallow(); - /* TODO: needless variable $skinid... */ $skinid = intRequestVar('skinid'); - self::pagehead(); + + // don't allow default skin to be deleted + if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] ) + { + self::error(_ERROR_DEFAULTSKIN); + return; + } + + /* don't allow if someone use it as a default*/ + $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;'; + $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid)); + + $members = array(); + while ( $row = $res->fetch() ) { + $members[] = $row['mrealname']; + } + if ( count($members) ) + { + self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members)); + return; + } + self::$skin->parse('adminskindelete'); - self::pagefoot(); return; } @@ -4225,43 +4091,36 @@ class Admin */ static private function action_adminskindeleteconfirm() { - global $member, $CONF, $manager; + global $member, $CONF; + $member->isAdmin() or self::disallow(); + $skinid = intRequestVar('skinid'); + // don't allow default skin to be deleted - if ( $skinid == $CONF['DefaultAdminSkin'] ) + if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] ) { self::error(_ERROR_DEFAULTSKIN); + return; } - // don't allow deletion of default skins for members - $memberDefaults = $member->getAdminSkin(); - foreach ( $memberDefaults as $memID => $adminskin ) + /* don't allow if someone use it as a default*/ + $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;'; + $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid)); + + $members = array(); + while ( $row = $res->fetch() ) { + $members[] = $row['mrealname']; + } + if ( count($members) ) { - if ( $skinid == $adminskin ) - { - $mem = MEMBER::createFromID($memID); - self::error(_ERROR_SKINDEFDELETE . $mem->displayname); - } + self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members)); + return; } - $data = array('skinid' => (integer) $skinid); - $manager->notify('PreDeleteAdminSkin', $data); - - // 1. delete description - $query = "DELETE FROM %s WHERE tdnumber=%s;"; - $query = sprintf($query, sql_table('template_desc'), (integer) $templateid); - sql_query($query); + self::skindeleteconfirm($skinid); - // 2. delete parts - $query = "DELETE FROM %s WHERE tdesc=%d;"; - $query = sprintf($query, sql_table('template'), (integer) $templateid); - - sql_query($query); - - $data = array('skinid' => intval($skinid)); - $manager->notify('PostDeleteAdminSkin', $data); - self::$action_adminskinoverview(); + self::action_adminskinoverview(); return; } @@ -4273,21 +4132,20 @@ class Admin */ static private function action_adminskinremovetype() { - global $member, $manager, $CONF; + global $member, $CONF; $member->isAdmin() or self::disallow(); - $skinid = intRequestVar('skinid'); - $skintype = requestVar('type'); + $skinid = intRequestVar('skinid'); + $skintype = requestVar('type'); if ( !isValidShortName($skintype) ) { self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); + return; } - self::pagehead(); self::$skin->parse('adminskinremovetype'); - self::pagefoot(); return; } @@ -4299,36 +4157,21 @@ class Admin */ static private function action_adminskinremovetypeconfirm() { - global $member, $CONF, $manager; + global $member; $member->isAdmin() or self::disallow(); - $skinid = intRequestVar('skinid'); - $skintype = requestVar('type'); + $skinid = intRequestVar('skinid'); + $skintype = requestVar('type'); - if ( !isValidShortName($skintype) ) + $error = self::skinremovetypeconfirm($skinid, $skintype); + if ( $error ) { - self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); + self::error($error); + return; } - $data =array( - 'skinid' => $skinid, - 'skintype' => $skintype - ); - $manager->notify('PreDeleteAdminSkinPart', $data); - - // delete part - $query = 'DELETE FROM %s WHERE sdesc = %d AND stype ="%s"'; - $query = sprintf($query, sql_table('skin'), (integer) $skinid, $skintype); - sql_query($query); - - $data = array( - 'skinid' => $skinid, - 'skintype' => $skintype - ); - $manager->notify('PostDeleteAdminSkinPart', $data); - - self::$action_adminskinedit(); + self::action_adminskinedit(); return; } @@ -4346,63 +4189,9 @@ class Admin $skinid = intRequestVar('skinid'); - // 1. read skin to clone - $skin = new Skin($skinid, 'Admin', 'AdminSkin'); - $name = "clone_{$skin->getName()}"; - - // if a skin with that name already exists: - if ( Skin::exists($name) ) - { - $i = 1; - while ( Skin::exists($name . $i) ) - { - $i++; - } - $name .= $i; - } - - // 2. create skin desc - $newid = Skin::createNew( - $name, - $skin->getDescription(), - $skin->getContentType(), - $skin->getIncludeMode(), - $skin->getIncludePrefix() - ); - - $query = "SELECT stype %s FROM WHERE sdesc=%d;"; - $query = sprintf($query, sql_table('skin'), (integer) $skinid); - - $res = sql_query($query); - while ( $row = sql_fetch_assoc($res) ) - { - self::$skinclonetype($skin, $newid, $row['stype']); - } - self::$action_adminskinoverview(); - return; - } - - /** - * Admin::adminskinclonetype() - * - * @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) - { - $content = $skin->getContentFromDB($type); + self::skinclone($skinid, 'AdminActions'); - if ( $content ) - { - $content = sql_real_escape_string($content); - $type = sql_real_escape_string($type); - - $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')"; - $query = sprintf(sql_table('skin'), (integer) $newid, $content, $type); - sql_query($query); - } + self::action_adminskinoverview(); return; } @@ -4414,16 +4203,11 @@ class Admin */ static private function action_adminskinieoverview() { - global $member, $DIR_LIBS, $manager; + global $member; $member->isAdmin() or self::disallow(); - // load skinie class - include_once($DIR_LIBS . 'skinie.php'); - - self::pagehead(); self::$skin->parse('adminskinieoverview'); - self::pagefoot(); return; } @@ -4435,58 +4219,28 @@ class Admin */ static private function action_adminskinieimport() { - global $DIR_LIBS, $DIR_ADMINSKINS, $manager, $member; + global $member; $member->isAdmin() or self::disallow(); - // load skinie class - include_once($DIR_LIBS . 'skinie.php'); + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); - - $importer = new SKINIMPORT(); - - // get full filename - if ( $mode == 'file' ) + $error = self::skinieimport($mode, $skinFileRaw); + if ( $error ) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml'; - - // backwards compatibilty (in v2.0, exports were saved as skindata.xml) - if ( !file_exists($skinFile) ) - { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml'; - } + self::error($error); + return; } - else + + if ( !is_object(self::$skin) ) { - $skinFile = $skinFileRaw; + self::action_adminskiniedoimport(); } - - // read only metadata - $error = $importer->readFile($skinFile, 1); - if ( $error ) + else { - self::error($error); + self::$skin->parse('adminskinieimport'); } - - /* 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); - /* 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(); return; } @@ -4498,54 +4252,37 @@ class Admin */ static private function action_adminskiniedoimport() { - global $DIR_LIBS, $DIR_ADMINSKINS, $member; + global $DIR_SKINS, $member; $member->isAdmin() or self::disallow(); - // load skinie class - include_once($DIR_LIBS . 'skinie.php'); - - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); + $mode = postVar('mode'); + $skinFileRaw = postVar('skinfile'); $allowOverwrite = intPostVar('overwrite'); - // get full filename - if ( $mode == 'file' ) - { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml'; - // backwards compatibilty (in v2.0, exports were saved as skindata.xml) - if ( !file_exists($skinFile) ) - { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml'; - } - } - else - { - $skinFile = $skinFileRaw; - } - - $importer = new SKINIMPORT(); - - $error = $importer->readFile($skinFile); + $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite); if ( $error ) { self::error($error); + return; } - $error = $importer->writeToDatabase($allowOverwrite); - if ( $error ) + if ( !is_object(self::$skin) ) { - self::error($error); + 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 = new Skin(0, 'AdminActions', 'AdminSkin'); + $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn'); + } + else + { + self::$skin->parse('adminskiniedoimport'); } - - /* TODO: we should consider to use the other way instead of this */ - $_REQUEST['skininfo'] = $importer->getInfo(); - $_REQUEST['skinnames'] = $importer->getSkinNames(); - $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - - self::pagehead(); - self::$skin->parse('adminskiniedoimport'); - self::pagefoot(); return; } @@ -4557,37 +4294,17 @@ class Admin */ static private function action_adminskinieexport() { - global $member, $DIR_PLUGINS; + global $member; $member->isAdmin() or self::disallow(); // load skinie class $aSkins = requestIntArray('skin'); - if (!is_array($aSkins)) { - $aSkins = array(); - } - $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 ) - { - $exporter->addSkin($skinId); - } - foreach ( $templateList as $templateId ) - { - $exporter->addTemplate($templateId); - } - $exporter->setInfo($info); - $exporter->export(); + self::skinieexport($aSkins, $aTemplates, $info); + return; } @@ -4603,9 +4320,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('settingsedit'); - self::pagefoot(); return; } @@ -4626,6 +4341,7 @@ class Admin if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) ) { self::error(_ERROR_BADMAILADDRESS); + return; } // save settings @@ -4663,7 +4379,9 @@ class Admin self::updateConfig('DebugVars', postVar('DebugVars')); 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. @@ -4681,9 +4399,7 @@ class Admin */ static private function action_systemoverview() { - self::pagehead(); self::$skin->parse('systemoverview'); - self::pagefoot(); return; } @@ -4696,13 +4412,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(_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(); } /** @@ -4712,11 +4429,10 @@ 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::$headMess = $msg; self::$skin->parse('adminerrorpage'); - self::pagefoot(); return; } @@ -4727,306 +4443,25 @@ 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::PluninAdminPagehead() - * Output pluginadmin page head + * Admin::action_PluginAdmin() + * Output pluginadmin * + * @param string $skinContents * @param string $extrahead * @return void */ - static public function PluninAdminPagehead($extrahead = '') - { - self::pagehead(); - return; - } - - /** - * Admin::PluninAdminPagefoot() - * Output pluginadmin page foot - * - * @param void - * @return void - */ - static public function PluninAdminPagefoot() - { - self::pagefoot(); - return; - } - - /** - * Admin::pagehead() - * Output admin page head - * - * @param string PluninAdminPagehead - * @return void - */ - static private function pagehead($extrahead = '') - { - global $member, $nucleus, $CONF, $manager; - - if ( self::existsSkinContents('pagehead') ) - { - if ( isset($extrahead) && !empty($extrahead) ) - { - self::$extrahead = $extrahead; - } - self::$skin->parse('pagehead'); - } - else - { - $data = array( - 'extrahead' => &$extrahead, - 'action' => self::$action - ); - - $manager->notify('AdminPrePageHead', $data); - - $baseUrl = Entity::hsc($CONF['SkinsURL']); - - /* - * 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 '
'; - } - return; - } - - /** - * Admin::pagefoot() - * Output admin page foot include quickmenu - * - * @param void - * @return void - */ - static private function pagefoot() + static public function action_PluginAdmin($skinContents, $extrahead = '') { - global $action, $member, $manager; - - if ( self::existsSkinContents('pagefoot') ) - { - self::$skin->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"; - } + self::$extrahead .= $extrahead; + self::$skin->parse('pluginadmin', $skinContents); return; } @@ -5040,13 +4475,10 @@ class Admin { global $member, $manager; - $member->teamRights($blogid) or self::disallow(); - $blogid = intRequestVar('blogid'); + $member->teamRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('bookmarklet'); - self::pagefoot(); return; } @@ -5062,9 +4494,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('actionlog'); - self::pagefoot(); return; } @@ -5078,13 +4508,10 @@ class Admin { global $member, $manager; - $member->blogAdminRights($blogid) or self::disallow(); - $blogid = intRequestVar('blogid'); + $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('banlist'); - self::pagefoot(); return; } @@ -5101,9 +4528,7 @@ class Admin $blogid = intRequestVar('blogid'); $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('banlistdelete'); - self::pagefoot(); return; } @@ -5117,19 +4542,19 @@ class Admin { global $member, $manager; - $member->blogAdminRights($blogid) or self::disallow(); - $blogid = intPostVar('blogid'); $allblogs = postVar('allblogs'); $iprange = postVar('iprange'); + $member->blogAdminRights($blogid) or self::disallow(); + $deleted = array(); if ( !$allblogs ) { if ( Ban::removeBan($blogid, $iprange) ) { - array_push($deleted, $blogid); + $deleted[] = $blogid; } } else @@ -5140,7 +4565,7 @@ class Admin { if ( Ban::removeBan($blogje, $iprange) ) { - array_push($deleted, $blogje); + $deleted[] = $blogje; } } } @@ -5148,11 +4573,13 @@ class Admin if ( sizeof($deleted) == 0 ) { self::error(_ERROR_DELETEBAN); + return; } - self::pagehead(); + /* TODO: we should use other ways */ + $_REQUEST['delblogs'] = $deleted; + self::$skin->parse('banlistdeleteconfirm'); - self::pagefoot(); return; } @@ -5164,7 +4591,11 @@ class Admin */ 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; } @@ -5190,9 +4621,7 @@ class Admin /* TODO: we should consider to use the other way instead of this */ $_REQUEST['blogid'] = $blogid; - self::pagehead(); self::$skin->parse('banlistnew'); - self::pagefoot(); return; } @@ -5226,6 +4655,7 @@ class Admin if ( !Ban::addBan($blogid, $iprange, $reason) ) { self::error(_ERROR_ADDBAN); + return; } } else @@ -5243,9 +4673,10 @@ class Admin if ( $failed ) { self::error(_ERROR_ADDBAN); + return; } } - self::$action_banlist(); + self::action_banlist(); return; } @@ -5263,7 +4694,7 @@ class Admin ActionLog::clear(); - self::$action_manage(_MSG_ACTIONLOGCLEARED); + self::action_manage(_MSG_ACTIONLOGCLEARED); return; } @@ -5279,9 +4710,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('backupoverview'); - self::pagefoot(); return; } @@ -5309,7 +4738,7 @@ class Admin @set_time_limit(1200); Backup::do_backup($useGzip); - exit; + return; } /** @@ -5328,6 +4757,7 @@ class Admin if ( intPostVar('letsgo') != 1 ) { self::error(_ERROR_BACKUP_NOTSURE); + return; } include($DIR_LIBS . 'backup.php'); @@ -5340,10 +4770,9 @@ class Admin if ( $message != '' ) { self::error($message); + return; } - self::pagehead(); self::$skin->parse('backuprestore'); - self::pagefoot(); return; } @@ -5362,9 +4791,7 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('pluginlist'); - self::pagefoot(); return; } @@ -5386,11 +4813,10 @@ class Admin if ( !$manager->pidInstalled($plugid) ) { self::error(_ERROR_NOSUCHPLUGIN); + return; } - self::pagehead(); self::$skin->parse('pluginhelp'); - self::pagefoot(); return; } @@ -5413,16 +4839,18 @@ class Admin if ( $manager->pluginInstalled($name) ) { self::error(_ERROR_DUPPLUGIN); + return; } if ( !checkPlugin($name) ) { self::error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')'); + return; } // 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; @@ -5431,10 +4859,10 @@ class Admin $manager->notify('PreAddPlugin', $data); // do this before calling getPlugin (in case the plugin id is used there) - $query = "INSERT INTO %s (porder, pfile) VALUES (%d, '%s');"; - $query = sprintf(sql_table('plugin'), (integer) $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'); @@ -5447,10 +4875,11 @@ class Admin $query = "DELETE FROM %s WHERE pid=%d;"; $query = sprintf($query, sql_table('plugin'), (integer) $iPid); - sql_query($query); + DB::execute($query); $manager->clearCachedInfo('installedPlugins'); self::error(_ERROR_PLUGIN_LOAD); + return; } // check if plugin needs a newer Nucleus version @@ -5461,6 +4890,7 @@ class Admin // ...and show error self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion())); + return; } // check if plugin needs a newer Nucleus version @@ -5471,17 +4901,19 @@ class Admin // ...and show error self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) ); + return; } $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()); self::error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName))); + return; } } @@ -5492,7 +4924,7 @@ class Admin $manager->notify('PostAddPlugin', $data); // update all events - self::$action_pluginupdate(); + self::action_pluginupdate(); return; } @@ -5511,22 +4943,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); } } } @@ -5552,11 +4984,10 @@ class Admin if ( !$manager->pidInstalled($pid) ) { self::error(_ERROR_NOSUCHPLUGIN); + return; } - self::pagehead(); self::$skin->parse('plugindelete'); - self::pagefoot(); return; } @@ -5579,6 +5010,7 @@ class Admin if ( $error ) { self::error($error); + return; } redirect($CONF['AdminURL'] . '?action=pluginlist'); @@ -5591,7 +5023,7 @@ class Admin * @param void * @return void */ - static private function deleteOnePlugin($pid, $callUninstall = 0) + static public function deleteOnePlugin($pid, $callUninstall = 0) { global $manager; @@ -5604,13 +5036,13 @@ class Admin $query = "SELECT pfile as result FROM %s WHERE pid=%d;"; $query = sprintf($query, sql_table('plugin'), (integer) $pid); - $name = quickQuery($query); + $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); + $plug =& $manager->getPlugin($row['pfile']); if ( $plug ) { $depList = $plug->getPluginDep(); @@ -5618,7 +5050,7 @@ class Admin { if ( $name == $depName ) { - return sprintf(_ERROR_DELREQPLUGIN, $o->pfile); + return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']); } } } @@ -5638,31 +5070,30 @@ class Admin } // 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'); $data = array('plugid' => $pid); @@ -5689,21 +5120,20 @@ class Admin if ( !$manager->pidInstalled($plugid) ) { self::error(_ERROR_NOSUCHPLUGIN); + return; } // 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); + 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(); + //self::action_pluginlist(); // To avoid showing ticket in the URL, redirect to pluginlist, instead. redirect($CONF['AdminURL'] . '?action=pluginlist'); return; @@ -5726,24 +5156,23 @@ class Admin if ( !$manager->pidInstalled($plugid) ) { self::error(_ERROR_NOSUCHPLUGIN); + return; } // 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); - $res = sql_query('SELECT * FROM ' . sql_table('plugin')); - $maxOrder = sql_num_rows($res); + $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); + 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(); + //self::action_pluginlist(); // To avoid showing ticket in the URL, redirect to pluginlist, instead. redirect($CONF['AdminURL'] . '?action=pluginlist'); return; @@ -5770,16 +5199,18 @@ class Admin if ( !$manager->pidInstalled($pid) ) { self::error(_ERROR_NOSUCHPLUGIN); + return; } 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; } @@ -5804,6 +5235,7 @@ class Admin if ( !$manager->pidInstalled($pid) ) { self::error(_ERROR_NOSUCHPLUGIN); + return; } $aOptions = requestArray('plugoption'); @@ -5815,167 +5247,342 @@ class Admin ); $manager->notify('PostPluginOptionsUpdate', $data); - self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED); + self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED); return; } /** - * Admin::insertPluginOptions() + * Admin::skineditgeneral() * - * Output plugin option field + * @param integer $skinid + * @param string $handler + * @return string empty or message if failed + */ + static private function skineditgeneral($skinid, $handler='') + { + $name = postVar('name'); + $desc = postVar('desc'); + $type = postVar('type'); + $inc_mode = postVar('inc_mode'); + $inc_prefix = postVar('inc_prefix'); + + $skin =& $manager->getSkin($skinid, $handler); + + // 1. Some checks + if ( !isValidSkinName($name) ) + { + return _ERROR_BADSKINNAME; + } + + if ( ($skin->getName() != $name) && SKIN::exists($name) ) + { + return _ERROR_DUPSKINNAME; + } + + if ( !$type ) + { + $type = 'text/html'; + } + + if ( !$inc_mode ) + { + $inc_mode = 'normal'; + } + + // 2. Update description + $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix); + + return ''; + } + /** + * Admin::skindeleteconfirm() * - * @access public - * @param string $context plugin option context - * @param integer $contextid plugin option context id + * @param integer $skinid * @return void */ - static public function insertPluginOptions($context, $contextid = 0) + static private function skindeleteconfirm($skinid) { global $manager; - // get all current values for this contextid - // (note: this might contain doubles for overlapping contextids) - $aIdToValue = array(); + if ( !preg_match('#^admin/#', self::$action) ) + { + $event_identifier = 'Skin'; + } + else + { + $event_identifier = 'AdminSkin'; + } + + $manager->notify("PreDelete{$event_identifier}", array('skinid' => $skinid)); + + // 1. delete description + $query = "DELETE FROM %s WHERE sdnumber=%d;"; + $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); + DB::execute($query); + + // 2. delete parts + $query = "DELETE FROM %s WHERE sdesc=%d;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid); + DB::execute($query); - $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;"; - $query = sprintf($query, sql_table('plugin_option'), (integer) $contextid); + $manager->notify("PostDelete{$event_identifier}", array('skinid' => $skinid)); - $res = sql_query($query); - while ( $object = sql_fetch_object($res) ) + return; + } + + /** + * Admin::skinremovetypeconfirm() + * + * @param integer $skinid + * @param string $skintype + * @return string empty or message if failed + */ + static private function skinremovetypeconfirm($skinid, $skintype) + { + if ( !preg_match('#^admin/#', self::$action) ) { - $aIdToValue[$object->oid] = $object->ovalue; + $event_identifier = 'Skin'; + } + else + { + $event_identifier = 'AdminSkin'; } - // get list of oids per pid - $query = "SELECT * FROM %s, %s WHERE opid=pid and ocontext= '%s' ORDER BY porder, oid ASC;"; - $query = sprintf($query, sql_table('plugin_option_desc'), sql_table('plugin'), sql_real_escape_string($context)); - $res = sql_query($query); - - $aOptions = array(); - while ( $object = sql_fetch_object($res) ) + if ( !isValidShortName($skintype) ) { - 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' => '' - ) - ); + return _ERROR_SKIN_PARTS_SPECIAL_DELETE; } + $data =array( + 'skinid' => $skinid, + 'skintype' => $skintype + ); + $manager->notify("PreDelete{$event_identifier}Part", $data); + + // delete part + $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( - 'context' => $context, - 'contextid' => $contextid, - 'options' =>& $aOptions + 'skinid' => $skinid, + 'skintype' => $skintype ); - $manager->notify('PrePluginOptionsEdit', $data); + $manager->notify("PostDelete{$event_identifier}Part", $data); - self::$aOptions = $aOptions; - self::$skin->parse('insertpluginoptions'); - return; + return ''; } /** - * Admin::action_parseSpecialskin() + * Admin::skinclone() * - * @param void + * @param integer $skinid + * @param string $handler * @return void */ - static private function action_parseSpecialskin() + static private function skinclone($skinid, $handler='') { - self::pagehead(); - self::$skin->parse(self::$action); - self::pagefoot(); + global $manager; + + // 1. read skin to clone + $skin =& $manager->getSkin($skinid, $handler); + $name = "{$skin->getName()}_clone"; + + // if a skin with that name already exists: + if ( Skin::exists($name) ) + { + $i = 1; + while ( Skin::exists($name . $i) ) + { + $i++; + } + $name .= $i; + } + + // 2. create skin desc + $newid = Skin::createNew( + $name, + $skin->getDescription(), + $skin->getContentType(), + $skin->getIncludeMode(), + $skin->getIncludePrefix() + ); + + // 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 ) + { + $content = $skin->getContentFromDB($row['stype']); + 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; } - /* - * TODO: use Skin class instead of this - static private function parse($type) + /** + * Admin::skinieimport() + * + * @param string $mode + * @param string $skinFileRaw + * @return string empty or message if failed + */ + static private function skinieimport($mode, $skinFileRaw) { - global $manager, $CONF; + global $DIR_LIBS, $DIR_SKINS; - if ( $type == 'pagehead' ) + // load skinie class + include_once($DIR_LIBS . 'skinie.php'); + + $importer = new SkinImport(); + + // get full filename + if ( $mode == 'file' ) { - $data = array( - 'skin' => &self::$skin, - 'type' => $type - ); - - $manager->notify('InitAdminSkinParse', $data); - sendContentType(self::$skin->getContentType(), 'skin', i18n::get_current_charset()); + $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml'; + } + else + { + $skinFile = $skinFileRaw; + } + + // read only metadata + $error = $importer->readFile($skinFile, 1); + if ( $error ) + { + unset($importer); + return $error; } - $contents = self::$skin->getContentFromDB($type); + /* TODO: we should consider to use the other way insterad of this */ + $_REQUEST['skininfo'] = $importer->getInfo(); + $_REQUEST['skinnames'] = $importer->getSkinNames(); + $_REQUEST['tpltnames'] = $importer->getTemplateNames(); + + // clashes + $skinNameClashes = $importer->checkSkinNameClashes(); + $templateNameClashes = $importer->checkTemplateNameClashes(); + $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); + + /* TODO: we should consider to use the other way insterad of this */ + $_REQUEST['skinclashes'] = $skinNameClashes; + $_REQUEST['tpltclashes'] = $templateNameClashes; + $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; + + unset($importer); + return ''; + } + + /** + * Admin::skinieedoimport() + * + * @param string $mode + * @param string $skinFileRaw + * @param boolean $allowOverwrite + * @return string empty or message if failed + */ + static private function skiniedoimport($mode, $skinFileRaw, $allowOverwrite) + { + global $DIR_LIBS, $DIR_SKINS; + + // load skinie class + include_once($DIR_LIBS . 'skinie.php'); + + $importer = new SkinImport(); - if ( !$contents ) + // get full filename + if ( $mode == 'file' ) { - echo _ERROR_SKIN; - return; + $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml'; + } + else + { + $skinFile = $skinFileRaw; } - $actions = self::$skin->getAllowedActionsForType($type); + $error = $importer->readFile($skinFile); + if ( $error ) + { + unset($importer); + return $error; + } - if ( $type == 'pagehead' ) + $error = $importer->writeToDatabase($allowOverwrite); + if ( $error ) { - $data = array( - 'skin' => &self::$skin, - 'type' => $type, - 'contents' => &$contents - ); - - $manager->notify('PreAdminSkinParse', $data); + unset($importer); + return $error; } - PARSER::setProperty('IncludeMode', self::$skin->getIncludeMode()); - PARSER::setProperty('IncludePrefix', self::$skin->getIncludePrefix()); + /* TODO: we should consider to use the other way insterad of this */ + $_REQUEST['skininfo'] = $importer->getInfo(); + $_REQUEST['skinnames'] = $importer->getSkinNames(); + $_REQUEST['tpltnames'] = $importer->getTemplateNames(); + + unset($importer); + return ''; + } + + /** + * Admin::skinieexport() + * + * @param array $aSkins + * @param array $aTemplates + * @param string $info + * @return void + */ + static private function skinieexport($aSkins, $aTemplates, $info) + { + global $DIR_LIBS; + + // load skinie class + include_once($DIR_LIBS . 'skinie.php'); - if ( $type == 'createitem' || $type == 'itemedit' ) + if ( !is_array($aSkins) ) { - // TODO: where is this class??? - $handler = new Factory(intRequestVar('blogid'), $type, self::$skin, $this); - $actions = array_merge($actions, $handler->actions); + $aSkins = array(); } - else + + if (!is_array($aTemplates)) { - // TODO: why??? - $actions = array_merge($actions, self::$skin->getAllowedActionsForType($type)); + $aTemplates = array(); } - $parser = new Parser($actions, $handler); - $handler->setParser($parser); - $handler->setSkin(self::$skin); - $parser->parse($contents); + $skinList = array_keys($aSkins); + $templateList = array_keys($aTemplates); - if ( $type == 'pagefoot' ) + $exporter = new SkinExport(); + foreach ( $skinList as $skinId ) { - $data = array( - 'skin' => &self::$skin, - 'type' => $type, - ); - - $manager->notify('PostAdminSkinParse', $data); + $exporter->addSkin($skinId); + } + foreach ( $templateList as $templateId ) + { + $exporter->addTemplate($templateId); } + $exporter->setInfo($info); + $exporter->export(); + + return; + } + + /** + * Admin::action_parseSpecialskin() + * + * @param void + * @return void + */ + static private function action_parseSpecialskin() + { + self::$skin->parse(self::$action); return; } - */ /** * Admin::getAdminskinIDFromName() @@ -5985,9 +5592,9 @@ class Admin */ static private function getAdminskinIDFromName($skinname) { - $query = "SELECT 'sdnumber' as result FROM %s WHERE sdname = '%s';"; - $query = sprintf($query, sql_table('skin_desc'), mysql_real_escape_string($skinname)); - $admnSknID = quickQuery($query); + $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; } @@ -5999,16 +5606,16 @@ class Admin */ static private function getAdminskinNameFromID($skinid) { - $query = "SELECT sdname as result FROM %s WHERE sdnumber = '%d';"; + $query = "SELECT sdname as result FROM %s WHERE sdnumber = %d;"; $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); - $admnSknID = quickQuery($query); + $admnSknID = DB::getValue($query); return (integer) $adminSkinID; } /** * Admin::getAdminextrahead() */ - static function getAdminextrahead() + static public function getAdminextrahead() { return self::$extrahead; } @@ -6016,7 +5623,7 @@ class Admin /** * Admin::getAdminpassvar() */ - static function getAdminpassvar() + static public function getAdminpassvar() { return self::$passvar; } @@ -6024,7 +5631,7 @@ class Admin /** * Admin::getAdminAction() */ - static function getAdminAction() + static public function getAdminAction() { return self::$action; } @@ -6032,7 +5639,7 @@ class Admin /** * Admin::getAdminaOption() */ - static function getAdminaOption() + static public function getAdminaOption() { return self::$aOptions; } @@ -6073,12 +5680,11 @@ 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; } @@ -6095,9 +5701,9 @@ class Admin $member->isAdmin() or self::disallow(); include_once($DIR_LIBS . 'Skinie.php'); - $skinFileRaw = postVar('skinfile'); - $mode = postVar('mode'); - $allowOverwrite = intPostVar('overwrite'); + $skinFileRaw = postVar('skinfile'); + $mode = postVar('mode'); + $allowOverwrite = intPostVar('overwrite'); if ( $mode == 'file' ) { @@ -6113,11 +5719,13 @@ class Admin if ( $error ) { self::error($error); + return; } $error = $importer->writeToDatabase($allowOverwrite); if ( $error ) { self::error($error); + return; } $_REQUEST['skininfo'] = $importer->getInfo(); @@ -6125,6 +5733,6 @@ class Admin $_REQUEST['tpltnames'] = $importer->getTemplateNames(); header('Location: ' . $CONF['AdminURL']); - exit; + return; } }