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] = ''; - ?> -