From 8aa1b06e91dec96162a50ee9118fceddcbee09c4 Mon Sep 17 00:00:00 2001 From: sakamocchi Date: Mon, 7 May 2012 22:03:26 +0900 Subject: [PATCH] =?utf8?q?CHANGE:=20=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2?= =?utf8?q?=E7=94=A8=E3=82=B9=E3=82=AD=E3=83=B3=E3=81=AB<%pagehead%><%pagef?= =?utf8?q?oot%>=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit AdminActions::parse_pagehead()とAdminActions::parse_pagefoot()も追加。 PluginAdmin::start()とPluginAdmin::end()で依然Skin::parse()するため、このページを表示するときだけはイベントが2度発生してしまう。今後の課題とする。 --- nucleus/libs/ADMIN.php | 469 +++---------------------------------- nucleus/libs/AdminActions.php | 440 ++++++++++++++++++++++++++++------ nucleus/libs/PLUGINADMIN.php | 27 +-- nucleus/libs/SKIN.php | 1 - skins/admin/default/skinbackup.xml | 287 ++++++++++++----------- 5 files changed, 548 insertions(+), 676 deletions(-) diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index 38a4339..24148f8 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -26,15 +26,15 @@ class Admin static private $formal_public_identifier = '-//W3C//DTD XHTML 1.0 Strict//EN'; static private $system_identifier = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'; static private $xhtml_namespace = 'http://www.w3.org/1999/xhtml'; - + static public $headMess; - + static private $action; static private $skin; static private $extrahead; static private $passvar; static private $aOptions; - + /** * Admin::$edit_actions */ @@ -50,12 +50,12 @@ class Admin 'admintemplateedit', 'admintemplateoverview', 'admintemplatedelete' - ); - - /** - * Admin::$skinless_actions - */ - static private $skinless_actions = array( + ); + + /** + * Admin::$skinless_actions + */ + static private $skinless_actions = array( 'plugindeleteconfirm', 'pluginoptionsupdate', 'skinremovetypeconfirm', @@ -89,9 +89,9 @@ class Admin 'changemembersettings', 'clearactionlog', 'memberedit' - ); - - static private $actions_needless_to_check = array( + ); + + static private $actions_needless_to_check = array( 'showlogin', 'login', 'overview', @@ -341,9 +341,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('showlogin'); - self::pagefoot(); } /** @@ -360,9 +358,7 @@ class Admin self::$headMess = $msg; } - self::pagehead(); self::$skin->parse('overview'); - self::pagefoot(); return; } @@ -382,9 +378,7 @@ class Admin } $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('manage'); - self::pagefoot(); return; } @@ -405,9 +399,7 @@ class Admin $member->teamRights($blogid) or $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('itemlist'); - self::pagefoot(); return; } @@ -444,9 +436,7 @@ class Admin self::batchAskDeleteConfirmation('item', $selected); } - self::pagehead(); self::$skin->parse('batchitem'); - self::pagefoot(); return; } @@ -477,9 +467,7 @@ class Admin self::batchAskDeleteConfirmation('comment', $selected); } - self::pagehead(); self::$skin->parse('batchcomment'); - self::pagefoot(); return; } @@ -522,9 +510,7 @@ class Admin self::batchAskDeleteConfirmation('member',$selected); } - self::pagehead(); self::$skin->parse('batchmember'); - self::pagefoot(); return; } @@ -556,9 +542,7 @@ class Admin self::batchAskDeleteConfirmation('team',$selected); } - self::pagehead(); self::$skin->parse('batchteam'); - self::pagefoot(); return; } @@ -595,9 +579,7 @@ class Admin self::batchAskDeleteConfirmation('category', $selected); } - self::pagehead(); self::$skin->parse('batchcategory'); - self::pagefoot(); return; } @@ -613,9 +595,7 @@ class Admin static private function batchMoveSelectDestination($type, $ids) { $_POST['batchmove'] = $type; - self::pagehead(); self::$skin->parse('batchmove'); - self::pagefoot(); return; } @@ -632,9 +612,7 @@ class Admin { $_POST['batchmove'] = $type; global $manager; - self::pagehead(); self::$skin->parse('batchmovecat'); - self::pagefoot(); return; } @@ -649,9 +627,7 @@ class Admin */ static private function batchAskDeleteConfirmation($type, $ids) { - self::pagehead(); self::$skin->parse('batchdelete'); - self::pagefoot(); return; } @@ -752,9 +728,7 @@ class Admin { global $member, $manager, $CONF; - self::pagehead(); self::$skin->parse('browseownitems'); - self::pagefoot(); return; } @@ -783,9 +757,7 @@ class Admin $blogid = getBlogIdFromItemId($itemid); - self::pagehead(); self::$skin->parse('itemcommentlist'); - self::pagefoot(); return; } @@ -798,9 +770,7 @@ class Admin */ static private function action_browseowncomments() { - self::pagehead(); self::$skin->parse('browseowncomments'); - self::pagefoot(); return; } @@ -829,9 +799,7 @@ class Admin /* TODO: we consider to use the other way insterad of this */ $_REQUEST['blogid'] = $blogid; - self::pagehead(); self::$skin->parse('blogcommentlist'); - self::pagefoot(); return; } @@ -855,9 +823,7 @@ class Admin $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('createitem'); - self::pagefoot(); return; } @@ -886,9 +852,7 @@ class Admin ) ); - self::pagehead(); self::$skin->parse('itemedit'); - self::pagefoot(); return; } @@ -1026,9 +990,7 @@ class Admin self::error(_ERROR_NOSUCHITEM); } - self::pagehead(); self::$skin->parse('itemdelete'); - self::pagefoot(); return; } @@ -1129,9 +1091,7 @@ class Admin $member->canAlterItem($itemid) or self::disallow(); - self::pagehead(); self::$skin->parse('itemmove'); - self::pagefoot(); return; } @@ -1264,9 +1224,7 @@ class Admin $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); self::$skin->parse('commentedit'); - self::pagefoot(); return; } @@ -1349,9 +1307,7 @@ class Admin $commentid = intRequestVar('commentid'); $member->canAlterComment($commentid) or self::disallow(); - self::pagehead(); self::$skin->parse('commentdelete'); - self::pagefoot(); return; } @@ -1441,9 +1397,7 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('usermanagement'); - self::pagefoot(); return; } @@ -1482,10 +1436,9 @@ class Admin // check if allowed ($member->getID() == $memberid) or $member->isAdmin() or self::disallow(); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('editmembersettings'); - self::pagefoot(); return; } @@ -1760,9 +1713,7 @@ class Admin $_POST['bNeedsPasswordChange'] = TRUE; self::$headMess = $message; - self::pagehead(); self::$skin->parse('activate'); - self::pagefoot(); return; } @@ -1846,9 +1797,7 @@ class Admin // do the activation Member::activate($key); - self::pagehead(); self::$skin->parse('activatesetpwd'); - self::pagefoot(); return; } @@ -1868,9 +1817,7 @@ class Admin // check if allowed $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('manageteam'); - self::pagefoot(); return; } @@ -1921,9 +1868,7 @@ class Admin $teammem = Member::createFromID($memberid); $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('teamdelete'); - self::pagefoot(); return; } @@ -2077,10 +2022,9 @@ class Admin $blog =& $manager->getBlog($blogid); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('blogsettings'); - self::pagefoot(); return; } @@ -2154,10 +2098,9 @@ class Admin $_REQUEST['desturl'] = $desturl; $member->blogAdminRights($blogid) or self::disallow(); - $extrahead = ''; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('categoryedit'); - self::pagefoot(); return; } @@ -2255,9 +2198,7 @@ class Admin self::error(_ERROR_DELETELASTCATEGORY); } - self::pagehead(); self::$skin->parse('categorydelete'); - self::pagefoot(); return; } @@ -2558,9 +2499,7 @@ class Admin $blog =& $manager->getBlog($blogid); - self::pagehead(); self::$skin->parse('deleteblog'); - self::pagefoot(); return; } @@ -2638,9 +2577,7 @@ class Admin $mem = Member::createFromID($memberid); - self::pagehead(); self::$skin->parse('memberdelete'); - self::pagefoot(); return; } @@ -2737,9 +2674,7 @@ class Admin // Only Super-Admins can do this $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('createnewlog'); - self::pagefoot(); return; } @@ -2842,9 +2777,7 @@ class Admin /* TODO: we should consider to use the other way insterad of this */ $_REQUEST['blogid'] = $blogid; $_REQUEST['catid'] = $catid; - self::pagehead(); self::$skin->parse('addnewlog'); - self::pagefoot(); return; } @@ -2885,9 +2818,7 @@ class Admin include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); self::$skin->parse('skinieoverview'); - self::pagefoot(); return; } @@ -2952,9 +2883,7 @@ class Admin self::error($error); } - self::pagehead(); self::$skin->parse('skinieimport'); - self::pagefoot(); return; } @@ -3017,9 +2946,7 @@ class Admin $_REQUEST['skinnames'] = $importer->getSkinNames(); $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - self::pagehead(); self::$skin->parse('skiniedoimport'); - self::pagefoot(); return; } @@ -3082,9 +3009,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('templateoverview'); - self::pagefoot(); return; } @@ -3106,12 +3031,10 @@ class Admin $member->isAdmin() or self::disallow(); - $extrahead = "\n"; - $extrahead .= '\n"; + Admin::$extrahead .= "\n"; + Admin::$extrahead .= '\n"; - self::pagehead($extrahead); self::$skin->parse('templateedit'); - self::pagefoot(); return; } @@ -3259,9 +3182,7 @@ class Admin $templateid = intRequestVar('templateid'); // TODO: check if template can be deleted - self::pagehead(); self::$skin->parse('templatedelete'); - self::pagefoot(); return; } @@ -3386,9 +3307,7 @@ class Admin { global $member, $manager; $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('admntemplateoverview'); - self::pagefoot(); return; } @@ -3406,11 +3325,11 @@ class Admin self::$headMess = $msg; } $member->isAdmin() or self::disallow(); - $extrahead = "\n"; - $extrahead .= '' . "\n"; - self::pagehead($extrahead); + + Admin::$extrahead .= "\n"; + Admin::$extrahead .= '' . "\n"; + self::$skin->parse('admintemplateedit'); - self::pagefoot(); return; } @@ -3608,9 +3527,7 @@ class Admin $member->isAdmin() or self::disallow(); // TODO: check if template can be deleted - self::pagehead(); self::$skin->parse('admintemplatedelete'); - self::pagefoot(); return; } @@ -3737,9 +3654,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('skinoverview'); - self::pagefoot(); return; } @@ -3786,9 +3701,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('skinedit'); - self::pagefoot(); return; } @@ -3862,9 +3775,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); } - self::pagehead(); self::$skin->parse('skinedittype'); - self::pagefoot(); return; } @@ -3921,9 +3832,7 @@ class Admin self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name)); } - self::pagehead(); self::$skin->parse('skindelete'); - self::pagefoot(); return; } @@ -4004,9 +3913,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - self::pagehead(); self::$skin->parse('skinremovetype'); - self::pagefoot(); return; } @@ -4145,9 +4052,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('adminskinoverview'); - self::pagefoot(); return; } @@ -4193,9 +4098,7 @@ class Admin global $member, $manager; $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('adminskinedit'); - self::pagefoot(); return; } @@ -4269,9 +4172,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT); } - self::pagehead(); self::$skin->parse('adminskinedittype'); - self::pagefoot(); return; } @@ -4309,9 +4210,7 @@ class Admin /* TODO: needless variable $skinid... */ $skinid = intRequestVar('skinid'); - self::pagehead(); self::$skin->parse('adminskindelete'); - self::pagefoot(); return; } @@ -4386,9 +4285,7 @@ class Admin self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE); } - self::pagehead(); self::$skin->parse('adminskinremovetype'); - self::pagefoot(); return; } @@ -4520,9 +4417,7 @@ class Admin // load skinie class include_once($DIR_LIBS . 'skinie.php'); - self::pagehead(); self::$skin->parse('adminskinieoverview'); - self::pagefoot(); return; } @@ -4583,9 +4478,7 @@ class Admin $_REQUEST['tpltclashes'] = $templateNameClashes; $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0; - self::pagehead(); self::$skin->parse('adminskinieimport'); - self::pagefoot(); return; } @@ -4642,9 +4535,7 @@ class Admin $_REQUEST['skinnames'] = $importer->getSkinNames(); $_REQUEST['tpltnames'] = $importer->getTemplateNames(); - self::pagehead(); self::$skin->parse('adminskiniedoimport'); - self::pagefoot(); return; } @@ -4703,9 +4594,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('settingsedit'); - self::pagefoot(); return; } @@ -4781,9 +4670,7 @@ class Admin */ static private function action_systemoverview() { - self::pagehead(); self::$skin->parse('systemoverview'); - self::pagefoot(); return; } @@ -4816,9 +4703,7 @@ class Admin static public function error($msg) { self::$headMess = $msg; - self::pagehead(); self::$skin->parse('adminerrorpage'); - self::pagefoot(); return; } @@ -4845,7 +4730,8 @@ class Admin */ static public function PluninAdminPagehead($extrahead = '') { - self::pagehead(); + self::$extrahead .= $extrahead; + self::$skin->parse('pagehead'); return; } @@ -4858,277 +4744,7 @@ class Admin */ static public function PluninAdminPagefoot() { - self::pagefoot(); - return; - } - - /** - * Admin::pagehead() - * Output admin page head - * - * @param string PluninAdminPagehead - * @return void - */ - static private function pagehead($extrahead = '') - { - global $member, $nucleus, $CONF, $manager; - - if ( self::existsSkinContents('pagehead') ) - { - if ( isset($extrahead) && !empty($extrahead) ) - { - self::$extrahead = $extrahead; - } - self::$skin->parse('pagehead'); - } - else - { - $data = array( - 'extrahead' => &$extrahead, - 'action' => self::$action - ); - - $manager->notify('AdminPrePageHead', $data); - - $baseUrl = Entity::hsc($CONF['SkinsURL']); - - /* - * TODO: obsoleted - if ( !array_key_exists('AdminCSS', $CONF) ) - { - DB::execute("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')"); - $CONF['AdminCSS'] = 'original'; - } - */ - - /* HTTP 1.1 application for no caching */ - header("Cache-Control: no-cache, must-revalidate"); - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - - $root_element = 'html'; - $charset = i18n::get_current_charset(); - $locale = preg_replace('#_#', '-', i18n::get_current_locale()); - $xml_version_info = self::$xml_version_info; - $formal_public_identifier = self::$formal_public_identifier; - $system_identifier = self::$system_identifier; - $xhtml_namespace = self::$xhtml_namespace; - - echo "\n"; - echo "\n"; - echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n"; - echo "\n"; - echo '' . Entity::hsc($CONF['SiteName']) . " - Admin\n"; - /* - * TODO: obsoleted - echo "\n"; - */ - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "{$extrahead}\n"; - echo "\n\n"; - echo "\n"; - echo "
\n"; - echo "
\n"; - echo '

