X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2FADMIN.php;h=6dbf3b3d5021a5fbe8919d9683b31b48eb607e02;hb=b82168398ee0160603b015a4930998f6e656c098;hp=0e35fcf4342cee2e9363360a4e2ac23cd0f72d3c;hpb=9814922d2228c33dc55c2e9822fd92dedfd14ef7;p=nucleus-jp%2Fnucleus-next.git diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index 0e35fcf..6dbf3b3 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', @@ -148,7 +154,7 @@ class Admin global $CONF, $DIR_LIBS; /* NOTE: 1. decide which skinid to use */ - $skinid = $CONF['DefaultAdminSkin']; + $skinid = $CONF['AdminSkin']; /* * NOTE: this is temporary escaped because not implemented yet if (isset($member) && $member->isLoggedIn()) @@ -201,7 +207,7 @@ class Admin { $alias = array( 'login' => 'overview', - '' => 'overview' + '' => 'overview', ); } if ( array_key_exists($action, $alias) && isset($alias[$action]) ) @@ -226,7 +232,7 @@ class Admin self::error(_ERROR_BADTICKET); } } - + /* 3. parse according to the action */ if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) ) { @@ -236,15 +242,15 @@ 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)); } - elseif ( $id != $CONF['DefaultAdminSkin'] ) + elseif ( $id != $CONF['AdminSkin'] ) { - self::$skin = new Skin($CONF['DefaultAdminSkin']); + self::$skin = new Skin($CONF['AdminSkin'], 'AdminActions'); if ( self::$skin && self::existsSkinContents('adminerrorpage') ) { self::error(_BADACTION . ENTITY::hsc($action)); @@ -274,16 +280,16 @@ class Admin } else { - $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype='%s';"; + $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype=%s"; /* TODO: skinid should be a default */ if ( !is_object(self::$skin) ) { 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 +304,9 @@ class Admin */ static private function specialActionsAllow($action) { - $query = "SELECT sdesc as result FROM %s WHERE sdesc = %d AND stype = '%s';"; - $query = sprintf($query, sql_table('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,7 +335,7 @@ class Admin // skip to overview when allowed if ( $member->isLoggedIn() && $member->canLogin() ) { - self::$action_overview(); + self::action_overview(); exit; } @@ -340,9 +346,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('showlogin'); - self::pagefoot(); } /** @@ -359,9 +363,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('overview'); - self::pagefoot(); return; } @@ -381,9 +383,7 @@ class Admin } $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('manage'); - self::pagefoot(); return; } @@ -404,9 +404,7 @@ class Admin $member->teamRights($blogid) or $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('itemlist'); - self::pagefoot(); return; } @@ -443,9 +441,7 @@ class Admin self::batchAskDeleteConfirmation('item', $selected); } - self::pagehead(); self::$skin->parse('batchitem'); - self::pagefoot(); return; } @@ -473,12 +469,22 @@ class Admin // On delete: check if confirmation has been given if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') ) { - self::batchAskDeleteConfirmation('comment',$selected); + self::batchAskDeleteConfirmation('comment', $selected); } - self::pagehead(); self::$skin->parse('batchcomment'); - self::pagefoot(); + return; + } + + /** + * Admin::setAdminAction() + * + * @param string $action + * @return void + */ + static public function setAdminAction($action) + { + self::$action = $action; return; } @@ -509,9 +515,7 @@ class Admin self::batchAskDeleteConfirmation('member',$selected); } - self::pagehead(); self::$skin->parse('batchmember'); - self::pagefoot(); return; } @@ -543,9 +547,7 @@ class Admin self::batchAskDeleteConfirmation('team',$selected); } - self::pagehead(); self::$skin->parse('batchteam'); - self::pagefoot(); return; } @@ -582,9 +584,7 @@ class Admin self::batchAskDeleteConfirmation('category', $selected); } - self::pagehead(); self::$skin->parse('batchcategory'); - self::pagefoot(); return; } @@ -600,9 +600,7 @@ class Admin static private function batchMoveSelectDestination($type, $ids) { $_POST['batchmove'] = $type; - self::pagehead(); self::$skin->parse('batchmove'); - self::pagefoot(); return; } @@ -619,9 +617,7 @@ class Admin { $_POST['batchmove'] = $type; global $manager; - self::pagehead(); self::$skin->parse('batchmovecat'); - self::pagefoot(); return; } @@ -636,96 +632,7 @@ class Admin */ static private function batchAskDeleteConfirmation($type, $ids) { - self::pagehead(); self::$skin->parse('batchdelete'); - self::pagefoot(); - return; - } - - /** - * Admin::selectBlogCategory() - * Inserts a HTML select element with choices for all categories to which the current - * member has access - * - * @see function selectBlog - * @param string $name name of weblod - * @param integer $selected - * @param integer $tabindex - * @param integer $showNewCat - * @param integer $iForcedBlogInclude ID for weblog always included - * @return void - * - * NOTE: callback from AdminAction - */ - static 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; } @@ -739,9 +646,7 @@ class Admin { global $member, $manager, $CONF; - self::pagehead(); self::$skin->parse('browseownitems'); - self::pagefoot(); return; } @@ -770,9 +675,7 @@ class Admin $blogid = getBlogIdFromItemId($itemid); - self::pagehead(); self::$skin->parse('itemcommentlist'); - self::pagefoot(); return; } @@ -785,9 +688,7 @@ class Admin */ static private function action_browseowncomments() { - self::pagehead(); self::$skin->parse('browseowncomments'); - self::pagefoot(); return; } @@ -816,9 +717,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; } @@ -838,13 +802,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; } @@ -863,19 +845,28 @@ 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 - ) - ); + $blog =& $manager->getBlog($blogid); + + $contents =& $manager->getItem($itemid, 1, 1); + $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$contents)); + + 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('itemedit'); - self::pagefoot(); return; } @@ -900,7 +891,7 @@ class Admin // delete actions are handled by itemdelete (which has confirmation) if ( $actiontype == 'delete' ) { - self::$action_itemdelete(); + self::action_itemdelete(); return; } @@ -973,7 +964,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) @@ -982,10 +973,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, 0, 0); + $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; } @@ -1011,9 +1004,7 @@ class Admin self::error(_ERROR_NOSUCHITEM); } - self::pagehead(); self::$skin->parse('itemdelete'); - self::pagefoot(); return; } @@ -1038,7 +1029,7 @@ class Admin // delete item (note: some checks will be performed twice) self::deleteOneItem($itemid); - self::$action_itemlist($blogid); + self::action_itemlist($blogid); return; } @@ -1049,7 +1040,7 @@ class Admin * @param integer $itemid ID for item * @return void */ - static private function deleteOneItem($itemid) + static public function deleteOneItem($itemid) { global $member, $manager; @@ -1087,9 +1078,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(); } @@ -1114,9 +1105,7 @@ class Admin $member->canAlterItem($itemid) or self::disallow(); - self::pagehead(); self::$skin->parse('itemmove'); - self::pagefoot(); return; } @@ -1165,11 +1154,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; } @@ -1183,7 +1172,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; @@ -1217,20 +1206,19 @@ class Admin self::error($result['message']); } - $blogid = getBlogIDFromItemID($result['itemid']); - $blog =& $manager->getBlog($blogid); - $btimestamp = $blog->getCorrectTime(); - $item = $manager->getItem(intval($result['itemid']), 1, 1); + $itemid = (integer) $result['itemid']; + + $blogid = (integer) getBlogIDFromItemID($itemid); 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=' . $blogid); + self::action_categoryedit($result['catid'], $blogid, $distURI); } else { - $methodName = 'action_itemList'; - call_user_func(array(&$this, $methodName), $blogid); + $methodName = 'action_itemlist'; + self::action_itemlist($blogid); } return; } @@ -1250,9 +1238,7 @@ class Admin $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); self::$skin->parse('commentedit'); - self::pagefoot(); return; } @@ -1300,25 +1286,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; } @@ -1337,9 +1321,7 @@ class Admin $commentid = intRequestVar('commentid'); $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); self::$skin->parse('commentdelete'); - self::pagefoot(); return; } @@ -1359,9 +1341,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 ) @@ -1371,11 +1351,11 @@ class Admin if ( $member->canAlterItem($itemid) ) { - self::$action_itemcommentlist($itemid); + self::action_itemcommentlist($itemid); } else { - self::$action_browseowncomments(); + self::action_browseowncomments(); } return; } @@ -1386,7 +1366,7 @@ class Admin * @param integer $commentid ID for comment * @return void */ - static private function deleteOneComment($commentid) + static public function deleteOneComment($commentid) { global $member, $manager; @@ -1406,7 +1386,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 @@ -1431,9 +1411,7 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('usermanagement'); - self::pagefoot(); return; } @@ -1446,7 +1424,7 @@ class Admin */ static private function action_memberedit() { - self::$action_editmembersettings(intRequestVar('memberid')); + self::action_editmembersettings(intRequestVar('memberid')); return; } @@ -1472,10 +1450,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,7 +1490,7 @@ class Admin $notes = strip_tags(postVar('notes')); $locale = postVar('locale'); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); if ( $CONF['AllowLoginEdit'] || $member->isAdmin() ) { @@ -1575,8 +1552,8 @@ class Admin || (!$canlogin && $mem->isAdmin() && $mem->canLogin()) ) { - $r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1'); - if ( sql_num_rows($r) < 2 ) + $r = DB::getResult('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1'); + if ( $r->rowCount() < 2 ) { self::error(_ERROR_ATLEASTONEADMIN); } @@ -1633,7 +1610,7 @@ class Admin { $member->logout(); } - self::$action_login(_MSG_ACTIVATION_SENT, 0); + self::action_login(_MSG_ACTIVATION_SENT, 0); return; } @@ -1642,11 +1619,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; } @@ -1699,7 +1676,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; } @@ -1738,7 +1727,7 @@ class Admin self::error(_ERROR_ACTIVATE); } - $mem = Member::createFromId($info->vmember); + $mem =& $manager->getMember($info->vmember); if ( !$mem ) { @@ -1750,9 +1739,7 @@ class Admin $_POST['bNeedsPasswordChange'] = TRUE; self::$headMess = $message; - self::pagehead(); self::$skin->parse('activate'); - self::pagefoot(); return; } @@ -1779,7 +1766,7 @@ class Admin return self::showActivationPage($key, _ERROR_ACTIVATE); } - $mem = Member::createFromId($info->vmember); + $mem =& $manager->getMember($info->vmember); if ( !$mem ) { @@ -1836,9 +1823,7 @@ class Admin // do the activation Member::activate($key); - self::pagehead(); self::$skin->parse('activatesetpwd'); - self::pagefoot(); return; } @@ -1858,9 +1843,7 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('manageteam'); - self::pagefoot(); return; } @@ -1888,7 +1871,7 @@ class Admin self::error(_ERROR_ALREADYONTEAM); } - self::$action_manageteam(); + self::action_manageteam(); return; } @@ -1908,12 +1891,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; } @@ -1935,7 +1916,7 @@ class Admin { self::error($error); } - self::$action_manageteam(); + self::action_manageteam(); return; } @@ -1945,7 +1926,7 @@ class Admin * @param void * @return void */ - static private function deleteOneTeamMember($blogid, $memberid) + static public function deleteOneTeamMember($blogid, $memberid) { global $member, $manager; @@ -1960,7 +1941,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( @@ -1975,8 +1956,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; } @@ -1984,7 +1965,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, @@ -2003,7 +1984,7 @@ class Admin */ static private function action_teamchangeadmin() { - global $member; + global $manager, $member; $blogid = intRequestVar('blogid'); $memberid = intRequestVar('memberid'); @@ -2011,15 +1992,15 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - $mem = Member::createFromID($memberid); + $mem =& $manager->getMember($memberid); // don't allow when there is only one admin at this moment if ( $mem->isBlogAdmin($blogid) ) { $query = "SELECT * FROM %s WHERE tblog=%d AND tadmin=1;"; $query = sprintf($query, sql_table('team'), (integer) $blogid); - $r = sql_query($query); - if ( sql_num_rows($r) == 1 ) + $r = DB::getResult($query); + if ( $r->rowCount() == 1 ) { self::error(_ERROR_ATLEASTONEBLOGADMIN); } @@ -2036,16 +2017,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; } @@ -2067,10 +2048,9 @@ class Admin $blog =& $manager->getBlog($blogid); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('blogsettings'); - self::pagefoot(); return; } @@ -2096,10 +2076,10 @@ class Admin self::error(_ERROR_BADCATEGORYNAME); } - $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d;"; - $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid); - $res = sql_query($query); - if ( sql_num_rows($res) > 0 ) + $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;"; + $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid); + $res = DB::getResult($query); + if ( $res->rowCount() > 0 ) { self::error(_ERROR_DUPCATEGORYNAME); } @@ -2107,7 +2087,7 @@ class Admin $blog =& $manager->getBlog($blogid); $newCatID = $blog->createNewCategory($cname, $cdesc); - self::$action_blogsettings(); + self::action_blogsettings(); return; } @@ -2144,10 +2124,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; } @@ -2174,17 +2153,17 @@ class Admin self::error(_ERROR_BADCATEGORYNAME); } - $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d AND not(catid=%d);"; - $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid, (integer) $catid); - $res = sql_query($query); - if ( sql_num_rows($res) > 0 ) + $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);"; + $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid, (integer) $catid); + $res = DB::getResult($query); + if ( $res->rowCount() > 0 ) { self::error(_ERROR_DUPCATEGORYNAME); } - $query = "UPDATE %s SET cname='%s', cdesc='%s' WHERE catid=%d;"; - $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), sql_real_escape_string($cdesc), (integer) $catid); - sql_query($query); + $query = "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;"; + $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), DB::quoteValue($cdesc), (integer) $catid); + DB::execute($query); // store plugin options $aOptions = requestArray('plugoption'); @@ -2202,7 +2181,7 @@ class Admin } else { - self::$action_blogsettings(); + self::action_blogsettings(); } return; } @@ -2239,15 +2218,13 @@ class Admin // check if catid is the only category left for blogid $query = "SELECT catid FROM %s WHERE cblog=%d;"; $query = sprintf($query, sql_table('category'), $blogid); - $res = sql_query($query); - if ( sql_num_rows($res) == 1 ) + $res = DB::getResult($query); + if ( $res->rowCount() == 1 ) { self::error(_ERROR_DELETELASTCATEGORY); } - self::pagehead(); self::$skin->parse('categorydelete'); - self::pagefoot(); return; } @@ -2272,7 +2249,7 @@ class Admin self::error($error); } - self::$action_blogsettings(); + self::action_blogsettings(); return; } @@ -2283,7 +2260,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; @@ -2314,10 +2291,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; } @@ -2328,15 +2305,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); @@ -2344,6 +2321,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 * @@ -2432,7 +2499,7 @@ class Admin ); $manager->notify('PostPluginOptionsUpdate', $data); - self::$action_overview(_MSG_SETTINGSCHANGED); + self::action_overview(_MSG_SETTINGSCHANGED); return; } @@ -2458,9 +2525,7 @@ class Admin $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('deleteblog'); - self::pagefoot(); return; } @@ -2490,35 +2555,35 @@ class Admin // delete all comments $query = 'DELETE FROM ' . sql_table('comment') . ' WHERE cblog='.$blogid; - sql_query($query); + DB::execute($query); // delete all items $query = 'DELETE FROM ' . sql_table('item') . ' WHERE iblog=' . $blogid; - sql_query($query); + DB::execute($query); // delete all team members $query = 'DELETE FROM ' . sql_table('team') . ' WHERE tblog=' . $blogid; - sql_query($query); + DB::execute($query); // delete all bans $query = 'DELETE FROM ' . sql_table('ban') . ' WHERE blogid=' . $blogid; - sql_query($query); + DB::execute($query); // delete all categories $query = 'DELETE FROM ' . sql_table('category') . ' WHERE cblog=' . $blogid; - sql_query($query); + DB::execute($query); // delete all associated plugin options NucleusPlugin::delete_option_values('blog', $blogid); // delete the blog itself $query = 'DELETE FROM ' . sql_table('blog') . ' WHERE bnumber=' . $blogid; - sql_query($query); + DB::execute($query); $data = array('blogid' => $blogid); $manager->notify('PostDeleteBlog', $data); - self::$action_overview(_DELETED_BLOG); + self::action_overview(_DELETED_BLOG); return; } @@ -2536,11 +2601,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; } @@ -2566,11 +2629,11 @@ class Admin if ( $member->isAdmin() ) { - self::$action_usermanagement(); + self::action_usermanagement(); } else { - self::$action_overview(_DELETED_MEMBER); + self::action_overview(_DELETED_MEMBER); } return; } @@ -2583,12 +2646,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() ) { @@ -2601,19 +2664,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); @@ -2637,9 +2700,7 @@ class Admin // Only Super-Admins can do this $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('createnewlog'); - self::pagefoot(); return; } @@ -2682,27 +2743,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); @@ -2711,7 +2772,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.'); @@ -2742,9 +2803,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; } @@ -2767,7 +2826,7 @@ class Admin $blog->setURL(trim($burl)); $blog->writeSettings(); - self::$action_overview(_MSG_NEWBLOG); + self::action_overview(_MSG_NEWBLOG); return; } @@ -2785,9 +2844,7 @@ class Admin include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); self::$skin->parse('skinieoverview'); - self::pagefoot(); return; } @@ -2812,7 +2869,7 @@ class Admin $importer = new SkinImport(); // get full filename - if ($mode == 'file') + if ( $mode == 'file' ) { $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml'; @@ -2838,7 +2895,7 @@ class Admin $_REQUEST['tpltnames'] = $importer->getTemplateNames(); // clashes - $skinNameClashe = $importer->checkSkinNameClashes(); + $skinNameClashes = $importer->checkSkinNameClashes(); $templateNameClashes = $importer->checkTemplateNameClashes(); $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0); @@ -2852,9 +2909,7 @@ class Admin self::error($error); } - self::pagehead(); self::$skin->parse('skinieimport'); - self::pagefoot(); return; } @@ -2917,9 +2972,7 @@ class Admin $_REQUEST['skinnames'] = $importer->getSkinNames(); $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - self::pagehead(); self::$skin->parse('skiniedoimport'); - self::pagefoot(); return; } @@ -2982,9 +3035,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('templateoverview'); - self::pagefoot(); return; } @@ -3006,30 +3057,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; } @@ -3185,16 +3216,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; } @@ -3225,7 +3256,7 @@ class Admin $newTemplateId = Template::createNew($name, $desc); - self::$action_templateoverview(); + self::action_templateoverview(); return; } @@ -3268,13 +3299,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; } @@ -3286,11 +3317,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; } @@ -3308,11 +3337,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; } @@ -3339,23 +3368,21 @@ class Admin { self::error(_ERROR_DUPTEMPLATENAME); } - $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')); @@ -3460,7 +3487,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 ) @@ -3470,7 +3497,7 @@ class Admin } // jump back to template edit - self::$action_admintemplateedit(_TEMPLATE_UPDATED); + self::action_admintemplateedit(_TEMPLATE_UPDATED); return; } @@ -3490,10 +3517,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(); } /** @@ -3508,9 +3539,7 @@ class Admin $member->isAdmin() or self::disallow(); // TODO: check if template can be deleted - self::pagehead(); self::$skin->parse('admintemplatedelete'); - self::pagefoot(); return; } @@ -3533,17 +3562,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; } @@ -3564,13 +3593,17 @@ class Admin { self::error(_ERROR_BADTEMPLATENAME); } - if ( Template::exists($name) ) + else if ( !preg_match('#^admin/#', $name) ) + { + self::error(_ERROR_BADADMINTEMPLATENAME); + } + else if ( Template::exists($name) ) { self::error(_ERROR_DUPTEMPLATENAME); } $newTemplateId = Template::createNew($name, $desc); - self::$action_admintemplateoverview(); + self::action_admintemplateoverview(); return; } @@ -3591,7 +3624,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) ) @@ -3604,20 +3637,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; } @@ -3633,9 +3666,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('skinoverview'); - self::pagefoot(); return; } @@ -3666,7 +3697,7 @@ class Admin $newId = SKIN::createNew($name, $desc); - self::$action_skinoverview(); + self::action_skinoverview(); return; } @@ -3682,9 +3713,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('skinedit'); - self::pagefoot(); return; } @@ -3733,7 +3762,7 @@ class Admin // 2. Update description $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix); - self::$action_skinedit(); + self::action_skinedit(); return; } @@ -3758,9 +3787,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); } - self::pagehead(); self::$skin->parse('skinedittype'); - self::pagefoot(); return; } @@ -3783,7 +3810,7 @@ class Admin $skin = new SKIN($skinid); $skin->update($type, $content); - self::$action_skinedittype(_SKIN_UPDATED); + self::action_skinedittype(_SKIN_UPDATED); return; } @@ -3811,15 +3838,13 @@ class Admin $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)); } - self::pagehead(); self::$skin->parse('skindelete'); - self::pagefoot(); return; } @@ -3847,10 +3872,10 @@ class Admin $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)); } $data = array('skinid' => $skinid); @@ -3859,17 +3884,17 @@ class Admin // 1. delete description $query = "DELETE FROM %s WHERE sdnumber=%d;"; $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid); - sql_query($query); + DB::execute($query); // 2. delete parts $query = "DELETE FROM %s WHERE sdesc=%d;"; $query = sprintf($query, sql_table('skin'), (integer) $skinid); - sql_query($query); + DB::execute($query); $data = array('skinid' => $skinid); $manager->notify('PostDeleteSkin', $data); - self::$action_skinoverview(); + self::action_skinoverview(); return; } @@ -3900,9 +3925,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - self::pagehead(); self::$skin->parse('skinremovetype'); - self::pagefoot(); return; } @@ -3938,11 +3961,10 @@ class Admin '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); + $query = "DELETE FROM %s WHERE sdesc=%d AND stype=%s;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) ); + DB::execute($query); $data = array( 'skinid' => $skinid, @@ -3950,7 +3972,7 @@ class Admin ); $manager->notify('PostDeleteSkinPart', $data); - self::$action_skinedit(); + self::action_skinedit(); return; } @@ -3971,14 +3993,16 @@ class Admin // 1. read skin to clone $skin = new Skin($skinid); - $name = "clone_{$skin->getName()}"; + $name = "{$skin->getName()}_clone"; // if a skin with that name already exists: if ( Skin::exists($name) ) { $i = 1; - while (Skin::exists($name . $i)) + while ( Skin::exists($name . $i) ) + { $i++; + } $name .= $i; } @@ -3995,13 +4019,13 @@ class Admin $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) ) + $res = DB::getResult($query); + foreach ( $res as $row ) { - self::$skinclonetype($skin, $newid, $row['stype']); + self::skinclonetype($skin, $newid, $row['stype']); } - self::$action_skinoverview(); + self::action_skinoverview(); return; } @@ -4016,13 +4040,13 @@ class Admin static private function skinclonetype($skin, $newid, $type) { $newid = intval($newid); - $content = $skin->getContent($type); + $content = $skin->getContentFromDB($type); if ( $content ) { - $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')"; - $query = sprintf($query, sql_table('skin'), (integer) $newid, $content, $type); - sql_query($query); + $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)"; + $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type)); + DB::execute($query); } return; } @@ -4039,9 +4063,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('adminskinoverview'); - self::pagefoot(); return; } @@ -4062,13 +4084,17 @@ class Admin { self::error(_ERROR_BADSKINNAME); } - if ( Skin::exists($name) ) + else if ( !preg_match('#^admin/#', $name) ) + { + self::error(_ERROR_BADADMINSKINNAME); + } + else if ( Skin::exists($name) ) { self::error(_ERROR_DUPSKINNAME); } /* TODO: $newId is not reused... */ $newId = Skin::createNew($name, $desc); - self::$action_adminskinoverview(); + self::action_adminskinoverview(); return; } @@ -4083,9 +4109,7 @@ class Admin global $member, $manager; $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('adminskinedit'); - self::pagefoot(); return; } @@ -4130,7 +4154,7 @@ class Admin } // 2. Update description $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix); - self::$action_adminskinedit(); + self::action_adminskinedit(); return; } @@ -4159,9 +4183,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); } - self::pagehead(); self::$skin->parse('adminskinedittype'); - self::pagefoot(); return; } @@ -4182,7 +4204,7 @@ class Admin $skin = new Skin($skinid, 'Admin', 'AdminSkin'); $skin->update($type, $content); - self::$action_adminskinedittype(_SKIN_UPDATED); + self::action_adminskinedittype(_SKIN_UPDATED); return; } @@ -4199,9 +4221,7 @@ class Admin /* TODO: needless variable $skinid... */ $skinid = intRequestVar('skinid'); - self::pagehead(); self::$skin->parse('adminskindelete'); - self::pagefoot(); return; } @@ -4214,42 +4234,45 @@ class Admin static private function action_adminskindeleteconfirm() { global $member, $CONF, $manager; + $member->isAdmin() or self::disallow(); $skinid = intRequestVar('skinid'); + // don't allow default skin to be deleted - if ( $skinid == $CONF['DefaultAdminSkin'] ) + if ( $skinid == $CONF['AdminSkin'] ) { self::error(_ERROR_DEFAULTSKIN); } - // don't allow deletion of default skins for members + /* + * TODO: NOT Implemented + * don't allow deletion of default skins for members $memberDefaults = $member->getAdminSkin(); foreach ( $memberDefaults as $memID => $adminskin ) { if ( $skinid == $adminskin ) { - $mem = MEMBER::createFromID($memID); + $mem =& $manager->getMember($memID); self::error(_ERROR_SKINDEFDELETE . $mem->displayname); } } + */ - $data = array('skinid' => (integer) $skinid); - $manager->notify('PreDeleteAdminSkin', $data); + $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid)); // 1. delete description - $query = "DELETE FROM %s WHERE tdnumber=%s;"; - $query = sprintf($query, sql_table('template_desc'), (integer) $templateid); - sql_query($query); + $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 tdesc=%d;"; - $query = sprintf($query, sql_table('template'), (integer) $templateid); + $query = "DELETE FROM %s WHERE sdesc=%d;"; + $query = sprintf($query, sql_table('skin'), (integer) $skinid); - sql_query($query); + DB::execute($query); - $data = array('skinid' => intval($skinid)); - $manager->notify('PostDeleteAdminSkin', $data); - self::$action_adminskinoverview(); + $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid)); + self::action_adminskinoverview(); return; } @@ -4273,9 +4296,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - self::pagehead(); self::$skin->parse('adminskinremovetype'); - self::pagefoot(); return; } @@ -4304,11 +4325,11 @@ class Admin '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); + $query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s ;'; + $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) ); + DB::execute($query); $data = array( 'skinid' => $skinid, @@ -4316,7 +4337,7 @@ class Admin ); $manager->notify('PostDeleteAdminSkinPart', $data); - self::$action_adminskinedit(); + self::action_adminskinedit(); return; } @@ -4336,7 +4357,7 @@ class Admin // 1. read skin to clone $skin = new Skin($skinid, 'Admin', 'AdminSkin'); - $name = "clone_{$skin->getName()}"; + $name = "{$skin->getName()}_clone"; // if a skin with that name already exists: if ( Skin::exists($name) ) @@ -4358,15 +4379,16 @@ class Admin $skin->getIncludePrefix() ); - $query = "SELECT stype %s FROM WHERE sdesc=%d;"; + // 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) ) + $res = DB::getResult($query); + foreach ( $res as $row ) { - self::$skinclonetype($skin, $newid, $row['stype']); + self::skinclonetype($skin, $newid, $row['stype']); } - self::$action_adminskinoverview(); + self::action_adminskinoverview(); return; } @@ -4380,16 +4402,13 @@ class Admin */ static private function adminskinclonetype($skin, $newid, $type) { - $content = $skin->getContent($type); + $content = $skin->getContentFromDB($type); 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); + $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; } @@ -4409,13 +4428,12 @@ class Admin // load skinie class include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); self::$skin->parse('adminskinieoverview'); - self::pagefoot(); return; } /** + * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!! * Admin::action_adminskinieimport() * * @param void @@ -4423,7 +4441,7 @@ class Admin */ static private function action_adminskinieimport() { - global $DIR_LIBS, $DIR_ADMINSKINS, $manager, $member; + global $DIR_LIBS, $DIR_SKINS, $manager, $member; $member->isAdmin() or self::disallow(); @@ -4438,12 +4456,12 @@ class Admin // get full filename if ( $mode == 'file' ) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml'; + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml"; // backwards compatibilty (in v2.0, exports were saved as skindata.xml) if ( !file_exists($skinFile) ) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml'; + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml"; } } else @@ -4471,14 +4489,20 @@ class Admin $_REQUEST['skinclashes'] = $skinNameClashes; $_REQUEST['tpltclashes'] = $templateNameClashes; $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; - - self::pagehead(); - self::$skin->parse('adminskinieimport'); - self::pagefoot(); + + if ( !is_object(self::$skin) ) + { + self::action_adminskiniedoimport(); + } + else + { + self::$skin->parse('adminskinieimport'); + } return; } /** + * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!! * Admin::action_adminskiniedoimport() * * @param void @@ -4486,7 +4510,7 @@ class Admin */ static private function action_adminskiniedoimport() { - global $DIR_LIBS, $DIR_ADMINSKINS, $member; + global $DIR_LIBS, $DIR_SKINS, $member; $member->isAdmin() or self::disallow(); @@ -4500,11 +4524,11 @@ class Admin // get full filename if ( $mode == 'file' ) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml'; + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml"; // backwards compatibilty (in v2.0, exports were saved as skindata.xml) if ( !file_exists($skinFile) ) { - $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml'; + $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml"; } } else @@ -4531,9 +4555,22 @@ class Admin $_REQUEST['skinnames'] = $importer->getSkinNames(); $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - self::pagehead(); - self::$skin->parse('adminskiniedoimport'); - self::pagefoot(); + if ( !is_object(self::$skin) ) + { + global $DIR_SKINS; + $query = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'"; + $query = sprintf($query, sql_table('skin_desc')); + $res = intval(DB::getValue($query)); + $query = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'"; + $query = sprintf($query, sql_table('config'), $res); + DB::execute($query); + $skin = new Skin(0, 'AdminActions', 'AdminSkin'); + $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn'); + } + else + { + self::$skin->parse('adminskiniedoimport'); + } return; } @@ -4565,7 +4602,8 @@ class Admin $info = postVar('info'); - $exporter = new SkinEXPORT(); + include_libs('skinie.php'); + $exporter = new SkinExport(); foreach ( $skinList as $skinId ) { $exporter->addSkin($skinId); @@ -4591,9 +4629,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('settingsedit'); - self::pagefoot(); return; } @@ -4669,9 +4705,7 @@ class Admin */ static private function action_systemoverview() { - self::pagehead(); self::$skin->parse('systemoverview'); - self::pagefoot(); return; } @@ -4684,13 +4718,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(); } /** @@ -4700,11 +4735,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; } @@ -4715,280 +4749,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::pagehead() - * Output admin page head - * - * @param void - * @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 + * Admin::action_PluginAdmin() + * Output pluginadmin + * + * @param string $skinContents + * @param string $extrahead * @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; } @@ -5002,13 +4781,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; } @@ -5024,9 +4800,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('actionlog'); - self::pagefoot(); return; } @@ -5040,13 +4814,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; } @@ -5063,9 +4834,7 @@ class Admin $blogid = intRequestVar('blogid'); $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('banlistdelete'); - self::pagefoot(); return; } @@ -5079,19 +4848,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 @@ -5102,7 +4871,7 @@ class Admin { if ( Ban::removeBan($blogje, $iprange) ) { - array_push($deleted, $blogje); + $deleted[] = $blogje; } } } @@ -5112,9 +4881,10 @@ class Admin self::error(_ERROR_DELETEBAN); } - self::pagehead(); + /* TODO: we should use other ways */ + $_REQUEST['delblogs'] = $deleted; + self::$skin->parse('banlistdeleteconfirm'); - self::pagefoot(); return; } @@ -5126,7 +4896,7 @@ class Admin */ static private function action_banlistnewfromitem() { - self::$action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid'))); + self::action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid'))); return; } @@ -5152,9 +4922,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; } @@ -5207,7 +4975,7 @@ class Admin self::error(_ERROR_ADDBAN); } } - self::$action_banlist(); + self::action_banlist(); return; } @@ -5225,7 +4993,7 @@ class Admin ActionLog::clear(); - self::$action_manage(_MSG_ACTIONLOGCLEARED); + self::action_manage(_MSG_ACTIONLOGCLEARED); return; } @@ -5241,9 +5009,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('backupoverview'); - self::pagefoot(); return; } @@ -5303,9 +5069,7 @@ class Admin { self::error($message); } - self::pagehead(); self::$skin->parse('backuprestore'); - self::pagefoot(); return; } @@ -5324,9 +5088,7 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('pluginlist'); - self::pagefoot(); return; } @@ -5350,9 +5112,7 @@ class Admin self::error(_ERROR_NOSUCHPLUGIN); } - self::pagehead(); self::$skin->parse('pluginhelp'); - self::pagefoot(); return; } @@ -5383,8 +5143,8 @@ class Admin } // get number of currently installed plugins - $res = sql_query('SELECT * FROM ' . sql_table('plugin')); - $numCurrent = sql_num_rows($res); + $res = DB::getResult('SELECT * FROM ' . sql_table('plugin')); + $numCurrent = $res->rowCount(); // plugin will be added as last one in the list $newOrder = $numCurrent + 1; @@ -5393,10 +5153,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'); @@ -5409,7 +5169,7 @@ 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); @@ -5438,8 +5198,8 @@ class Admin $pluginList = $plugin->getPluginDep(); foreach ( $pluginList as $pluginName ) { - $res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"'); - if (sql_num_rows($res) == 0) + $res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName)); + if ($res->rowCount() == 0) { // uninstall plugin again... self::deleteOnePlugin($plugin->getID()); @@ -5454,7 +5214,7 @@ class Admin $manager->notify('PostAddPlugin', $data); // update all events - self::$action_pluginupdate(); + self::action_pluginupdate(); return; } @@ -5473,22 +5233,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); } } } @@ -5516,9 +5276,7 @@ class Admin self::error(_ERROR_NOSUCHPLUGIN); } - self::pagehead(); self::$skin->parse('plugindelete'); - self::pagefoot(); return; } @@ -5553,7 +5311,7 @@ class Admin * @param void * @return void */ - static private function deleteOnePlugin($pid, $callUninstall = 0) + static public function deleteOnePlugin($pid, $callUninstall = 0) { global $manager; @@ -5566,13 +5324,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(); @@ -5580,7 +5338,7 @@ class Admin { if ( $name == $depName ) { - return sprintf(_ERROR_DELREQPLUGIN, $o->pfile); + return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']); } } } @@ -5600,31 +5358,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); @@ -5654,18 +5411,16 @@ class Admin } // 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; @@ -5691,21 +5446,19 @@ class Admin } // 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; @@ -5738,10 +5491,11 @@ class Admin { 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; } @@ -5777,80 +5531,7 @@ class Admin ); $manager->notify('PostPluginOptionsUpdate', $data); - self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED); - return; - } - - /** - * Admin::insertPluginOptions() - * - * Output plugin option field - * - * @access public - * @param string $context plugin option context - * @param integer $contextid plugin option context id - * @return void - */ - static public function insertPluginOptions($context, $contextid = 0) - { - global $manager; - - // get all current values for this contextid - // (note: this might contain doubles for overlapping contextids) - $aIdToValue = array(); - - $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;"; - $query = sprintf($query, sql_table('plugin_option'), (integer) $contextid); - - $res = sql_query($query); - while ( $object = sql_fetch_object($res) ) - { - $aIdToValue[$object->oid] = $object->ovalue; - } - - // 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 ( !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' => '' - ) - ); - } - - $data = array( - 'context' => $context, - 'contextid' => $contextid, - 'options' =>& $aOptions - ); - $manager->notify('PrePluginOptionsEdit', $data); - - self::$aOptions = $aOptions; - self::$skin->parse('insertpluginoptions'); + self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED); return; } @@ -5862,83 +5543,10 @@ class Admin */ static private function action_parseSpecialskin() { - self::pagehead(); self::$skin->parse(self::$action); - self::pagefoot(); return; } - /* - * TODO: use Skin class instead of this - static private function parse($type) - { - global $manager, $CONF; - - if ( $type == 'pagehead' ) - { - $data = array( - 'skin' => &self::$skin, - 'type' => $type - ); - - $manager->notify('InitAdminSkinParse', $data); - sendContentType(self::$skin->getContentType(), 'skin', i18n::get_current_charset()); - } - - $contents = self::$skin->getContent($type); - - if ( !$contents ) - { - echo _ERROR_SKIN; - return; - } - - $actions = self::$skin->getAllowedActionsForType($type); - - if ( $type == 'pagehead' ) - { - $data = array( - 'skin' => &self::$skin, - 'type' => $type, - 'contents' => &$contents - ); - - $manager->notify('PreAdminSkinParse', $data); - } - - PARSER::setProperty('IncludeMode', self::$skin->getIncludeMode()); - PARSER::setProperty('IncludePrefix', self::$skin->getIncludePrefix()); - - if ( $type == 'createitem' || $type == 'itemedit' ) - { - // TODO: where is this class??? - $handler = new Factory(intRequestVar('blogid'), $type, self::$skin, $this); - $actions = array_merge($actions, $handler->actions); - } - else - { - // TODO: why??? - $actions = array_merge($actions, self::$skin->getAllowedActionsForType($type)); - } - - $parser = new Parser($actions, $handler); - $handler->setParser($parser); - $handler->setSkin(self::$skin); - $parser->parse($contents); - - if ( $type == 'pagefoot' ) - { - $data = array( - 'skin' => &self::$skin, - 'type' => $type, - ); - - $manager->notify('PostAdminSkinParse', $data); - } - return; - } - */ - /** * Admin::getAdminskinIDFromName() * @@ -5947,9 +5555,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; } @@ -5961,16 +5569,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; } @@ -5978,7 +5586,7 @@ class Admin /** * Admin::getAdminpassvar() */ - static function getAdminpassvar() + static public function getAdminpassvar() { return self::$passvar; } @@ -5986,7 +5594,7 @@ class Admin /** * Admin::getAdminAction() */ - static function getAdminAction() + static public function getAdminAction() { return self::$action; } @@ -5994,7 +5602,7 @@ class Admin /** * Admin::getAdminaOption() */ - static function getAdminaOption() + static public function getAdminaOption() { return self::$aOptions; } @@ -6035,12 +5643,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; }