\r
static public function initialize()\r
{\r
- global $CONF, $DIR_LIBS;\r
+ global $CONF, $DIR_LIBS, $manager;\r
\r
/* NOTE: 1. decide which skinid to use */\r
$skinid = $CONF['AdminSkin'];\r
}\r
\r
/* NOTE: 3. initializing each members */\r
- self::$skin = new Skin($skinid, 'AdminActions', 'AdminSkin');\r
+ self::$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
self::$action = '';\r
self::$extrahead = '';\r
self::$passvar = '';\r
}\r
elseif ( $id != $CONF['AdminSkin'] )\r
{\r
- self::$skin = new Skin($CONF['AdminSkin'], 'AdminActions');\r
+ self::$skin =& $manager->getSkin($CONF['AdminSkin'], 'AdminActions');\r
if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
{\r
self::error(_BADACTION . ENTITY::hsc($action));\r
$itemid = intRequestVar('itemid');\r
}\r
\r
- /* TODO: we consider to use the other way insterad of this */\r
- $_REQUEST['itemid'] = $itemid;\r
- $_REQUEST['blogid'] = getBlogIdFromItemId($itemid);\r
- \r
// only allow if user is allowed to alter item\r
$member->canAlterItem($itemid) or self::disallow();\r
\r
- $blogid = getBlogIdFromItemId($itemid);\r
+ $item =& $manager->getItem($itemid, 1, 1);\r
+ $_REQUEST['itemid'] = $item['itemid'];\r
+ $_REQUEST['blogid'] = $item['blogid'];\r
\r
self::$skin->parse('itemcommentlist');\r
return;\r
// only allow if user is allowed to alter item\r
$member->canAlterItem($itemid) or self::disallow();\r
\r
- $blogid = getBlogIDFromItemID($itemid);\r
- $blog =& $manager->getBlog($blogid);\r
- \r
- $contents =& $manager->getItem($itemid, 1, 1);\r
- $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$contents));\r
+ $item =& $manager->getItem($itemid, 1, 1);\r
+ $blog =& $manager->getBlog($item['blogid']);\r
+ $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$item));\r
\r
if ( $blog->convertBreaks() )\r
{\r
- if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
+ if ( array_key_exists('body', $item) && !empty($item['body']) )\r
{\r
- $contents['body'] = removeBreaks($contents['body']);\r
+ $item['body'] = removeBreaks($item['body']);\r
}\r
- if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+ if ( array_key_exists('more', $item) && !empty($item['more']) )\r
{\r
- $contents['more'] = removeBreaks($contents['more']);\r
+ $item['more'] = removeBreaks($item['more']);\r
}\r
}\r
\r
self::$blog = &$blog;\r
- self::$contents = &$contents;\r
+ self::$contents = &$item;\r
\r
self::$skin->parse('itemedit');\r
return;\r
}\r
}\r
\r
- /*\r
- set some variables based on actiontype\r
-\r
- actiontypes:\r
- draft items -> addnow, addfuture, adddraft, delete\r
- non-draft items -> edit, changedate, delete\r
-\r
- variables set:\r
- $timestamp: set to a nonzero value for future dates or date changes\r
- $wasdraft: set to 1 when the item used to be a draft item\r
- $publish: set to 1 when the edited item is not a draft\r
- */\r
+ /**\r
+ * set some variables based on actiontype\r
+ * \r
+ * actiontypes:\r
+ * draft items -> addnow, addfuture, adddraft, delete\r
+ * non-draft items -> edit, changedate, delete\r
+ * \r
+ * variables set:\r
+ * $timestamp: set to a nonzero value for future dates or date changes\r
+ * $wasdraft: set to 1 when the item used to be a draft item\r
+ * $publish: set to 1 when the edited item is not a draft\r
+ */\r
$blogid = getBlogIDFromItemID($itemid);\r
- $blog =& $manager->getBlog($blogid);\r
+ $blog =& $manager->getBlog($blogid);\r
\r
$wasdrafts = array('adddraft', 'addfuture', 'addnow');\r
$wasdraft = in_array($actiontype, $wasdrafts) ? 1 : 0;\r
else\r
{\r
// TODO: set start item correctly for itemlist\r
- $item =& $manager->getitem($itemid, 0, 0);\r
+ $item =& $manager->getitem($itemid, 1, 1);\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
*/\r
static private function action_itemdeleteconfirm()\r
{\r
- global $member;\r
+ global $member, $manager;\r
\r
$itemid = intRequestVar('itemid');\r
\r
// only allow if user is allowed to alter item\r
$member->canAlterItem($itemid) or self::disallow();\r
\r
- // get blogid first\r
- $blogid = getBlogIdFromItemId($itemid);\r
+ // get item first\r
+ $item =& $manager->getItem($itemid, 1, 1);\r
\r
// delete item (note: some checks will be performed twice)\r
- self::deleteOneItem($itemid);\r
+ self::deleteOneItem($item['itemid']);\r
\r
- self::action_itemlist($blogid);\r
+ self::action_itemlist($item['blogid']);\r
return;\r
}\r
\r
}\r
\r
// need to get blogid before the item is deleted\r
- $blogid = getBlogIDFromItemId($itemid);\r
+ $item =& $manager->getItem($itemid, 1, 1);\r
\r
$manager->loadClass('ITEM');\r
- Item::delete($itemid);\r
+ Item::delete($item['itemid']);\r
\r
// update blog's futureposted\r
- self::updateFuturePosted($blogid);\r
+ self::updateFuturePosted($item['itemid']);\r
return;\r
}\r
\r
self::error($result['message']);\r
}\r
\r
- $itemid = (integer) $result['itemid'];\r
- \r
- $blogid = (integer) getBlogIDFromItemID($itemid);\r
+ $item =& $manager->getItem($result['itemid'], 0, 0);\r
\r
if ( $result['status'] == 'newcategory' )\r
{\r
- $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $blogid);\r
- self::action_categoryedit($result['catid'], $blogid, $distURI);\r
+ $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $item['blogid']);\r
+ self::action_categoryedit($result['catid'], $item['blogid'], $distURI);\r
}\r
else\r
{\r
$methodName = 'action_itemlist';\r
- self::action_itemlist($blogid);\r
+ self::action_itemlist($item['blogid']);\r
}\r
return;\r
}\r
\r
$member->canAlterComment($commentid) or self::disallow();\r
\r
+ $comment = COMMENT::getComment($commentid);\r
+ $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));\r
+ \r
+ Admin::$contents = $comment;\r
self::$skin->parse('commentedit');\r
return;\r
}\r
// check if allowed\r
($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
\r
self::$skin->parse('editmembersettings');\r
return;\r
$email = strip_tags(postVar('email'));\r
$url = strip_tags(postVar('url'));\r
$adminskin = intPostVar('adminskin');\r
+ $bookmarklet = intPostVar('bookmarklet');\r
\r
// begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it.\r
if ( !preg_match('#^https?://#', $url) )\r
$mem->setURL($url);\r
$mem->setNotes($notes);\r
$mem->setLocale($locale);\r
- \r
+ $mem->setAdminSkin($adminskin);\r
+ $mem->setBookmarklet($bookmarklet);\r
+\r
// only allow super-admins to make changes to the admin status\r
if ( $member->isAdmin() )\r
{\r
\r
$blog =& $manager->getBlog($blogid);\r
\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
\r
self::$skin->parse('blogsettings');\r
return;\r
$_REQUEST['desturl'] = $desturl;\r
$member->blogAdminRights($blogid) or self::disallow();\r
\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
\r
self::$skin->parse('categoryedit');\r
return;\r
\r
$member->isAdmin() or self::disallow();\r
\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
\r
self::$skin->parse('templateedit');\r
}\r
$member->isAdmin() or self::disallow();\r
\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(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
*/\r
static private function action_skineditgeneral()\r
{\r
- global $member;\r
+ global $manager, $member;\r
\r
$skinid = intRequestVar('skinid');\r
\r
$inc_mode = postVar('inc_mode');\r
$inc_prefix = postVar('inc_prefix');\r
\r
- $skin = new Skin($skinid);\r
+ $skin =& $manager->getSkin($skinid);\r
\r
// 1. Some checks\r
if ( !isValidSkinName($name) )\r
*/\r
static private function action_skinupdate()\r
{\r
- global $member;\r
+ global $manager, $member;\r
\r
$skinid = intRequestVar('skinid');\r
$content = trim(postVar('content'));\r
\r
$member->isAdmin() or self::disallow();\r
\r
- $skin = new SKIN($skinid);\r
+ $skin =& $manager->getSKIN($skinid);\r
$skin->update($type, $content);\r
\r
self::action_skinedittype(_SKIN_UPDATED);\r
*/\r
static private function action_skindelete()\r
{\r
- global $member, $manager, $CONF;\r
+ global $manager, $member, $CONF;\r
\r
$skinid = intRequestVar('skinid');\r
\r
*/\r
static private function action_skinclone()\r
{\r
- global $member;\r
+ global $manager, $member;\r
\r
$member->isAdmin() or self::disallow();\r
\r
$skinid = intRequestVar('skinid');\r
\r
// 1. read skin to clone\r
- $skin = new Skin($skinid);\r
+ $skin =& $manager->getSkin($skinid);\r
\r
$name = "{$skin->getName()}_clone";\r
\r
*/\r
static private function action_adminskineditgeneral()\r
{\r
- global $member;\r
+ global $manager, $member;\r
\r
$skinid = intRequestVar('skinid');\r
\r
$inc_mode = postVar('inc_mode');\r
$inc_prefix = postVar('inc_prefix');\r
\r
- $skin = new Skin($skinid, 'AdminActions', 'AdminSkin');\r
+ $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
\r
// 1. Some checks\r
if ( !isValidSkinName($name) )\r
*/\r
static private function action_adminskinupdate()\r
{\r
- global $member;\r
- $skinid = intRequestVar('skinid');\r
- $content = trim(postVar('content'));\r
- $type = postVar('type');\r
+ global $manager, $member;\r
+ \r
+ $skinid = intRequestVar('skinid');\r
+ $content = trim(postVar('content'));\r
+ $type = postVar('type');\r
\r
$member->isAdmin() or self::disallow();\r
\r
- $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
+ $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
$skin->update($type, $content);\r
self::action_adminskinedittype(_SKIN_UPDATED);\r
return;\r
*/\r
static private function action_adminskinclone()\r
{\r
- global $member;\r
+ global $manager, $member;\r
\r
$member->isAdmin() or self::disallow();\r
\r
$skinid = intRequestVar('skinid');\r
\r
// 1. read skin to clone\r
- $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
+ $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
$name = "{$skin->getName()}_clone";\r
\r
// if a skin with that name already exists:\r
*/\r
static private function action_adminskiniedoimport()\r
{\r
- global $DIR_LIBS, $DIR_SKINS, $member;\r
+ global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
\r
$member->isAdmin() or self::disallow();\r
\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 =& $manager->Skin(0, 'AdminActions', 'AdminSkin');\r
$skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');\r
}\r
else\r
self::updateConfig('DebugVars', postVar('DebugVars'));\r
self::updateConfig('DefaultListSize', postVar('DefaultListSize'));\r
self::updateConfig('AdminCSS', postVar('AdminCSS'));\r
- \r
+ self::updateConfig('AdminSkin', postVar('adminskin'));\r
+ self::updateConfig('BookmarkletSkin', postVar('bookmarklet'));\r
+\r
// load new config and redirect (this way, the new locale will be used is necessary)\r
// note that when changing cookie settings, this redirect might cause the user\r
// to have to log in again.\r
*/\r
static private function action_banlistnewfromitem()\r
{\r
- self::action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
+ global $manager;\r
+ \r
+ $itemid = intRequestVar('itemid');\r
+ $item =& $manager->getItem($itemid, 1, 1);\r
+ self::action_banlistnew($item['blogid']);\r
return;\r
}\r
\r
}\r
$plugname = $manager->getPluginNameFromPid($pid);\r
$plugin = $manager->getPlugin($plugname);\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
\r
self::$skin->parse('pluginoptions');\r
return;\r
OSDN Git Service
