\r
static private $action;\r
static private $skin;\r
- static private $extrahead;\r
static private $passvar;\r
static private $aOptions;\r
\r
+ static public $extrahead;\r
static public $blog;\r
- static public $item;\r
+ static public $contents;\r
\r
/**\r
* Admin::$edit_actions\r
'admintemplateedit',\r
'admintemplateoverview',\r
'admintemplatedelete'\r
- );\r
-\r
- /**\r
- * Admin::$skinless_actions\r
- */\r
- static private $skinless_actions = array(\r
+ );\r
+ \r
+ /**\r
+ * Admin::$skinless_actions\r
+ */\r
+ static private $skinless_actions = array(\r
'plugindeleteconfirm',\r
'pluginoptionsupdate',\r
'skinremovetypeconfirm',\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
\r
static public function initialize()\r
{\r
- global $CONF, $DIR_LIBS;\r
+ global $CONF, $DIR_LIBS, $manager, $member;\r
\r
/* NOTE: 1. decide which skinid to use */\r
$skinid = $CONF['AdminSkin'];\r
/*\r
- * NOTE: this is temporary escaped because not implemented yet\r
+ * NOTE: this is temporary escaped because not implemented yet*/\r
if (isset($member) && $member->isLoggedIn())\r
{\r
$memskin = $member->getAdminSkin();\r
- if ( $memskin )\r
+ if ( $memskin && Skin::existsID($memskin))\r
{\r
$skinid = $memskin;\r
}\r
}\r
- */\r
\r
/* NOTE: 2. make an instance of skin object */\r
if ( !Skin::existsID($skinid) )\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
$alias = array(\r
'login' => 'overview',\r
'' => 'overview',\r
- 'admntemplateoverview' => 'admintemplateoverview'\r
);\r
}\r
if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
if (!$manager->checkTicket())\r
{\r
self::error(_ERROR_BADTICKET);\r
+ return;\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
else if ( self::existsSkinContents('adminerrorpage') )\r
{\r
self::error(_BADACTION . ENTITY::hsc($action));\r
+ return;\r
}\r
elseif ( $id != $CONF['AdminSkin'] )\r
{\r
- self::$skin = new Skin($CONF['AdminSkin']);\r
+ self::$skin =& $manager->getSkin($CONF['AdminSkin'], 'AdminActions');\r
if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
{\r
self::error(_BADACTION . ENTITY::hsc($action));\r
+ return;\r
}\r
}\r
else\r
{\r
self::error(_BADACTION . ENTITY::hsc($action));\r
+ return;\r
}\r
- exit;\r
+ return;\r
}\r
\r
/**\r
if ( $member->isLoggedIn() && $member->canLogin() )\r
{\r
self::action_overview();\r
- exit;\r
+ return;\r
}\r
\r
/* TODO: needless variable??? */\r
if ( !is_array($selected) || sizeof($selected) == 0 )\r
{\r
self::error(_BATCH_NOSELECTION);\r
+ return;\r
}\r
\r
// On move: when no destination blog/category chosen, show choice now\r
if ( !is_array($selected) || sizeof($selected) == 0 )\r
{\r
self::error(_BATCH_NOSELECTION);\r
+ return;\r
}\r
\r
// On delete: check if confirmation has been given\r
if ( !is_array($selected) || sizeof($selected) == 0 )\r
{\r
self::error(_BATCH_NOSELECTION);\r
+ return;\r
}\r
\r
// On delete: check if confirmation has been given\r
if ( !is_array($selected) || sizeof($selected) == 0 )\r
{\r
self::error(_BATCH_NOSELECTION);\r
+ return;\r
}\r
\r
// On delete: check if confirmation has been given\r
if ( !is_array($selected) || sizeof($selected) == 0 )\r
{\r
self::error(_BATCH_NOSELECTION);\r
+ return;\r
}\r
\r
// On move: when no destination blog chosen, show choice now\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
}\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
+ /**\r
* Admin::action_createitem()\r
* Provide a page to item a new item to the given blog\r
* \r
$member->teamRights($blogid) or self::disallow();\r
\r
$blog =& $manager->getBlog($blogid);\r
- $item = array();\r
+ $contents = array();\r
\r
$data = array(\r
'blog' => &$blog,\r
- 'item' => &$item,\r
- 'contents' => &$item\r
+ 'contents' => &$contents\r
);\r
$manager->notify('PreAddItemForm', $data);\r
\r
if ( $blog->convertBreaks() )\r
{\r
- if ( array_key_exists('body', $item) && !empty($item['body']) )\r
+ if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
{\r
- $item['body'] = removeBreaks($item['body']);\r
+ $contents['body'] = removeBreaks($contents['body']);\r
}\r
- if ( array_key_exists('more', $item) && !empty($item['more']) )\r
+ if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
{\r
- $item['more'] = removeBreaks($item['more']);\r
+ $contents['more'] = removeBreaks($contents['more']);\r
}\r
}\r
\r
self::$blog = &$blog;\r
- self::$item = &$item;\r
+ self::$contents = &$contents;\r
\r
self::$skin->parse('createitem');\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
$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
\r
self::$blog = &$blog;\r
- self::$item = &$item;\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 = Item::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
if ( !$manager->existsItem($itemid,1,1) )\r
{\r
self::error(_ERROR_NOSUCHITEM);\r
+ return;\r
}\r
\r
self::$skin->parse('itemdelete');\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
if ( $result['status'] == 'error' )\r
{\r
self::error($result['message']);\r
+ return;\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
if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE)\r
{\r
self::error(_ERROR_COMMENT_LONGWORD);\r
+ return;\r
}\r
\r
// check length\r
if ( i18n::strlen($body) < 3 )\r
{\r
self::error(_ERROR_COMMENT_NOCOMMENT);\r
+ return;\r
}\r
\r
if ( i18n::strlen($body) > 5000 )\r
{\r
self::error(_ERROR_COMMENT_TOOLONG);\r
+ return;\r
}\r
\r
// prepare body\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
$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
if ( !isValidDisplayName($name) )\r
{\r
self::error(_ERROR_BADNAME);\r
+ return;\r
}\r
\r
if ( ($name != $mem->getDisplayName()) && Member::exists($name) )\r
{\r
self::error(_ERROR_NICKNAMEINUSE);\r
+ return;\r
}\r
\r
if ( $password != $repeatpassword )\r
{\r
self::error(_ERROR_PASSWORDMISMATCH);\r
+ return;\r
}\r
\r
if ( $password && (i18n::strlen($password) < 6) )\r
{\r
self::error(_ERROR_PASSWORDTOOSHORT);\r
+ return;\r
}\r
\r
if ( $password )\r
if ( !$pwdvalid )\r
{\r
self::error($pwderror);\r
+ return;\r
}\r
}\r
}\r
if ( !NOTIFICATION::address_validation($email) )\r
{\r
self::error(_ERROR_BADMAILADDRESS);\r
+ return;\r
}\r
if ( !$realname )\r
{\r
self::error(_ERROR_REALNAMEMISSING);\r
+ return;\r
}\r
if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) )\r
{\r
self::error(_ERROR_NOSUCHTRANSLATION);\r
+ return;\r
}\r
\r
// check if there will remain at least one site member with both the logon and admin rights\r
if ( $r->rowCount() < 2 )\r
{\r
self::error(_ERROR_ATLEASTONEADMIN);\r
+ return;\r
}\r
}\r
\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
if ( postVar('password') != postVar('repeatpassword') )\r
{\r
self::error(_ERROR_PASSWORDMISMATCH);\r
+ return;\r
}\r
\r
if ( i18n::strlen(postVar('password')) < 6 )\r
{\r
self::error(_ERROR_PASSWORDTOOSHORT);\r
+ return;\r
}\r
\r
$res = Member::create(\r
if ( $res != 1 )\r
{\r
self::error($res);\r
+ return;\r
}\r
\r
// fire PostRegister event\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
+ /**\r
* Admin::action_activate()\r
* Account activation\r
* \r
if ( !$info )\r
{\r
self::error(_ERROR_ACTIVATE);\r
+ return;\r
}\r
\r
- $mem = Member::createFromId($info->vmember);\r
+ $mem =& $manager->getMember($info->vmember);\r
\r
if ( !$mem )\r
{\r
self::error(_ERROR_ACTIVATE);\r
+ return;\r
}\r
\r
/* TODO: we should consider to use the other way insterad of this */\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
if ( !$blog->addTeamMember($memberid, $admin) )\r
{\r
self::error(_ERROR_ALREADYONTEAM);\r
+ return;\r
}\r
\r
self::action_manageteam();\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::$skin->parse('teamdelete');\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
self::action_manageteam();\r
return;\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
*/\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
if ( $r->rowCount() == 1 )\r
{\r
self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
+ return;\r
}\r
}\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
if ( !isValidCategoryName($cname) )\r
{\r
self::error(_ERROR_BADCATEGORYNAME);\r
+ return;\r
}\r
\r
$query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";\r
if ( $res->rowCount() > 0 )\r
{\r
self::error(_ERROR_DUPCATEGORYNAME);\r
+ return;\r
}\r
\r
$blog =& $manager->getBlog($blogid);\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
if ( !isValidCategoryName($cname) )\r
{\r
self::error(_ERROR_BADCATEGORYNAME);\r
+ return;\r
}\r
\r
$query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";\r
if ( $res->rowCount() > 0 )\r
{\r
self::error(_ERROR_DUPCATEGORYNAME);\r
+ return;\r
}\r
\r
$query = "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";\r
if ( $desturl )\r
{\r
redirect($desturl);\r
- exit;\r
- }\r
- else\r
- {\r
- self::action_blogsettings();\r
+ return;\r
}\r
+ \r
+ self::action_blogsettings();\r
+ \r
return;\r
}\r
\r
if ( !$blog->isValidCategory($catid) )\r
{\r
self::error(_ERROR_NOSUCHCATEGORY);\r
+ return;\r
}\r
\r
// don't allow deletion of default category\r
if ( $blog->getDefaultCategory() == $catid )\r
{\r
self::error(_ERROR_DELETEDEFCATEGORY);\r
+ return;\r
}\r
\r
// check if catid is the only category left for blogid\r
if ( $res->rowCount() == 1 )\r
{\r
self::error(_ERROR_DELETELASTCATEGORY);\r
+ return;\r
}\r
\r
self::$skin->parse('categorydelete');\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
self::action_blogsettings();\r
if ( $notify_address && !NOTIFICATION::address_validation($notify_address) )\r
{\r
self::error(_ERROR_BADNOTIFY);\r
+ return;\r
}\r
\r
if ( !isValidShortName($shortname) )\r
{\r
self::error(_ERROR_BADSHORTBLOGNAME);\r
+ return;\r
}\r
\r
if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) )\r
{\r
self::error(_ERROR_DUPSHORTBLOGNAME);\r
+ return;\r
}\r
// check if update file is writable\r
if ( $updatefile && !is_writeable($updatefile) )\r
{\r
self::error(_ERROR_UPDATEFILE);\r
+ return;\r
}\r
\r
$blog->setName(trim(postVar('name')));\r
if ( $CONF['DefaultBlog'] == $blogid )\r
{\r
self::error(_ERROR_DELDEFBLOG);\r
+ return;\r
}\r
\r
$blog =& $manager->getBlog($blogid);\r
if ( $CONF['DefaultBlog'] == $blogid )\r
{\r
self::error(_ERROR_DELDEFBLOG);\r
+ return;\r
}\r
\r
// delete all comments\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::$skin->parse('memberdelete');\r
return;\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
if ( $member->isAdmin() )\r
{\r
self::action_usermanagement();\r
+ return;\r
}\r
else\r
{\r
self::action_overview(_DELETED_MEMBER);\r
+ return;\r
}\r
return;\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
if ( !isValidShortName($bshortname) )\r
{\r
self::error(_ERROR_BADSHORTBLOGNAME);\r
+ return;\r
}\r
\r
if ( $manager->existsBlog($bshortname) )\r
{\r
self::error(_ERROR_DUPSHORTBLOGNAME);\r
+ return;\r
}\r
\r
$data = array(\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
self::$skin->parse('skinieimport');\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
$error = $importer->writeToDatabase($allowOverwrite);\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
/* TODO: we should consider to use the other way insterad of this */\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\" 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
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
if ( !isValidTemplateName($name) )\r
{\r
self::error(_ERROR_BADTEMPLATENAME);\r
+ return;\r
}\r
\r
if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
{\r
self::error(_ERROR_DUPTEMPLATENAME);\r
+ return;\r
}\r
\r
// 1. Remove all template parts\r
if ( !isValidTemplateName($name) )\r
{\r
self::error(_ERROR_BADTEMPLATENAME);\r
+ return;\r
}\r
\r
if ( Template::exists($name) )\r
{\r
self::error(_ERROR_DUPTEMPLATENAME);\r
+ return;\r
}\r
\r
$newTemplateId = Template::createNew($name, $desc);\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
if ( !isValidTemplateName($name) )\r
{\r
self::error(_ERROR_BADTEMPLATENAME);\r
+ return;\r
}\r
\r
if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
{\r
self::error(_ERROR_DUPTEMPLATENAME);\r
+ return;\r
}\r
\r
// 1. Remove all template parts\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
if ( !isValidTemplateName($name) )\r
{\r
self::error(_ERROR_BADTEMPLATENAME);\r
+ return;\r
}\r
else if ( !preg_match('#^admin/#', $name) )\r
{\r
self::error(_ERROR_BADADMINTEMPLATENAME);\r
+ return;\r
}\r
else if ( Template::exists($name) )\r
{\r
self::error(_ERROR_DUPTEMPLATENAME);\r
+ return;\r
}\r
\r
$newTemplateId = Template::createNew($name, $desc);\r
if ( !isValidSkinName($name) )\r
{\r
self::error(_ERROR_BADSKINNAME);\r
+ return;\r
}\r
\r
if ( SKIN::exists($name) )\r
{\r
self::error(_ERROR_DUPSKINNAME);\r
+ return;\r
}\r
\r
$newId = SKIN::createNew($name, $desc);\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
self::error(_ERROR_BADSKINNAME);\r
+ return;\r
}\r
\r
if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
{\r
self::error(_ERROR_DUPSKINNAME);\r
+ return;\r
}\r
\r
if ( !$type )\r
if ( !isValidShortName($type) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+ return;\r
}\r
\r
self::$skin->parse('skinedittype');\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
if ( $skinid == $CONF['BaseSkin'] )\r
{\r
self::error(_ERROR_DEFAULTSKIN);\r
+ return;\r
}\r
\r
// don't allow deletion of default skins for blogs\r
if ( $name )\r
{\r
self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+ return;\r
}\r
\r
self::$skin->parse('skindelete');\r
if ( $skinid == $CONF['BaseSkin'] )\r
{\r
self::error(_ERROR_DEFAULTSKIN);\r
+ return;\r
}\r
\r
// don't allow deletion of default skins for blogs\r
if ( $name )\r
{\r
self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+ return;\r
}\r
\r
$data = array('skinid' => $skinid);\r
if ( !isValidShortName($skintype) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+ return;\r
}\r
\r
// don't allow default skinparts to be deleted\r
if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+ return;\r
}\r
\r
self::$skin->parse('skinremovetype');\r
if ( !isValidShortName($skintype) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+ return;\r
}\r
\r
// don't allow default skinparts to be deleted\r
if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+ return;\r
}\r
\r
$data = array(\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
*/\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
if ( !isValidSkinName($name) )\r
{\r
self::error(_ERROR_BADSKINNAME);\r
+ return;\r
}\r
else if ( !preg_match('#^admin/#', $name) )\r
{\r
self::error(_ERROR_BADADMINSKINNAME);\r
+ return;\r
}\r
else if ( Skin::exists($name) )\r
{\r
self::error(_ERROR_DUPSKINNAME);\r
+ return;\r
}\r
/* TODO: $newId is not reused... */\r
$newId = Skin::createNew($name, $desc);\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
self::error(_ERROR_BADSKINNAME);\r
+ return;\r
}\r
if ( ($skin->getName() != $name) && Skin::exists($name) )\r
{\r
self::error(_ERROR_DUPSKINNAME);\r
+ return;\r
}\r
if ( !$type )\r
{\r
if ( !isValidShortName($type) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+ return;\r
}\r
\r
self::$skin->parse('adminskinedittype');\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
if ( $skinid == $CONF['AdminSkin'] )\r
{\r
self::error(_ERROR_DEFAULTSKIN);\r
+ return;\r
}\r
\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
+ $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d';\r
+ $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));\r
+ $members = array();\r
+ while ( $row = $res->fetch() ) {\r
+ $members[] = $row['mrealname'];\r
+ }\r
+ if ( count($members) )\r
{\r
- if ( $skinid == $adminskin )\r
- {\r
- $mem = MEMBER::createFromID($memID);\r
- self::error(_ERROR_SKINDEFDELETE . $mem->displayname);\r
- }\r
+ self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));\r
+ return;\r
}\r
- */\r
\r
$manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
\r
if ( !isValidShortName($skintype) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+ return;\r
}\r
\r
self::$skin->parse('adminskinremovetype');\r
if ( !isValidShortName($skintype) )\r
{\r
self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+ return;\r
}\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
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
\r
/**\r
+ * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
* Admin::action_adminskinieimport()\r
* \r
* @param void\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
/* TODO: we should consider to use the other way instead of this */\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
*/\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
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
$error = $importer->writeToDatabase($allowOverwrite);\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
/* TODO: we should consider to use the other way instead of this */\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
if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) )\r
{\r
self::error(_ERROR_BADMAILADDRESS);\r
+ return;\r
}\r
\r
// save settings\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
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
if ( sizeof($deleted) == 0 )\r
{\r
self::error(_ERROR_DELETEBAN);\r
+ return;\r
}\r
\r
/* TODO: we should use other ways */\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
if ( !Ban::addBan($blogid, $iprange, $reason) )\r
{\r
self::error(_ERROR_ADDBAN);\r
+ return;\r
}\r
}\r
else\r
if ( $failed )\r
{\r
self::error(_ERROR_ADDBAN);\r
+ return;\r
}\r
}\r
self::action_banlist();\r
@set_time_limit(1200);\r
\r
Backup::do_backup($useGzip);\r
- exit;\r
+ return;\r
}\r
\r
/**\r
if ( intPostVar('letsgo') != 1 )\r
{\r
self::error(_ERROR_BACKUP_NOTSURE);\r
+ return;\r
}\r
\r
include($DIR_LIBS . 'backup.php');\r
if ( $message != '' )\r
{\r
self::error($message);\r
+ return;\r
}\r
self::$skin->parse('backuprestore');\r
return;\r
if ( !$manager->pidInstalled($plugid) )\r
{\r
self::error(_ERROR_NOSUCHPLUGIN);\r
+ return;\r
}\r
\r
self::$skin->parse('pluginhelp');\r
if ( $manager->pluginInstalled($name) )\r
{\r
self::error(_ERROR_DUPPLUGIN);\r
+ return;\r
}\r
\r
if ( !checkPlugin($name) )\r
{\r
self::error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')');\r
+ return;\r
}\r
\r
// get number of currently installed plugins\r
\r
$manager->clearCachedInfo('installedPlugins');\r
self::error(_ERROR_PLUGIN_LOAD);\r
+ return;\r
}\r
\r
// check if plugin needs a newer Nucleus version\r
\r
// ...and show error\r
self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion()));\r
+ return;\r
}\r
\r
// check if plugin needs a newer Nucleus version\r
\r
// ...and show error\r
self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );\r
+ return;\r
}\r
\r
$pluginList = $plugin->getPluginDep();\r
// uninstall plugin again...\r
self::deleteOnePlugin($plugin->getID());\r
self::error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName)));\r
+ return;\r
}\r
}\r
\r
if ( !$manager->pidInstalled($pid) )\r
{\r
self::error(_ERROR_NOSUCHPLUGIN);\r
+ return;\r
}\r
\r
self::$skin->parse('plugindelete');\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
redirect($CONF['AdminURL'] . '?action=pluginlist');\r
if ( !$manager->pidInstalled($plugid) )\r
{\r
self::error(_ERROR_NOSUCHPLUGIN);\r
+ return;\r
}\r
\r
// 1. get old order number\r
if ( !$manager->pidInstalled($plugid) )\r
{\r
self::error(_ERROR_NOSUCHPLUGIN);\r
+ return;\r
}\r
\r
// 1. get old order number\r
if ( !$manager->pidInstalled($pid) )\r
{\r
self::error(_ERROR_NOSUCHPLUGIN);\r
+ return;\r
}\r
\r
if ( isset($message) )\r
{\r
self::$headMess = $message;\r
}\r
- Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+ $plugname = $manager->getPluginNameFromPid($pid);\r
+ $plugin = $manager->getPlugin($plugname);\r
+ Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
\r
self::$skin->parse('pluginoptions');\r
return;\r
if ( !$manager->pidInstalled($pid) )\r
{\r
self::error(_ERROR_NOSUCHPLUGIN);\r
+ return;\r
}\r
\r
$aOptions = requestArray('plugoption');\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
$error = $importer->writeToDatabase($allowOverwrite);\r
if ( $error )\r
{\r
self::error($error);\r
+ return;\r
}\r
\r
$_REQUEST['skininfo'] = $importer->getInfo();\r
$_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
\r
header('Location: ' . $CONF['AdminURL']);\r
- exit;\r
+ return;\r
}\r
}\r
OSDN Git Service
