Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23806 Modified Files: Tag: branch-smarty index.php rss.php serendipity_admin.php serendipity_admin_image_selector.php serendipity_config.inc.php serendipity_entries.php Removed Files: Tag: branch-smarty INSTALL LICENSE NEWS README TODO compat.php htaccess.cgi.errordocs.tpl htaccess.cgi.normal.tpl htaccess.cgi.rewrite.tpl htaccess.errordocs.tpl htaccess.normal.tpl htaccess.rewrite.tpl serendipity.inc.php serendipity_admin_category.inc.php serendipity_admin_comments.inc.php serendipity_admin_entries.inc.php serendipity_admin_images.inc.php serendipity_admin_installer.inc.php serendipity_admin_interop.inc.php serendipity_admin_overview.inc.php serendipity_admin_plugins.inc.php serendipity_admin_templates.inc.php serendipity_admin_upgrader.inc.php serendipity_admin_users.inc.php serendipity_config_local.tpl serendipity_config_user.tpl serendipity_db.inc.php serendipity_db_mysql.inc.php serendipity_db_mysqli.inc.php serendipity_db_postgres.inc.php serendipity_db_sqlite.inc.php serendipity_entries_overview.inc.php serendipity_functions.inc.php serendipity_functions_config.inc.php serendipity_functions_images.inc.php serendipity_functions_installer.inc.php serendipity_genpage.inc.php serendipity_lang.inc.php serendipity_layout.inc.php serendipity_layout_table.inc.php serendipity_plugin_api.php serendipity_rss_exchange.inc.php serendipity_sidebar_items.php upgrade.sh Log Message: * renamed files as announced on the list. upgrader will take care of moving old files to a 'backup' directory for upgrading (non-CVS) users. * MFH'ed some parts * Fixed quicksave button display * Fixed footer * Fixed entry preview properly * Fixed printing categories where no categories appeard in entry view --- serendipity_admin_installer.inc.php DELETED --- --- serendipity_lang.inc.php DELETED --- --- serendipity_genpage.inc.php DELETED --- --- htaccess.normal.tpl DELETED --- --- serendipity_admin_plugins.inc.php DELETED --- --- serendipity_layout_table.inc.php DELETED --- --- htaccess.cgi.rewrite.tpl DELETED --- Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.16 retrieving revision 1.93.2.17 diff -u -d -r1.93.2.16 -r1.93.2.17 --- serendipity_config.inc.php 16 Oct 2004 17:27:12 -0000 1.93.2.16 +++ serendipity_config.inc.php 6 Nov 2004 11:22:46 -0000 1.93.2.17 @@ -4,8 +4,8 @@ if (!defined('S9Y_INCLUDE_PATH')) { define('S9Y_INCLUDE_PATH', dirname(__FILE__) . '/'); } -define('S9Y_CONFIG_TEMPLATE', S9Y_INCLUDE_PATH . 'serendipity_config_local.tpl'); -define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'serendipity_config_user.tpl'); +define('S9Y_CONFIG_TEMPLATE', S9Y_INCLUDE_PATH . 'include/tpl/config_local.tpl'); +define('S9Y_CONFIG_USERTEMPLATE', S9Y_INCLUDE_PATH . 'include/tpl/config_user.tpl'); define('IS_installed', file_exists('serendipity_config_local.inc.php')); @@ -13,9 +13,9 @@ define('IN_serendipity', true); } -include_once(S9Y_INCLUDE_PATH . 'compat.php'); +include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php'); -$serendipity['version'] = '0.8-alpha2'; +$serendipity['version'] = '0.8-alpha3'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = 1; $serendipity['rewrite'] = 'none'; @@ -51,7 +51,7 @@ /* * Load main language file */ -include($serendipity['serendipityPath'] . 'serendipity_lang.inc.php'); +include($serendipity['serendipityPath'] . 'include/lang.inc.php'); /* URI paths * These could be defined in the language headers, except that would break @@ -126,10 +126,10 @@ /* * Include main functions */ -include_once(S9Y_INCLUDE_PATH . 'serendipity_functions.inc.php'); +include_once(S9Y_INCLUDE_PATH . 'include/functions.inc.php'); if (serendipity_FUNCTIONS_LOADED!== true) { - die(sprintf(INCLUDE_ERROR, 'serendipity_functions.inc.php')); + die(sprintf(INCLUDE_ERROR, 'include/functions.inc.php')); } /* @@ -158,7 +158,7 @@ * Load main language file again, because now we have the preferred language */ -include(S9Y_INCLUDE_PATH .'serendipity_lang.inc.php'); +include(S9Y_INCLUDE_PATH . 'include/lang.inc.php'); /* * Set current locale, if any has been defined --- INSTALL DELETED --- --- NEWS DELETED --- --- serendipity_db.inc.php DELETED --- --- serendipity_admin_category.inc.php DELETED --- Index: serendipity_admin_image_selector.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -d -r1.32.2.1 -r1.32.2.2 --- serendipity_admin_image_selector.php 4 Nov 2004 11:56:43 -0000 1.32.2.1 +++ serendipity_admin_image_selector.php 6 Nov 2004 11:22:46 -0000 1.32.2.2 @@ -52,11 +52,11 @@ 'htmltarget' => (!empty($serendipity['GET']['htmltarget']) ? $serendipity['GET']['htmltarget'] : ''), 'filename_only' => (!empty($serendipity['GET']['filename_only']) ? $serendipity['GET']['filename_only'] : '') ); - include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php'; break 2; case 'add': - include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php'; if (isset($created_thumbnail) && is_array($created_thumbnail) && isset($created_thumbnail['image_id'])) { $serendipity['GET']['image'] = (int)$created_thumbnail['image_id']; --- serendipity_admin_templates.inc.php DELETED --- --- LICENSE DELETED --- --- htaccess.rewrite.tpl DELETED --- --- serendipity_functions.inc.php DELETED --- --- serendipity_db_mysql.inc.php DELETED --- --- serendipity_admin_users.inc.php DELETED --- --- serendipity_rss_exchange.inc.php DELETED --- --- htaccess.errordocs.tpl DELETED --- Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.41.2.2 retrieving revision 1.41.2.3 diff -u -d -r1.41.2.2 -r1.41.2.3 --- serendipity_admin.php 27 Oct 2004 14:15:16 -0000 1.41.2.2 +++ serendipity_admin.php 6 Nov 2004 11:22:45 -0000 1.41.2.3 @@ -43,9 +43,9 @@ <?php if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) { if (IS_installed === false) { - $file = 'serendipity_admin_installer.inc.php'; + $file = 'include/admin/installer.inc.php'; } elseif ( IS_up2date === false ) { - $file = 'serendipity_admin_upgrader.inc.php'; + $file = 'include/admin/upgrader.inc.php'; } else { $file = ''; // For register_global users don't let us be tricked to include a different file somehow } @@ -101,27 +101,27 @@ switch($serendipity['GET']['adminModule']) { case 'installer': - include S9Y_INCLUDE_PATH . 'serendipity_admin_installer.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/installer.inc.php'; break; case 'images': - include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php'; break; case 'templates': - include S9Y_INCLUDE_PATH . 'serendipity_admin_templates.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/templates.inc.php'; break; case 'plugins': - include S9Y_INCLUDE_PATH . 'serendipity_admin_plugins.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/plugins.inc.php'; break; case 'users': - include S9Y_INCLUDE_PATH . 'serendipity_admin_users.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/users.inc.php'; break; case 'interop': - include S9Y_INCLUDE_PATH . 'serendipity_admin_interop.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/interop.inc.php'; break; case 'logout': @@ -129,7 +129,7 @@ break; default: - include S9Y_INCLUDE_PATH . 'serendipity_admin_overview.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/overview.inc.php'; } } ?> --- serendipity_functions_images.inc.php DELETED --- --- compat.php DELETED --- --- README DELETED --- --- serendipity_functions_installer.inc.php DELETED --- --- upgrade.sh DELETED --- --- serendipity_admin_interop.inc.php DELETED --- --- TODO DELETED --- Index: rss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/rss.php,v retrieving revision 1.28.2.4 retrieving revision 1.28.2.5 diff -u -d -r1.28.2.4 -r1.28.2.5 --- rss.php 17 Oct 2004 20:26:51 -0000 1.28.2.4 +++ rss.php 6 Nov 2004 11:22:45 -0000 1.28.2.5 @@ -81,7 +81,7 @@ $description = serendipity_utf8_encode(htmlspecialchars($description)); $fullFeed = false; -include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php'); +include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php'); $plugins = serendipity_plugin_api::enum_plugins(); if (is_array($plugins)) { --- serendipity_config_local.tpl DELETED --- --- serendipity_config_user.tpl DELETED --- --- serendipity_db_sqlite.inc.php DELETED --- --- htaccess.cgi.errordocs.tpl DELETED --- --- serendipity_admin_overview.inc.php DELETED --- --- serendipity_entries_overview.inc.php DELETED --- --- serendipity_plugin_api.php DELETED --- --- htaccess.cgi.normal.tpl DELETED --- --- serendipity_db_postgres.inc.php DELETED --- --- serendipity.inc.php DELETED --- --- serendipity_admin_comments.inc.php DELETED --- Index: serendipity_entries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v retrieving revision 1.40.2.1 retrieving revision 1.40.2.2 diff -u -d -r1.40.2.1 -r1.40.2.2 --- serendipity_entries.php 28 Sep 2004 10:04:30 -0000 1.40.2.1 +++ serendipity_entries.php 6 Nov 2004 11:22:46 -0000 1.40.2.2 @@ -98,19 +98,19 @@ switch($serendipity['GET']['adminModule']) { case 'entries': - include S9Y_INCLUDE_PATH . 'serendipity_admin_entries.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/entries.inc.php'; break; case 'images': - include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php'; break; case 'comments': - include S9Y_INCLUDE_PATH . 'serendipity_admin_comments.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/comments.inc.php'; break; case 'category': - include S9Y_INCLUDE_PATH . 'serendipity_admin_category.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/category.inc.php'; break; case 'logout': @@ -122,7 +122,7 @@ break; default: - include S9Y_INCLUDE_PATH . 'serendipity_entries_overview.inc.php'; + include S9Y_INCLUDE_PATH . 'include/admin/overview.inc.php'; } ?> </div> --- serendipity_admin_entries.inc.php DELETED --- --- serendipity_admin_images.inc.php DELETED --- --- serendipity_sidebar_items.php DELETED --- Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.49.2.9 retrieving revision 1.49.2.10 diff -u -d -r1.49.2.9 -r1.49.2.10 --- index.php 4 Nov 2004 14:40:48 -0000 1.49.2.9 +++ index.php 6 Nov 2004 11:22:45 -0000 1.49.2.10 @@ -100,7 +100,7 @@ $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date)); ob_start(); - include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); $data = ob_get_contents(); ob_end_clean(); @@ -150,7 +150,7 @@ $serendipity['smarty']->assign(array('head_title' => $title, 'head_subtitle' => $serendipity['blogTitle'])); ob_start(); - include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); $data = ob_get_contents(); ob_end_clean(); @@ -185,7 +185,7 @@ exit; } else if (preg_match(PAT_ARCHIVE, $uri)) { $serendipity['GET']['action'] = 'archives'; - include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); } else if (preg_match(PAT_PLUGIN, $uri, $matches)) { serendipity_plugin_api::hook_event('external_plugin', $matches[1]); exit; @@ -199,7 +199,7 @@ } ob_start(); - include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); $data = ob_get_contents(); ob_end_clean(); if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) { @@ -217,7 +217,7 @@ $serendipity['GET']['action'] = 'read'; $serendipity['GET']['range'] = $serendipity['GET']['calendarZoom']; } - include_once(S9Y_INCLUDE_PATH . 'serendipity_genpage.inc.php'); + include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); } } else { printf(DOCUMENT_NOT_FOUND, $uri); --- serendipity_admin_upgrader.inc.php DELETED --- --- serendipity_functions_config.inc.php DELETED --- --- serendipity_db_mysqli.inc.php DELETED --- --- serendipity_layout.inc.php DELETED --- |