' . Entity::hsc($CONF['SiteName']) . "

\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; - if ( $member->isLoggedIn() ) - { - echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - " . _LOGOUT. "
\n"; - echo "" . _ADMINHOME . " - "; - } - else - { - echo '' . _NOTLOGGEDIN . "
\n"; - } - echo ""._YOURSITE."
\n"; - echo '('; - - if (array_key_exists('codename', $nucleus) && $nucleus['codename'] != '' ) - { - $codenamestring = ' "' . $nucleus['codename'].'"'; - } - else - { - $codenamestring = ''; - } - - if ( $member->isLoggedIn() && $member->isAdmin() ) - { - $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel()); - echo 'Nucleus CMS ' . $nucleus['version'] . $codenamestring . ''; - - $newestVersion = getLatestVersion(); - $newestCompare = str_replace('/', '.', $newestVersion); - $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']); - - if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 ) - { - echo "
\n"; - echo ''; - echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion; - echo ""; - } - } - else - { - echo "Nucleus CMS {$nucleus['version']}{$codenamestring}"; - } - echo ')'; - echo '
'; - } - return; - } - - /** - * Admin::pagefoot() - * Output admin page foot include quickmenu - * - * @param void - * @return void - */ - static private function pagefoot() - { - global $action, $member, $manager; - - if ( self::existsSkinContents('pagefoot') ) - { - self::$skin->parse('pagefoot'); - exit; - } - else - { - $data = array( - 'action' => self::$action - ); - - $manager->notify('AdminPrePageFoot', $data); - - if ( $member->isLoggedIn() && ($action != 'showlogin') ) - { - echo '

' . _LOGOUT . "

\n"; - echo "\n"; - } - - echo "
\n"; - echo 'Nucleus CMS © 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT; - echo '-'; - echo '' . _ADMINPAGEFOOT_DONATE . "\n"; - echo "
\n"; - - echo "
\n"; - - if ( ($action != 'showlogin') && ($member->isLoggedIn()) ) - { - echo "\n"; - - echo '

' . _QMENU_ADD . "

\n"; - echo "
\n"; - echo "

\n"; - echo "\n"; - - $showAll = requestVar('showall'); - - if ( ($member->isAdmin()) && ($showAll == 'yes') ) - { - // Super-Admins have access to all blogs! (no add item support though) - $query = "SELECT bnumber as value, bname as text FROM %s ORDER BY bname;"; - $query = sprintf($query, sql_table('blog')); - } - else - { - $query = "SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;"; - $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID()); - } - $template['name'] = 'blogid'; - $template['tabindex'] = 15000; - $template['extra'] = _QMENU_ADD_SELECT; - $template['selected'] = -1; - $template['shorten'] = 10; - $template['shortenel'] = ''; - $template['javascript'] = 'onchange="return form.submit()"'; - showlist($query, 'select', $template); - - echo "

\n"; - echo "
\n"; - - echo "

{$member->getDisplayName()}

\n"; - echo "\n"; - - if ( $member->isAdmin() ) - { - echo '

' . _QMENU_MANAGE . "

\n"; - echo "\n"; - - echo "

" . _QMENU_LAYOUT . "

\n"; - echo "\n"; - } - - $data = array('options' => array()); - - $manager->notify('QuickMenu', $data); - - if ( count($data['options']) > 0 ) - { - echo "

" . _QMENU_PLUGINS . "

\n"; - echo "\n"; - } - } - else if ( ($action == 'activate') || ($action == 'activatesetpwd') ) - { - - echo '

' . _QMENU_ACTIVATE . '

' . _QMENU_ACTIVATE_TEXT; - } - else - { - echo '

' . _QMENU_INTRO . '

' . _QMENU_INTRO_TEXT; - } - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "
\n"; - - echo "\n"; - echo "\n"; - } + self::$skin->parse('pagefoot'); return; } @@ -5145,9 +4761,7 @@ class Admin $blogid = intRequestVar('blogid'); $member->teamRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('bookmarklet'); - self::pagefoot(); return; } @@ -5163,9 +4777,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('actionlog'); - self::pagefoot(); return; } @@ -5182,9 +4794,7 @@ class Admin $blogid = intRequestVar('blogid'); $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('banlist'); - self::pagefoot(); return; } @@ -5201,9 +4811,7 @@ class Admin $blogid = intRequestVar('blogid'); $member->blogAdminRights($blogid) or self::disallow(); - self::pagehead(); self::$skin->parse('banlistdelete'); - self::pagefoot(); return; } @@ -5253,9 +4861,7 @@ class Admin /* TODO: we should use other ways */ $_REQUEST['delblogs'] = $deleted; - self::pagehead(); self::$skin->parse('banlistdeleteconfirm'); - self::pagefoot(); return; } @@ -5293,9 +4899,7 @@ class Admin /* TODO: we should consider to use the other way instead of this */ $_REQUEST['blogid'] = $blogid; - self::pagehead(); self::$skin->parse('banlistnew'); - self::pagefoot(); return; } @@ -5382,9 +4986,7 @@ class Admin $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('backupoverview'); - self::pagefoot(); return; } @@ -5444,9 +5046,7 @@ class Admin { self::error($message); } - self::pagehead(); self::$skin->parse('backuprestore'); - self::pagefoot(); return; } @@ -5465,9 +5065,7 @@ class Admin // check if allowed $member->isAdmin() or self::disallow(); - self::pagehead(); self::$skin->parse('pluginlist'); - self::pagefoot(); return; } @@ -5491,9 +5089,7 @@ class Admin self::error(_ERROR_NOSUCHPLUGIN); } - self::pagehead(); self::$skin->parse('pluginhelp'); - self::pagefoot(); return; } @@ -5657,9 +5253,7 @@ class Admin self::error(_ERROR_NOSUCHPLUGIN); } - self::pagehead(); self::$skin->parse('plugindelete'); - self::pagefoot(); return; } @@ -5874,10 +5468,9 @@ class Admin { self::$headMess = $message; } - $extrahead = "\n"; - self::pagehead($extrahead); + Admin::$extrahead .= "\n"; + self::$skin->parse('pluginoptions'); - self::pagefoot(); return; } @@ -5975,9 +5568,7 @@ class Admin */ static private function action_parseSpecialskin() { - self::pagehead(); self::$skin->parse(self::$action); - self::pagefoot(); return; } @@ -6077,9 +5668,9 @@ class Admin self::$skin = (object) $skn; $handler = new AdminActions($actnName, self::$skin, $this); - $handler->setSkin(self::$skin); $parser = new PARSER($handler); + $parser->setSkin(self::$skin); $parser->parse($contents); return; diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php index 366ca40..fabb773 100644 --- a/nucleus/libs/AdminActions.php +++ b/nucleus/libs/AdminActions.php @@ -7,9 +7,6 @@ if ( !class_exists('BaseActions') ) class AdminActions extends BaseActions { - // reference to the skin object for which a part is being parsed - private $skin; - private $skintype; /* NOTE: list of whole available action names for tags @@ -133,11 +130,23 @@ class AdminActions extends BaseActions static private $default_actions = array( 'addtickettourl', 'adminurl', + 'codename', 'customhelplink', + 'date', + 'extrahead', 'headmessage', 'helplink', + 'member', + 'newestcompare', + 'pagehead', + 'pagefoot', + 'qmenuaddselect', + 'quickmenu', + 'sitevar', 'sprinttext', - 'ticket' + 'ticket', + 'version', + 'versioncheckurl' ); /** @@ -531,7 +540,7 @@ class AdminActions extends BaseActions 'categories', 'currenttime', 'init', - 'itemoptions', + 'pluginoptions', 'pluginextras' ); break; @@ -581,8 +590,8 @@ class AdminActions extends BaseActions 'categories', 'currenttime', 'itemtime', - 'pluginextras', - 'itemoptions' + 'pluginoptions', + 'pluginextras' ); break; case 'itemlist': @@ -621,27 +630,6 @@ class AdminActions extends BaseActions 'yrbloglist', ); break; - case 'pagefoot': - $extra_actions = array( - 'date', - 'qmenuaddselect', - 'member', - 'quickmenu', - ); - break; - case 'pagehead': - $extra_actions = array( - 'charset', - 'sitevar', - 'adminurl', - 'extrahead', - 'member', - 'versioncheckurl', - 'version', - 'codename', - 'newestcompare', - ); - break; case 'plugindelete': $extra_actions = array( 'editpluginfo', @@ -787,18 +775,6 @@ class AdminActions extends BaseActions } /** - * AdminActions::setSkin() - * Set the skin - * @param object $skin an instance of Skin class - * @return void - */ - public function setSkin(&$skin) - { - $this->skin =& $skin; - return; - } - - /** * AdminActions::parse_actionloglist() * Parse skinvar actionloglist * @@ -1293,7 +1269,7 @@ class AdminActions extends BaseActions $template['content'] = 'adminskinlist'; $template['tabindex'] = 10; - $template['friendly_names'] = $this->skin->getAvailableTypes(); + $template['friendly_names'] = $this->parser->skin->getAvailableTypes(); Showlist($query, 'table', $template, $templateName); return; } @@ -1332,7 +1308,7 @@ class AdminActions extends BaseActions $templates = Template::read($templateName); } - $nType = $this->skin->getAvailableTypes(); + $nType = $this->parser->skin->getAvailableTypes(); $skinid = intRequestVar('skinid'); $query = "SELECT stype FROM %s WHERE stype NOT IN (%s) AND sdesc=%d;"; @@ -1424,7 +1400,7 @@ class AdminActions extends BaseActions { global $DIR_ADMINSKINS; $skinType = strtolower(trim(requestVar('type'))); - $actions = $this->skin->getAllowedActionsForType($skinType); + $actions = $this->parser->skin->getAllowedActionsForType($skinType); sort($actions); while ( $current = array_shift($actions) ) @@ -2376,7 +2352,7 @@ class AdminActions extends BaseActions $templates = Template::read($templateName); } - $types = $this->skin->getAvailableTypes(); + $types = $this->parser->skin->getAvailableTypes(); ksort($types); /* NOTE: set templates for HEAD/BODY/FOOT */ @@ -2657,7 +2633,7 @@ class AdminActions extends BaseActions { global $CONF, $manager, $member; - $fNames = $this->skin->getAvailableTypes(); + $fNames = $this->parser->skin->getAvailableTypes(); $sType = strtolower(trim(requestVar('type'))); switch ( $type ) @@ -2666,16 +2642,16 @@ class AdminActions extends BaseActions echo intRequestVar('skinid'); break; case 'name': - echo Entity::hsc($this->skin->getName()); + echo Entity::hsc($this->parser->skin->getName()); break; case 'desc': - echo Entity::hsc($this->skin->getDescription()); + echo Entity::hsc($this->parser->skin->getDescription()); break; case 'type': - echo Entity::hsc($this->skin->getContentType()); + echo Entity::hsc($this->parser->skin->getContentType()); break; case 'content': - echo Entity::hsc($this->skin->getContentFromDB($sType)); + echo Entity::hsc($this->parser->skin->getContentFromDB($sType)); break; case 'skintype': $skinType = !array_key_exists($sType, $fNames) ? ucfirst($sType) : $fNames[$sType]; @@ -2685,7 +2661,7 @@ class AdminActions extends BaseActions echo Entity::hsc($sType); break; case 'prefix': - echo Entity::hsc($this->skin->getIncludePrefix()); + echo Entity::hsc($this->parser->skin->getIncludePrefix()); break; case 'mode': $incMode = $skin->getIncludeMode() ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL; @@ -3720,6 +3696,7 @@ class AdminActions extends BaseActions { $templates = Template::read($templateName); } + if ( !array_key_exists('INSERT_PLUGOPTION_TITLE', $templates) || empty($templates['INSERT_PLUGOPTION_TITLE']) ) { $template['title'] = "" @@ -3730,6 +3707,7 @@ class AdminActions extends BaseActions { $template['title'] = $templates['INSERT_PLUGOPTION_TITLE']; } + if ( !array_key_exists('INSERT_PLUGOPTION_BODY', $templates) || empty($templates['INSERT_PLUGOPTION_BODY']) ) { $template['body'] = "" @@ -3906,27 +3884,13 @@ class AdminActions extends BaseActions } /** - * AdminActions::parse_itemoptions() - * Parse skinvar itemoptions - * Adds the itemOptions of a plugin to a page - * @author TeRanEX - */ - public function parse_itemoptions() - { - $this->parse_pluginoptions('item'); - return; - } - - /** - * AdminActions::parse_itemoptions() - * + * AdminActions::parse_itemtime() * date change on edit item * - * Parse skinvar itemoptions - * Adds the itemOptions of a plugin to a page - * @author TeRanEX + * @param string $key key of PHP's getDate() + * @return void */ - public function parse_itemtime($what) + public function parse_itemtime($key) { global $manager; @@ -3956,7 +3920,7 @@ class AdminActions extends BaseActions $manager->notify('PreAddItemForm', $data); } $itemtime = getdate($contents['timestamp']); - echo $itemtime[$what]; + echo $itemtime[$key]; return; } @@ -4341,26 +4305,77 @@ class AdminActions extends BaseActions * @param string $type type of plugin option * @return void */ - public function parse_pluginoptions($type = 'global') + public function parse_pluginoptions($context='global') { - global $itemid; + global $itemid, $manager; - switch ( $type ) + switch ( $context ) { case 'member': - $id = intRequestVar('memberid'); + $contextid = intRequestVar('memberid'); break; case 'blog': - $id = intRequestVar('blogid'); + $contextid = intRequestVar('blogid'); break; case 'category': - $id = intRequestVar('catid'); + $contextid = intRequestVar('catid'); break; case 'item': - $id = $itemid; + $contextid = $itemid; break; } - Admin::insertPluginOptions($type, $id); + + /* Actually registererd plugin options */ + $aIdToValue = array(); + $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;"; + $query = sprintf($query, sql_table('plugin_option'), (integer) $contextid); + $res = DB::getResult($query); + foreach ( $res as $row ) + { + $aIdToValue[$row['oid']] = $row['ovalue']; + } + + /* Currently available plugin options */ + $query = "SELECT * FROM %s, %s WHERE opid=pid and ocontext= %s ORDER BY porder, oid ASC;"; + $query = sprintf($query, sql_table('plugin_option_desc'), sql_table('plugin'), DB::quoteValue($context)); + $res = DB::getResult($query); + + $options = array(); + foreach ($res as $row ) + { + if ( !array_key_exists($row['oid'], $aIdToValue) ) + { + $value = $row['odef']; + } + else + { + $value = $aIdToValue[$row['oid']]; + } + + $options[] = array( + 'pid' => $row['pid'], + 'pfile' => $row['pfile'], + 'oid' => $row['oid'], + 'value' => $value, + 'name' => $row['oname'], + 'description' => $row['odesc'], + 'type' => $row['otype'], + 'typeinfo' => $row['oextra'], + 'contextid' => $contextid, + 'extra' => '' + ); + } + + $data = array( + 'context' => $context, + 'contextid' => $contextid, + 'options' => &$opt4ions + ); + $manager->notify('PrePluginOptionsEdit', $data); + + $content = $this->parser->skin->getContentFromDB('insertpluginoptions'); + $this->parser->parse($content); + return; } @@ -5726,4 +5741,275 @@ class AdminActions extends BaseActions $this->newPlugCandidates = $candidates; return (count($candidates) > 0); } + + /** + * AdminActions::pagehead() + * Output admin page head + * + * @param void + * @return void + */ + public function parse_pagehead() + { + global $member, $nucleus, $CONF, $manager; + + $content = $this->parser->skin->getContentFromDB('pagehead'); + if ( !$content ) + { + $extrahead = Admin::$extrahead; + $data = array( + 'extrahead' => &$extrahead, + 'action' => Admin::$action + ); + $manager->notify('AdminPrePageHead', $data); + + $baseUrl = Entity::hsc($CONF['SkinsURL']); + + /* + * TODO: obsoleted + if ( !array_key_exists('AdminCSS', $CONF) ) + { + DB::execute("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')"); + $CONF['AdminCSS'] = 'original'; + } + */ + + /* HTTP 1.1 application for no caching */ + header("Cache-Control: no-cache, must-revalidate"); + header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); + + $root_element = 'html'; + $charset = i18n::get_current_charset(); + $locale = preg_replace('#_#', '-', i18n::get_current_locale()); + $xml_version_info = self::$xml_version_info; + $formal_public_identifier = self::$formal_public_identifier; + $system_identifier = self::$system_identifier; + $xhtml_namespace = self::$xhtml_namespace; + + echo "\n"; + echo "\n"; + echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n"; + echo "\n"; + echo '' . Entity::hsc($CONF['SiteName']) . " - Admin\n"; + /* + * TODO: obsoleted + echo "\n"; + */ + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "{$extrahead}\n"; + echo "\n\n"; + echo "\n"; + echo "
\n"; + echo "
\n"; + echo '

' . Entity::hsc($CONF['SiteName']) . "

\n"; + echo "
\n"; + echo "
\n"; + echo "
\n"; + echo "
\n"; + + if ( !$member->isLoggedIn() ) + { + echo '' . _NOTLOGGEDIN . "
\n"; + } + else + { + echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - " . _LOGOUT. "
\n"; + echo "" . _ADMINHOME . " - "; + } + + echo ""._YOURSITE."
\n"; + echo '('; + + if ( !array_key_exists('codename', $nucleus) || empty($nucleus['codename']) ) + { + $codenamestring = ''; + } + else + { + $codenamestring = ' "' . $nucleus['codename'].'"'; + } + + if ( $member->isLoggedIn() && $member->isAdmin() ) + { + $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel()); + echo 'Nucleus CMS ' . $nucleus['version'] . $codenamestring . ''; + + $newestVersion = getLatestVersion(); + $newestCompare = str_replace('/', '.', $newestVersion); + $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']); + + if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 ) + { + echo "
\n"; + echo ''; + echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion; + echo ""; + } + } + else + { + echo "Nucleus CMS {$nucleus['version']}{$codenamestring}"; + } + echo ')'; + echo '
'; + } + else + { + $this->parser->parse($content); + } + + return; + } + + /** + * AdminActionss::pagefoot() + * Output admin page foot include quickmenu + * + * @param void + * @return void + */ + public function parse_pagefoot() + { + global $action, $member, $manager; + + $content = $this->parser->skin->getContentFromDB('pagefoot'); + if ( !$content ) + { + $data = array( + 'action' => self::$action + ); + $manager->notify('AdminPrePageFoot', $data); + + if ( $member->isLoggedIn() && ($action != 'showlogin') ) + { + echo '

' . _LOGOUT . "

\n"; + echo "\n"; + } + + echo "
\n"; + echo 'Nucleus CMS © 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT; + echo '-'; + echo '' . _ADMINPAGEFOOT_DONATE . "\n"; + echo "
\n"; + + echo "
\n"; + + if ( ($action != 'showlogin') && ($member->isLoggedIn()) ) + { + echo "\n"; + + echo '

' . _QMENU_ADD . "

\n"; + echo "
\n"; + echo "

\n"; + echo "\n"; + + $showAll = requestVar('showall'); + + if ( ($member->isAdmin()) && ($showAll == 'yes') ) + { + // Super-Admins have access to all blogs! (no add item support though) + $query = "SELECT bnumber as value, bname as text FROM %s ORDER BY bname;"; + $query = sprintf($query, sql_table('blog')); + } + else + { + $query = "SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;"; + $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID()); + } + $template['name'] = 'blogid'; + $template['tabindex'] = 15000; + $template['extra'] = _QMENU_ADD_SELECT; + $template['selected'] = -1; + $template['shorten'] = 10; + $template['shortenel'] = ''; + $template['javascript'] = 'onchange="return form.submit()"'; + showlist($query, 'select', $template); + + echo "

\n"; + echo "
\n"; + + echo "

{$member->getDisplayName()}

\n"; + echo "\n"; + + if ( $member->isAdmin() ) + { + echo '

' . _QMENU_MANAGE . "

\n"; + echo "\n"; + + echo "

" . _QMENU_LAYOUT . "

\n"; + echo "\n"; + } + + $data = array('options' => array()); + + $manager->notify('QuickMenu', $data); + + if ( count($data['options']) > 0 ) + { + echo "

" . _QMENU_PLUGINS . "

\n"; + echo "\n"; + } + } + else if ( ($action == 'activate') || ($action == 'activatesetpwd') ) + { + + echo '

' . _QMENU_ACTIVATE . '

' . _QMENU_ACTIVATE_TEXT; + } + else + { + echo '

' . _QMENU_INTRO . '

' . _QMENU_INTRO_TEXT; + } + + echo "\n"; + echo "
\n"; + + echo "\n"; + echo "
\n"; + + echo "\n"; + echo "
\n"; + + echo "\n"; + echo "
\n"; + + echo "\n"; + echo "\n"; + } + else + { + $this->parser->skin->parse('pagefoot'); + exit; + } + + return; + } } diff --git a/nucleus/libs/PLUGINADMIN.php b/nucleus/libs/PLUGINADMIN.php index ba547b5..5cdd11d 100644 --- a/nucleus/libs/PLUGINADMIN.php +++ b/nucleus/libs/PLUGINADMIN.php @@ -20,9 +20,9 @@ class PluginAdmin { - public $strFullName; // NP_SomeThing - public $plugin; // ref. to plugin object - public $bValid; // evaluates to true when object is considered valid + public $strFullName; // NP_SomeThing + public $plugin; // ref. to plugin object + public $bValid; // evaluates to true when object is considered valid public $admin; // ref to an admin object public function __construct($pluginName) @@ -42,18 +42,17 @@ class PluginAdmin doError(_ERROR_INVALID_PLUGIN); } - $this->plugin =& $manager->getPlugin($this->strFullName); - $this->bValid = $this->plugin; + $this->plugin = &$manager->getPlugin($this->strFullName); + $this->bValid = $this->plugin; if ( !$this->bValid ) { doError(_ERROR_INVALID_PLUGIN); } - /*$this->admin = new Admin(); - $this->admin->action = "plugin_{$pluginName}";*/ Admin::initialize(); Admin::setAdminAction("plugin_{$pluginName}"); + return; } @@ -66,11 +65,8 @@ class PluginAdmin public function start($extraHead = '') { global $CONF; - $strBaseHref = ''; - $extraHead .= $strBaseHref; - - //$this->admin->pagehead($extraHead); - Admin::PluninAdminPagehead($extraHead); + $extrahead = '' . "\n"; + Admin::PluninAdminPagehead($extrahead); return; } @@ -82,8 +78,7 @@ class PluginAdmin */ public function end() { - $this->_AddTicketByJS(); - //$this->admin->pagefoot(); + $this->AddTicketByJS(); Admin::PluninAdminPagefoot(); return; } @@ -96,10 +91,10 @@ class PluginAdmin * @param void * @return void */ - public function _AddTicketByJS() + private function AddTicketByJS() { global $CONF,$ticketforplugin; - if ( !($ticket=$ticketforplugin['ticket']) ) + if ( !($ticket = $ticketforplugin['ticket']) ) { return; } diff --git a/nucleus/libs/SKIN.php b/nucleus/libs/SKIN.php index 682a948..48af7c3 100644 --- a/nucleus/libs/SKIN.php +++ b/nucleus/libs/SKIN.php @@ -372,7 +372,6 @@ class Skin // call action handler $action_class = $this->action_class; $handler = new $action_class($type); - $handler->setSkin($this); // register action handler to parser $parser = new Parser($handler); diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml index 10835d4..1612f99 100644 --- a/skins/admin/default/skinbackup.xml +++ b/skins/admin/default/skinbackup.xml @@ -7,12 +7,12 @@ - (<%text(_BACKTOMANAGE)%>)

+

(<%text(_BACKTOMANAGE)%>)

<%text(_ACTIONLOG_CLEAR_TITLE)%>

<%text(_ACTIONLOG_CLEAR_TEXT)%>

<%text(_ACTIONLOG_TITLE)%>

- <%actionloglist%>]]> - <%activationmessage(title)%> + <%actionloglist%><%pagefoot%>]]> +

