static private $formal_public_identifier = '-//W3C//DTD XHTML 1.0 Strict//EN';\r
static private $system_identifier = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd';\r
static private $xhtml_namespace = 'http://www.w3.org/1999/xhtml';\r
- \r
+\r
+ static public $headMess;\r
+\r
static private $action;\r
static private $skin;\r
- static private $extrahead;\r
static private $passvar;\r
- static private $headMess;\r
static private $aOptions;\r
\r
+ static public $extrahead;\r
+ static public $blog;\r
+ static public $contents;\r
+ \r
/**\r
* Admin::$edit_actions\r
*/\r
'changemembersettings',\r
'clearactionlog',\r
'memberedit'\r
- );\r
- \r
- static private $actions_needless_to_check = array(\r
+ );\r
+\r
+ static private $actions_needless_to_check = array(\r
'showlogin',\r
'login',\r
'overview',\r
'bookmarklet',\r
'blogsettings',\r
'banlist',\r
+ 'createaccount',\r
'deleteblog',\r
'editmembersettings',\r
- 'browseownitems',\r
+ 'createaccount',\r
+ 'forgotpassword',\r
'browseowncomments',\r
'createitem',\r
'itemedit',\r
global $CONF, $DIR_LIBS;\r
\r
/* NOTE: 1. decide which skinid to use */\r
- $skinid = $CONF['DefaultAdminSkin'];\r
+ $skinid = $CONF['AdminSkin'];\r
/*\r
* NOTE: this is temporary escaped because not implemented yet\r
if (isset($member) && $member->isLoggedIn())\r
{\r
$alias = array(\r
'login' => 'overview',\r
- '' => 'overview'\r
+ '' => 'overview',\r
);\r
}\r
if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
self::error(_ERROR_BADTICKET);\r
}\r
}\r
-\r
+ \r
/* 3. parse according to the action */\r
if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
{\r
}\r
elseif ( method_exists('Admin', $methodName) )\r
{\r
- call_user_func(array(self, $methodName));\r
+ call_user_func(array(__CLASS__, $methodName));\r
}\r
else if ( self::existsSkinContents('adminerrorpage') )\r
{\r
self::error(_BADACTION . ENTITY::hsc($action));\r
}\r
- elseif ( $id != $CONF['DefaultAdminSkin'] )\r
+ elseif ( $id != $CONF['AdminSkin'] )\r
{\r
- self::$skin = new Skin($CONF['DefaultAdminSkin']);\r
+ self::$skin = new Skin($CONF['AdminSkin'], 'AdminActions');\r
if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
{\r
self::error(_BADACTION . ENTITY::hsc($action));\r
}\r
else\r
{\r
- $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype='%s';";\r
+ $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype=%s";\r
/* TODO: skinid should be a default */\r
if ( !is_object(self::$skin) )\r
{\r
global $CONF;\r
- return quickQuery(sprintf($query, sql_table('skin'), $CONF['DefaultAdminSkin'], sql_real_escape_string($action)));\r
+ return DB::getValue(sprintf($query, sql_table('skin'), $CONF['AdminSkin'], DB::quoteValue($action)));\r
}\r
else\r
{\r
- return quickQuery(sprintf($query, sql_table('skin'), self::$skin->getID(), sql_real_escape_string($action)));\r
+ return DB::getValue(sprintf($query, sql_table('skin'), self::$skin->getID(), DB::quoteValue($action)));\r
}\r
}\r
return;\r
*/\r
static private function specialActionsAllow($action)\r
{\r
- $query = "SELECT sdesc as result FROM %s WHERE sdesc = %d AND stype = '%s';";\r
- $query = sprintf($query, sql_table('skin'), (integer) self::$skin->id, sql_real_escape_string($action));\r
- return quickQuery($query);\r
+ $query = "SELECT sdesc as result FROM %s WHERE sdesc = %d AND stype = %s";\r
+ $query = sprintf($query, sql_table('skin'), (integer) self::$skin->id, DB::quoteValue($action));\r
+ return DB::getValue($query);\r
}\r
\r
/**\r
// skip to overview when allowed\r
if ( $member->isLoggedIn() && $member->canLogin() )\r
{\r
- self::$action_overview();\r
+ self::action_overview();\r
exit;\r
}\r
\r
self::$headMess = $msg;\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('showlogin');\r
- self::pagefoot();\r
}\r
\r
/**\r
self::$headMess = $msg;\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('overview');\r
- self::pagefoot();\r
return;\r
}\r
\r
}\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('manage');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$member->teamRights($blogid) or $member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('itemlist');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::batchAskDeleteConfirmation('item', $selected);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('batchitem');\r
- self::pagefoot();\r
return;\r
}\r
\r
// On delete: check if confirmation has been given\r
if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )\r
{\r
- self::batchAskDeleteConfirmation('comment',$selected);\r
+ self::batchAskDeleteConfirmation('comment', $selected);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('batchcomment');\r
- self::pagefoot();\r
+ return;\r
+ }\r
+ \r
+ /**\r
+ * Admin::setAdminAction()\r
+ *\r
+ * @param string $action\r
+ * @return void\r
+ */\r
+ static public function setAdminAction($action)\r
+ {\r
+ self::$action = $action;\r
return;\r
}\r
\r
self::batchAskDeleteConfirmation('member',$selected);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('batchmember');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::batchAskDeleteConfirmation('team',$selected);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('batchteam');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::batchAskDeleteConfirmation('category', $selected);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('batchcategory');\r
- self::pagefoot();\r
return;\r
}\r
\r
static private function batchMoveSelectDestination($type, $ids)\r
{\r
$_POST['batchmove'] = $type;\r
- self::pagehead();\r
self::$skin->parse('batchmove');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
$_POST['batchmove'] = $type;\r
global $manager;\r
- self::pagehead();\r
self::$skin->parse('batchmovecat');\r
- self::pagefoot();\r
return;\r
}\r
\r
*/\r
static private function batchAskDeleteConfirmation($type, $ids)\r
{\r
- self::pagehead();\r
self::$skin->parse('batchdelete');\r
- self::pagefoot();\r
- return;\r
- }\r
- \r
- /**\r
- * Admin::selectBlogCategory()\r
- * Inserts a HTML select element with choices for all categories to which the current\r
- * member has access\r
- *\r
- * @see function selectBlog\r
- * @param string $name name of weblod\r
- * @param integer $selected \r
- * @param integer $tabindex \r
- * @param integer $showNewCat \r
- * @param integer $iForcedBlogInclude ID for weblog always included\r
- * @return void\r
- *\r
- * NOTE: callback from AdminAction\r
- */\r
- static public function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
- {\r
- Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);\r
- return;\r
- }\r
- \r
- /**\r
- * Admin::selectBlog()\r
- * Inserts a HTML select element with choices for all blogs to which the user has access\r
- * mode = 'blog' => shows blognames and values are blogids\r
- * mode = 'category' => show category names and values are catids\r
- *\r
- * @param string $name name of weblod\r
- * @param string $mode \r
- * @param integer $selected \r
- * @param integer $tabindex \r
- * @param integer $showNewCat \r
- * @param integer $iForcedBlogInclude ID for weblog always included\r
- * @param $iForcedBlogInclude\r
- * ID of a blog that always needs to be included, without checking if the\r
- * member is on the blog team (-1 = none)\r
- * @return void\r
- */\r
- static private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
- {\r
- global $member, $CONF;\r
- \r
- // 0. get IDs of blogs to which member can post items (+ forced blog)\r
- $aBlogIds = array();\r
- if ( $iForcedBlogInclude != -1 )\r
- {\r
- $aBlogIds[] = intval($iForcedBlogInclude);\r
- }\r
- \r
- if ( ($member->isAdmin()) && ($CONF['ShowAllBlogs']) )\r
- {\r
- $query = "SELECT bnumber FROM %s ORDER BY bname;";\r
- $query = sprintf($query, sql_table('blog'));\r
- }\r
- else\r
- {\r
- $query = "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";\r
- $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
- }\r
- \r
- $rblogids = sql_query($query);\r
- while ($o = sql_fetch_object($rblogids))\r
- {\r
- if ( $o->bnumber != $iForcedBlogInclude )\r
- {\r
- $aBlogIds[] = intval($o->bnumber);\r
- }\r
- }\r
- \r
- if ( count($aBlogIds) == 0 )\r
- {\r
- return;\r
- }\r
- \r
- /* TODO: we should consider to use the other way instead of this */\r
- $_REQUEST['selectData'] = array(\r
- 'name' => $name,\r
- 'tabindex' => $tabindex,\r
- 'mode' => $mode,\r
- 'selected' => $selected,\r
- 'showNewCat' => $showNewCat,\r
- 'aBlogIds' => $aBlogIds,\r
- );\r
- self::$skin->parse('blogselectbox');\r
return;\r
}\r
\r
{\r
global $member, $manager, $CONF;\r
\r
- self::pagehead();\r
self::$skin->parse('browseownitems');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$blogid = getBlogIdFromItemId($itemid);\r
\r
- self::pagehead();\r
self::$skin->parse('itemcommentlist');\r
- self::pagefoot();\r
return;\r
}\r
\r
*/\r
static private function action_browseowncomments()\r
{\r
- self::pagehead();\r
self::$skin->parse('browseowncomments');\r
- self::pagefoot();\r
return;\r
}\r
\r
/* TODO: we consider to use the other way insterad of this */\r
$_REQUEST['blogid'] = $blogid;\r
\r
- self::pagehead();\r
self::$skin->parse('blogcommentlist');\r
- self::pagefoot();\r
+ return;\r
+ }\r
+ \r
+ /**\r
+ * Admin::action_createaccount()\r
+ * \r
+ * @param void\r
+ * @return void\r
+ */\r
+ static private function action_createaccount()\r
+ {\r
+ global $CONF;\r
+ \r
+ if ( $CONF['AllowMemberCreate'] != 1 )\r
+ {\r
+ self::$skin->parse('createaccountdisable');\r
+ return;\r
+ }\r
+ \r
+ $name = '';\r
+ $realname ='';\r
+ $email = '';\r
+ $url = '';\r
+ \r
+ $contents = array(\r
+ 'name' => '',\r
+ 'realname' => '',\r
+ 'email' => '',\r
+ 'url' => ''\r
+ );\r
+ \r
+ if ( array_key_exists('showform', $_POST) && $_POST['showform'] == 1 )\r
+ {\r
+ $action = new Action();\r
+ $message = $action->createAccount();\r
+ if ( $message === 1 )\r
+ {\r
+ self::$headMess = $message;\r
+ self::$skin->parse('createaccountsuccess');\r
+ return;\r
+ }\r
+ \r
+ /* TODO: validation */\r
+ if ( array_key_exists('name', $_POST) )\r
+ {\r
+ $contents['name'] = $_POST['name'];\r
+ }\r
+ if ( array_key_exists('realname', $_POST) )\r
+ {\r
+ $contents['realname'] = $_POST['realname'];\r
+ }\r
+ if ( array_key_exists('email', $_POST) )\r
+ {\r
+ $contents['email'] = $_POST['email'];\r
+ }\r
+ if ( array_key_exists('url', $_POST) )\r
+ {\r
+ $contents['url'] = $_POST['url'];\r
+ }\r
+ \r
+ self::$contents = $contents;\r
+ \r
+ }\r
+ \r
+ self::$skin->parse('createaccountinput');\r
return;\r
}\r
\r
// check if allowed\r
$member->teamRights($blogid) or self::disallow();\r
\r
- $memberid = $member->getID();\r
- \r
$blog =& $manager->getBlog($blogid);\r
+ $contents = array();\r
+ \r
+ $data = array(\r
+ 'blog' => &$blog,\r
+ 'contents' => &$contents\r
+ );\r
+ $manager->notify('PreAddItemForm', $data);\r
+ \r
+ if ( $blog->convertBreaks() )\r
+ {\r
+ if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
+ {\r
+ $contents['body'] = removeBreaks($contents['body']);\r
+ }\r
+ if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+ {\r
+ $contents['more'] = removeBreaks($contents['more']);\r
+ }\r
+ }\r
+ \r
+ self::$blog = &$blog;\r
+ self::$contents = &$contents;\r
\r
- self::pagehead();\r
self::$skin->parse('createitem');\r
- self::pagefoot();\r
return;\r
}\r
\r
// only allow if user is allowed to alter item\r
$member->canAlterItem($itemid) or self::disallow();\r
\r
- $itemid = intRequestVar('itemid');\r
$blogid = getBlogIDFromItemID($itemid);\r
- $item =& $manager->getItem($itemid, 1, 1);\r
- $manager->notify(\r
- 'PrepareItemForEdit',\r
- array(\r
- 'item' => &$item\r
- )\r
- );\r
+ $blog =& $manager->getBlog($blogid);\r
+ \r
+ $contents =& $manager->getItem($itemid, 1, 1);\r
+ $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$contents));\r
+ \r
+ if ( $blog->convertBreaks() )\r
+ {\r
+ if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
+ {\r
+ $contents['body'] = removeBreaks($contents['body']);\r
+ }\r
+ if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+ {\r
+ $contents['more'] = removeBreaks($contents['more']);\r
+ }\r
+ }\r
+ \r
+ self::$blog = &$blog;\r
+ self::$contents = &$contents;\r
\r
- self::pagehead();\r
self::$skin->parse('itemedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
// delete actions are handled by itemdelete (which has confirmation)\r
if ( $actiontype == 'delete' )\r
{\r
- self::$action_itemdelete();\r
+ self::action_itemdelete();\r
return;\r
}\r
\r
\r
if ( $catid != intPostVar('catid') )\r
{\r
- self::$action_categoryedit(\r
+ self::action_categoryedit(\r
$catid,\r
$blog->getID(),\r
$CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)\r
else\r
{\r
// TODO: set start item correctly for itemlist\r
- $item = Item::getItem($itemid, 0, 0);\r
- $cnt = quickQuery('SELECT COUNT(*) FROM ' . sql_table('item') . ' WHERE unix_timestamp(itime) <= ' . $item['timestamp']);\r
+ $item =& $manager->getitem($itemid, 0, 0);\r
+ $query = "SELECT COUNT(*) FROM %s WHERE unix_timestamp(itime) <= '%s';";\r
+ $query = sprintf($query, sql_table('item'), $item['timestamp']);\r
+ $cnt = DB::getValue($query);\r
$_REQUEST['start'] = $cnt + 1;\r
- self::$action_itemlist(getBlogIDFromItemID($itemid));\r
+ self::action_itemlist(getBlogIDFromItemID($itemid));\r
}\r
return;\r
}\r
self::error(_ERROR_NOSUCHITEM);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('itemdelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
// delete item (note: some checks will be performed twice)\r
self::deleteOneItem($itemid);\r
\r
- self::$action_itemlist($blogid);\r
+ self::action_itemlist($blogid);\r
return;\r
}\r
\r
* @param integer $itemid ID for item\r
* @return void\r
*/\r
- static private function deleteOneItem($itemid)\r
+ static public function deleteOneItem($itemid)\r
{\r
global $member, $manager;\r
\r
\r
$query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'";\r
$query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime));\r
- $result = sql_query($query);\r
+ $result = DB::getResult($query);\r
\r
- if ( sql_num_rows($result) > 0 )\r
+ if ( $result->rowCount() > 0 )\r
{\r
$blog->setFuturePost();\r
}\r
\r
$member->canAlterItem($itemid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('itemmove');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
if ( $catid != intRequestVar('catid') )\r
{\r
- self::$action_categoryedit($catid, $blog->getID());\r
+ self::action_categoryedit($catid, $blog->getID());\r
}\r
else\r
{\r
- self::$action_itemlist(getBlogIDFromCatID($catid));\r
+ self::action_itemlist(getBlogIDFromCatID($catid));\r
}\r
return;\r
}\r
* @param integer $destCatid ID for category to which the item will be moved\r
* @return void\r
*/\r
- static private function moveOneItem($itemid, $destCatid)\r
+ static public function moveOneItem($itemid, $destCatid)\r
{\r
global $member;\r
\r
self::error($result['message']);\r
}\r
\r
- $blogid = getBlogIDFromItemID($result['itemid']);\r
- $blog =& $manager->getBlog($blogid);\r
- $btimestamp = $blog->getCorrectTime();\r
- $item = $manager->getItem(intval($result['itemid']), 1, 1);\r
+ $itemid = (integer) $result['itemid'];\r
+ \r
+ $blogid = (integer) getBlogIDFromItemID($itemid);\r
\r
if ( $result['status'] == 'newcategory' )\r
{\r
- $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . intval($blogid));\r
- self::$action_categoryedit($result['catid'], $blogid, $distURI);\r
+ $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $blogid);\r
+ self::action_categoryedit($result['catid'], $blogid, $distURI);\r
}\r
else\r
{\r
- $methodName = 'action_itemList';\r
- call_user_func(array(&$this, $methodName), $blogid);\r
+ $methodName = 'action_itemlist';\r
+ self::action_itemlist($blogid);\r
}\r
return;\r
}\r
\r
$member->canAlterComment($commentid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('commentedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
);\r
$manager->notify('PreUpdateComment', $data);\r
\r
- $query = "UPDATE %s SET cmail='%s', cemail = '%s', cbody= '%s' WHERE cnumber=%d;";\r
- $query = sprintf($query, sql_real_escape_string($url), sql_real_escape_string($url), sql_real_escape_string($url), (integer) $commentid);\r
- sql_query($query);\r
+ $query = "UPDATE %s SET cmail=%s, cemail=%s, cbody=%s WHERE cnumber=%d;";\r
+ $query = sprintf($query, sql_table('comment'), DB::quoteValue($url), DB::quoteValue($email), DB::quoteValue($body), (integer) $commentid);\r
+ DB::execute($query);\r
\r
// get itemid\r
$query = "SELECT citem FROM %s WHERE cnumber=%d;";\r
$query = sprintf($query, sql_table('comment'), (integer) $commentid);\r
\r
- $res = sql_query($query);\r
- $o = sql_fetch_object($res);\r
- $itemid = $o->citem;\r
+ $itemid = DB::getValue($query);\r
\r
if ( $member->canAlterItem($itemid) )\r
{\r
- self::$action_itemcommentlist($itemid);\r
+ self::action_itemcommentlist($itemid);\r
}\r
else\r
{\r
- self::$action_browseowncomments();\r
+ self::action_browseowncomments();\r
}\r
return;\r
}\r
$commentid = intRequestVar('commentid');\r
$member->canAlterComment($commentid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('commentdelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
$query = "SELECT citem FROM %s WHERE cnumber=%d;";\r
$query = sprintf($query, sql_table('comment'), (integer) $commentid);\r
\r
- $res = sql_query($query);\r
- $o = sql_fetch_object($res);\r
- $itemid = $o->citem;\r
+ $itemid = DB::getValue($query);\r
\r
$error = self::deleteOneComment($commentid);\r
if ( $error )\r
\r
if ( $member->canAlterItem($itemid) )\r
{\r
- self::$action_itemcommentlist($itemid);\r
+ self::action_itemcommentlist($itemid);\r
}\r
else\r
{\r
- self::$action_browseowncomments();\r
+ self::action_browseowncomments();\r
}\r
return;\r
}\r
* @param integer $commentid ID for comment\r
* @return void\r
*/\r
- static private function deleteOneComment($commentid)\r
+ static public function deleteOneComment($commentid)\r
{\r
global $member, $manager;\r
\r
// delete the comments associated with the item\r
$query = "DELETE FROM %s WHERE cnumber=%d;";\r
$query = sprintf($query, sql_table('comment'), (integer) $commentid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$data = array(\r
'commentid' => $commentid\r
// check if allowed\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('usermanagement');\r
- self::pagefoot();\r
return;\r
}\r
\r
*/\r
static private function action_memberedit()\r
{\r
- self::$action_editmembersettings(intRequestVar('memberid'));\r
+ self::action_editmembersettings(intRequestVar('memberid'));\r
return;\r
}\r
\r
// check if allowed\r
($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
\r
- $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
- self::pagehead($extrahead);\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ \r
self::$skin->parse('editmembersettings');\r
- self::pagefoot();\r
return;\r
}\r
\r
$notes = strip_tags(postVar('notes'));\r
$locale = postVar('locale');\r
\r
- $mem = Member::createFromID($memberid);\r
+ $mem =& $manager->getMember($memberid);\r
\r
if ( $CONF['AllowLoginEdit'] || $member->isAdmin() )\r
{\r
|| (!$canlogin && $mem->isAdmin() && $mem->canLogin())\r
)\r
{\r
- $r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');\r
- if ( sql_num_rows($r) < 2 )\r
+ $r = DB::getResult('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');\r
+ if ( $r->rowCount() < 2 )\r
{\r
self::error(_ERROR_ATLEASTONEADMIN);\r
}\r
{\r
$member->logout();\r
}\r
- self::$action_login(_MSG_ACTIVATION_SENT, 0);\r
+ self::action_login(_MSG_ACTIVATION_SENT, 0);\r
return;\r
}\r
\r
{\r
$mem->newCookieKey();\r
$member->logout();\r
- self::$action_login(_MSG_LOGINAGAIN, 0);\r
+ self::action_login(_MSG_LOGINAGAIN, 0);\r
}\r
else\r
{\r
- self::$action_overview(_MSG_SETTINGSCHANGED);\r
+ self::action_overview(_MSG_SETTINGSCHANGED);\r
}\r
return;\r
}\r
);\r
$manager->notify('PostRegister', $data);\r
\r
- self::$action_usermanagement();\r
+ self::action_usermanagement();\r
+ return;\r
+ }\r
+ \r
+ /**\r
+ * Admin::action_forgotpassword()\r
+ * \r
+ * @param void\r
+ * @return void\r
+ */\r
+ static private function action_forgotpassword()\r
+ {\r
+ self::$skin->parse('forgotpassword');\r
return;\r
}\r
\r
self::error(_ERROR_ACTIVATE);\r
}\r
\r
- $mem = Member::createFromId($info->vmember);\r
+ $mem =& $manager->getMember($info->vmember);\r
\r
if ( !$mem )\r
{\r
$_POST['bNeedsPasswordChange'] = TRUE;\r
\r
self::$headMess = $message;\r
- self::pagehead();\r
self::$skin->parse('activate');\r
- self::pagefoot();\r
return;\r
}\r
\r
return self::showActivationPage($key, _ERROR_ACTIVATE);\r
}\r
\r
- $mem = Member::createFromId($info->vmember);\r
+ $mem =& $manager->getMember($info->vmember);\r
\r
if ( !$mem )\r
{\r
// do the activation\r
Member::activate($key);\r
\r
- self::pagehead();\r
self::$skin->parse('activatesetpwd');\r
- self::pagefoot();\r
return;\r
}\r
\r
// check if allowed\r
$member->blogAdminRights($blogid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('manageteam');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::error(_ERROR_ALREADYONTEAM);\r
}\r
\r
- self::$action_manageteam();\r
+ self::action_manageteam();\r
return;\r
}\r
\r
// check if allowed\r
$member->blogAdminRights($blogid) or self::disallow();\r
\r
- $teammem = Member::createFromID($memberid);\r
+ $teammem =& $manager->getMember($memberid);\r
$blog =& $manager->getBlog($blogid);\r
\r
- self::pagehead();\r
self::$skin->parse('teamdelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
self::error($error);\r
}\r
- self::$action_manageteam();\r
+ self::action_manageteam();\r
return;\r
}\r
\r
* @param void\r
* @return void\r
*/\r
- static private function deleteOneTeamMember($blogid, $memberid)\r
+ static public function deleteOneTeamMember($blogid, $memberid)\r
{\r
global $member, $manager;\r
\r
\r
// check if: - there remains at least one blog admin\r
// - (there remains at least one team member)\r
- $tmem = Member::createFromID($memberid);\r
+ $tmem =& $manager->getMember($memberid);\r
\r
\r
$data = array(\r
// (check for at least two admins before deletion)\r
$query = "SELECT * FROM %s WHERE tblog=%d and tadmin=1;";\r
$query = sprintf($query, sql_table('team'), (integer) $blogid);\r
- $r = sql_query($query);\r
- if ( sql_num_rows($r) < 2 )\r
+ $r = DB::getResult($query);\r
+ if ( $r->rowCount() < 2 )\r
{\r
return _ERROR_ATLEASTONEBLOGADMIN;\r
}\r
\r
$query = "DELETE FROM %s WHERE tblog=%d AND tmember=%d;";\r
$query = sprintf($query, sql_table('team'), (integer) $blogid, (integer) $memberid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$data = array(\r
'member' => &$tmem,\r
*/\r
static private function action_teamchangeadmin()\r
{\r
- global $member;\r
+ global $manager, $member;\r
\r
$blogid = intRequestVar('blogid');\r
$memberid = intRequestVar('memberid');\r
// check if allowed\r
$member->blogAdminRights($blogid) or self::disallow();\r
\r
- $mem = Member::createFromID($memberid);\r
+ $mem =& $manager->getMember($memberid);\r
\r
// don't allow when there is only one admin at this moment\r
if ( $mem->isBlogAdmin($blogid) )\r
{\r
$query = "SELECT * FROM %s WHERE tblog=%d AND tadmin=1;";\r
$query = sprintf($query, sql_table('team'), (integer) $blogid);\r
- $r = sql_query($query);\r
- if ( sql_num_rows($r) == 1 )\r
+ $r = DB::getResult($query);\r
+ if ( $r->rowCount() == 1 )\r
{\r
self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
}\r
\r
$query = "UPDATE %s SET tadmin=%d WHERE tblog=%d and tmember=%d;";\r
$query = sprintf($query, (integer) $blogid, (integer) $newval, (integer) $blogid, (integer) $memberid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// only show manageteam if member did not change its own admin privileges\r
if ( $member->isBlogAdmin($blogid) )\r
{\r
- self::$action_manageteam();\r
+ self::action_manageteam();\r
}\r
else\r
{\r
- self::$action_overview(_MSG_ADMINCHANGED);\r
+ self::action_overview(_MSG_ADMINCHANGED);\r
}\r
return;\r
}\r
\r
$blog =& $manager->getBlog($blogid);\r
\r
- $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
- self::pagehead($extrahead);\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ \r
self::$skin->parse('blogsettings');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::error(_ERROR_BADCATEGORYNAME);\r
}\r
\r
- $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d;";\r
- $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid);\r
- $res = sql_query($query);\r
- if ( sql_num_rows($res) > 0 )\r
+ $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";\r
+ $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid);\r
+ $res = DB::getResult($query);\r
+ if ( $res->rowCount() > 0 )\r
{\r
self::error(_ERROR_DUPCATEGORYNAME);\r
}\r
$blog =& $manager->getBlog($blogid);\r
$newCatID = $blog->createNewCategory($cname, $cdesc);\r
\r
- self::$action_blogsettings();\r
+ self::action_blogsettings();\r
return;\r
}\r
\r
$_REQUEST['desturl'] = $desturl;\r
$member->blogAdminRights($blogid) or self::disallow();\r
\r
- $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
- self::pagehead($extrahead);\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ \r
self::$skin->parse('categoryedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::error(_ERROR_BADCATEGORYNAME);\r
}\r
\r
- $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d AND not(catid=%d);";\r
- $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid, (integer) $catid);\r
- $res = sql_query($query);\r
- if ( sql_num_rows($res) > 0 )\r
+ $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";\r
+ $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid, (integer) $catid);\r
+ $res = DB::getResult($query);\r
+ if ( $res->rowCount() > 0 )\r
{\r
self::error(_ERROR_DUPCATEGORYNAME);\r
}\r
\r
- $query = "UPDATE %s SET cname='%s', cdesc='%s' WHERE catid=%d;";\r
- $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), sql_real_escape_string($cdesc), (integer) $catid);\r
- sql_query($query);\r
+ $query = "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";\r
+ $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), DB::quoteValue($cdesc), (integer) $catid);\r
+ DB::execute($query);\r
\r
// store plugin options\r
$aOptions = requestArray('plugoption');\r
}\r
else\r
{\r
- self::$action_blogsettings();\r
+ self::action_blogsettings();\r
}\r
return;\r
}\r
// check if catid is the only category left for blogid\r
$query = "SELECT catid FROM %s WHERE cblog=%d;";\r
$query = sprintf($query, sql_table('category'), $blogid);\r
- $res = sql_query($query);\r
- if ( sql_num_rows($res) == 1 )\r
+ $res = DB::getResult($query);\r
+ if ( $res->rowCount() == 1 )\r
{\r
self::error(_ERROR_DELETELASTCATEGORY);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('categorydelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::error($error);\r
}\r
\r
- self::$action_blogsettings();\r
+ self::action_blogsettings();\r
return;\r
}\r
\r
* @param String $catid category id for deleting\r
* @return Void\r
*/\r
- static private function deleteOneCategory($catid)\r
+ static public function deleteOneCategory($catid)\r
{\r
global $manager, $member;\r
\r
\r
// check if catid is the only category left for blogid\r
$query = "SELECT catid FROM %s WHERE cblog=%d;";\r
- $query = sprintf(sql_table('category'), (integer) $blogid);\r
+ $query = sprintf($query, sql_table('category'), (integer) $blogid);\r
\r
- $res = sql_query($query);\r
- if ( sql_num_rows($res) == 1 )\r
+ $res = DB::getResult($query);\r
+ if ( $res->rowCount() == 1 )\r
{\r
return _ERROR_DELETELASTCATEGORY;\r
}\r
// change category for all items to the default category\r
$query = "UPDATE %s SET icat=%d WHERE icat=%d;";\r
$query =sprintf($query, sql_table('item'), (integer) $destcatid, (integer) $catid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all associated plugin options\r
- NucleusPlugin::delete_option_values('category', $catid);\r
+ NucleusPlugin::delete_option_values('category', (integer) $catid);\r
\r
// delete category\r
$query = "DELETE FROM %s WHERE catid=%d;";\r
- $query = sprintf($query, (integer) $catid);\r
- sql_query($query);\r
+ $query = sprintf($query, sql_table('category'), (integer) $catid);\r
+ DB::execute($query);\r
\r
$data = array('catid' => $catid);\r
$manager->notify('PostDeleteCategory', $data);\r
}\r
\r
/**\r
+ * Admin::moveOneCategory()\r
+ * Delete a category by its id\r
+ * \r
+ * @param int $catid category id for move\r
+ * @param int $destblogid blog id for destination\r
+ * @return void\r
+ */\r
+ static public function moveOneCategory($catid, $destblogid)\r
+ {\r
+ global $manager, $member;\r
+ $catid = intval($catid);\r
+ $destblogid = intval($destblogid);\r
+ $blogid = getBlogIDFromCatID($catid);\r
+ // mover should have admin rights on both blogs\r
+ if (!$member->blogAdminRights($blogid)) {\r
+ return _ERROR_DISALLOWED;\r
+ }\r
+ if (!$member->blogAdminRights($destblogid)) {\r
+ return _ERROR_DISALLOWED;\r
+ }\r
+ // cannot move to self\r
+ if ($blogid == $destblogid) {\r
+ return _ERROR_MOVETOSELF;\r
+ }\r
+ // get blogs\r
+ $blog =& $manager->getBlog($blogid);\r
+ $destblog =& $manager->getBlog($destblogid);\r
+ // check if the category is valid\r
+ if (!$blog || !$blog->isValidCategory($catid)) {\r
+ return _ERROR_NOSUCHCATEGORY;\r
+ }\r
+ // don't allow default category to be moved\r
+ if ($blog->getDefaultCategory() == $catid) {\r
+ return _ERROR_MOVEDEFCATEGORY;\r
+ }\r
+ $manager->notify(\r
+ 'PreMoveCategory',\r
+ array(\r
+ 'catid' => &$catid,\r
+ 'sourceblog' => &$blog,\r
+ 'destblog' => &$destblog\r
+ )\r
+ );\r
+ // update comments table (cblog)\r
+ $query = 'SELECT '\r
+ . ' inumber '\r
+ . 'FROM '\r
+ . sql_table('item') . ' '\r
+ . 'WHERE '\r
+ . ' icat = %d';\r
+ $items = sql_query(sprintf($query, $catid));\r
+ while ($oItem = sql_fetch_object($items)) {\r
+ $query = 'UPDATE '\r
+ . sql_table('comment') . ' '\r
+ . 'SET '\r
+ . ' cblog = %d' . ' '\r
+ . 'WHERE '\r
+ . ' citem = %d';\r
+ sql_query(sprintf($query, $destblogid, $oItem->inumber));\r
+ }\r
+ \r
+ // update items (iblog)\r
+ $query = 'UPDATE '\r
+ . sql_table('item') . ' '\r
+ . 'SET '\r
+ . ' iblog = %d '\r
+ . 'WHERE '\r
+ . ' icat = %d';\r
+ sql_query(sprintf($query, $destblogid, $catid));\r
+ \r
+ // move category\r
+ $query = 'UPDATE '\r
+ . sql_table('category') . ' '\r
+ . 'SET '\r
+ . ' cblog = %d' . ' '\r
+ . 'WHERE '\r
+ . ' catid = %d';\r
+ sql_query(sprintf($query, $destblogid, $catid));\r
+ $manager->notify(\r
+ 'PostMoveCategory',\r
+ array(\r
+ 'catid' => &$catid,\r
+ 'sourceblog' => &$blog,\r
+ 'destblog' => $destblog\r
+ )\r
+ );\r
+ return;\r
+ }\r
+\r
+ /**\r
* Admin::action_blogsettingsupdate\r
* Updating blog settings\r
* \r
);\r
$manager->notify('PostPluginOptionsUpdate', $data);\r
\r
- self::$action_overview(_MSG_SETTINGSCHANGED);\r
+ self::action_overview(_MSG_SETTINGSCHANGED);\r
return;\r
}\r
\r
\r
$blog =& $manager->getBlog($blogid);\r
\r
- self::pagehead();\r
self::$skin->parse('deleteblog');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
// delete all comments\r
$query = 'DELETE FROM ' . sql_table('comment') . ' WHERE cblog='.$blogid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all items\r
$query = 'DELETE FROM ' . sql_table('item') . ' WHERE iblog=' . $blogid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all team members\r
$query = 'DELETE FROM ' . sql_table('team') . ' WHERE tblog=' . $blogid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all bans\r
$query = 'DELETE FROM ' . sql_table('ban') . ' WHERE blogid=' . $blogid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all categories\r
$query = 'DELETE FROM ' . sql_table('category') . ' WHERE cblog=' . $blogid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all associated plugin options\r
NucleusPlugin::delete_option_values('blog', $blogid);\r
\r
// delete the blog itself\r
$query = 'DELETE FROM ' . sql_table('blog') . ' WHERE bnumber=' . $blogid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$data = array('blogid' => $blogid);\r
$manager->notify('PostDeleteBlog', $data);\r
\r
- self::$action_overview(_DELETED_BLOG);\r
+ self::action_overview(_DELETED_BLOG);\r
return;\r
}\r
\r
\r
($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
\r
- $mem = Member::createFromID($memberid);\r
+ $mem =& $manager->getMember($memberid);\r
\r
- self::pagehead();\r
self::$skin->parse('memberdelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
if ( $member->isAdmin() )\r
{\r
- self::$action_usermanagement();\r
+ self::action_usermanagement();\r
}\r
else\r
{\r
- self::$action_overview(_DELETED_MEMBER);\r
+ self::action_overview(_DELETED_MEMBER);\r
}\r
return;\r
}\r
* @params Integer $memberid member id\r
* @return String null string or error messages\r
*/\r
- static private function deleteOneMember($memberid)\r
+ static public function deleteOneMember($memberid)\r
{\r
global $manager;\r
\r
$memberid = intval($memberid);\r
- $mem = Member::createFromID($memberid);\r
+ $mem =& $manager->getMember($memberid);\r
\r
if ( !$mem->canBeDeleted() )\r
{\r
/* unlink comments from memberid */\r
if ( $memberid )\r
{\r
- $query = "UPDATE %s SET cmember=0, cuser='%s' WHERE cmember=%d;";\r
- $query = sprintf($query, sql_table('comment'), sql_real_escape_string($mem->getDisplayName()), $memberid);\r
- sql_query($query);\r
+ $query = "UPDATE %s SET cmember=0, cuser=%s WHERE cmember=%d;";\r
+ $query = sprintf($query, sql_table('comment'), DB::quoteValue($mem->getDisplayName()), $memberid);\r
+ DB::execute($query);\r
}\r
\r
$query = 'DELETE FROM ' . sql_table('member') . ' WHERE mnumber=' . $memberid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$query = 'DELETE FROM ' . sql_table('team') . ' WHERE tmember=' . $memberid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$query = 'DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . $memberid;\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// delete all associated plugin options\r
NucleusPlugin::delete_option_values('member', $memberid);\r
// Only Super-Admins can do this\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('createnewlog');\r
- self::pagefoot();\r
return;\r
}\r
\r
$manager->notify('PreAddBlog', $data);\r
\r
// add slashes for sql queries\r
- $bname = sql_real_escape_string($bname);\r
- $bshortname = sql_real_escape_string($bshortname);\r
- $btimeoffset = sql_real_escape_string($btimeoffset);\r
- $bdesc = sql_real_escape_string($bdesc);\r
- $bdefskin = sql_real_escape_string($bdefskin);\r
+ $bname = DB::quoteValue($bname);\r
+ $bshortname = DB::quoteValue($bshortname);\r
+ $btimeoffset = DB::quoteValue($btimeoffset);\r
+ $bdesc = DB::quoteValue($bdesc);\r
+ $bdefskin = DB::quoteValue($bdefskin);\r
\r
// create blog\r
- $query = "INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('%s', '%s', '%s', '%s', '%s');";\r
- $query = sprintf(sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin);\r
- sql_query($query);\r
+ $query = "INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s);";\r
+ $query = sprintf($query, sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin);\r
+ DB::execute($query);\r
\r
- $blogid = sql_insert_id();\r
+ $blogid = DB::getInsertId();\r
$blog =& $manager->getBlog($blogid);\r
\r
// create new category\r
$catdefname = (!defined('_EBLOGDEFAULTCATEGORY_NAME') ? 'General' : _EBLOGDEFAULTCATEGORY_NAME);\r
$catdefdesc = (!defined('_EBLOGDEFAULTCATEGORY_DESC') ? 'Items that do not fit in other categories' : _EBLOGDEFAULTCATEGORY_DESC);\r
\r
- $query = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")';\r
- sql_query(sprintf($query, sql_table('category'), (integer) $blogid, $catdefname, $catdefdesc));\r
- $catid = sql_insert_id();\r
+ $query = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)';\r
+ DB::execute(sprintf($query, sql_table('category'), (integer) $blogid, DB::quoteValue($catdefname), DB::quoteValue($catdefdesc)));\r
+ $catid = DB::getInsertId();\r
\r
// set as default category\r
$blog->setDefaultCategory($catid);\r
// create team member\r
$query = "INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1);";\r
$query = sprintf($query, sql_table('team'), (integer) $member->getID(), (integer) $blogid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item');\r
$itemdefbody = (defined('_EBLOG_FIRSTITEM_BODY') ? _EBLOG_FIRSTITEM_BODY : 'This is the first item in your weblog. Feel free to delete it.');\r
/* TODO: we should consider to use the other way insterad of this */\r
$_REQUEST['blogid'] = $blogid;\r
$_REQUEST['catid'] = $catid;\r
- self::pagehead();\r
self::$skin->parse('addnewlog');\r
- self::pagefoot();\r
return;\r
}\r
\r
$blog->setURL(trim($burl));\r
$blog->writeSettings();\r
\r
- self::$action_overview(_MSG_NEWBLOG);\r
+ self::action_overview(_MSG_NEWBLOG);\r
return;\r
}\r
\r
\r
include_once($DIR_LIBS . 'skinie.php');\r
\r
- self::pagehead();\r
self::$skin->parse('skinieoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
$importer = new SkinImport();\r
\r
// get full filename\r
- if ($mode == 'file')\r
+ if ( $mode == 'file' )\r
{\r
$skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
\r
$_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
\r
// clashes\r
- $skinNameClashe = $importer->checkSkinNameClashes();\r
+ $skinNameClashes = $importer->checkSkinNameClashes();\r
$templateNameClashes = $importer->checkTemplateNameClashes();\r
$hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
\r
self::error($error);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('skinieimport');\r
- self::pagefoot();\r
return;\r
}\r
\r
$_REQUEST['skinnames'] = $importer->getSkinNames();\r
$_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
\r
- self::pagehead();\r
self::$skin->parse('skiniedoimport');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('templateoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$member->isAdmin() or self::disallow();\r
\r
- $extrahead = "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
- $extrahead .= '<script type=\"text/javascript">setTemplateEditText("' . sql_real_escape_string(_EDITTEMPLATE_EMPTY) . "\");</script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
\r
- self::pagehead($extrahead);\r
self::$skin->parse('templateedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
/**\r
- * TODO: remove this\r
- *\r
- static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {\r
- static $count = 1;\r
- if (!isset($template[$name])) $template[$name] = '';\r
- ?>\r
- </tr><tr>\r
- <td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>\r
- <td id="td<?php echo $count?>"><textarea class="templateedit" name="<?php echo $name?>" tabindex="<?php echo $tabindex?>" cols="50" rows="<?php echo $big?10:5?>" id="textarea<?php echo $count?>"><?php echo Entity::hsc($template[$name]); ?></textarea></td>\r
- <?php $count++;\r
- }\r
- */\r
- \r
- /**\r
* Admin::action_templateupdate()\r
* \r
* @param void\r
self::error(_ERROR_DUPTEMPLATENAME);\r
}\r
\r
- $name = sql_real_escape_string($name);\r
- $desc = sql_real_escape_string($desc);\r
- \r
// 1. Remove all template parts\r
$query = "DELETE FROM %s WHERE tdesc=%d;";\r
$query = sprintf($query, sql_table('template'), (integer) $templateid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// 2. Update description\r
- $query = "UPDATE %s SET tdname='%s',tddesc='%s' WHERE tdnumber=%d;";\r
- $query = sprintf($query, sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
- sql_query($query);\r
+ $query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;";\r
+ $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid);\r
+ DB::execute($query);\r
\r
// 3. Add non-empty template parts\r
self::addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER'));\r
}\r
\r
// jump back to template edit\r
- self::$action_templateedit(_TEMPLATE_UPDATED);\r
+ self::action_templateedit(_TEMPLATE_UPDATED);\r
return;\r
}\r
\r
return -1;\r
}\r
\r
- $partname = sql_real_escape_string($partname);\r
- $content = sql_real_escape_string($content);\r
- \r
- $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, '%s', '%s');";\r
- $query = sprintf($query, sql_table('template'), (integer) $id, $partname, $content);\r
- sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
- return sql_insert_id();\r
+ $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, %s, %s);";\r
+ $query = sprintf($query, sql_table('template'), (integer) $id, DB::quoteValue($partname), DB::quoteValue($content));\r
+ if ( DB::execute($query) === FALSE )\r
+ {\r
+ $err = DB::getError();\r
+ exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);\r
+ }\r
+ return DB::getInsertId();\r
}\r
\r
/**\r
$templateid = intRequestVar('templateid');\r
// TODO: check if template can be deleted\r
\r
- self::pagehead();\r
self::$skin->parse('templatedelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
$manager->notify('PreDeleteTemplate', $data);\r
\r
// 1. delete description\r
- sql_query('DELETE FROM ' . sql_table('template_desc') . ' WHERE tdnumber=' . $templateid);\r
+ DB::execute('DELETE FROM ' . sql_table('template_desc') . ' WHERE tdnumber=' . $templateid);\r
\r
// 2. delete parts\r
- sql_query('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid);\r
+ DB::execute('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid);\r
\r
\r
$data = array('templateid' => $templateid);\r
$manager->notify('PostDeleteTemplate', $data);\r
\r
- self::$action_templateoverview();\r
+ self::action_templateoverview();\r
return;\r
}\r
\r
\r
$newTemplateId = Template::createNew($name, $desc);\r
\r
- self::$action_templateoverview();\r
+ self::action_templateoverview();\r
return;\r
}\r
\r
$query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;";\r
$query = sprintf($query, sql_table('template'), (integer) $templateid);\r
\r
- $res = sql_query($query);\r
- while ( $o = sql_fetch_object($res) )\r
+ $res = DB::getResult($query);\r
+ foreach ( $res as $row)\r
{\r
- self::addToTemplate($newid, $o->tpartname, $o->tcontent);\r
+ self::addToTemplate($newid, $row['tpartname'], $row['tcontent']);\r
}\r
\r
- self::$action_templateoverview();\r
+ self::action_templateoverview();\r
return;\r
}\r
\r
*/\r
static private function action_admintemplateoverview()\r
{\r
- global $member, $manager;\r
+ global $member;\r
$member->isAdmin() or self::disallow();\r
- self::pagehead();\r
self::$skin->parse('admntemplateoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::$headMess = $msg;\r
}\r
$member->isAdmin() or self::disallow();\r
- $extrahead = "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
- $extrahead .= '<script type="text/javascript">setTemplateEditText("' . sql_real_escape_string(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
- self::pagehead($extrahead);\r
+ \r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
+ Admin::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
+ \r
self::$skin->parse('admintemplateedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
self::error(_ERROR_DUPTEMPLATENAME);\r
}\r
- $name = sql_real_escape_string($name);\r
- $desc = sql_real_escape_string($desc);\r
\r
// 1. Remove all template parts\r
$query = "DELETE FROM %s WHERE tdesc=%d;";\r
- $query = sprintf($query, (integer) $templateid);\r
- sql_query($query);\r
+ $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+ DB::execute($query);\r
\r
// 2. Update description\r
- $query = 'UPDATE %s SET tdname=%s tddesc=%s WHERE tdnumber=%d;';\r
- $query = sprintf($query, sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
- sql_query($query);\r
+ $query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;";\r
+ $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid);\r
+ DB::execute($query);\r
\r
// 3. Add non-empty template parts\r
- self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_HEAD', postVar('ADMINSKINTYPELIST_HEAD'));\r
- self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_BODY', postVar('ADMINSKINTYPELIST_BODY'));\r
- self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_FOOT', postVar('ADMINSKINTYPELIST_FOOT'));\r
+ self::addToAdminTemplate($templateid, 'NORMALSKINLIST_HEAD', postVar('NORMALSKINLIST_HEAD'));\r
+ self::addToAdminTemplate($templateid, 'NORMALSKINLIST_BODY', postVar('NORMALSKINLIST_BODY'));\r
+ self::addToAdminTemplate($templateid, 'NORMALSKINLIST_FOOT', postVar('NORMALSKINLIST_FOOT'));\r
self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON', postVar('ADMIN_CUSTOMHELPLINK_ICON'));\r
self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR', postVar('ADMIN_CUSTOMHELPLINK_ANCHOR'));\r
self::addToAdminTemplate($templateid, 'ADMIN_BLOGLINK', postVar('ADMIN_BLOGLINK'));\r
self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT', postVar('PLUGIN_QUICKMENU_FOOT'));\r
\r
$data = array('fields' => array());\r
- $manager->notify('TemplateExtraFields', $data);\r
+ $manager->notify('AdminTemplateExtraFields', $data);\r
foreach ( $data['fields'] as $pfkey => $pfvalue )\r
{\r
foreach ( $pfvalue as $pffield => $pfdesc )\r
}\r
\r
// jump back to template edit\r
- self::$action_admintemplateedit(_TEMPLATE_UPDATED);\r
+ self::action_admintemplateedit(_TEMPLATE_UPDATED);\r
return;\r
}\r
\r
return -1;\r
}\r
\r
- $query = "INSERT INTO (tdesc, tpartname, tcontent ) VALUES (%d, '%s', '%s');";\r
- $query = sprintf($query, sql_table('template'), (integer) $id, sql_real_escape_string($partname), sql_real_escape_string($contents));\r
- sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
- return sql_insert_id();\r
+ $query = "INSERT INTO %s (tdesc, tpartname, tcontent ) VALUES (%d, %s, %s);";\r
+ $query = sprintf($query, sql_table('template'), (integer) $id, DB::quoteValue($partname), DB::quoteValue($content));\r
+ if ( DB::execute($query) === FALSE )\r
+ {\r
+ $err = DB::getError();\r
+ exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);\r
+ }\r
+ return DB::getInsertId();\r
}\r
\r
/**\r
$member->isAdmin() or self::disallow();\r
\r
// TODO: check if template can be deleted\r
- self::pagehead();\r
self::$skin->parse('admintemplatedelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
// 1. delete description\r
$query = "DELETE FROM %s WHERE tdnumber=%s;";\r
$query = sprintf($query, sql_table('template_desc'), (integer) $templateid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// 2. delete parts\r
$query = "DELETE FROM %s WHERE tdesc=%d;";\r
$query = sprintf($query, sql_table('template'), (integer) $templateid);\r
- sql_query();\r
+ DB::execute($query);\r
\r
$data = array('templateid' => $templateid);\r
$manager->notify('PostDeleteAdminTemplate', $data);\r
\r
- self::$action_admintemplateoverview();\r
+ self::action_admintemplateoverview();\r
return;\r
}\r
\r
{\r
self::error(_ERROR_BADTEMPLATENAME);\r
}\r
- if ( Template::exists($name) )\r
+ else if ( !preg_match('#^admin/#', $name) )\r
+ {\r
+ self::error(_ERROR_BADADMINTEMPLATENAME);\r
+ }\r
+ else if ( Template::exists($name) )\r
{\r
self::error(_ERROR_DUPTEMPLATENAME);\r
}\r
\r
$newTemplateId = Template::createNew($name, $desc);\r
- self::$action_admintemplateoverview();\r
+ self::action_admintemplateoverview();\r
return;\r
}\r
\r
$desc = Template::getDesc($templateid);\r
\r
// 2. create desc thing\r
- $name = "cloned" . $name;\r
+ $name = $name . "cloned";\r
\r
// if a template with that name already exists:\r
if ( Template::exists($name) )\r
$name .= $i;\r
}\r
\r
- $newid = Template::admincreateNew($name, $desc);\r
+ $newid = Template::createNew($name, $desc);\r
\r
// 3. create clone\r
// go through parts of old template and add them to the new one\r
- $query = "SELECT tpartname, tcontent FROM %sWHERE tdesc=%d;";\r
+ $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;";\r
$query = sprintf($query, sql_table('template'), (integer) $templateid);\r
\r
- $res = sql_query($query);\r
- while ( $o = sql_fetch_object($res) )\r
+ $res = DB::getResult($query);\r
+ foreach ( $res as $row )\r
{\r
- self::addToAdminTemplate($newid, $o->tpartname, $o->tcontent);\r
+ self::addToAdminTemplate($newid, $row['tpartname'], $row['tcontent']);\r
}\r
\r
- self::$action_admintemplateoverview();\r
+ self::action_admintemplateoverview();\r
return;\r
}\r
\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('skinoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$newId = SKIN::createNew($name, $desc);\r
\r
- self::$action_skinoverview();\r
+ self::action_skinoverview();\r
return;\r
}\r
\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('skinedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
// 2. Update description\r
$skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
\r
- self::$action_skinedit();\r
+ self::action_skinedit();\r
return;\r
}\r
\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('skinedittype');\r
- self::pagefoot();\r
return;\r
}\r
\r
$skin = new SKIN($skinid);\r
$skin->update($type, $content);\r
\r
- self::$action_skinedittype(_SKIN_UPDATED);\r
+ self::action_skinedittype(_SKIN_UPDATED);\r
return;\r
}\r
\r
$query = "SELECT bname FROM %s WHERE bdefskin=%d";\r
$query = sprintf($query, sql_table('blog'), (integer) $skinid);\r
\r
- $r = sql_query($query);\r
- if ( $o = sql_fetch_object($r) )\r
+ $name = DB::getValue($query);\r
+ if ( $name )\r
{\r
- self::error(_ERROR_SKINDEFDELETE . Entity::hsc($o->bname));\r
+ self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('skindelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
$query = "SELECT bname FROM %s WHERE bdefskin=%d;";\r
$query = sprintf($query, sql_table('blog'), (integer) $skinid);\r
\r
- $r = sql_query($query);\r
- if ( $o = sql_fetch_object($r) )\r
- {\r
- self::error(_ERROR_SKINDEFDELETE .$o->bname);\r
+ $name = DB::getValue($query);\r
+ if ( $name )\r
+ {\r
+ self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
}\r
\r
$data = array('skinid' => $skinid);\r
// 1. delete description\r
$query = "DELETE FROM %s WHERE sdnumber=%d;";\r
$query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
// 2. delete parts\r
$query = "DELETE FROM %s WHERE sdesc=%d;";\r
$query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$data = array('skinid' => $skinid);\r
$manager->notify('PostDeleteSkin', $data);\r
\r
- self::$action_skinoverview();\r
+ self::action_skinoverview();\r
return;\r
}\r
\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('skinremovetype');\r
- self::pagefoot();\r
return;\r
}\r
\r
'skintype' => $skintype\r
);\r
$manager->notify('PreDeleteSkinPart', $data);\r
- \r
// delete part\r
- $query = "DELETE FROM %s WHERE sdesc=%d AND stype='%s';";\r
- $query = sprintf($query, sql_table('skin'), (integer) $skinid, (integer) $skintype);\r
- sql_query($query);\r
+ $query = "DELETE FROM %s WHERE sdesc=%d AND stype=%s;";\r
+ $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
+ DB::execute($query);\r
\r
$data = array(\r
'skinid' => $skinid,\r
);\r
$manager->notify('PostDeleteSkinPart', $data);\r
\r
- self::$action_skinedit();\r
+ self::action_skinedit();\r
return;\r
}\r
\r
// 1. read skin to clone\r
$skin = new Skin($skinid);\r
\r
- $name = "clone_{$skin->getName()}";\r
+ $name = "{$skin->getName()}_clone";\r
\r
// if a skin with that name already exists:\r
if ( Skin::exists($name) )\r
{\r
$i = 1;\r
- while (Skin::exists($name . $i))\r
+ while ( Skin::exists($name . $i) )\r
+ {\r
$i++;\r
+ }\r
$name .= $i;\r
}\r
\r
$query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
$query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
\r
- $res = sql_query($query);\r
- while ( $row = sql_fetch_assoc($res) )\r
+ $res = DB::getResult($query);\r
+ foreach ( $res as $row )\r
{\r
- self::$skinclonetype($skin, $newid, $row['stype']);\r
+ self::skinclonetype($skin, $newid, $row['stype']);\r
}\r
\r
- self::$action_skinoverview();\r
+ self::action_skinoverview();\r
return;\r
}\r
\r
static private function skinclonetype($skin, $newid, $type)\r
{\r
$newid = intval($newid);\r
- $content = $skin->getContent($type);\r
+ $content = $skin->getContentFromDB($type);\r
\r
if ( $content )\r
{\r
- $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')";\r
- $query = sprintf($query, sql_table('skin'), (integer) $newid, $content, $type);\r
- sql_query($query);\r
+ $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
+ $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
+ DB::execute($query);\r
}\r
return;\r
}\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('adminskinoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
self::error(_ERROR_BADSKINNAME);\r
}\r
- if ( Skin::exists($name) )\r
+ else if ( !preg_match('#^admin/#', $name) )\r
+ {\r
+ self::error(_ERROR_BADADMINSKINNAME);\r
+ }\r
+ else if ( Skin::exists($name) )\r
{\r
self::error(_ERROR_DUPSKINNAME);\r
}\r
/* TODO: $newId is not reused... */\r
$newId = Skin::createNew($name, $desc);\r
- self::$action_adminskinoverview();\r
+ self::action_adminskinoverview();\r
return;\r
}\r
\r
global $member, $manager;\r
\r
$member->isAdmin() or self::disallow();\r
- self::pagehead();\r
self::$skin->parse('adminskinedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
}\r
// 2. Update description\r
$skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
- self::$action_adminskinedit();\r
+ self::action_adminskinedit();\r
return;\r
}\r
\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('adminskinedittype');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
$skin->update($type, $content);\r
- self::$action_adminskinedittype(_SKIN_UPDATED);\r
+ self::action_adminskinedittype(_SKIN_UPDATED);\r
return;\r
}\r
\r
\r
/* TODO: needless variable $skinid... */\r
$skinid = intRequestVar('skinid');\r
- self::pagehead();\r
self::$skin->parse('adminskindelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
static private function action_adminskindeleteconfirm()\r
{\r
global $member, $CONF, $manager;\r
+ \r
$member->isAdmin() or self::disallow();\r
$skinid = intRequestVar('skinid');\r
+ \r
// don't allow default skin to be deleted\r
- if ( $skinid == $CONF['DefaultAdminSkin'] )\r
+ if ( $skinid == $CONF['AdminSkin'] )\r
{\r
self::error(_ERROR_DEFAULTSKIN);\r
}\r
\r
- // don't allow deletion of default skins for members\r
+ /*\r
+ * TODO: NOT Implemented\r
+ * don't allow deletion of default skins for members\r
$memberDefaults = $member->getAdminSkin();\r
foreach ( $memberDefaults as $memID => $adminskin )\r
{\r
if ( $skinid == $adminskin )\r
{\r
- $mem = MEMBER::createFromID($memID);\r
+ $mem =& $manager->getMember($memID);\r
self::error(_ERROR_SKINDEFDELETE . $mem->displayname);\r
}\r
}\r
+ */\r
\r
- $data = array('skinid' => (integer) $skinid);\r
- $manager->notify('PreDeleteAdminSkin', $data);\r
+ $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
\r
// 1. delete description\r
- $query = "DELETE FROM %s WHERE tdnumber=%s;";\r
- $query = sprintf($query, sql_table('template_desc'), (integer) $templateid);\r
- sql_query($query);\r
+ $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
+ $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
+ DB::execute($query);\r
\r
// 2. delete parts\r
- $query = "DELETE FROM %s WHERE tdesc=%d;";\r
- $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+ $query = "DELETE FROM %s WHERE sdesc=%d;";\r
+ $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
- $data = array('skinid' => intval($skinid));\r
- $manager->notify('PostDeleteAdminSkin', $data);\r
- self::$action_adminskinoverview();\r
+ $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
+ self::action_adminskinoverview();\r
return;\r
}\r
\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('adminskinremovetype');\r
- self::pagefoot();\r
return;\r
}\r
\r
'skintype' => $skintype\r
);\r
$manager->notify('PreDeleteAdminSkinPart', $data);\r
- \r
+\r
// delete part\r
- $query = 'DELETE FROM %s WHERE sdesc = %d AND stype ="%s"';\r
- $query = sprintf($query, sql_table('skin'), (integer) $skinid, $skintype);\r
- sql_query($query);\r
+ $query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s ;';\r
+ $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
+ DB::execute($query);\r
\r
$data = array(\r
'skinid' => $skinid,\r
);\r
$manager->notify('PostDeleteAdminSkinPart', $data);\r
\r
- self::$action_adminskinedit();\r
+ self::action_adminskinedit();\r
return;\r
}\r
\r
\r
// 1. read skin to clone\r
$skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
- $name = "clone_{$skin->getName()}";\r
+ $name = "{$skin->getName()}_clone";\r
\r
// if a skin with that name already exists:\r
if ( Skin::exists($name) )\r
$skin->getIncludePrefix()\r
);\r
\r
- $query = "SELECT stype %s FROM WHERE sdesc=%d;";\r
+ // 3. clone\r
+ $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
$query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
\r
- $res = sql_query($query);\r
- while ( $row = sql_fetch_assoc($res) )\r
+ $res = DB::getResult($query);\r
+ foreach ( $res as $row )\r
{\r
- self::$skinclonetype($skin, $newid, $row['stype']);\r
+ self::skinclonetype($skin, $newid, $row['stype']);\r
}\r
- self::$action_adminskinoverview();\r
+ self::action_adminskinoverview();\r
return;\r
}\r
\r
*/\r
static private function adminskinclonetype($skin, $newid, $type)\r
{\r
- $content = $skin->getContent($type);\r
+ $content = $skin->getContentFromDB($type);\r
\r
if ( $content )\r
{\r
- $content = sql_real_escape_string($content);\r
- $type = sql_real_escape_string($type);\r
- \r
- $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')";\r
- $query = sprintf(sql_table('skin'), (integer) $newid, $content, $type);\r
- sql_query($query);\r
+ $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
+ $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
+ DB::execute($query);\r
}\r
return;\r
}\r
// load skinie class\r
include_once($DIR_LIBS . 'skinie.php');\r
\r
- self::pagehead();\r
self::$skin->parse('adminskinieoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
/**\r
+ * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
* Admin::action_adminskinieimport()\r
* \r
* @param void\r
*/\r
static private function action_adminskinieimport()\r
{\r
- global $DIR_LIBS, $DIR_ADMINSKINS, $manager, $member;\r
+ global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
\r
$member->isAdmin() or self::disallow();\r
\r
// get full filename\r
if ( $mode == 'file' )\r
{\r
- $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml';\r
+ $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml";\r
\r
// backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
if ( !file_exists($skinFile) )\r
{\r
- $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml';\r
+ $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
}\r
}\r
else\r
$_REQUEST['skinclashes'] = $skinNameClashes;\r
$_REQUEST['tpltclashes'] = $templateNameClashes;\r
$_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
- \r
- self::pagehead();\r
- self::$skin->parse('adminskinieimport');\r
- self::pagefoot();\r
+\r
+ if ( !is_object(self::$skin) )\r
+ {\r
+ self::action_adminskiniedoimport();\r
+ }\r
+ else\r
+ {\r
+ self::$skin->parse('adminskinieimport');\r
+ }\r
return;\r
}\r
\r
/**\r
+ * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
* Admin::action_adminskiniedoimport()\r
* \r
* @param void\r
*/\r
static private function action_adminskiniedoimport()\r
{\r
- global $DIR_LIBS, $DIR_ADMINSKINS, $member;\r
+ global $DIR_LIBS, $DIR_SKINS, $member;\r
\r
$member->isAdmin() or self::disallow();\r
\r
// get full filename\r
if ( $mode == 'file' )\r
{\r
- $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml';\r
+ $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml";\r
// backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
if ( !file_exists($skinFile) )\r
{\r
- $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml';\r
+ $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
}\r
}\r
else\r
$_REQUEST['skinnames'] = $importer->getSkinNames();\r
$_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
\r
- self::pagehead();\r
- self::$skin->parse('adminskiniedoimport');\r
- self::pagefoot();\r
+ if ( !is_object(self::$skin) )\r
+ {\r
+ global $DIR_SKINS;\r
+ $query = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'";\r
+ $query = sprintf($query, sql_table('skin_desc'));\r
+ $res = intval(DB::getValue($query));\r
+ $query = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";\r
+ $query = sprintf($query, sql_table('config'), $res);\r
+ DB::execute($query);\r
+ $skin = new Skin(0, 'AdminActions', 'AdminSkin');\r
+ $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');\r
+ }\r
+ else\r
+ {\r
+ self::$skin->parse('adminskiniedoimport');\r
+ }\r
return;\r
}\r
\r
\r
$info = postVar('info');\r
\r
- $exporter = new SkinEXPORT();\r
+ include_libs('skinie.php');\r
+ $exporter = new SkinExport();\r
foreach ( $skinList as $skinId )\r
{\r
$exporter->addSkin($skinId);\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('settingsedit');\r
- self::pagefoot();\r
return;\r
}\r
\r
*/\r
static private function action_systemoverview()\r
{\r
- self::pagehead();\r
self::$skin->parse('systemoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
*/\r
static private function updateConfig($name, $val)\r
{\r
- $name = sql_real_escape_string($name);\r
- $val = trim(sql_real_escape_string($val));\r
- \r
- $query = "UPDATE %s SET value='%s' WHERE name='%s'";\r
- $query = sprintf($query, sql_table('config'), $val, $name);\r
- sql_query($query) or die(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
- return sql_insert_id();\r
+ $query = "UPDATE %s SET value=%s WHERE name=%s";\r
+ $query = sprintf($query, sql_table('config'), DB::quoteValue($val), DB::quoteValue($name));\r
+ if ( DB::execute($query) === FALSE )\r
+ {\r
+ $err = DB::getError();\r
+ die(_ADMIN_SQLDIE_QUERYERROR . $err[2]);\r
+ }\r
+ return DB::getInsertId();\r
}\r
\r
/**\r
* @param string $msg message that will be shown\r
* @return void\r
*/\r
- static private function error($msg)\r
+ static public function error($msg)\r
{\r
- self::pagehead();\r
+ self::$headMess = $msg;\r
self::$skin->parse('adminerrorpage');\r
- self::pagefoot();\r
return;\r
}\r
\r
* @param void\r
* @return void\r
*/\r
- static private function disallow()\r
+ static public function disallow()\r
{\r
ActionLog::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI'));\r
self::error(_ERROR_DISALLOWED);\r
return;\r
}\r
- \r
- /**\r
- * Admin::pagehead()\r
- * Output admin page head\r
- * \r
- * @param void\r
- * @return void\r
- */\r
- static private function pagehead($extrahead = '')\r
- {\r
- global $member, $nucleus, $CONF, $manager;\r
\r
- if ( self::existsSkinContents('pagehead') )\r
- {\r
- if ( isset($extrahead) && !empty($extrahead) )\r
- {\r
- self::$extrahead = $extrahead;\r
- }\r
- self::$skin->parse('pagehead');\r
- }\r
- else\r
- {\r
- $data = array(\r
- 'extrahead' => &$extrahead,\r
- 'action' => self::$action\r
- );\r
- \r
- $manager->notify('AdminPrePageHead', $data);\r
- \r
- $baseUrl = Entity::hsc($CONF['SkinsURL']);\r
- \r
- /*\r
- * TODO: obsoleted\r
- if ( !array_key_exists('AdminCSS', $CONF) )\r
- {\r
- sql_query("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')");\r
- $CONF['AdminCSS'] = 'original';\r
- }\r
- */\r
- \r
- /* HTTP 1.1 application for no caching */\r
- header("Cache-Control: no-cache, must-revalidate");\r
- header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");\r
- \r
- $root_element = 'html';\r
- $charset = i18n::get_current_charset();\r
- $locale = preg_replace('#_#', '-', i18n::get_current_locale());\r
- $xml_version_info = self::$xml_version_info;\r
- $formal_public_identifier = self::$formal_public_identifier;\r
- $system_identifier = self::$system_identifier;\r
- $xhtml_namespace = self::$xhtml_namespace;\r
- \r
- echo "<?xml version=\"{$xml_version_info}\" encoding=\"{$charset}\" ?>\n";\r
- echo "<!DOCTYPE {$root_element} PUBLIC \"{$formal_public_identifier}\" \"{$system_identifier}\">\n";\r
- echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n";\r
- echo "<head>\n";\r
- echo '<title>' . Entity::hsc($CONF['SiteName']) . " - Admin</title>\n";\r
- /*\r
- * TODO: obsoleted\r
- echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/admin_{$CONF["AdminCSS"]}.css\" />\n";\r
- */\r
- echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/addedit.css\" />\n";\r
- echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/edit.js\"></script>\n";\r
- echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/admin.js\"></script>\n";\r
- echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/compatibility.js\"></script>\n";\r
- echo "{$extrahead}\n";\r
- echo "</head>\n\n";\r
- echo "<body>\n";\r
- echo "<div id=\"adminwrapper\">\n";\r
- echo "<div class=\"header\">\n";\r
- echo '<h1>' . Entity::hsc($CONF['SiteName']) . "</h1>\n";\r
- echo "</div>\n";\r
- echo "<div id=\"container\">\n";\r
- echo "<div id=\"content\">\n";\r
- echo "<div class=\"loginname\">\n";\r
- if ( $member->isLoggedIn() )\r
- {\r
- echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a><br />\n";\r
- echo "<a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";\r
- }\r
- else\r
- {\r
- echo '<a href="index.php?action=showlogin" title="Log in">' . _NOTLOGGEDIN . "</a><br />\n";\r
- }\r
- echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a><br />\n";\r
- echo '(';\r
- \r
- if (array_key_exists('codename', $nucleus) && $nucleus['codename'] != '' )\r
- {\r
- $codenamestring = ' "' . $nucleus['codename'].'"';\r
- }\r
- else\r
- {\r
- $codenamestring = '';\r
- }\r
- \r
- if ( $member->isLoggedIn() && $member->isAdmin() )\r
- {\r
- $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());\r
- echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';\r
- \r
- $newestVersion = getLatestVersion();\r
- $newestCompare = str_replace('/', '.', $newestVersion);\r
- $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']);\r
- \r
- if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 )\r
- {\r
- echo "<br />\n";\r
- echo '<a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';\r
- echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion;\r
- echo "</a>";\r
- }\r
- }\r
- else\r
- {\r
- echo "Nucleus CMS {$nucleus['version']}{$codenamestring}";\r
- }\r
- echo ')';\r
- echo '</div>';\r
- }\r
- return;\r
- }\r
- \r
/**\r
- * Admin::pagefoot()\r
- * Output admin page foot include quickmenu\r
- * \r
- * @param void\r
+ * Admin::action_PluginAdmin()\r
+ * Output pluginadmin\r
+ *\r
+ * @param string $skinContents\r
+ * @param string $extrahead\r
* @return void\r
*/\r
- static private function pagefoot()\r
+ static public function action_PluginAdmin($skinContents, $extrahead = '')\r
{\r
- global $action, $member, $manager;\r
- \r
- if ( self::existsSkinContents('pagefoot') )\r
- {\r
- self::$skin->parse('pagefoot');\r
- exit;\r
- }\r
- else\r
- {\r
- $data = array(\r
- 'action' => self::$action\r
- );\r
- \r
- $manager->notify('AdminPrePageFoot', $data);\r
- \r
- if ( $member->isLoggedIn() && ($action != 'showlogin') )\r
- {\r
- echo '<h2>' . _LOGOUT . "</h2>\n";\r
- echo "<ul>\n";\r
- echo '<li><a href="index.php?action=overview">' . _BACKHOME . "</a></li>\n";\r
- echo '<li><a href="index.php?action=logout">' . _LOGOUT . "</a></li>\n";\r
- echo "</ul>\n";\r
- }\r
- \r
- echo "<div class=\"foot\">\n";\r
- echo '<a href="' . _ADMINPAGEFOOT_OFFICIALURL . '">Nucleus CMS</a> © 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT;\r
- echo '-';\r
- echo '<a href="' . _ADMINPAGEFOOT_DONATEURL . '">' . _ADMINPAGEFOOT_DONATE . "</a>\n";\r
- echo "</div>\n";\r
- \r
- echo "<div id=\"quickmenu\">\n";\r
- \r
- if ( ($action != 'showlogin') && ($member->isLoggedIn()) )\r
- {\r
- echo "<ul>\n";\r
- echo '<li><a href="index.php?action=overview">' . _QMENU_HOME . "</a></li>\n";\r
- echo "</ul>\n";\r
- \r
- echo '<h2>' . _QMENU_ADD . "</h2>\n";\r
- echo "<form method=\"get\" action=\"index.php\">\n";\r
- echo "<p>\n";\r
- echo "<input type=\"hidden\" name=\"action\" value=\"createitem\" />\n";\r
- \r
- $showAll = requestVar('showall');\r
- \r
- if ( ($member->isAdmin()) && ($showAll == 'yes') )\r
- {\r
- // Super-Admins have access to all blogs! (no add item support though)\r
- $query = "SELECT bnumber as value, bname as text FROM %s ORDER BY bname;";\r
- $query = sprintf($query, sql_table('blog'));\r
- }\r
- else\r
- {\r
- $query = "SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;";\r
- $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
- }\r
- $template['name'] = 'blogid';\r
- $template['tabindex'] = 15000;\r
- $template['extra'] = _QMENU_ADD_SELECT;\r
- $template['selected'] = -1;\r
- $template['shorten'] = 10;\r
- $template['shortenel'] = '';\r
- $template['javascript'] = 'onchange="return form.submit()"';\r
- showlist($query, 'select', $template);\r
- \r
- echo "</p>\n";\r
- echo "</form>\n";\r
- \r
- echo "<h2>{$member->getDisplayName()}</h2>\n";\r
- echo "<ul>\n";\r
- echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . "</a></li>\n";\r
- echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . "</a></li>\n";\r
- echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . "</a></li>\n";\r
- echo "</ul>\n";\r
- \r
- if ( $member->isAdmin() )\r
- {\r
- echo '<h2>' . _QMENU_MANAGE . "</h2>\n";\r
- echo "<ul>\n";\r
- echo '<li><a href="index.php?action=actionlog">' . _QMENU_MANAGE_LOG . "</a></li>\n";\r
- echo '<li><a href="index.php?action=settingsedit">' . _QMENU_MANAGE_SETTINGS . "</a></li>\n";\r
- echo '<li><a href="index.php?action=systemoverview">' . _QMENU_MANAGE_SYSTEM . "</a></li>\n";\r
- echo '<li><a href="index.php?action=usermanagement">' . _QMENU_MANAGE_MEMBERS . "</a></li>\n";\r
- echo '<li><a href="index.php?action=createnewlog">' . _QMENU_MANAGE_NEWBLOG . "</a></li>\n";\r
- echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . "</a></li>\n";\r
- echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . "</a></li>\n";\r
- echo "</ul>\n";\r
- \r
- echo "<h2>" . _QMENU_LAYOUT . "</h2>\n";\r
- echo "<ul>\n";\r
- echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . "</a></li>\n";\r
- echo '<li><a href="index.php?action=templateoverview">' . _QMENU_LAYOUT_TEMPL . "</a></li>\n";\r
- echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . "</a></li>\n";\r
- echo "</ul>\n";\r
- }\r
- \r
- $data = array('options' => array());\r
- \r
- $manager->notify('QuickMenu', $data);\r
- \r
- if ( count($data['options']) > 0 )\r
- {\r
- echo "<h2>" . _QMENU_PLUGINS . "</h2>\n";\r
- echo "<ul>\n";\r
- foreach ( $data['options'] as $option )\r
- {\r
- echo '<li><a href="' . Entity::hsc($option['url']) . '" title="' . Entity::hsc($option['tooltip']) . '">' . Entity::hsc($option['title']) . "</a></li>\n";\r
- }\r
- echo "</ul>\n";\r
- }\r
- }\r
- else if ( ($action == 'activate') || ($action == 'activatesetpwd') )\r
- {\r
- \r
- echo '<h2>' . _QMENU_ACTIVATE . '</h2>' . _QMENU_ACTIVATE_TEXT;\r
- }\r
- else\r
- {\r
- echo '<h2>' . _QMENU_INTRO . '</h2>' . _QMENU_INTRO_TEXT;\r
- }\r
- \r
- echo "<!-- quickmenu -->\n";\r
- echo "</div>\n";\r
- \r
- echo "<!-- content -->\n";\r
- echo "</div>\n";\r
- \r
- echo "<!-- container -->\n";\r
- echo "</div>\n";\r
- \r
- echo "<!-- adminwrapper -->\n";\r
- echo "</div>\n";\r
- \r
- echo "</body>\n";\r
- echo "</html>\n";\r
- }\r
+ self::$extrahead .= $extrahead;\r
+ self::$skin->parse('pluginadmin', $skinContents);\r
return;\r
}\r
\r
{\r
global $member, $manager;\r
\r
- $member->teamRights($blogid) or self::disallow();\r
- \r
$blogid = intRequestVar('blogid');\r
+ $member->teamRights($blogid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('bookmarklet');\r
- self::pagefoot();\r
return;\r
}\r
\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('actionlog');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
global $member, $manager;\r
\r
- $member->blogAdminRights($blogid) or self::disallow();\r
- \r
$blogid = intRequestVar('blogid');\r
+ $member->blogAdminRights($blogid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('banlist');\r
- self::pagefoot();\r
return;\r
}\r
\r
$blogid = intRequestVar('blogid');\r
$member->blogAdminRights($blogid) or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('banlistdelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
global $member, $manager;\r
\r
- $member->blogAdminRights($blogid) or self::disallow();\r
- \r
$blogid = intPostVar('blogid');\r
$allblogs = postVar('allblogs');\r
$iprange = postVar('iprange');\r
\r
+ $member->blogAdminRights($blogid) or self::disallow();\r
+ \r
$deleted = array();\r
\r
if ( !$allblogs )\r
{\r
if ( Ban::removeBan($blogid, $iprange) )\r
{\r
- array_push($deleted, $blogid);\r
+ $deleted[] = $blogid;\r
}\r
}\r
else\r
{\r
if ( Ban::removeBan($blogje, $iprange) )\r
{\r
- array_push($deleted, $blogje);\r
+ $deleted[] = $blogje;\r
}\r
}\r
}\r
self::error(_ERROR_DELETEBAN);\r
}\r
\r
- self::pagehead();\r
+ /* TODO: we should use other ways */\r
+ $_REQUEST['delblogs'] = $deleted;\r
+ \r
self::$skin->parse('banlistdeleteconfirm');\r
- self::pagefoot();\r
return;\r
}\r
\r
*/\r
static private function action_banlistnewfromitem()\r
{\r
- self::$action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
+ self::action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
return;\r
}\r
\r
/* TODO: we should consider to use the other way instead of this */\r
$_REQUEST['blogid'] = $blogid; \r
\r
- self::pagehead();\r
self::$skin->parse('banlistnew');\r
- self::pagefoot();\r
\r
return;\r
}\r
self::error(_ERROR_ADDBAN);\r
}\r
}\r
- self::$action_banlist();\r
+ self::action_banlist();\r
return;\r
}\r
\r
\r
ActionLog::clear();\r
\r
- self::$action_manage(_MSG_ACTIONLOGCLEARED);\r
+ self::action_manage(_MSG_ACTIONLOGCLEARED);\r
return;\r
}\r
\r
\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('backupoverview');\r
- self::pagefoot();\r
return;\r
}\r
\r
{\r
self::error($message);\r
}\r
- self::pagehead();\r
self::$skin->parse('backuprestore');\r
- self::pagefoot();\r
return;\r
}\r
\r
// check if allowed\r
$member->isAdmin() or self::disallow();\r
\r
- self::pagehead();\r
self::$skin->parse('pluginlist');\r
- self::pagefoot();\r
return;\r
}\r
\r
self::error(_ERROR_NOSUCHPLUGIN);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('pluginhelp');\r
- self::pagefoot();\r
return;\r
}\r
\r
}\r
\r
// get number of currently installed plugins\r
- $res = sql_query('SELECT * FROM ' . sql_table('plugin'));\r
- $numCurrent = sql_num_rows($res);\r
+ $res = DB::getResult('SELECT * FROM ' . sql_table('plugin'));\r
+ $numCurrent = $res->rowCount();\r
\r
// plugin will be added as last one in the list\r
$newOrder = $numCurrent + 1;\r
$manager->notify('PreAddPlugin', $data);\r
\r
// do this before calling getPlugin (in case the plugin id is used there)\r
- $query = "INSERT INTO %s (porder, pfile) VALUES (%d, '%s');";\r
- $query = sprintf(sql_table('plugin'), (integer) $newOrder, sql_real_escape_string($name));\r
- sql_query($query);\r
- $iPid = sql_insert_id();\r
+ $query = "INSERT INTO %s (porder, pfile) VALUES (%d, %s);";\r
+ $query = sprintf($query, sql_table('plugin'), (integer) $newOrder, DB::quoteValue($name));\r
+ DB::execute($query);\r
+ $iPid = DB::getInsertId();\r
\r
$manager->clearCachedInfo('installedPlugins');\r
\r
$query = "DELETE FROM %s WHERE pid=%d;";\r
$query = sprintf($query, sql_table('plugin'), (integer) $iPid);\r
\r
- sql_query($query);\r
+ DB::execute($query);\r
\r
$manager->clearCachedInfo('installedPlugins');\r
self::error(_ERROR_PLUGIN_LOAD);\r
$pluginList = $plugin->getPluginDep();\r
foreach ( $pluginList as $pluginName )\r
{\r
- $res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"');\r
- if (sql_num_rows($res) == 0)\r
+ $res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName));\r
+ if ($res->rowCount() == 0)\r
{\r
// uninstall plugin again...\r
self::deleteOnePlugin($plugin->getID());\r
$manager->notify('PostAddPlugin', $data);\r
\r
// update all events\r
- self::$action_pluginupdate();\r
+ self::action_pluginupdate();\r
return;\r
}\r
\r
$member->isAdmin() or self::disallow();\r
\r
// delete everything from plugin_events\r
- sql_query('DELETE FROM '.sql_table('plugin_event'));\r
+ DB::execute('DELETE FROM '.sql_table('plugin_event'));\r
\r
// loop over all installed plugins\r
- $res = sql_query('SELECT pid, pfile FROM '.sql_table('plugin'));\r
- while ( $o = sql_fetch_object($res) )\r
+ $res = DB::getResult('SELECT pid, pfile FROM '.sql_table('plugin'));\r
+ foreach ( $res as $row )\r
{\r
- $pid = $o->pid;\r
- $plug =& $manager->getPlugin($o->pfile);\r
+ $pid = $row['pid'];\r
+ $plug =& $manager->getPlugin($row['pfile']);\r
if ( $plug )\r
{\r
$eventList = $plug->getEventList();\r
foreach ( $eventList as $eventName )\r
{\r
- $query = "INSERT INTO %s (pid, event) VALUES (%d, '%s')";\r
- $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, sql_real_escape_string($eventName));\r
- sql_query($query);\r
+ $query = "INSERT INTO %s (pid, event) VALUES (%d, %s)";\r
+ $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, DB::quoteValue($eventName));\r
+ DB::execute($query);\r
}\r
}\r
}\r
self::error(_ERROR_NOSUCHPLUGIN);\r
}\r
\r
- self::pagehead();\r
self::$skin->parse('plugindelete');\r
- self::pagefoot();\r
return;\r
}\r
\r
* @param void\r
* @return void\r
*/\r
- static private function deleteOnePlugin($pid, $callUninstall = 0)\r
+ static public function deleteOnePlugin($pid, $callUninstall = 0)\r
{\r
global $manager;\r
\r
\r
$query = "SELECT pfile as result FROM %s WHERE pid=%d;";\r
$query = sprintf($query, sql_table('plugin'), (integer) $pid);\r
- $name = quickQuery($query);\r
+ $name = DB::getValue($query);\r
\r
// check dependency before delete\r
- $res = sql_query('SELECT pfile FROM ' . sql_table('plugin'));\r
- while ($o = sql_fetch_object($res))\r
+ $res = DB::getResult('SELECT pfile FROM ' . sql_table('plugin'));\r
+ foreach ( $res as $row )\r
{\r
- $plug =& $manager->getPlugin($o->pfile);\r
+ $plug =& $manager->getPlugin($row['pfile']);\r
if ( $plug )\r
{\r
$depList = $plug->getPluginDep();\r
{\r
if ( $name == $depName )\r
{\r
- return sprintf(_ERROR_DELREQPLUGIN, $o->pfile);\r
+ return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']);\r
}\r
}\r
}\r
}\r
\r
// delete all subscriptions\r
- sql_query('DELETE FROM ' . sql_table('plugin_event') . ' WHERE pid=' . $pid);\r
+ DB::execute('DELETE FROM ' . sql_table('plugin_event') . ' WHERE pid=' . $pid);\r
\r
// delete all options\r
// get OIDs from plugin_option_desc\r
- $res = sql_query('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
+ $res = DB::getResult('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
$aOIDs = array();\r
- while ($o = sql_fetch_object($res))\r
+ foreach ( $res as $row )\r
{\r
- array_push($aOIDs, $o->oid);\r
+ array_push($aOIDs, $row['oid']);\r
}\r
\r
// delete from plugin_option and plugin_option_desc\r
- sql_query('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
+ DB::execute('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
if (count($aOIDs) > 0)\r
{\r
- sql_query('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',', $aOIDs) . ')');\r
+ DB::execute('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',', $aOIDs) . ')');\r
}\r
\r
// update order numbers\r
- $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
- $o = sql_fetch_object($res);\r
- sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=(porder - 1) WHERE porder>' . $o->porder);\r
+ $res = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
+ DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=(porder - 1) WHERE porder>' . $res);\r
\r
// delete row\r
- sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
+ DB::execute('DELETE FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
\r
$manager->clearCachedInfo('installedPlugins');\r
$data = array('plugid' => $pid);\r
}\r
\r
// 1. get old order number\r
- $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
- $o = sql_fetch_object($res);\r
- $oldOrder = $o->porder;\r
+ $oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
\r
// 2. calculate new order number\r
$newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;\r
\r
// 3. update plug numbers\r
- sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
- sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
+ DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
+ DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
\r
- //self::$action_pluginlist();\r
+ //self::action_pluginlist();\r
// To avoid showing ticket in the URL, redirect to pluginlist, instead.\r
redirect($CONF['AdminURL'] . '?action=pluginlist');\r
return;\r
}\r
\r
// 1. get old order number\r
- $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
- $o = sql_fetch_object($res);\r
- $oldOrder = $o->porder;\r
+ $oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
\r
- $res = sql_query('SELECT * FROM ' . sql_table('plugin'));\r
- $maxOrder = sql_num_rows($res);\r
+ $res = DB::getResult('SELECT * FROM ' . sql_table('plugin'));\r
+ $maxOrder = $res->rowCount();\r
\r
// 2. calculate new order number\r
$newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder;\r
\r
// 3. update plug numbers\r
- sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
- sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
+ DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
+ DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
\r
- //self::$action_pluginlist();\r
+ //self::action_pluginlist();\r
// To avoid showing ticket in the URL, redirect to pluginlist, instead.\r
redirect($CONF['AdminURL'] . '?action=pluginlist');\r
return;\r
{\r
self::$headMess = $message;\r
}\r
- $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
- self::pagehead($extrahead);\r
+ $plugname = $manager->getPluginNameFromPid($pid);\r
+ $plugin = $manager->getPlugin($plugname);\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ \r
self::$skin->parse('pluginoptions');\r
- self::pagefoot();\r
return;\r
}\r
\r
);\r
$manager->notify('PostPluginOptionsUpdate', $data);\r
\r
- self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
- return;\r
- }\r
- \r
- /**\r
- * Admin::insertPluginOptions()\r
- * \r
- * Output plugin option field\r
- * \r
- * @access public\r
- * @param string $context plugin option context\r
- * @param integer $contextid plugin option context id\r
- * @return void\r
- */\r
- static public function insertPluginOptions($context, $contextid = 0)\r
- {\r
- global $manager;\r
- \r
- // get all current values for this contextid\r
- // (note: this might contain doubles for overlapping contextids)\r
- $aIdToValue = array();\r
- \r
- $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;";\r
- $query = sprintf($query, sql_table('plugin_option'), (integer) $contextid);\r
- \r
- $res = sql_query($query);\r
- while ( $object = sql_fetch_object($res) )\r
- {\r
- $aIdToValue[$object->oid] = $object->ovalue;\r
- }\r
- \r
- // get list of oids per pid\r
- $query = "SELECT * FROM %s, %s WHERE opid=pid and ocontext= '%s' ORDER BY porder, oid ASC;";\r
- $query = sprintf($query, sql_table('plugin_option_desc'), sql_table('plugin'), sql_real_escape_string($context));\r
- $res = sql_query($query);\r
- \r
- $aOptions = array();\r
- while ( $object = sql_fetch_object($res) )\r
- {\r
- if ( !in_array($object->oid, array_keys($aIdToValue)) )\r
- {\r
- $value = $object->odef;\r
- }\r
- else\r
- {\r
- $value = $aIdToValue[$object->oid];\r
- }\r
- \r
- array_push(\r
- $aOptions,\r
- array(\r
- 'pid' => $object->pid,\r
- 'pfile' => $object->pfile,\r
- 'oid' => $object->oid,\r
- 'value' => $value,\r
- 'name' => $object->oname,\r
- 'description' => $object->odesc,\r
- 'type' => $object->otype,\r
- 'typeinfo' => $object->oextra,\r
- 'contextid' => $contextid,\r
- 'extra' => ''\r
- )\r
- );\r
- }\r
- \r
- $data = array(\r
- 'context' => $context,\r
- 'contextid' => $contextid,\r
- 'options' =>& $aOptions\r
- );\r
- $manager->notify('PrePluginOptionsEdit', $data);\r
- \r
- self::$aOptions = $aOptions;\r
- self::$skin->parse('insertpluginoptions');\r
+ self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
return;\r
}\r
\r
*/\r
static private function action_parseSpecialskin()\r
{\r
- self::pagehead();\r
self::$skin->parse(self::$action);\r
- self::pagefoot();\r
return;\r
}\r
\r
- /*\r
- * TODO: use Skin class instead of this\r
- static private function parse($type)\r
- {\r
- global $manager, $CONF;\r
- \r
- if ( $type == 'pagehead' )\r
- {\r
- $data = array(\r
- 'skin' => &self::$skin,\r
- 'type' => $type\r
- );\r
- \r
- $manager->notify('InitAdminSkinParse', $data);\r
- sendContentType(self::$skin->getContentType(), 'skin', i18n::get_current_charset());\r
- }\r
- \r
- $contents = self::$skin->getContent($type);\r
- \r
- if ( !$contents )\r
- {\r
- echo _ERROR_SKIN;\r
- return;\r
- }\r
- \r
- $actions = self::$skin->getAllowedActionsForType($type);\r
- \r
- if ( $type == 'pagehead' )\r
- {\r
- $data = array(\r
- 'skin' => &self::$skin,\r
- 'type' => $type,\r
- 'contents' => &$contents\r
- );\r
- \r
- $manager->notify('PreAdminSkinParse', $data);\r
- }\r
- \r
- PARSER::setProperty('IncludeMode', self::$skin->getIncludeMode());\r
- PARSER::setProperty('IncludePrefix', self::$skin->getIncludePrefix());\r
- \r
- if ( $type == 'createitem' || $type == 'itemedit' )\r
- {\r
- // TODO: where is this class???\r
- $handler = new Factory(intRequestVar('blogid'), $type, self::$skin, $this);\r
- $actions = array_merge($actions, $handler->actions);\r
- }\r
- else\r
- {\r
- // TODO: why???\r
- $actions = array_merge($actions, self::$skin->getAllowedActionsForType($type));\r
- }\r
- \r
- $parser = new Parser($actions, $handler);\r
- $handler->setParser($parser);\r
- $handler->setSkin(self::$skin);\r
- $parser->parse($contents);\r
- \r
- if ( $type == 'pagefoot' )\r
- {\r
- $data = array(\r
- 'skin' => &self::$skin,\r
- 'type' => $type,\r
- );\r
- \r
- $manager->notify('PostAdminSkinParse', $data);\r
- }\r
- return;\r
- }\r
- */\r
- \r
/**\r
* Admin::getAdminskinIDFromName()\r
* \r
*/\r
static private function getAdminskinIDFromName($skinname)\r
{\r
- $query = "SELECT 'sdnumber' as result FROM %s WHERE sdname = '%s';";\r
- $query = sprintf($query, sql_table('skin_desc'), mysql_real_escape_string($skinname));\r
- $admnSknID = quickQuery($query);\r
+ $query = "SELECT 'sdnumber' as result FROM %s WHERE sdname = %s;";\r
+ $query = sprintf($query, sql_table('skin_desc'), DB::quoteValue($skinname));\r
+ $admnSknID = DB::getValue($query);\r
return (integer) $adminSkinID;\r
}\r
\r
*/\r
static private function getAdminskinNameFromID($skinid)\r
{\r
- $query = "SELECT sdname as result FROM %s WHERE sdnumber = '%d';";\r
+ $query = "SELECT sdname as result FROM %s WHERE sdnumber = %d;";\r
$query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
- $admnSknID = quickQuery($query);\r
+ $admnSknID = DB::getValue($query);\r
return (integer) $adminSkinID;\r
}\r
\r
/**\r
* Admin::getAdminextrahead()\r
*/\r
- static function getAdminextrahead()\r
+ static public function getAdminextrahead()\r
{\r
return self::$extrahead;\r
}\r
/**\r
* Admin::getAdminpassvar()\r
*/\r
- static function getAdminpassvar()\r
+ static public function getAdminpassvar()\r
{\r
return self::$passvar;\r
}\r
/**\r
* Admin::getAdminAction()\r
*/\r
- static function getAdminAction()\r
+ static public function getAdminAction()\r
{\r
return self::$action;\r
}\r
/**\r
* Admin::getAdminaOption()\r
*/\r
- static function getAdminaOption()\r
+ static public function getAdminaOption()\r
{\r
return self::$aOptions;\r
}\r
\r
self::$skin = (object) $skn;\r
$handler = new AdminActions($actnName, self::$skin, $this);\r
- $actions = Skin::getAllowedActionsForType($actnName);\r
\r
- $parser = new PARSER($actions, $handler);\r
- $handler->setParser($parser);\r
- $handler->setSkin(self::$skin);\r
+ $parser = new PARSER($handler);\r
+ $parser->setSkin(self::$skin);\r
$parser->parse($contents);\r
+ \r
return;\r
}\r
\r
OSDN Git Service
