$alias = array(\r
'login' => 'overview',\r
'' => 'overview',\r
- 'admntemplateoverview' => 'admintemplateoverview'\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 ( $id != $CONF['AdminSkin'] )\r
{\r
- self::$skin = new Skin($CONF['AdminSkin']);\r
+ self::$skin = new Skin($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
$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">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . "\");</script>\n";\r
+ Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
\r
self::$skin->parse('templateedit');\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
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
'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
+ $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
'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
+ $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
}\r
\r
/**\r
+ * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
* Admin::action_adminskinieimport()\r
* \r
* @param void\r
$_REQUEST['skinclashes'] = $skinNameClashes;\r
$_REQUEST['tpltclashes'] = $templateNameClashes;\r
$_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
- \r
- self::$skin->parse('adminskinieimport');\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
$_REQUEST['skinnames'] = $importer->getSkinNames();\r
$_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
\r
- self::$skin->parse('adminskiniedoimport');\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
self::error(_ERROR_DISALLOWED);\r
return;\r
}\r
- \r
+\r
/**\r
- * Admin::PluninAdminPagehead()\r
- * Output pluginadmin page head\r
+ * Admin::action_PluginAdmin()\r
+ * Output pluginadmin\r
*\r
+ * @param string $skinContents\r
* @param string $extrahead\r
* @return void\r
*/\r
- static public function PluninAdminPagehead($extrahead = '')\r
+ static public function action_PluginAdmin($skinContents, $extrahead = '')\r
{\r
self::$extrahead .= $extrahead;\r
- self::$skin->parse('pagehead');\r
- return;\r
- }\r
- \r
- /**\r
- * Admin::PluninAdminPagefoot()\r
- * Output pluginadmin page foot\r
- *\r
- * @param void\r
- * @return void\r
- */\r
- static public function PluninAdminPagefoot()\r
- {\r
- self::$skin->parse('pagefoot');\r
+ self::$skin->parse('pluginadmin', $skinContents);\r
return;\r
}\r
\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
OSDN Git Service