<%activationmessage(title)%>

<%activationmessage(text)%>

<%headmessage%>

<%if(bechangepass)%>
@@ -34,10 +34,10 @@ -
<%endif%>]]> - <%text(_ACTIVATE_SUCCESS_TITLE)%> -

<%text(_ACTIVATE_SUCCESS_TEXT)%>

]]> - <%text(_BLOGCREATED_TITLE)%> + <%endif%><%pagefoot%>]]> +

<%text(_ACTIVATE_SUCCESS_TITLE)%>

+

<%text(_ACTIVATE_SUCCESS_TEXT)%>

<%pagefoot%>]]> +

<%text(_BLOGCREATED_TITLE)%>

<%sprinttext(_BLOGCREATED_ADDEDTXT,<|%createdblogsetting(name)%|>)%>

  1. <%sprinttext(_BLOGCREATED_SIMPLEWAY,<|%getblogsetting(short)%|>)%>
    2. @@ -90,13 +90,13 @@ selector(); - ]]> - Error! + <%pagefoot%>]]> +

    Error!

    <%headmessage%>
    <%text(_BACK)%> -]]>     - <%text(_DELETE_CONFIRM)%> +<%pagefoot%>]]> +

    <%text(_DELETE_CONFIRM)%>

    <%text(_CONFIRMTXT_SKIN)%><%editadminskintype(name)%> (<%editadminskintype(desc)%>)

    @@ -105,8 +105,8 @@ selector();
    -
    ]]>     - (<%text(_SKIN_BACK)%>)

    + <%pagefoot%>]]>     +

    (<%text(_SKIN_BACK)%>)

    <%text(_SKIN_EDITONE_TITLE)%> '<%editadminskin(name)%>'

    <%text(_SKIN_PARTS_TITLE)%>

    <%text(_SKIN_PARTS_MSG)%> @@ -146,8 +146,8 @@ selector(); - ]]>     - (<%text(_SKIN_GOBACK)%>)

    + <%pagefoot%>]]>     +

    (<%text(_SKIN_GOBACK)%>)

    <%text(_SKIN_EDITPART_TITLE)%> '<%editadminskintype(name)%>': <%editadminskintype(skintype)%>

    <%headmessage%>
    @@ -169,16 +169,16 @@ selector(); <%text(_SKINEDIT_ALLOWEDTEMPLATESS)%> <%adminskineditallowedlist(template)%>
    -
    ]]>     - (<%text(_BACKTOMANAGE)%>)

    + <%pagefoot%>]]>     +

    (<%text(_BACKTOMANAGE)%>)

    <%text(_SKINIE_DONE)%>

    • <%text(_SKINIE_INFO_GENERAL)%> <%importskininfo(info)%>

    • <%text(_SKINIE_INFO_IMPORTEDSKINS)%> <%importskininfo(snames)%>

    • <%text(_SKINIE_INFO_IMPORTEDTEMPLS)%> <%importskininfo(tnames)%>

      • -
    ]]>     - (<%text(_BACK)%>)

    + <%pagefoot%>]]>     +

    (<%text(_BACK)%>)

    <%text(_SKINIE_CONFIRM_TITLE)%>

      @@ -197,8 +197,8 @@ selector(); <%if(nameclashes)%>
      <%endif%> - ]]> - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_SKINIE_TITLE_IMPORT)%>

      @@ -249,8 +249,8 @@ selector(); - ]]> - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_SKIN_EDIT_TITLE)%>

      <%text(_SKIN_AVAILABLE_TITLE)%>

      <%adminskinoverview%> @@ -272,8 +272,8 @@ selector(); - ]]>       - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_SKIN_PARTS_SPECIAL)%><%editadminskintype(skintype)%> (<%editadminskintype(name)%>) (<%editadminskintype(desc)%>)

      @@ -283,8 +283,8 @@ selector();
      -
      ]]>       - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_TEMPLATE)%><%editadmintemplateinfo(name)%> (<%editadmintemplateinfo(desc)%>)

      @@ -293,8 +293,8 @@ selector();
      -
      ]]>       - (<%text(_TEMPLATE_BACK)%>)

      + <%pagefoot%>]]>       +

      (<%text(_TEMPLATE_BACK)%>)

      <%text(_TEMPLATE_EDIT_TITLE)%> '<%editadmintemplateinfo(name)%>'

      <%headmessage%> @@ -463,8 +463,8 @@ selector(); - ]]>       - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_TEMPLATE_TITLE)%>

      <%text(_TEMPLATE_AVAILABLE_TITLE)%>

      <%admintemplateoverview%> @@ -486,8 +486,8 @@ selector(); - ]]>       - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_BACKUPS_TITLE)%>

      <%text(_BACKUP_TITLE)%>

      <%text(_BACKUP_INTRO)%>

      @@ -515,15 +515,15 @@ selector(); <%text(_RESTORE_WARNING)%>

      -]]>       - <%text(_RESTORE_COMPLETE)%> -]]> - (<%text(_BACKHOME)%>)

      +<%pagefoot%>]]>       +

      <%text(_RESTORE_COMPLETE)%>

      +<%pagefoot%>]]>       +

      (<%text(_BACKHOME)%>)

      <%text(_BAN_TITLE)%> '<%adminbloglink(admin/default)%>'

      <%adminbanlist%>

      <%text(_BAN_NEW_TITLE)%>

      -

      <%text(_BAN_NEW_TEXT)%>

      ]]>       - <%text(_BAN_REMOVE_TITLE)%> +

      <%text(_BAN_NEW_TEXT)%>

      <%pagefoot%>]]>       +

      <%text(_BAN_REMOVE_TITLE)%>

      @@ -553,15 +553,15 @@ selector();
      -]]>       - index.php?action=banlist&blogid=<%requestblogid%>">(<%text(_BACK)%>) +<%pagefoot%>]]> + (<%text(_BACK)%>)

      <%text(_BAN_REMOVED_TITLE)%>

      <%text(_BAN_REMOVED_TEXT)%>

        <%banlistdeletedlist%>
      -]]>       - <%text(_BAN_ADD_TITLE)%> +<%pagefoot%>]]> +

      <%text(_BAN_ADD_TITLE)%>

      <%text(_BAN_IPRANGE)%>

      <%text(_BAN_IPRANGE_TEXT)%>

      @@ -589,8 +589,8 @@ selector();
      -]]>       - index.php?action=overview"><%text(_BACKHOME)%> +<%pagefoot%>]]> + <%text(_BACKHOME)%>

      <%text(_BATCH_CATEGORIES)%>

      <%text(_BATCH_EXECUTING)%><%adminbatchaction%>

        @@ -598,15 +598,15 @@ selector();
      - <%text(_BATCH_DONE)%>]]>       - index.php?action=overview"><%text(_BACKHOME)%> + <%text(_BATCH_DONE)%><%pagefoot%>]]> + <%text(_BACKHOME)%>

      <%text(_BATCH_COMMENTS)%>

      <%text(_BATCH_EXECUTING)%><%adminbatchaction%>

        <%adminbatchlist%>
      - <%text(_BATCH_DONE)%>]]>       - <%text(_BATCH_DELETE_CONFIRM)%> + <%text(_BATCH_DONE)%><%pagefoot%>]]> +

      <%text(_BATCH_DELETE_CONFIRM)%>

      @@ -616,22 +616,22 @@ selector(); <%batchdeletelist%>
      -
      ]]>       - index.php?action=overview"><%text(_BACKHOME)%> + <%pagefoot%>]]> + <%text(_BACKHOME)%>

      <%text(_BATCH_ITEMS)%>

      <%text(_BATCH_EXECUTING)%><%adminbatchaction%>

        <%adminbatchlist%>
      - <%text(_BATCH_DONE)%>]]>       - index.php?action=usermanagement"><%text(_MEMBERS_BACKTOOVERVIEW)%> + <%text(_BATCH_DONE)%><%pagefoot%>]]> + <%text(_MEMBERS_BACKTOOVERVIEW)%>

      <%text(_BATCH_MEMBERS)%>

      <%text(_BATCH_EXECUTING)%><%adminbatchaction%>

        <%adminbatchlist%>
      - <%text(_BATCH_DONE)%>]]>       - <%text(_MOVE_TITLE)%> + <%text(_BATCH_DONE)%><%pagefoot%>]]> +

      <%text(_MOVE_TITLE)%>

      @@ -641,8 +641,8 @@ selector(); <%movedistselect%>
      -
      ]]>       - <%text(_MOVECAT_TITLE)%> + <%pagefoot%>]]> +

      <%text(_MOVECAT_TITLE)%>

      @@ -652,19 +652,19 @@ selector(); <%movedistselect%>
      -
      ]]>       - index.php?action=manageteam&blogid=<%requestblogid%>"><%text(_BACK)%> + <%pagefoot%>]]> + <%text(_BACK)%>

      <%text(_BATCH_TEAM)%>

      <%text(_BATCH_EXECUTING)%><%adminbatchaction%>

        <%adminbatchlist%>
      - <%text(_BATCH_DONE)%>]]>       + <%text(_BATCH_DONE)%><%pagefoot%>]]> (<%text(_BACKHOME)%>)

      <%text(_COMMENTS_BLOG)%> <%adminbloglink(admin/default)%>

      <%commentnavlist(admin/default)%>]]>       ]]> - (<%text(_BACKHOME)%>)

      +

      (<%text(_BACKHOME)%>)

      <%text(_EBLOG_TITLE)%>: '<%adminbloglink(admin/default)%>'

      <%text(_EBLOG_TEAM_TITLE)%>

      @@ -781,8 +781,8 @@ selector();

      <%text(_PLUGINS_EXTRA)%>

      - <%pluginextras(blog)%>]]>       - (<%text(_BACKHOME)%>)

      + <%pluginextras(blog)%><%pagefoot%>]]>       +

      (<%text(_BACKHOME)%>)

      <%text(_BOOKMARKLET_TITLE)%>

      <%text(_BOOKMARKLET_DESC1)%><%text(_BOOKMARKLET_DESC2)%><%text(_BOOKMARKLET_DESC3)%><%text(_BOOKMARKLET_DESC4)%><%text(_BOOKMARKLET_DESC5)%>

      <%text(_BOOKMARKLET_BOOKARKLET)%>

      @@ -792,14 +792,14 @@ selector();
      <%sprinttext(_BOOKMARKLET_ANCHOR,<|%getblogsetting(name)%|>)%><%text(_BOOKMARKLET_BMARKFOLLOW)%>

      -]]>       - (<%text(_BACKHOME)%>)

      +<%pagefoot%>]]>       +

      (<%text(_BACKHOME)%>)

      <%text(_COMMENTS_YOUR)%>

      - <%commentnavlist(admin/default)%>]]>       - <%text(_BACKHOME)%>

      + <%commentnavlist(admin/default)%><%pagefoot%>]]>       +

      <%text(_BACKHOME)%>

      <%text(_ITEMLIST_YOUR)%>

      - <%itemnavlist(admin/default)%>]]>       - <%text(_DELETE_CONFIRM)%> + <%itemnavlist(admin/default)%><%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_CATEGORY)%><%categorysetting(name)%>
      @@ -811,8 +811,8 @@ selector(); - ]]>       - (<%text(_BACK_TO_BLOGSETTINGS)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACK_TO_BLOGSETTINGS)%>)

      <%text(_EBLOG_CAT_UPDATE)%> '<%categorysetting(name)%>'

      @@ -840,8 +840,8 @@ selector();
      -
      ]]>       - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_COMMENT)%>

      <%text(_EDITC_WHO)%>: <%deletecomment(author)%> @@ -853,8 +853,8 @@ selector(); <%ticket%> -
      ]]>       - <%text(_EDITC_TITLE)%> + <%pagefoot%>]]> +

      <%text(_EDITC_TITLE)%>

      @@ -894,8 +894,8 @@ selector();
      -
      ]]>       - <%text(_ADD_ADDTO)%> '<%adminbloglink(admin/default)%>' + <%pagefoot%>]]> +

      <%text(_ADD_ADDTO)%> '<%adminbloglink(admin/default)%>'

      <%init%> @@ -1053,7 +1053,7 @@ selector(); <%pluginextras%> - <%itemoptions%> + <%pluginoptions(item)%> <%text(_ADD_MORE)%> @@ -1156,8 +1156,8 @@ selector(); var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved' var formtype = 'add'; // Add or edit form -<%endif%>]]>       - (<%text(_BACKTOMANAGE)%>)

      +<%endif%><%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_EBLOG_CREATE_TITLE)%>

      <%text(_ADMIN_NOTABILIA)%>

      <%text(_ADMIN_PLEASE_READ)%>

      @@ -1210,8 +1210,8 @@ selector(); - ]]>       - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_WARNINGTXT_BLOGDEL)%>

      @@ -1222,8 +1222,8 @@ selector(); <%ticket%> -
      ]]>       - (<%text(_MEMBERS_BACKTOOVERVIEW)%>)<%else%>(<%text(_BACKHOME)%>)<%endif%> + <%pagefoot%>]]> + <%if(superadmin)%>(<%text(_MEMBERS_BACKTOOVERVIEW)%>)<%else%>(<%text(_BACKHOME)%>)<%endif%>

      <%text(_MEMBERS_EDIT)%>

      @@ -1293,12 +1293,12 @@ selector();

      <%text(_PLUGINS_EXTRA)%>

      - <%pluginextras(member)%>]]>       + <%pluginextras(member)%><%pagefoot%>]]>       ]]> - (<%text(_BACKTOOVERVIEW)%>)

      +

      (<%text(_BACKTOOVERVIEW)%>)

      <%text(_COMMENTS)%>

      - <%commentnavlist(admin/default)%>]]>       - <%text(_DELETE_CONFIRM)%> + <%commentnavlist(admin/default)%><%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_ITEM)%>

      "<%deleteitemtitle%>" @@ -1310,8 +1310,8 @@ selector(); <%ticket%> -
      ]]>       - <%text(_EDIT_ITEM)%> + <%pagefoot%>]]> +

      <%text(_EDIT_ITEM)%>

      <%init%> @@ -1496,7 +1496,7 @@ selector(); <%pluginextras%> - <%itemoptions%> + <%pluginoptions(item)%> <%text(_ADD_MORE)%> @@ -1596,20 +1596,20 @@ selector(); var goalurl = '../action.php'; // The PHP file where the content must be posted to var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved' var formtype = 'edit'; // Add or edit form -<%endif%>]]>       - (<%text(_BACKHOME)%>)

      +<%endif%><%pagefoot%>]]>       +

      (<%text(_BACKHOME)%>)

      <%text(_ITEMLIST_BLOG)%><%adminbloglink(admin/default)%>

      <%ilistaddnew%> - <%itemnavlist(admin/default)%>]]>       - <%text(_MOVE_TITLE)%> + <%itemnavlist(admin/default)%><%pagefoot%>]]> +

      <%text(_MOVE_TITLE)%>

      <%ticket%> <%movedistselect%> -
      ]]>       - (<%text(_BACKHOME)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKHOME)%>)

      <%headmessage%>

      <%text(_MANAGE_GENERAL)%>

      @@ -1631,8 +1631,8 @@ selector(); ]]>       - (<%text(_BACK_TO_BLOGSETTINGS)%>)

      +
    <%pagefoot%>]]>     +

    (<%text(_BACK_TO_BLOGSETTINGS)%>)

    <%text(_TEAM_TITLE)%><%blogsetting(name)%>

    <%text(_TEAM_CURRENT)%>

    <%blogteamlist(admin/default)%> @@ -1657,8 +1657,8 @@ selector(); - ]]>     - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

    <%text(_DELETE_CONFIRM)%>

    <%text(_CONFIRMTXT_MEMBER%><%editmember(displayname)%>

    <%text(_WARNINGTXT_NOTDELMEDIAFILES)%>

    @@ -1668,8 +1668,8 @@ selector(); -
    ]]>     - + <%pagefoot%>]]> + <%headmessage%>

    <%text(_OVERVIEW_YRBLOGS)%>

    <%yrbloglist(admin/default)%>

    <%text(_OVERVIEW_YRSETTINGS)%>

    @@ -1681,7 +1681,7 @@ selector(); <%if(superadmin)%>

    <%text(_OVERVIEW_MANAGEMENT)%>

    ]]>     + <%pagefoot%>]]> <%ifnot(adminaction,showlogin)%>

    <%text(_LOGOUT)%>

    • <%text(_BACKHOME)%>
      • @@ -1773,7 +1773,7 @@ selector(); <%text(_YOURSITE)%>
      (<%if(superadmin)%><%version%><%codename%><%newestcompare%><%else%><%version%><%codename%><%endif%>) ]]> - <%text(_DELETE_CONFIRM)%> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_PLUGIN)%> <%editpluginfo(name)%>?

      @@ -1782,12 +1782,12 @@ selector();
      -]]>       - (<%text(_PLUGS_BACK)%>)

      +<%pagefoot%>]]>       + (<%text(_PLUGS_BACK)%>)

      <%text(_PLUGS_HELP_TITLE)%>: <%helpplugname%>

      <%pluginhelp%> ]]>       - (<%text(_BACKTOMANAGE)%>)

      +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_PLUGS_TITLE_MANAGE)%><%helplink(plugins)%>

      <%text(_PLUGS_TITLE_INSTALLED)%>   <%helplink('getplugins')%><%text(_PLUGS_TITLE_GETPLUGINS)%>

      <%pluginlistlist(admin/default)%> @@ -1811,8 +1811,8 @@ selector(); <%newpluginlist%> - <%else%>

      <%text(_PLUGS_NOCANDIDATES)%>

      <%endif%>]]>       - (<%text(_PLUGS_BACK)%>)

      + <%else%>

      <%text(_PLUGS_NOCANDIDATES)%>

      <%endif%><%pagefoot%>]]>       +

      (<%text(_PLUGS_BACK)%>)

      <%sprinttext(_PLUGIN_OPTIONS_TITLE,<|%geteditpluginfo(name)%|>)%>

      <%headmessage%>
      @@ -1823,8 +1823,8 @@ selector(); <%ticket%> <%editplugoptionslist%> -
      ]]>       - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_SETTINGS_TITLE)%>

      @@ -1968,8 +1968,8 @@ selector();

      <%text(_PLUGINS_EXTRA)%>

      - <%pluginextras%>]]>       - <%text(_LOGIN)%> + <%pluginextras%><%pagefoot%>]]> +

      <%text(_LOGIN)%>

      <%headmessage%>

      <%text(_LOGIN_NAME)%>
      @@ -1985,8 +1985,8 @@ selector();
      <%text(_LOGIN_FORGOT)%> <%passrequestvars%> -

      ]]>       - <%text(_DELETE_CONFIRM)%> +

      <%pagefoot%>]]>       +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_SKIN)%><%editskintype(name)%> (<%editskintype(desc)%>)

      @@ -1995,8 +1995,8 @@ selector();
      -
      ]]>       - (<%text(_SKIN_BACK)%>)

      + <%pagefoot%>]]>       +

      (<%text(_SKIN_BACK)%>)

      <%text(_SKIN_EDITONE_TITLE)%> '<%editskin(name)%>'

      <%text(_SKIN_PARTS_TITLE)%>

      <%text(_SKIN_PARTS_MSG)%> @@ -2045,8 +2045,8 @@ selector(); - ]]>       - (<%text(_SKIN_GOBACK)%>)

      + <%pagefoot%>]]>       +

      (<%text(_SKIN_GOBACK)%>)

      <%text(_SKIN_EDITPART_TITLE)%> '<%editskintype(name)%>': <%editskintype(skintype)%>

      <%headmessage%>
      @@ -2071,16 +2071,16 @@ selector(); <%text(_SKINEDIT_ALLOWEDTEMPLATESS)%> <%skineditallowedlist(template)%>
      -
      ]]>       - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_SKINIE_DONE)%>

      • <%text(_SKINIE_INFO_GENERAL)%> <%importskininfo(info)%>

      • <%text(_SKINIE_INFO_IMPORTEDSKINS)%> <%importskininfo(snames)%>

      • <%text(_SKINIE_INFO_IMPORTEDTEMPLS)%> <%importskininfo(tnames)%>

        • -
      ]]>       - (<%text(_BACK)%>)

      +
    <%pagefoot%>]]>     +

    (<%text(_BACK)%>)

    <%text(_SKINIE_CONFIRM_TITLE)%>

    • <%text(_SKINIE_INFO_GENERAL)%> <%importskininfo(info)%>

      • @@ -2098,8 +2098,8 @@ selector(); <%if(nameclashes)%>
      <%endif%> - ]]> - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_SKINIE_TITLE_IMPORT)%>

      @@ -2150,8 +2150,8 @@ selector(); - ]]> - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_SKIN_EDIT_TITLE)%>

      <%text(_SKIN_AVAILABLE_TITLE)%>

      <%skinoverview%> @@ -2174,8 +2174,8 @@ selector(); - ]]>       - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_SKIN_PARTS_SPECIAL)%><%editskintype(skintype)%> (<%editskintype(name)%>) (<%editskintype(desc)%>)

      @@ -2185,8 +2185,8 @@ selector();
      -
      ]]>       - <%text(_ADMIN_SYSTEMOVERVIEW_HEADING)%> + <%pagefoot%>]]> +

      <%text(_ADMIN_SYSTEMOVERVIEW_HEADING)%>

      <%if(superadmin)%>

      <%text(_ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL)%>

      @@ -2264,8 +2264,9 @@ selector();
      <%else%> <%text(_ADMIN_SYSTEMOVERVIEW_NOT_ADMIN)%> -]]> - <%text(_DELETE_CONFIRM)%> +<%endif%> +<%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_TEAM1)%> @@ -2283,8 +2284,8 @@ selector(); - ]]> - <%text(_DELETE_CONFIRM)%> + <%pagefoot%>]]> +

      <%text(_DELETE_CONFIRM)%>

      <%text(_CONFIRMTXT_TEMPLATE)%><%edittemplateinfo(name)%> (<%edittemplateinfo(desc)%>)

      @@ -2293,8 +2294,8 @@ selector();
      - ]]>       - (<%text(_TEMPLATE_BACK)%>)

      + <%pagefoot%>]]>       +

      (<%text(_TEMPLATE_BACK)%>)

      <%text(_TEMPLATE_EDIT_TITLE)%> '<%edittemplateinfo(name)%>'

      <%headmessage%> @@ -2389,8 +2390,8 @@ selector();
      - ]]>       - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_TEMPLATE_TITLE)%>

      <%text(_TEMPLATE_AVAILABLE_TITLE)%>

      <%templateoverview%> @@ -2412,8 +2413,8 @@ selector(); - ]]>       - (<%text(_BACKTOMANAGE)%>)

      + <%pagefoot%>]]>       +

      (<%text(_BACKTOMANAGE)%>)

      <%text(_MEMBERS_TITLE)%>

      <%text(_MEMBERS_CURRENT)%>

      <%editmemberlist(admin/default)%> @@ -2459,7 +2460,7 @@ selector(); - ]]>       + <%pagefoot%>]]>