X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nucleus%2Flibs%2FAdminActions.php;h=f09c6c68a55dcf0337d0b4d9fc128a430714eb6e;hb=547cc6bec14d6746462ee6deee6254d80eaeb8ef;hp=30d14eb1401e9b259baf8f0aa68ba9cc14e15842;hpb=0b6718ba263e35fd5e781b624dc7436001d8f0ce;p=nucleus-jp%2Fnucleus-next.git diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php index 30d14eb..f09c6c6 100644 --- a/nucleus/libs/AdminActions.php +++ b/nucleus/libs/AdminActions.php @@ -1188,23 +1188,23 @@ class AdminActions extends BaseActions public function parse_defadminskinselect($template_name) { global $CONF, $action; - + if ( $action == 'editmembersettings' ) { global $member; - $default = ($member->adminskin > 0) ? $member->adminskin : $CONF['AdminSkin']; + $default = $member->adminskin; } elseif ( $action == 'memberedit' ) { global $manager; $mem = $manager->getMember(intRequestVar('memberid')); - $default = ($mem->adminskin > 0) ? $mem->adminskin : $CONF['AdminSkin']; + $default = $mem->adminskin; } else { $default = $CONF['AdminSkin']; } - + $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%'"; $query = sprintf($query, sql_table('skin_desc')); $template = array( @@ -1212,6 +1212,12 @@ class AdminActions extends BaseActions 'tabindex' => 10080, 'selected' => $default ); + + if ( $this->skintype != 'settingsedit' ) + { + $template['extra'] = Entity::hsc(_MEMBERS_USESITELANG); + } + $this->parser->parse(showlist($query, 'select', $template, $template_name)); return; } @@ -1230,13 +1236,13 @@ class AdminActions extends BaseActions if ( $action == 'editmembersettings' ) { global $member; - $default = ($member->bookmarklet > 0) ? $member->bookmarklet : $CONF['BookmarkletSkin']; + $default = $member->bookmarklet; } elseif ( $action == 'memberedit' ) { global $manager; $mem = $manager->getMember(intRequestVar('memberid')); - $default = ($mem->bookmarklet > 0) ? $mem->bookmarklet : $CONF['BookmarkletSkin']; + $default = $mem->bookmarklet; } else { @@ -1251,6 +1257,12 @@ class AdminActions extends BaseActions 'tabindex' => 10085, 'selected' => $default ); + + if ( $this->skintype != 'settingsedit' ) + { + $template['extra'] = Entity::hsc(_MEMBERS_USESITELANG); + } + $this->parser->parse(showlist($query, 'select', $template, $template_name)); return; } @@ -1363,7 +1375,7 @@ class AdminActions extends BaseActions { $template['content'] = 'categorylist'; $template['tabindex'] = 200; - $this->parser->parse(listplug_batchlist('category', $resource, 'table', $template)); + $this->parser->parse(listplug_batchlist('category', $resource, 'table', $template, $template_name)); } else { @@ -1506,7 +1518,7 @@ class AdminActions extends BaseActions $template['content'] = 'teamlist'; $template['tabindex'] = 10; - $this->parser->parse(listplug_batchlist('team', $resource, 'table', $template)); + $this->parser->parse(listplug_batchlist('team', $resource, 'table', $template, $template_name)); } else { @@ -2241,7 +2253,7 @@ class AdminActions extends BaseActions $template['content'] = 'memberlist'; $template['tabindex'] = 10; - $this->parser->parse(listplug_batchlist('member', $resource, 'table', $template)); + $this->parser->parse(listplug_batchlist('member', $resource, 'table', $template, $template_name)); } else { @@ -2729,7 +2741,8 @@ class AdminActions extends BaseActions ); $manager->notify('AdminPrePageHead', $data); - echo $extrahead; + + $this->parser->parse($extrahead); return; } @@ -3317,7 +3330,7 @@ class AdminActions extends BaseActions $template['content'] = 'itemlist'; - $this->parser->parse(listplug_navlist('item', $query, 'table', $template)); + $this->parser->parse(listplug_navlist('item', $query, 'table', $template, $template_name)); } else { @@ -3339,34 +3352,7 @@ class AdminActions extends BaseActions { global $manager; - $item = false; - $itemid = intRequestVar('itemid'); - $item =& $manager->getItem($itemid, 1, 1); - - if ( $item ) - { - $blog =& $manager->getBlog($item['blogid']); - - if ( $blog->convertBreaks() && requestVar('action') == 'itemedit' ) - { - $item['body'] = removeBreaks($item['body']); - $item['more'] = removeBreaks($item['more']); - } - } - - $contents = array(); - if ( requestVar('action') == 'itemedit' ) - { - $contents = $item; - } - elseif ( requestVar('action') == 'createitem' ) - { - $data = array( - 'contents' => &$contents, - 'blog' => &$this->blog - ); - $manager->notify('PreAddItemForm', $data); - } + $contents = Admin::$contents; $itemtime = getdate($contents['timestamp']); echo $itemtime[$key]; return; @@ -3407,62 +3393,74 @@ class AdminActions extends BaseActions */ public function parse_localeselectoptions() { - global $manager; + global $CONF, $member; $locales = i18n::get_available_locale_list(); - $memid = intRequestVar('memberid'); - if ( $memid ) + /* default option */ + if ( $this->skintype == 'editmembersettings' ) { - $mem =& $manager->getMember($memid); - if ( !$mem->getLocale() || !in_array($mem->getLocale(), $locales) ) - { - echo "\n"; - } - else - { - echo "\n"; - } + if ( !$member->getLocale() ) + { + echo "\n"; + } + else + { + echo "\n"; + } } else { - if ( !i18n::get_current_locale() || !in_array(i18n::get_current_locale(), $locales) ) - { - echo "\n"; - } - else - { - echo "\n"; - } + if ( $CONF['Locale'] == 'en_Latn_US' ) + { + echo "\n"; + } + else + { + echo "\n"; + } } + + /* optional options */ foreach ( $locales as $locale ) { - if ( $locale == 'en_Latn_US' ) + if ( $this->skintype == 'editmembersettings' ) { - continue; + if ( $locale != $member->getLocale() ) + { + echo "\n"; - } - else - { - echo "\n"; + /* already output */ + continue; } + else if ( $locale != $CONF['Locale'] ) + { + echo "\n"; - } - else - { - echo "\n"; - } + echo constant($label); } + echo "\n"; } return; } @@ -5131,31 +5129,13 @@ class AdminActions extends BaseActions { global $member, $nucleus, $CONF, $manager; - $extrahead = Admin::getAdminextrahead(); - $data = array( - 'extrahead' => &$extrahead, - 'action' => Admin::getAdminAction() - ); - $manager->notify('AdminPrePageHead', $data); + /* HTTP 1.1 application for no caching */ + header("Cache-Control: no-cache, must-revalidate"); + header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); $content = $this->parser->skin->getContentFromDB('pagehead'); if ( !$content ) { - $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()); @@ -5164,81 +5144,56 @@ class AdminActions extends BaseActions $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); - } - + $content = "\n" + . "\n" + . "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n" + . "\n" + . "<%sitevar(name)%> - Admin\n" + . "" + . "" + . "" + . "<%extrahead%>" + . "" + . "" + . "
" + . "
" + . "

<%sitevar(name)%>

" + . "
" + . "
" + . "
" + . "
" + . "\" />\n" + . "\n" + . "\n" + . "\n" + . "<%extrahead%>\n" + . "\n" + . "\n" + . "\n" + . "
\n" + . "
\n" + . "

<%sitevar(name)%>

\n" + . "
\n" + . "
\n" + . "
\n" + . "
\n" + . "<%if(loggedin)%>" + . "<%text(_LOGGEDINAS)%> <%member(yourrealname)%> - index.php?action=logout\"><%text(_LOGOUT)%>
" + . "index.php?action=overview\"><%text(_ADMINHOME)%> - " + . "<%else%>" + . "index.php?action=showlogin\" title=\"Log in\"><%text(_NOTLOGGEDIN)%>
" + . "<%endif%>" + . "\"><%text(_YOURSITE)%>
" + . "(" + . "<%if(superadmin)%>" + . "\" title=\"<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>\"><%version%><%codename%>" + . "<%newestcompare%><%else%><%version%><%codename%>" + . "<%endif%>" + . ")" + . "
"; + } + + $this->parser->parse($content); return; } @@ -5261,132 +5216,89 @@ class AdminActions extends BaseActions $content = $this->parser->skin->getContentFromDB('pagefoot'); if ( !$content ) { - 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'] = $blogid; - $template['shorten'] = 10; - $template['shortenel'] = ''; - $template['javascript'] = 'onchange="return form.submit()"'; - $this->parser->parse(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->parse($content); - exit; - } - + $content = "<%if(loggedin)%>" + . "<%ifnot(adminaction,showlogin)%>" + . "

<%text(_LOGOUT)%>

" + . "" + . "<%endif%>" + . "<%endif%>" + . "
" + . "\">Nucleus CMS © 2002- <%date(%Y)%> <%text(_ADMINPAGEFOOT_COPYRIGHT)%>" + . " - \"><%text(_ADMINPAGEFOOT_DONATE)%>" + . "
" + . "
" + . "" + . "
" + . "<%if(loggedin)%>" + . "<%ifnot(adminaction,showlogin)%>" + . "" + . "

<%text(_QMENU_ADD)%>

" + . "
index.php\">" + . "
" + . "" + . "<%qmenuaddselect(admin/default)%>" + . "
" + . "
" + . "

<%member(yourrealname)%>

" + . "" + . "<%if(superadmin)%>" + . "

<%text(_QMENU_MANAGE)%>

" + . "" + . "

<%text(_QMENU_LAYOUT)%>

" + . "" + . "

<%text(_SKINABLEADMIN_QMENU_LAYOUT)%>

" + . "" + . "<%endif%>" + . "<%quickmenu(admin/default)%>" + . "<%endif%>" + . "<%elseif(adminaction,activate)%>" + . "

<%text(_QMENU_ACTIVATE)%>

" + . "<%text(_QMENU_ACTIVATE_TEXT)%>" + . "<%elseif(adminaction,activatesetpwd)%>" + . "

<%text(_QMENU_ACTIVATE)%>

<%text(_QMENU_ACTIVATE_TEXT)%>" + . "<%else%>" + . "

<%text(_QMENU_INTRO)%>

<%text(_QMENU_INTRO_TEXT)%>" + . "<%endif%>" + . "
" + . "" + . "
" + . "" + . "
" + . "" + . "" + . "
" + . "" + . "

<%benchmark%>

" + . "" + . ""; + } + + $this->parser->parse($content); return; } /**