}\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
// 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
$aBlogIds[] = intval($iForcedBlogInclude);\r
}\r
\r
- if ( ($member->isAdmin()) && ($CONF['ShowAllBlogs']) )\r
+ if ( $member->isAdmin() && array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs'] )\r
{\r
$query = "SELECT bnumber FROM %s ORDER BY bname;";\r
$query = sprintf($query, sql_table('blog'));\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
$item = Item::getItem($itemid, 0, 0);\r
$cnt = quickQuery('SELECT COUNT(*) FROM ' . sql_table('item') . ' WHERE unix_timestamp(itime) <= ' . $item['timestamp']);\r
$_REQUEST['start'] = $cnt + 1;\r
- self::$action_itemlist(getBlogIDFromItemID($itemid));\r
+ self::action_itemlist(getBlogIDFromItemID($itemid));\r
}\r
return;\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
\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
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
+ self::action_categoryedit($result['catid'], $blogid, $distURI);\r
}\r
else\r
{\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
\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
*/\r
static private function action_memberedit()\r
{\r
- self::$action_editmembersettings(intRequestVar('memberid'));\r
+ self::action_editmembersettings(intRequestVar('memberid'));\r
return;\r
}\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
self::error(_ERROR_ALREADYONTEAM);\r
}\r
\r
- self::$action_manageteam();\r
+ self::action_manageteam();\r
return;\r
}\r
\r
{\r
self::error($error);\r
}\r
- self::$action_manageteam();\r
+ self::action_manageteam();\r
return;\r
}\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
$blog =& $manager->getBlog($blogid);\r
$newCatID = $blog->createNewCategory($cname, $cdesc);\r
\r
- self::$action_blogsettings();\r
+ self::action_blogsettings();\r
return;\r
}\r
\r
}\r
else\r
{\r
- self::$action_blogsettings();\r
+ self::action_blogsettings();\r
}\r
return;\r
}\r
self::error($error);\r
}\r
\r
- self::$action_blogsettings();\r
+ self::action_blogsettings();\r
return;\r
}\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
$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
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
$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
sql_query($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
+ $query = "UPDATE %s SET tdname='%s', tddesc='%s' WHERE tdnumber=%d;";\r
+ $query = sprintf($query, sql_table('template_desc'), sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
sql_query($query);\r
\r
// 3. Add non-empty template parts\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
$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
self::addToTemplate($newid, $o->tpartname, $o->tcontent);\r
}\r
\r
- self::$action_templateoverview();\r
+ self::action_templateoverview();\r
return;\r
}\r
\r
\r
// 1. Remove all template parts\r
$query = "DELETE FROM %s WHERE tdesc=%d;";\r
- $query = sprintf($query, (integer) $templateid);\r
+ $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
sql_query($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
+ $query = "UPDATE %s SET tdname='%s', tddesc='%s' WHERE tdnumber=%d;";\r
+ $query = sprintf($query, sql_table('template_desc'), sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
sql_query($query);\r
\r
// 3. Add non-empty template parts\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
+ $query = "INSERT INTO %s (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($content));\r
sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
return sql_insert_id();\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
\r
$newTemplateId = Template::createNew($name, $desc);\r
- self::$action_admintemplateoverview();\r
+ self::action_admintemplateoverview();\r
return;\r
}\r
\r
self::addToAdminTemplate($newid, $o->tpartname, $o->tcontent);\r
}\r
\r
- self::$action_admintemplateoverview();\r
+ self::action_admintemplateoverview();\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
// 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
$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
$data = array('skinid' => $skinid);\r
$manager->notify('PostDeleteSkin', $data);\r
\r
- self::$action_skinoverview();\r
+ self::action_skinoverview();\r
return;\r
}\r
\r
);\r
$manager->notify('PostDeleteSkinPart', $data);\r
\r
- self::$action_skinedit();\r
+ self::action_skinedit();\r
return;\r
}\r
\r
$res = sql_query($query);\r
while ( $row = sql_fetch_assoc($res) )\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
}\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
}\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
\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
$data = array('skinid' => intval($skinid));\r
$manager->notify('PostDeleteAdminSkin', $data);\r
- self::$action_adminskinoverview();\r
+ self::action_adminskinoverview();\r
return;\r
}\r
\r
);\r
$manager->notify('PostDeleteAdminSkinPart', $data);\r
\r
- self::$action_adminskinedit();\r
+ self::action_adminskinedit();\r
return;\r
}\r
\r
{\r
self::$skinclonetype($skin, $newid, $row['stype']);\r
}\r
- self::$action_adminskinoverview();\r
+ self::action_adminskinoverview();\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
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
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
$manager->notify('PostAddPlugin', $data);\r
\r
// update all events\r
- self::$action_pluginupdate();\r
+ self::action_pluginupdate();\r
return;\r
}\r
\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
\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
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
\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
$manager->notify('PostPluginOptionsUpdate', $data);\r
\r
- self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
+ self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
return;\r
}\r
\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->getContentFromDB($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
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
+ \r
+ $parser = new PARSER($handler);\r
$parser->parse($contents);\r
+ \r
return;\r
}\r
\r