|
From: Tom S. <tom...@us...> - 2004-11-27 22:15:06
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304 Modified Files: index.php serendipity_admin.php serendipity_config.inc.php Removed Files: serendipity_entries.php Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- serendipity_config.inc.php 26 Nov 2004 14:40:12 -0000 1.103 +++ serendipity_config.inc.php 27 Nov 2004 22:14:12 -0000 1.104 @@ -15,7 +15,7 @@ include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php'); -$serendipity['version'] = '0.8-alpha3'; +$serendipity['version'] = '0.8-alpha4'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = true; // Setting this to 'false' will enable debugging output $serendipity['rewrite'] = 'none'; @@ -70,8 +70,6 @@ @define('PATH_DELETE', 'delete'); @define('PATH_APPROVE', 'approve'); @define('PATH_FEEDS', 'feeds'); -@define('PATH_ADMIN', 'admin'); -@define('PATH_ENTRIES', 'entries'); @define('PATH_CATEGORIES', 'categories'); @define('PATH_PLUGIN', 'plugin'); @define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory @@ -88,8 +86,7 @@ @define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i'); @define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@'); @define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@'); -@define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@'); -@define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@'); +@define('PAT_ADMIN', '@/(admin|author)(/.+)?@'); @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@'); @define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@'); @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@'); @@ -195,7 +192,7 @@ */ if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) { - die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], 'serendipity_admin.php')); + die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php')); } // We don't care who tells us what to do --- serendipity_entries.php DELETED --- Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- index.php 21 Nov 2004 16:28:54 -0000 1.59 +++ index.php 27 Nov 2004 22:14:12 -0000 1.60 @@ -176,9 +176,6 @@ } else if (preg_match(PAT_ADMIN, $uri)) { header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php"); exit; -} else if (preg_match(PAT_ENTRIES, $uri)) { - header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php"); - exit; } else if (preg_match(PAT_ARCHIVE, $uri)) { $serendipity['GET']['action'] = 'archives'; include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- serendipity_admin.php 26 Nov 2004 14:40:12 -0000 1.44 +++ serendipity_admin.php 27 Nov 2004 22:14:12 -0000 1.45 @@ -1,12 +1,13 @@ <?php # $Id$ session_start(); + define('IN_installer', true); define('IN_upgrader', true); include('serendipity_config.inc.php'); header('Content-Type: text/html; charset=' . LANG_CHARSET); -if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout'){ +if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout') { serendipity_logout(); } else { if (IS_installed === true) { @@ -14,36 +15,37 @@ } } +// If we are inside an iframe, halt the script if (serendipity_is_iframe()) { - return true; // break out of current document + return true; } + ?> <html> <head> <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" /> - <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" /> -<?php -if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') { -?> - <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" /> -<?php -} -?> + <link rel="stylesheet" type="text/css" href="<?php echo serendipity_getTemplateFile('admin/style.css') ?>" /> </head> + <body id="serendipity_admin_page" onLoad="if (self.Spawnnugget) { Spawnnugget(); }"> + <div id="serendipityAdminFrame"> + <div id="serendipityAdminBanner"> + <?php if ( IS_installed === true && IS_up2date === true ) { ?> + <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1> + <h2><?php echo $serendipity['blogTitle'] ?></h2> + <?php } elseif ( IS_installed === false || IS_up2date === false ) { ?> + <h1><?php echo SERENDIPITY_INSTALLATION ?></h1> + <?php } ?> + </div> -<body class="s9y_wrap" id="serendipity_admin_page" onLoad="if (self.Spawnnugget) { Spawnnugget(); }"> - <div id="serendipity_banner"> -<?php if ( IS_installed === true && IS_up2date === true ) { ?> - <h1><?php echo (isset($serendipity['blogTitle']) ? $serendipity['blogTitle'] : ''); ?></h1> - <h2><?php echo SERENDIPITY_ADMIN_SUITE . ((serendipity_userLoggedIn()) ? ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')' : ''); ?></h2> -<?php } elseif ( IS_installed === false || IS_up2date === false ) { ?> - <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1> - <h2><?php echo SERENDIPITY_INSTALLATION ?></h2> -<?php } ?> - </div> - <table id="mainpane"> - <tr valign="top"> + <div id="serendipityAdminInfopane"> + <?php if (serendipity_userLoggedIn()) { ?> + <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?> + <?php } ?> + </div> + + <table id="serendipityAdminMainpane" width="100%" cellspacing="0" cellpadding="0"> + <tr valign="top"> <?php if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) { if (IS_installed === false) { @@ -51,54 +53,124 @@ } elseif ( IS_up2date === false ) { $file = 'include/admin/upgrader.inc.php'; } else { - $file = ''; // For register_global users don't let us be tricked to include a different file somehow + $file = ''; // For register_global, safety } +?> + <td> + <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?> +<?php +} elseif ( serendipity_userLoggedIn() == false ) { ?> - <td class="serendipity_admin"> - <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div> - <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?> + <td id="content"> + <div class="serendipityAdminContent"> + <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div> + <br /> <?php -} elseif ( !serendipity_userLoggedIn() ) { - serendipity_printLogin(); + if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { +?> + <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> +<?php + } +?> + <form action="?" method="post"> + <input type="hidden" name="serendipity[action]" value="admin" /> + <table cellspacing="10" cellpadding="0" border="0" align="center"> + <tr> + <td><?php echo USERNAME ?></td> + <td><input type="text" name="serendipity[user]" /></td> + </tr> + <tr> + <td><?php echo PASSWORD ?></td> + <td><input type="password" name="serendipity[pass]" /></td> + </tr> + <tr> + <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?> + </tr> + <tr> + <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" /></td> + </tr> + </table> + </form> + <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a> +<?php + + + } else { ?> - <td id="serendipityLeftSideBar"> + <td id="serendipitySideBar"> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> + </div> + </div> + + + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> + </div> + </div> + + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo CATEGORIES; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=editSelect"><?php echo EDIT_CATEGORIES; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_categories', $serendipity); ?> + </div> + </div> + + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo MEDIA; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a><br /> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div> - <div class="serendipitySideBarContent"> - • <a href="?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a><br /> - • <a href="?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a><br /> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> + • <a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a><br /> +<?php } ?> + • <a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?> + </div> + </div> + +<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> + </div> </div> - </div> <?php } ?> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div> - <div class="serendipitySideBarContent"> - • <a href="?serendipity[adminModule]=installer"><?php echo CONFIGURATION; ?></a><br /> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a><br /> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - • <a href="?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br /> <?php } ?> - • <a href="?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a><br /> - • <a href="?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a><br /> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> - </div> - </div> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarContent"> - • <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES; ?>"><?php echo AUTHOR_SUITE; ?></a><br /> - • <a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> - • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> + </div> </div> - </div> - </td> - <td id="content"> - <div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div> - <div class="serendipity_admin"> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + • <a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> + </div> + </div> + </td> + <td id="content"> + <div class="serendipityAdminContent"> <?php if (!isset($serendipity['GET']['adminModule'])) { $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : ''); @@ -106,9 +178,11 @@ switch($serendipity['GET']['adminModule']) { case 'installer': + case 'configuration': include S9Y_INCLUDE_PATH . 'include/admin/installer.inc.php'; break; + case 'media': case 'images': include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php'; break; @@ -133,21 +207,45 @@ include S9Y_INCLUDE_PATH . 'include/admin/import.inc.php'; break; + case 'entries': + include S9Y_INCLUDE_PATH . 'include/admin/entries.inc.php'; + break; + + case 'comments': + include S9Y_INCLUDE_PATH . 'include/admin/comments.inc.php'; + break; + + case 'category': + case 'categories': + include S9Y_INCLUDE_PATH . 'include/admin/category.inc.php'; + break; + + case 'logout': + echo LOGGEDOUT; + break; + + case 'event_display': + serendipity_plugin_api::hook_event('backend_sidebar_entries_event_display_' . $serendipity['GET']['adminAction'], $serendipity); + break; + case 'logout': echo LOGGEDOUT; break; default: include S9Y_INCLUDE_PATH . 'include/admin/overview.inc.php'; + break; } } ?> - </div> - </td> - </tr> - </table> - -</body> + </div> + </td> + </tr> + </table> + <br /> + <div id="serendipityAdminFooter"><?php echo sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion()); ?></div> + </div> + </body> </html> <?php /* vim: set sts=4 ts=4 expandtab : */ |
