You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
| 2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
| 2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
| 2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
| 2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
| 2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
| 2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
| 2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
| 2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
| 2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
| 2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
| 2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
| 2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
| 2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
| 2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
| 2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
| 2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
| 2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(72) |
Feb
(80) |
Mar
(92) |
Apr
(35) |
May
(19) |
Jun
(26) |
Jul
(30) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Garvin H. <gar...@us...> - 2004-11-11 12:45:37
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27945/include Modified Files: Tag: branch-smarty functions_smarty.inc.php functions_entries.inc.php Log Message: * Added entries_header hook for smarty showing headers * Finetuned smarty plugin hook function * Fixed entryproperties embeddage of search/fetchEntry .CVS: ---------------------------------------------------------------------- Index: functions_smarty.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_smarty.inc.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- functions_smarty.inc.php 8 Nov 2004 12:20:03 -0000 1.1.2.2 +++ functions_smarty.inc.php 11 Nov 2004 12:45:21 -0000 1.1.2.3 @@ -16,26 +16,28 @@ function serendipity_smarty_hookPlugin($params, &$smarty) { global $serendipity; static $hookable = array('frontend_header', + 'entries_header', 'entries_footer', 'frontend_comment'); - if ( !isset($params['hook']) ) { + if (!isset($params['hook'])) { $smarty->trigger_error(__FUNCTION__ .": missing 'hook' parameter"); return; } - if ( !in_array($params['hook'], $hookable) ) { + if (!in_array($params['hook'], $hookable)) { $smarty->trigger_error(__FUNCTION__ .": illegal hook '". $params['hook'] ."'"); return; } - if ( !isset($params['data']) ) { + if (!isset($params['data'])) { $params['data'] = &$serendipity; } - if ( !isset($params['adddata']) ) { - $params['add'] = null; + + if (!isset($params['addData'])) { + $params['addData'] = null; } - serendipity_plugin_api::hook_event($params['hook'], $params['data'], $params['add']); + serendipity_plugin_api::hook_event($params['hook'], $params['data'], $params['addData']); } Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- functions_entries.inc.php 9 Nov 2004 19:11:30 -0000 1.1.2.3 +++ functions_entries.inc.php 11 Nov 2004 12:45:21 -0000 1.1.2.4 @@ -293,17 +293,16 @@ global $serendipity; $cond = array(); - $cond['drafts'] = ''; + $cond['and'] = ''; if ($fetchDrafts == 'false') { - $cond['drafts'] = " AND e.isdraft = 'false' AND e.timestamp <= " . time(); + $cond['and'] = " AND e.isdraft = 'false' AND e.timestamp <= " . time(); } - $cond['admin'] = ''; if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) { - $cond['admin'] = " AND e.authorid = '" . $serendipity['authorid'] . "'"; + $cond['and'] = " AND e.authorid = '" . $serendipity['authorid'] . "'"; } - serendipity_plugin_api::hook_event('frontend_fetchentry', $cond); + serendipity_plugin_api::hook_event('frontend_fetchentry', $cond, array('noSticky' => true)); $querystring = "SELECT *, @@ -313,13 +312,10 @@ {$serendipity['dbPrefix']}entries e LEFT JOIN {$serendipity['dbPrefix']}authors a ON e.authorid = a.authorid - LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep - ON e.id = ep.entryid - + {$cond['joins']} WHERE e.$key LIKE '" . serendipity_db_escape_string($val) . "' - {$cond['admin']} - {$cond['drafts']} + {$cond['and']} LIMIT 1"; $ret = serendipity_db_query($querystring, true); @@ -419,6 +415,7 @@ } $cond = array(); + $cond['and'] = " AND isdraft = 'false' AND timestamp <= " . time(); serendipity_plugin_api::hook_event('frontend_fetchentries', $cond); $querystring = "SELECT $distinct e.id, @@ -439,12 +436,9 @@ ON e.authorid = a.authorid LEFT JOIN {$serendipity['dbPrefix']}entrycat ec ON e.id = ec.entryid - LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep - ON e.id = ep.entryid + {$cond['joins']} WHERE $find_part - AND isdraft = 'false' - AND timestamp <= " . time() . " {$cond['and']} $group ORDER BY timestamp DESC"; |
|
From: Garvin H. <gar...@us...> - 2004-11-11 11:16:04
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8900/include Modified Files: Tag: branch-smarty functions.inc.php functions_installer.inc.php Log Message: move the function to right place for being able to install s9y Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_installer.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- functions_installer.inc.php 6 Nov 2004 11:22:49 -0000 1.1.2.1 +++ functions_installer.inc.php 11 Nov 2004 11:15:55 -0000 1.1.2.2 @@ -819,4 +819,9 @@ } } } -?> + +function serendipity_getRealDir($file) { + return preg_replace('@/include$@', '', dirname($file)) . '/'; +} + +?> \ No newline at end of file Index: functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- functions.inc.php 6 Nov 2004 11:22:49 -0000 1.1.2.1 +++ functions.inc.php 11 Nov 2004 11:15:55 -0000 1.1.2.2 @@ -692,10 +692,6 @@ <?php } -function serendipity_getRealDir($file) { - return preg_replace('@/include$@', '', dirname($file)) . '/'; -} - define("serendipity_FUNCTIONS_LOADED", true); /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Garvin H. <gar...@us...> - 2004-11-09 19:12:10
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7803/include Modified Files: Tag: branch-smarty functions_entries.inc.php Log Message: don't show extended entry if called manually on frontend Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- functions_entries.inc.php 8 Nov 2004 09:25:31 -0000 1.1.2.2 +++ functions_entries.inc.php 9 Nov 2004 19:11:30 -0000 1.1.2.3 @@ -295,7 +295,7 @@ $cond = array(); $cond['drafts'] = ''; if ($fetchDrafts == 'false') { - $cond['drafts'] = " AND isdraft = 'false'"; + $cond['drafts'] = " AND e.isdraft = 'false' AND e.timestamp <= " . time(); } $cond['admin'] = ''; |
|
From: Garvin H. <gar...@us...> - 2004-11-09 19:11:52
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7803/docs Modified Files: Tag: branch-smarty NEWS Log Message: don't show extended entry if called manually on frontend Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- NEWS 8 Nov 2004 09:25:30 -0000 1.1.2.3 +++ NEWS 9 Nov 2004 19:11:30 -0000 1.1.2.4 @@ -3,6 +3,9 @@ Version 0.8 () ------------------------------------------------------------------------ + * Do not allow to view extended article when item is set to "publish" + but timestamp is in the future (garvinhicking) + * RSS Export orders entries in reverse ID order for easier importing (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-11-09 19:11:09
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7525 Modified Files: Tag: branch-0-7 serendipity_functions.inc.php Log Message: don't show extended entry if called manually on frontend Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.454 retrieving revision 1.454.2.1 diff -u -d -r1.454 -r1.454.2.1 --- serendipity_functions.inc.php 4 Nov 2004 09:32:16 -0000 1.454 +++ serendipity_functions.inc.php 9 Nov 2004 19:10:56 -0000 1.454.2.1 @@ -824,7 +824,7 @@ $drafts = ''; if ($fetchDrafts == 'false') { - $drafts = "AND isdraft = 'false'"; + $drafts = "AND isdraft = 'false' AND timestamp <= " . time(); } $admin = ''; |
|
From: Garvin H. <gar...@us...> - 2004-11-08 12:20:14
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24601/include Modified Files: Tag: branch-smarty functions_smarty.inc.php Log Message: shutdown function for applications like Gallery Index: functions_smarty.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_smarty.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- functions_smarty.inc.php 6 Nov 2004 11:22:49 -0000 1.1.2.1 +++ functions_smarty.inc.php 8 Nov 2004 12:20:03 -0000 1.1.2.2 @@ -130,4 +130,22 @@ ); return true; -} \ No newline at end of file +} + +/* Function can be called from foreign applications. ob_start() needs to + have been called before, and will be parsed into Smarty here */ +function serendipity_smarty_shutdown($serendipity_directory = '') { +global $serendipity; + + $cwd = getcwd(); + chdir($serendipity_directory); + $raw_data = ob_get_contents(); + ob_end_clean(); + $serendipity['smarty']->assign('content_message', $raw_data); + + serendipity_smarty_fetch('CONTENT', 'content.tpl'); + if (empty($serendipity['smarty_file'])) { + $serendipity['smarty_file'] = '404.tpl'; + } + $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); +} |
|
From: Tom S. <tom...@us...> - 2004-11-08 10:44:17
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4223 Modified Files: NEWS Log Message: - Spellcheck and correct NEWS file before release Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.254 retrieving revision 1.255 diff -u -d -r1.254 -r1.255 --- NEWS 8 Nov 2004 10:13:02 -0000 1.254 +++ NEWS 8 Nov 2004 10:44:07 -0000 1.255 @@ -3,8 +3,8 @@ Version 0.7 (November 8th, 2004) ------------------------------------------------------------------------ - * Fixed Concatenation syntax on PostgreSQL, only used by plugin - "Entrylinks". (garvinhicking) + * Fixed concatenation syntax when using PostgreSQL, only used by + the "Entrylinks" plugin. (garvinhicking) * SQLite database name was not saved properly and could get set to a wrong value when updating configuration (garvinhicking) @@ -13,7 +13,7 @@ (garvinhicking) * Fixed PostgreSQL index key names (names are now unique, and - combined indizes on the entries text-columns are no longer set) + combined indexes on the entries text-columns are no longer set) (jtate, garvinhicking) * Fixed bug with MySQL 3.x where the category was not properly set @@ -24,8 +24,8 @@ * Fixed some counting problems in statistics plugin (garvinhicking) - * Fixed comment counter for deleting non-approved comments - (tomsommer, griffinn) + * Fixed comment counter problem when deleting comments pending + approval (tomsommer, griffinn) Version 0.7-rc1 (October 20th, 2004) ------------------------------------------------------------------------ @@ -119,20 +119,18 @@ * Fixed warning message from emoticon plugin when emoticons.inc.php does not exist (garvinhicking) - * Fixed entries pagination for special cases where quickump calendar + * Fixed entries pagination for special cases where the calendar was displayed on the left sidebar (garvinhicking) Version 0.7-beta2 (September 15th, 2004) ------------------------------------------------------------------------ - * Fixed entries pagination for special cases where quickump calendar - was displayed on the left sidebar (garvinhicking) - * Added Italian translations, thanks to Alessandro Pellizzari * Fixed missing CSS-class for BBCode Event-Plugin (Jez Hancock) * Fixed possible SQL injections. Thanks to aCiDBiTS! + (tomsommer, garvinhicking) * Fixed postgreSQL quicksearch, thanks to Mauri Sahlberg! @@ -164,7 +162,7 @@ * Plugin serendipity_event_spamblock: Will reject any double comments, if enabled. Stub for enhancing other spam-protections - (kaptchas, spamassassin-integration, IP-Blacklists, whatever) + (captchas, spamassassin-integration, IP-Blacklists, whatever) (garvinhicking) * When using mod_rewrite, make use of RewriteBase for correct @@ -212,7 +210,7 @@ a specific database-type are not available within PHP (garvinhicking) - * Added bulgariang language, thanks to Bogomil Shopov + * Added Bulgarian language, thanks to Bogomil Shopov * Fix calendar bug to not show entries available for the 1st day of a month if on the first day on the next month an entry was @@ -437,7 +435,7 @@ * Fixed javascript error when submitting comments with "remember me" checkbox. (garvinhicking) - * XML-RPC methods updated to includer blogger.getRecentPosts and + * XML-RPC methods updated to include blogger.getRecentPosts and blogger.getPost (Till Adam) * Upgraded karma-plugin to allow logging (IP/User-Agent) of votes @@ -496,7 +494,7 @@ $eventData['clean_page'] variable to 'true'. (Jonathan Arkell) * Don't show "expand"/"toggle all" buttons if there is only one section - availiable (tomsommer) + available (tomsommer) * Redesigned admin interface for editing entries: Adjust items per page, sort order, filter mode, combined EDIT+DELETE interface into @@ -539,7 +537,7 @@ (Evan Nemerson, garvinhicking) [DB Layout change -> 0.6.2] * Published entries from the future will only be displayed on the - frontend when not in the future. They will get automagically + frontend when not in the future. They will get automatically displayed as soon as the publish time is effectively reached. #RFE 939867 (garvinhicking) @@ -560,7 +558,7 @@ * Improvements for multi-user interface: - Configuration is stored per-user (language, WYSIWYG-preference, and possibly others) - - passwords/usernames/E-Mail adresses can be changed + - passwords/usernames/E-Mail addresses can be changed - introduction of userlevels (admin, chief, editor) - public/private categories - plugins are stored per-user. Admin-created plugins cannot be @@ -573,7 +571,7 @@ - public/private images (garvinhicking) [DB Layout change -> 0.6.1] - * Configuration is now language-dependant. (garvinhicking) + * Configuration is now language-dependent. (garvinhicking) Version 0.6-pl3 (June 20th, 2004) ------------------------------------------------------------------------ |
|
From: Garvin H. <gar...@us...> - 2004-11-08 10:13:12
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29907 Modified Files: NEWS Log Message: final commit for 0.7? :) Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.253 retrieving revision 1.254 diff -u -d -r1.253 -r1.254 --- NEWS 8 Nov 2004 08:55:08 -0000 1.253 +++ NEWS 8 Nov 2004 10:13:02 -0000 1.254 @@ -1,6 +1,6 @@ # $Id$ -Version 0.7 () +Version 0.7 (November 8th, 2004) ------------------------------------------------------------------------ * Fixed Concatenation syntax on PostgreSQL, only used by plugin |
|
From: Garvin H. <gar...@us...> - 2004-11-08 09:25:47
|
Update of /cvsroot/php-blog/serendipity/include/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878/include/db Modified Files: Tag: branch-smarty postgres.inc.php Log Message: * RSS feed should not display sticky posts as sticky * RSS Export uses reverse chronological order for easier import * Fixed PostgreSQL concatenation issue * Fixed entry visibility (private/hidden/member) attribute to work as intended * Remove obsolete "force nocache" directive for RSS feed. Index: postgres.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/Attic/postgres.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- postgres.inc.php 6 Nov 2004 11:22:50 -0000 1.1.2.1 +++ postgres.inc.php 8 Nov 2004 09:25:32 -0000 1.1.2.2 @@ -157,7 +157,7 @@ } function serendipity_db_concat($string) { - return 'concat_text(' . $string . ')'; + return '(' . str_replace(', ', '||', $string) . ')'; } /* vim: set sts=4 ts=4 expandtab : */ |
|
From: Garvin H. <gar...@us...> - 2004-11-08 09:25:47
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878/plugins/serendipity_event_entryproperties Modified Files: Tag: branch-smarty serendipity_event_entryproperties.php Log Message: * RSS feed should not display sticky posts as sticky * RSS Export uses reverse chronological order for easier import * Fixed PostgreSQL concatenation issue * Fixed entry visibility (private/hidden/member) attribute to work as intended * Remove obsolete "force nocache" directive for RSS feed. Index: serendipity_event_entryproperties.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/Attic/serendipity_event_entryproperties.php,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -d -r1.1.2.6 -r1.1.2.7 --- serendipity_event_entryproperties.php 29 Oct 2004 11:02:35 -0000 1.1.2.6 +++ serendipity_event_entryproperties.php 8 Nov 2004 09:25:32 -0000 1.1.2.7 @@ -241,6 +241,8 @@ $conds = array(); if ($_SESSION['serendipityAuthedUser'] === true) { $conds[] = " (ISNULL(ep_access.property) OR ep_access.value = 'member' OR ep_access.value = 'public' OR (ep_access.value = 'private' AND e.authorid = " . (int)$serendipity['authorid'] . ")) "; + } else { + $conds[] = " (ISNULL(ep_access.property) OR ep_access.value = 'public') "; } if (count($conds) > 0) { @@ -253,12 +255,19 @@ } $conds = array(); - $conds[] = 'ep_sticky.value IS NULL AS orderkey,'; + if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) { + $conds[] = 'ep_sticky.value IS NULL AS orderkey,'; + } + if ($iscache && (!isset($addData['noCache']) || !$addData['noCache'])) { $conds[] = 'ep_cache_extended,'; $conds[] = 'ep_cache_body,'; } + if (count($conds) < 1) { + $conds[] = '1 AS orderkey,'; + } + $cond = implode("\n", $conds); if (empty($eventData['addkey'])) { $eventData['addkey'] = $cond; @@ -282,8 +291,12 @@ } $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_access ON (e.id = ep_access.entryid AND ep_access.property = 'ep_access')"; - $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky - ON (e.id = ep_sticky.entryid AND ep_sticky.property = 'ep_is_sticky')"; + + if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) { + $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky + ON (e.id = ep_sticky.entryid AND ep_sticky.property = 'ep_is_sticky')"; + } + $cond = implode("\n", $joins); if (empty($eventData['joins'])) { $eventData['joins'] = $cond; |
|
From: Garvin H. <gar...@us...> - 2004-11-08 09:25:46
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878/include Modified Files: Tag: branch-smarty functions_entries.inc.php plugin_internal.inc.php Log Message: * RSS feed should not display sticky posts as sticky * RSS Export uses reverse chronological order for easier import * Fixed PostgreSQL concatenation issue * Fixed entry visibility (private/hidden/member) attribute to work as intended * Remove obsolete "force nocache" directive for RSS feed. Index: plugin_internal.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/plugin_internal.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- plugin_internal.inc.php 6 Nov 2004 11:22:49 -0000 1.1.2.1 +++ plugin_internal.inc.php 8 Nov 2004 09:25:31 -0000 1.1.2.2 @@ -441,8 +441,6 @@ 'show_atom0.3', 'show_opml1.0', 'seperator', - 'prevent_cache', - 'seperator', 'field_managingEditor', 'field_webMaster', 'field_ttl', @@ -511,13 +509,6 @@ $propbag->add('type', 'seperator'); break; - case 'prevent_cache': - $propbag->add('type', 'boolean'); - $propbag->add('name', SYNDICATION_PLUGIN_PREVENT_CACHE); - $propbag->add('description', SYNDICATION_PLUGIN_PREVENT_CACHE_DESC); - $propbag->add('default', 'false'); - break; - case 'field_managingEditor': $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_MANAGINGEDITOR); @@ -579,12 +570,6 @@ $title = SYNDICATE_THIS_BLOG; - if ($this->get_config('prevent_cache') == 'true') { - $cache = '&nocache=true'; - } else { - $cache = ''; - } - if (serendipity_db_bool($this->get_config('show_0.91', true))) { ?> <div style="padding-bottom: 2px;"> Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- functions_entries.inc.php 6 Nov 2004 11:22:49 -0000 1.1.2.1 +++ functions_entries.inc.php 8 Nov 2004 09:25:31 -0000 1.1.2.2 @@ -73,7 +73,7 @@ * (For february 2002 you would pass 200202 for all entries withing * two timestamps you would pass array(timestamp1,timestamp2) **/ -function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false) { +function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false, $noSticky = false) { global $serendipity; $cond = array(); @@ -191,7 +191,7 @@ } } - serendipity_plugin_api::hook_event('frontend_fetchentries', $cond, array('noCache' => $noCache)); + serendipity_plugin_api::hook_event('frontend_fetchentries', $cond, array('noCache' => $noCache, 'noSticky' => $noSticky)); if (strtolower($serendipity['dbType']) == 'postgres') { $group = ''; |
|
From: Garvin H. <gar...@us...> - 2004-11-08 09:25:41
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878 Modified Files: Tag: branch-smarty rss.php Log Message: * RSS feed should not display sticky posts as sticky * RSS Export uses reverse chronological order for easier import * Fixed PostgreSQL concatenation issue * Fixed entry visibility (private/hidden/member) attribute to work as intended * Remove obsolete "force nocache" directive for RSS feed. Index: rss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/rss.php,v retrieving revision 1.28.2.5 retrieving revision 1.28.2.6 diff -u -d -r1.28.2.5 -r1.28.2.6 --- rss.php 6 Nov 2004 11:22:45 -0000 1.28.2.5 +++ rss.php 8 Nov 2004 09:25:18 -0000 1.28.2.6 @@ -26,7 +26,7 @@ break; case 'content': default: - $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC'); + $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC', '', false, true); break; } @@ -70,9 +70,10 @@ case 'content': default: if (isset($_GET['all']) && $_GET['all']) { - $entries = serendipity_fetchEntries(null, true); + // Fetch all entries in reverse order for later importing. Fetch sticky entries as normal entries. + $entries = serendipity_fetchEntries(null, true, '', false, false, 'id ASC', '', false, true); } else { - $entries = serendipity_fetchEntries(null, true, 15, false, (isset($modified_since) ? $modified_since : false)); + $entries = serendipity_fetchEntries(null, true, 15, false, (isset($modified_since) ? $modified_since : false), 'timestamp DESC', '', false, true); } break; } |
|
From: Garvin H. <gar...@us...> - 2004-11-08 09:25:40
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878/docs Modified Files: Tag: branch-smarty NEWS Log Message: * RSS feed should not display sticky posts as sticky * RSS Export uses reverse chronological order for easier import * Fixed PostgreSQL concatenation issue * Fixed entry visibility (private/hidden/member) attribute to work as intended * Remove obsolete "force nocache" directive for RSS feed. Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- NEWS 6 Nov 2004 12:31:10 -0000 1.1.2.2 +++ NEWS 8 Nov 2004 09:25:30 -0000 1.1.2.3 @@ -3,6 +3,9 @@ Version 0.8 () ------------------------------------------------------------------------ + * RSS Export orders entries in reverse ID order for easier + importing (garvinhicking) + * Cleaned up directory structure, created new subdirectories, split up functions file. See docs/CHANGED_FILES for details if you have external dependencies on removed files (like custom @@ -77,9 +80,12 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed Concatenation syntax on PostgreSQL, only used by plugin + "Entrylinks". (garvinhicking) + * SQLite database name was not saved properly and could get set to a wrong value when updating configuration (garvinhicking) - + * Better detection if Apache ErrorDocument can be used (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-11-08 08:55:19
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11755 Modified Files: NEWS serendipity_config.inc.php serendipity_db_postgres.inc.php Log Message: prepare 0.7 release; fix pgsql concatenation Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- serendipity_config.inc.php 20 Oct 2004 16:37:30 -0000 1.99 +++ serendipity_config.inc.php 8 Nov 2004 08:55:08 -0000 1.100 @@ -15,7 +15,7 @@ include_once(S9Y_INCLUDE_PATH . 'compat.php'); -$serendipity['version'] = '0.7-rc1'; +$serendipity['version'] = '0.7'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = 1; $serendipity['rewrite'] = 'none'; Index: serendipity_db_postgres.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- serendipity_db_postgres.inc.php 2 Nov 2004 09:07:03 -0000 1.20 +++ serendipity_db_postgres.inc.php 8 Nov 2004 08:55:08 -0000 1.21 @@ -157,7 +157,7 @@ } function serendipity_db_concat($string) { - return 'concat_text(' . $string . ')'; + return '(' . str_replace(', ', '||', $string) . ')'; } /* vim: set sts=4 ts=4 expandtab : */ Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.252 retrieving revision 1.253 diff -u -d -r1.252 -r1.253 --- NEWS 7 Nov 2004 12:44:27 -0000 1.252 +++ NEWS 8 Nov 2004 08:55:08 -0000 1.253 @@ -3,6 +3,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed Concatenation syntax on PostgreSQL, only used by plugin + "Entrylinks". (garvinhicking) + * SQLite database name was not saved properly and could get set to a wrong value when updating configuration (garvinhicking) |
|
From: Sebastian B. <ber...@us...> - 2004-11-07 12:44:39
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14736 Modified Files: NEWS Log Message: Testing CIA bot. Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.251 retrieving revision 1.252 diff -u -d -r1.251 -r1.252 --- NEWS 7 Nov 2004 12:43:51 -0000 1.251 +++ NEWS 7 Nov 2004 12:44:27 -0000 1.252 @@ -1,4 +1,3 @@ - # $Id$ Version 0.7 () |
|
From: Sebastian B. <ber...@us...> - 2004-11-07 12:44:01
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14588 Modified Files: NEWS Log Message: Testing CIA bot. Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.250 retrieving revision 1.251 diff -u -d -r1.250 -r1.251 --- NEWS 6 Nov 2004 10:58:42 -0000 1.250 +++ NEWS 7 Nov 2004 12:43:51 -0000 1.251 @@ -1,3 +1,4 @@ + # $Id$ Version 0.7 () |
|
From: Tom S. <tom...@us...> - 2004-11-06 21:34:26
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19816 Modified Files: Tag: branch-smarty index.php Log Message: - Remove commented function - Add number of included files to debug - Result is in seconds Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.49.2.10 retrieving revision 1.49.2.11 diff -u -d -r1.49.2.10 -r1.49.2.11 --- index.php 6 Nov 2004 11:22:45 -0000 1.49.2.10 +++ index.php 6 Nov 2004 21:33:04 -0000 1.49.2.11 @@ -235,7 +235,8 @@ } $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); -echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: large">Process complete in '. (microtime_float()-$time_start) .' ms</div>'; -# serendipity_plugin_api::register_default_plugins(); +/* TODO: Remove (hide) this debug */ +echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: 10pt; font-weight: bold; padding: 10px">Page generated in '. round(microtime_float()-$time_start,6) .' seconds, '. sizeof(get_included_files()) .' files included</div>'; + /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Tom S. <tom...@us...> - 2004-11-06 17:30:45
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30904 Modified Files: Tag: branch-smarty README Added Files: Tag: branch-smarty INSTALL_EMBEDED INSTALL_SHARED UPGRADE Log Message: - Split up the README file into smaller files for each INSTALL/UPGRADE design Index: README =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/Attic/README,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- README 6 Nov 2004 11:22:48 -0000 1.1.2.1 +++ README 6 Nov 2004 17:30:24 -0000 1.1.2.2 @@ -6,331 +6,6 @@ plugins and so on, please visit our Wiki on http://www.s9y.org/! ######################################################################## -# UPDATING # -######################################################################## - -The automatic update script should find and execute any necessary -changes to the database layout made in different s9y versions beginning -from 0.5. The upgrader will perform its automatic actions, as soon as you -have copied the new s9y files over your old installation and access the start -page of your blog. -You can speed up the process of backing up your data and copying the files by -using the supplied "upgrade.sh" script. Be sure to edit the file and change -the variables to your needs. - -Usually all DB schema upgrades in previous versions will be used. So -when you upgrade from 0.5 to 0.7 you will get upgrades from 0.5 -> 0.6 -and 0.6 -> 0.7. - -However, you are always advised to look at the corresponding -SQL update file in sql/db_update* to see which changes were made. - -Please bear in mind that the automatic update script is executable by -any user visiting your blog at the time of updating. You should modify -your .htaccess file before upgradding and include this directives: - ----- .htaccess -AuthType Basic -AuthName "Authorisation: Serendipity Upgrade IN PROGRESS" -AuthUserFile /absolute/path/to/your/s9y/.htpasswd -require valid-user ----- - -Then create a file .htpasswd using a simple 'username:cryptpasswd' -combination. Look at http://www.advancehost.com/htpasswd.html for an -online generator for .htpasswd files. - ----- .htpasswd -s9y:s9QXoc9dcFOT2 ----- - -This would create a user "s9y" with password "s9y" with which you'd have -to log into your blog. - -A proper backup of BOTH the file system and your database is suggested. -Whenever you made changes to the distributed files (or to the files like -xml.gif or the smilies) you have to make sure to copy them over the -distributed files after updating. - -######################################################################## -# NOTES ON UPDATING FROM 0.5/0.5.1 -> 0.6 # -######################################################################## - -* [The 0.5.1 release was renamed to 0.6, but there will still be DB - layout changes applied which are labelled as 0.5.1 - just ignore it. - It's only to easy migration to CVS-Snapshot users using the - 0.5.1-version] - -* The structure of the content_rewrite plugin has changed. It will get - rewritten automatically by the update script, but if you had output on - your sidebar before, you need to do this: - - - Add the 'serendipity_plugin_eventwrapper' to the sidebar plugins. - - Configure the 'serendipity_plugin_eventwrapper' and set it to use - your existing 'serendpity_event_contentrewrite' plugin. - -* Smilies and the XML-button where moved from the '/pixel' subdirectory - into per-template 'img/' subdirectories. If you modified the original - files, you need to copy your versions inside the - 'templates/default/img/' directory. - -* A home-link has been added to the page headers. For that, two new CSS - classes have been introduced: .homelink1 (header), .homelink2 ( - subheader). If you have a custom template, you need to adapt to those - changes. To make them look like your header previously has, insert - this in your style.css: - - a.homelink1, - a.homelink1:hover, - a.homelink1:link, - a.homelink1:visited, - #serendipity_banner h1 { - ... your css-definitions ... - text-decoration: none; - } - - a.homelink2, - a.homelink2:hover, - a.homelink2:link, - a.homelink2:visited, - #serendipity_banner h2 { - ... your css-definitions ... - text-decoration: none; - } - -######################################################################## -# NOTES ON UPDATING FROM 0.4 -> 0.5 # -######################################################################## - -No changes where made to the database scheme in this version. - -######################################################################## -# NOTES ON UPDATING FROM 0.3 -> 0.4 # -######################################################################## - -Run the file 'sql/db_update_0.3_0.4_mysql.sql' or -'sql/db_update_0.3_0.4_pgsql.sql' to update your database. Apart from -that, just copy over the new files of the distribution. - -######################################################################## -# THE 'embed' CONFIGURATION DIRECTIVE # -######################################################################## - -In your serendipity configuration, you can set an 'embed' option to true -or false. - -This defines, whether you use your blog as a standalone webpage - or if -you have different content wrapped around your blog, like the menu of -your usual homepage. - -By setting the 'embed' option to true, you have to make sure the -following things to get everything to work well: - -1. 'indexFile' option. - - This configuration option needs to be set to the wrapper file you - want to use. Let's say you normally have a 'content.php' file for - your webpage. This 'content.php' file sets up your internal - templates, your menu structure and such. - Now you want this file to be used to include your weblog. A simple - content.php could look like this: - - <?php - $homepage = new Template_Class; - $homepage->set_template($_REQUEST['page']); - $homepage->output_header(); - $homepage->output_content(); - $homepage->output_footer(); - $homepage->track_statistics(); - ?> - - So normally your file would be called with 'content.php?page=about' - to display your 'about' page of your personal homepage. - - Now we want this file to be displayed, having the 'page' variable - being set to 'blog'. - - For this, we set up a 'wrapper.php' file: - - <?php - $_REQUEST['page'] = 'blog'; - // Let serendipity generate our content: - ob_start(); - require 'index.php'; - $blog_data = ob_get_contents(); - ob_end_clean(); - - // Now we include our normal content building file. - // This one has to make use of your $blog_data variable to print - // the content where appropriate! - require 'content.php'; - ?> - - You would then set your 'indexFile' serendipity-option to the - 'wrapper.php' file. - - 2. Plugin panes & HTML-headers - - With the example above, we only get the main blog data printed. One - of the most visible actions when using the 'embed' option is that the - plugin panes are not generated. And HTML headers/foooters are also - not provided by s9y in this case, as this should be done by your - 'content.php' file. - - So you have to include them in your 'content.php' file, to have them - visible in your embedded setup. - - You can use this snippet: - <?php - serendipity_plugin_api::generate_plugins('left','div'); - serendipity_plugin_api::generate_plugins('right','div'); - ?> - somewhere in your 'content.php' file. - -The 'embed' option is therefore only recommended to be used by advanced -users going for a most flexible setup! - -######################################################################## -# HOW TO USE SERENDIPITY AS SHARED LIBRARY # -######################################################################## - -****************************************** -* WARNING: THIS FEATURE IS EXPERIMENTAL! * -****************************************** - -You can install ONE s9y distribution and manage multiple users on it by -sharing the core files and then deploying specially crafted files in -each user's directory. - -Let's do this using an example. You own the domain 's9yblogs.org'. -You want to have multiple virtual hosts for as many users as you like. -They are going to be called 'username.s9yblogs.org'. We choose the users -'garvin', 'j' and 'tom' for example hosts. We assume that your webserver -runs as user 'www', group 'www'. We also assume that all your users -are called like the subdomains, and they are also in group 'www'. We -further assume that PHP's safe_mod is turned off. - -Of course, for security reasons, you should set the open_basedir -directive to the user's document root, so he can't access other -installations on your host. - -So your Apache-Webser should contain VirtualHosts like this: - --- httpd.conf -<VirtualHost 42.42.42.42:80> - ServerName garvin.s9yblogs.org - DocumentRoot /home/www/garvin.s9yblogs.org/htdocs - <Directory "/home/www/garvin.s9yblogs.org/htdocs"> - AllowOverride All - </Directory> - php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/" - php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/garvin.s9yblogs.org/" -</VirtualHost> - -<VirtualHost 42.42.42.42:80> - ServerName j.s9yblogs.org - DocumentRoot /home/www/j.s9yblogs.org/htdocs - <Directory "/home/www/j.s9yblogs.org/htdocs"> - AllowOverride All - </Directory> - php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/" - php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/j.s9yblogs.org/" -</VirtualHost> - -<VirtualHost 42.42.42.42:80> - ServerName tom.s9yblogs.org - DocumentRoot /home/www/tom.s9yblogs.org/htdocs - <Directory "/home/www/tom.s9yblogs.org/htdocs"> - AllowOverride All - </Directory> - php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/" - php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/tom.s9yblogs.org/" -</VirtualHost> --- httpd.conf - -You will unpack the default s9y distribution files in -"/usr/local/lib/php/s9y/". Where you store the directory 's9y' is -not important, as long as you adjust the include_path setting in the -VirtualHosts. But the directory name 's9y' is significant. - -Now copy the subdirectories called - - * "/usr/local/lib/php/s9y/deployment/" [core redirection files] - * "/usr/local/lib/php/s9y/templates/" [templates so that users can change them] - * "/usr/local/lib/php/s9y/htmlarea/" [htmlarea WYSIWYG-editor] - - to each of the user's subdirectories: - -$ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/garvin.s9yblogs.org/htdocs/ -$ cp -r /usr/local/lib/php/s9y/templates /home/www/garvin.s9yblogs.org/htdocs/ -$ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/garvin.s9yblogs.org/htdocs/ -$ chown -R garvin.www /home/www/garvin.s9yblogs.org/htdocs/* -$ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs -$ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs/uploads/ - -$ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/j.s9yblogs.org/htdocs/ -$ cp -r /usr/local/lib/php/s9y/templates /home/www/j.s9yblogs.org/htdocs/ -$ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/j.s9yblogs.org/htdocs/ -$ chown -R j.www /home/www/j.s9yblogs.org/htdocs/* -$ chmod go+rwx /home/www/j.s9yblogs.org/htdocs -$ chmod go+rwx /home/www/j.s9yblogs.org/htdocs/uploads/ - -$ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/tom.s9yblogs.org/htdocs/ -$ cp -r /usr/local/lib/php/s9y/templates /home/www/tom.s9yblogs.org/htdocs/ -$ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/tom.s9yblogs.org/htdocs/ -$ chown -R tom.www /home/www/tom.s9yblogs.org/htdocs/* -$ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs -$ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs/uploads/ - -For later management access, it is advised you keep a list of all URLs -for your s9y-managed blogs. We suggest to create a SQL table like -'my_managed_s9y_blogs': - -sql> CREATE TABLE my_managed_s9y_blogs (url varchar(255) default null); -sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://garvin.s9yblogs.org/'); -sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://j.s9yblogs.org/'); -sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://tom.s9yblogs.org/'); - -Now you are almost ready for take-off. We assume that every user has -access to a seperate SQL database where his blog-data is later stored -in. You can already see, that the steps needed above shouldn't be to -hard to put into a customized script.sh file for use in your setup. - -Open up your http://garvin.s9yblogs.org/ file. You should now see s9y's -installation screen. Enter the database- and username and the -corresponding password. Everything else can be left to the user. - -Now every user can manage his/her blog just as if it were a standalone -installation. - -SPECIAL NOTES: -======================================================================== - -* Each blog is still a standalone blog. - -* If you update the core library files from version 0.5 to 0.6 (for - example) every user of your core library will get the default s9y- - Upgrader script to see and needs to update his local configuration. - - As a provider for s9y blogs to your users, you are advised to migrate - the user's blogs on your own. To do so, it is best that you always - have a "spare" testing blog installed just like your user's blogs. - - Open that installation and look at the upgrader. Execute it and see - that it completes without errors. If that happened, you should cycle - through a list of ALL your s9y-managed blogs like this: - - <?php - $sql = mysql_query('SELECT url FROM my_managed_s9y_blogs'); - while ($row = mysql_fetch_array($sql, MYSQL_ASSOC)) { - $fp = fopen($row['url'] . 'serendipity_admin.php?serendipity[action]=upgrade'); - } - ?> - - So basically all you need to do is call that script for every s9y- - powered blog you host. - -######################################################################## # NOTES FOR CONDITIONAL GET IN RSS FEEDS # ######################################################################## --- NEW FILE: UPGRADE --- ######################################################################## # UPDATING # ######################################################################## The automatic update script should find and execute any necessary changes to the database layout made in different s9y versions beginning from 0.5. The upgrader will perform its automatic actions, as soon as you have copied the new s9y files over your old installation and access the start page of your blog. You can speed up the process of backing up your data and copying the files by using the supplied "upgrade.sh" script. Be sure to edit the file and change the variables to your needs. Usually all DB schema upgrades in previous versions will be used. So when you upgrade from 0.5 to 0.7 you will get upgrades from 0.5 -> 0.6 and 0.6 -> 0.7. However, you are always advised to look at the corresponding SQL update file in sql/db_update* to see which changes were made. Please bear in mind that the automatic update script is executable by any user visiting your blog at the time of updating. You should modify your .htaccess file before upgradding and include this directives: ---- .htaccess AuthType Basic AuthName "Authorisation: Serendipity Upgrade IN PROGRESS" AuthUserFile /absolute/path/to/your/s9y/.htpasswd require valid-user ---- Then create a file .htpasswd using a simple 'username:cryptpasswd' combination. Look at http://www.advancehost.com/htpasswd.html for an online generator for .htpasswd files. ---- .htpasswd s9y:s9QXoc9dcFOT2 ---- This would create a user "s9y" with password "s9y" with which you'd have to log into your blog. A proper backup of BOTH the file system and your database is suggested. Whenever you made changes to the distributed files (or to the files like xml.gif or the smilies) you have to make sure to copy them over the distributed files after updating. ######################################################################## # NOTES ON UPDATING FROM 0.5/0.5.1 -> 0.6 # ######################################################################## * [The 0.5.1 release was renamed to 0.6, but there will still be DB layout changes applied which are labelled as 0.5.1 - just ignore it. It's only to easy migration to CVS-Snapshot users using the 0.5.1-version] * The structure of the content_rewrite plugin has changed. It will get rewritten automatically by the update script, but if you had output on your sidebar before, you need to do this: - Add the 'serendipity_plugin_eventwrapper' to the sidebar plugins. - Configure the 'serendipity_plugin_eventwrapper' and set it to use your existing 'serendpity_event_contentrewrite' plugin. * Smilies and the XML-button where moved from the '/pixel' subdirectory into per-template 'img/' subdirectories. If you modified the original files, you need to copy your versions inside the 'templates/default/img/' directory. * A home-link has been added to the page headers. For that, two new CSS classes have been introduced: .homelink1 (header), .homelink2 ( subheader). If you have a custom template, you need to adapt to those changes. To make them look like your header previously has, insert this in your style.css: a.homelink1, a.homelink1:hover, a.homelink1:link, a.homelink1:visited, #serendipity_banner h1 { ... your css-definitions ... text-decoration: none; } a.homelink2, a.homelink2:hover, a.homelink2:link, a.homelink2:visited, #serendipity_banner h2 { ... your css-definitions ... text-decoration: none; } ######################################################################## # NOTES ON UPDATING FROM 0.4 -> 0.5 # ######################################################################## No changes where made to the database scheme in this version. ######################################################################## # NOTES ON UPDATING FROM 0.3 -> 0.4 # ######################################################################## Run the file 'sql/db_update_0.3_0.4_mysql.sql' or 'sql/db_update_0.3_0.4_pgsql.sql' to update your database. Apart from that, just copy over the new files of the distribution. --- NEW FILE: INSTALL_SHARED --- ######################################################################## # HOW TO USE SERENDIPITY AS SHARED LIBRARY # ######################################################################## ****************************************** * WARNING: THIS FEATURE IS EXPERIMENTAL! * ****************************************** You can install ONE s9y distribution and manage multiple users on it by sharing the core files and then deploying specially crafted files in each user's directory. Let's do this using an example. You own the domain 's9yblogs.org'. You want to have multiple virtual hosts for as many users as you like. They are going to be called 'username.s9yblogs.org'. We choose the users 'garvin', 'j' and 'tom' for example hosts. We assume that your webserver runs as user 'www', group 'www'. We also assume that all your users are called like the subdomains, and they are also in group 'www'. We further assume that PHP's safe_mod is turned off. Of course, for security reasons, you should set the open_basedir directive to the user's document root, so he can't access other installations on your host. So your Apache-Webser should contain VirtualHosts like this: -- httpd.conf <VirtualHost 42.42.42.42:80> ServerName garvin.s9yblogs.org DocumentRoot /home/www/garvin.s9yblogs.org/htdocs <Directory "/home/www/garvin.s9yblogs.org/htdocs"> AllowOverride All </Directory> php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/" php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/garvin.s9yblogs.org/" </VirtualHost> <VirtualHost 42.42.42.42:80> ServerName j.s9yblogs.org DocumentRoot /home/www/j.s9yblogs.org/htdocs <Directory "/home/www/j.s9yblogs.org/htdocs"> AllowOverride All </Directory> php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/" php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/j.s9yblogs.org/" </VirtualHost> <VirtualHost 42.42.42.42:80> ServerName tom.s9yblogs.org DocumentRoot /home/www/tom.s9yblogs.org/htdocs <Directory "/home/www/tom.s9yblogs.org/htdocs"> AllowOverride All </Directory> php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/" php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/tom.s9yblogs.org/" </VirtualHost> -- httpd.conf You will unpack the default s9y distribution files in "/usr/local/lib/php/s9y/". Where you store the directory 's9y' is not important, as long as you adjust the include_path setting in the VirtualHosts. But the directory name 's9y' is significant. Now copy the subdirectories called * "/usr/local/lib/php/s9y/deployment/" [core redirection files] * "/usr/local/lib/php/s9y/templates/" [templates so that users can change them] * "/usr/local/lib/php/s9y/htmlarea/" [htmlarea WYSIWYG-editor] to each of the user's subdirectories: $ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/garvin.s9yblogs.org/htdocs/ $ cp -r /usr/local/lib/php/s9y/templates /home/www/garvin.s9yblogs.org/htdocs/ $ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/garvin.s9yblogs.org/htdocs/ $ chown -R garvin.www /home/www/garvin.s9yblogs.org/htdocs/* $ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs $ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs/uploads/ $ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/j.s9yblogs.org/htdocs/ $ cp -r /usr/local/lib/php/s9y/templates /home/www/j.s9yblogs.org/htdocs/ $ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/j.s9yblogs.org/htdocs/ $ chown -R j.www /home/www/j.s9yblogs.org/htdocs/* $ chmod go+rwx /home/www/j.s9yblogs.org/htdocs $ chmod go+rwx /home/www/j.s9yblogs.org/htdocs/uploads/ $ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/tom.s9yblogs.org/htdocs/ $ cp -r /usr/local/lib/php/s9y/templates /home/www/tom.s9yblogs.org/htdocs/ $ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/tom.s9yblogs.org/htdocs/ $ chown -R tom.www /home/www/tom.s9yblogs.org/htdocs/* $ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs $ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs/uploads/ For later management access, it is advised you keep a list of all URLs for your s9y-managed blogs. We suggest to create a SQL table like 'my_managed_s9y_blogs': sql> CREATE TABLE my_managed_s9y_blogs (url varchar(255) default null); sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://garvin.s9yblogs.org/'); sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://j.s9yblogs.org/'); sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://tom.s9yblogs.org/'); Now you are almost ready for take-off. We assume that every user has access to a seperate SQL database where his blog-data is later stored in. You can already see, that the steps needed above shouldn't be to hard to put into a customized script.sh file for use in your setup. Open up your http://garvin.s9yblogs.org/ file. You should now see s9y's installation screen. Enter the database- and username and the corresponding password. Everything else can be left to the user. Now every user can manage his/her blog just as if it were a standalone installation. SPECIAL NOTES: ======================================================================== * Each blog is still a standalone blog. * If you update the core library files from version 0.5 to 0.6 (for example) every user of your core library will get the default s9y- Upgrader script to see and needs to update his local configuration. As a provider for s9y blogs to your users, you are advised to migrate the user's blogs on your own. To do so, it is best that you always have a "spare" testing blog installed just like your user's blogs. Open that installation and look at the upgrader. Execute it and see that it completes without errors. If that happened, you should cycle through a list of ALL your s9y-managed blogs like this: <?php $sql = mysql_query('SELECT url FROM my_managed_s9y_blogs'); while ($row = mysql_fetch_array($sql, MYSQL_ASSOC)) { $fp = fopen($row['url'] . 'serendipity_admin.php?serendipity[action]=upgrade'); } ?> So basically all you need to do is call that script for every s9y- powered blog you host. --- NEW FILE: INSTALL_EMBEDED --- ######################################################################## # THE 'embed' CONFIGURATION DIRECTIVE # ######################################################################## In your serendipity configuration, you can set an 'embed' option to true or false. This defines, whether you use your blog as a standalone webpage - or if you have different content wrapped around your blog, like the menu of your usual homepage. By setting the 'embed' option to true, you have to make sure the following things to get everything to work well: 1. 'indexFile' option. This configuration option needs to be set to the wrapper file you want to use. Let's say you normally have a 'content.php' file for your webpage. This 'content.php' file sets up your internal templates, your menu structure and such. Now you want this file to be used to include your weblog. A simple content.php could look like this: <?php $homepage = new Template_Class; $homepage->set_template($_REQUEST['page']); $homepage->output_header(); $homepage->output_content(); $homepage->output_footer(); $homepage->track_statistics(); ?> So normally your file would be called with 'content.php?page=about' to display your 'about' page of your personal homepage. Now we want this file to be displayed, having the 'page' variable being set to 'blog'. For this, we set up a 'wrapper.php' file: <?php $_REQUEST['page'] = 'blog'; // Let serendipity generate our content: ob_start(); require 'index.php'; $blog_data = ob_get_contents(); ob_end_clean(); // Now we include our normal content building file. // This one has to make use of your $blog_data variable to print // the content where appropriate! require 'content.php'; ?> You would then set your 'indexFile' serendipity-option to the 'wrapper.php' file. 2. Plugin panes & HTML-headers With the example above, we only get the main blog data printed. One of the most visible actions when using the 'embed' option is that the plugin panes are not generated. And HTML headers/foooters are also not provided by s9y in this case, as this should be done by your 'content.php' file. So you have to include them in your 'content.php' file, to have them visible in your embedded setup. You can use this snippet: <?php serendipity_plugin_api::generate_plugins('left','div'); serendipity_plugin_api::generate_plugins('right','div'); ?> somewhere in your 'content.php' file. The 'embed' option is therefore only recommended to be used by advanced users going for a most flexible setup! |
|
From: Tom S. <tom...@us...> - 2004-11-06 17:27:13
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30300 Removed Files: Tag: branch-smarty TODO Log Message: - Remove TODO file --- TODO DELETED --- |
|
From: Garvin H. <gar...@us...> - 2004-11-06 12:31:21
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2597/docs Modified Files: Tag: branch-smarty NEWS Log Message: clarify Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- NEWS 6 Nov 2004 11:22:48 -0000 1.1.2.1 +++ NEWS 6 Nov 2004 12:31:10 -0000 1.1.2.2 @@ -4,7 +4,9 @@ ------------------------------------------------------------------------ * Cleaned up directory structure, created new subdirectories, - split up functions file (garvinhicking) + split up functions file. See docs/CHANGED_FILES for details if + you have external dependencies on removed files (like custom + plugins, themes, or special embedded usage) (garvinhicking) * "Recent Entries" Plugin can now have userdefined title and only show entries of a specific category (+ subcategories). |
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 --- |
|
From: Garvin H. <gar...@us...> - 2004-11-06 11:23:04
|
Update of /cvsroot/php-blog/serendipity/include/tpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23806/include/tpl Added Files: Tag: branch-smarty config_local.tpl config_user.tpl htaccess_cgi_errordocs.tpl htaccess_cgi_normal.tpl htaccess_cgi_rewrite.tpl htaccess_errordocs.tpl htaccess_normal.tpl htaccess_rewrite.tpl 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 --- NEW FILE: htaccess_errordocs.tpl --- # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} php_value session.use_trans_sid 0 php_value register_globals off <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: config_user.tpl --- <?php # $Id: config_user.tpl,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ // USERCONF_CAT_PERSONAL # USERCONF_CAT_PERSONAL_DESC $serendipity['username'] = '{USERCONF_USERNAME|username|string|John Doe|0}'; // USERCONF_USERNAME_DESC $serendipity['password'] = '{USERCONF_PASSWORD|password|protected||0}'; // USERCONF_PASSWORD_DESC $serendipity['userlevel'] = '{USERCONF_USERLEVEL|userlevel|string||1}'; // USERCONF_USERLEVEL_DESC $serendipity['email'] = '{USERCONF_EMAIL|email|string|jo...@ex...|0}'; // USERCONF_EMAIL_DESC $serendipity['mail_comments'] = '{USERCONF_SENDCOMMENTS|mail_comments|bool|1|0}'; // USERCONF_SENDCOMMENTS_DESC $serendipity['mail_trackbacks'] = '{USERCONF_SENDTRACKBACKS|mail_trackbacks|bool|1|0}'; // USERCONF_SENDTRACKBACKS_DESC $serendipity['right_publish'] = '{USERCONF_ALLOWPUBLISH|right_publish|bool|1|1}'; // USERCONF_ALLOWPUBLISH_DESC ?> --- NEW FILE: htaccess_cgi_errordocs.tpl --- # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: htaccess_normal.tpl --- # BEGIN s9y DirectoryIndex {PREFIX}{indexFile} php_value session.use_trans_sid 0 php_value register_globals off <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: htaccess_cgi_rewrite.tpl --- # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} RewriteEngine On RewriteBase {PREFIX} RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA] RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1-short.html [L,NC,QSA] RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA] RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA] RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA] RewriteRule ^{PAT_APPROVE} {indexFile}?url={PATH_APPROVE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_DELETE} {indexFile}?url={PATH_DELETE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: config_local.tpl --- <?php # $Id: config_local.tpl,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ // INSTALL_CAT_DB # INSTALL_CAT_DB_DESC $serendipity['dbType'] = '{INSTALL_DBTYPE|dbType|list|mysql=>MySQL,postgres=>PostgreSQL,mysqli=>MySQLi,sqlite=>SQLite|255}'; // INSTALL_DBTYPE_DESC $serendipity['dbHost'] = '{INSTALL_DBHOST|dbHost|string|localhost|255}'; // INSTALL_DBHOST_DESC $serendipity['dbUser'] = '{INSTALL_DBUSER|dbUser|string|serendipity|255}'; // INSTALL_DBUSER_DESC $serendipity['dbPass'] = '{INSTALL_DBPASS|dbPass|protected||255}'; // INSTALL_DBPASS_DESC $serendipity['dbName'] = '{INSTALL_DBNAME|dbName|string|serendipity|255}'; // INSTALL_DBNAME_DESC $serendipity['dbPrefix'] = '{INSTALL_DBPREFIX|dbPrefix|string|serendipity_|255}'; // INSTALL_DBPREFIX_DESC // INSTALL_CAT_PATHS # INSTALL_CAT_PATHS_DESC $serendipity['serendipityPath'] = '{INSTALL_FULLPATH|serendipityPath|string|/webroot/serendipity/|255}'; // INSTALL_FULLPATH_DESC $serendipity['uploadPath'] = '{INSTALL_UPLOADPATH|uploadPath|string|uploads/|255}'; // INSTALL_UPLOADPATH_DESC $serendipity['serendipityHTTPPath'] = '{INSTALL_RELPATH|serendipityHTTPPath|string|/serendipity/|255}'; // INSTALL_RELPATH_DESC $serendipity['templatePath'] = '{INSTALL_RELTEMPLPATH|templatePath|string|templates/|255}'; // INSTALL_RELTEMPLPATH_DESC $serendipity['uploadHTTPPath'] = '{INSTALL_RELUPLOADPATH|uploadHTTPPath|string|uploads/|255}'; // INSTALL_RELUPLOADPATH_DESC $serendipity['baseURL'] = '{INSTALL_URL|baseURL|string|http://www.example.com/serendipity/|255}'; // INSTALL_URL_DESC $serendipity['indexFile'] = '{INSTALL_INDEXFILE|indexFile|string|index.php|255}'; // INSTALL_INDEXFILE_DESC // INSTALL_CAT_SETTINGS # INSTALL_CAT_SETTINGS_DESC $serendipity['user'] = '{INSTALL_USERNAME|user|string|John Doe|255|installOnly}'; // INSTALL_USERNAME_DESC $serendipity['pass'] = '{INSTALL_PASSWORD|pass|protected|john|255|installOnly}'; // INSTALL_PASSWORD_DESC $serendipity['email'] = '{INSTALL_EMAIL|email|string|jo...@ex...|255|installOnly}'; // INSTALL_EMAIL_DESC $serendipity['want_mail'] = '{INSTALL_SENDMAIL|want_mail|bool|1|255|installOnly}'; // INSTALL_SENDMAIL_DESC $serendipity['allowSubscriptions'] = '{INSTALL_SUBSCRIBE|allowSubscriptions|bool|1|255}' // INSTALL_SUBSCRIBE_DESC $serendipity['blogTitle'] = '{INSTALL_BLOGNAME|blogTitle|string|John Doe's personal blog|1|global}'; // INSTALL_BLOGNAME_DESC $serendipity['blogDescription'] = '{INSTALL_BLOGDESC|blogDescription|string|My little place on the web...|1|global}'; // INSTALL_BLOGDESC_DESC $serendipity['lang'] = '{INSTALL_LANG|lang|list|[LANGUAGE_LIST]|0}'; // INSTALL_LANG_DESC // INSTALL_CAT_DISPLAY # INSTALL_CAT_DISPLAY_DESC $serendipity['extCSS'] = '{INSTALL_EXTERNALSTYLE|extCSS|string|none|255}'; // INSTALL_EXTERNALSTYLE_DESC $serendipity['wysiwyg'] = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0}'; // INSTALL_WYSIWYG_DESC $serendipity['XHTML11'] = '{INSTALL_XHTML11|XHTML11|bool|0|255}'; // INSTALL_XHTML11_DESC $serendipity['enablePopup'] = '{INSTALL_POPUP|enablePopup|bool|0|255}'; // INSTALL_POPUP_DESC $serendipity['embed'] = '{INSTALL_EMBED|embed|bool||255}'; // INSTALL_EMBED_DESC $serendipity['top_as_links'] = '{INSTALL_SHOW_EXTERNAL_LINKS|top_as_links|bool||1|255}'; // INSTALL_SHOW_EXTERNAL_LINKS_DESC $serendipity['blockReferer'] = '{INSTALL_BLOCKREF|blockReferer|string|;|255}'; // INSTALL_BLOCKREF_DESC $serendipity['rewrite'] = '{INSTALL_REWRITE|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}'; // INSTALL_REWRITE_DESC // INSTALL_CAT_IMAGECONV # INSTALL_CAT_IMAGECONV_DESC $serendipity['magick'] = '{INSTALL_IMAGEMAGICK|magick|bool|0|255}'; // INSTALL_IMAGEMAGICK_DESC $serendipity['convert'] = '{INSTALL_IMAGEMAGICKPATH|convert|string|/usr/local/bin/convert|255}'; // INSTALL_IMAGEMAGICKPATH_DESC $serendipity['thumbSuffix'] = '{INSTALL_THUMBSUFFIX|thumbSuffix|string|serendipityThumb|255}'; // INSTALL_THUMBSUFFIX_DESC $serendipity['thumbSize'] = '{INSTALL_THUMBWIDTH|thumbSize|int|110|255}'; // INSTALL_THUMBWIDTH_DESC ?> --- NEW FILE: htaccess_rewrite.tpl --- # BEGIN s9y ErrorDocument 404 {PREFIX}{indexFile} DirectoryIndex {PREFIX}{indexFile} php_value session.use_trans_sid 0 php_value register_globals off RewriteEngine On RewriteBase {PREFIX} RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA] RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1-short.html [L,NC,QSA] RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA] RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA] RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA] RewriteRule ^{PAT_APPROVE} {indexFile}?url={PATH_APPROVE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_DELETE} {indexFile}?url={PATH_DELETE}/$1/$2/$3 [L,QSA] RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA] RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA] RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y --- NEW FILE: htaccess_cgi_normal.tpl --- # BEGIN s9y DirectoryIndex {PREFIX}{indexFile} <Files *.tpl> deny from all </Files> <Files *.sql> deny from all </Files> <Files *.inc.php> deny from all </Files> <Files *.db> deny from all </Files> # END s9y |
|
From: Garvin H. <gar...@us...> - 2004-11-06 11:23:04
|
Update of /cvsroot/php-blog/serendipity/templates/moz-modern In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23806/templates/moz-modern Modified Files: Tag: branch-smarty layout.php 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 Index: layout.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- layout.php 25 Aug 2004 08:58:18 -0000 1.7 +++ layout.php 6 Nov 2004 11:22:50 -0000 1.7.2.1 @@ -1,8 +1,8 @@ <?php # $Id$ include_once('serendipity_config.inc.php'); -include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php'); -include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php'); +include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php'); +include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php'); if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) { ob_start(); |
|
From: Garvin H. <gar...@us...> - 2004-11-06 11:23:04
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23806/templates/default Modified Files: Tag: branch-smarty entries.tpl smarty_layout.php 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 Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -d -r1.1.2.17 -r1.1.2.18 --- entries.tpl 9 Oct 2004 23:26:16 -0000 1.1.2.17 +++ entries.tpl 6 Nov 2004 11:22:50 -0000 1.1.2.18 @@ -29,13 +29,13 @@ <div class="serendipity_entry_extended"><a id="extended"></a>{$entry.extended}</div> {/if} - {if $entry.has_extended and not $is_single_entry} + {if $entry.has_extended and not $is_single_entry and not $entry.is_extended} <br /><a href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a><br /><br /> {/if} <div class='serendipity_entryFooter'> {$CONST.POSTED_BY} {$entry.username} - {if $entry.categories} + {if $entry.categories and count($entry.categories) > 0} {$CONST.IN} {foreach from=$entry.categories item="category"}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.categoryid}-{$category.category_name|@makeFilename}">{$category.category_name|@escape}</a> {/foreach} {/if} {$CONST.AT} <a href="{$entry.link}">{$entry.timestamp|@formatTime:'%H:%M'}</a> Index: smarty_layout.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/smarty_layout.php,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- smarty_layout.php 16 Oct 2004 17:27:15 -0000 1.1.2.4 +++ smarty_layout.php 6 Nov 2004 11:22:50 -0000 1.1.2.5 @@ -1,8 +1,8 @@ <?php # $Id$ include_once('serendipity_config.inc.php'); -include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php'); -include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php'); +include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php'); +include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php'); switch ($serendipity['GET']['action']) { // User wants to read the diary |
|
From: Garvin H. <gar...@us...> - 2004-11-06 11:23:04
|
Update of /cvsroot/php-blog/serendipity/include/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23806/include/db Added Files: Tag: branch-smarty db.inc.php mysql.inc.php mysqli.inc.php postgres.inc.php sqlite.inc.php 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 --- NEW FILE: db.inc.php --- <?php # $Id: db.inc.php,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ # Copyright (c) 2003-2004, Jannis Hermanns # All rights reserved. See LICENSE file for licensing details @define('S9Y_DB_INCLUDED', TRUE); include_once(S9Y_INCLUDE_PATH . "include/db/{$serendipity['dbType']}.inc.php"); function serendipity_db_update($table, $keys, $values) { global $serendipity; $set = ''; foreach ($values as $k => $v) { if (strlen($set)) $set .= ', '; $set .= $k . '=\'' . serendipity_db_escape_string($v) . '\''; } $where = ''; foreach ($keys as $k => $v) { if (strlen($where)) $where .= ' AND '; $where .= $k . '=\'' . serendipity_db_escape_string($v) . '\''; } if (strlen($where)) { $where = " WHERE $where"; } return serendipity_db_query("UPDATE {$serendipity['dbPrefix']}$table SET $set $where"); } function serendipity_db_insert($table, $values) { global $serendipity; $names = implode(',', array_keys($values)); $vals = ''; foreach ($values as $k => $v) { if (strlen($vals)) $vals .= ', '; $vals .= '\'' . serendipity_db_escape_string($v) . '\''; } return serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}$table ($names) values ($vals)"); } function serendipity_db_bool ($val) { if(($val === true) || ($val == 'true') || ($val == 't') || ($val == '1')) return true; #elseif (($val === false || $val == 'false' || $val == 'f')) else return false; } /* vim: set sts=4 ts=4 expandtab : */ ?> --- NEW FILE: mysqli.inc.php --- <?php # $Id: mysqli.inc.php,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ /* Issues a query to the underlying database; * returns: * false if there was an error, * true if the query succeeded but did not generate any rows * array of field values if it returned a single row and $single is true * array of array of field values if it returned row(s) */ function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { global $serendipity; $type_map = array('assoc' => MYSQLI_ASSOC, 'num' => MYSQLI_NUM, 'both' => MYSQLI_BOTH); $c = mysqli_query($serendipity['dbConn'], $sql); if ( mysqli_error($serendipity['dbConn']) != '' ) { return mysqli_error($serendipity['dbConn']); } if (!$c) { if (!$serendipity['production']) { print mysqli_error($serendipity['dbConn']); if (function_exists('debug_backtrace') && $reportErr == true) { highlight_string(var_export(debug_backtrace(), 1)); } } return false; } if ($c === true) { return true; } $result_type = $type_map[$result_type]; switch(mysqli_num_rows($c)) { case 0: if ($single) { return false; } return true; case 1: if ($single) { return mysqli_fetch_array($c, $result_type); } default: if ($single) { return mysqli_fetch_array($c, $result_type); } $rows = array(); while ($row = mysqli_fetch_array($c, $result_type)) { if (!empty($assocKey) && !empty($assocVal)) { // You can fetch a key-associated array via the two function parameters assocKey and assocVal $rows[$row[$assocKey]] = $row[$assocVal]; } else { $rows[] = $row; } } return $rows; } } function serendipity_db_insert_id() { global $serendipity; return mysqli_insert_id($serendipity['dbConn']); } function serendipity_db_affected_rows() { global $serendipity; return mysqli_affected_rows($serendipity['dbConn']); } function serendipity_db_escape_string($string) { global $serendipity; return mysqli_escape_string($serendipity['dbConn'], $string); } function serendipity_db_limit($start, $offset) { return $start . ', ' . $offset; } function serendipity_db_limit_sql($limitstring) { return ' LIMIT ' . $limitstring; } function serendipity_db_connect() { global $serendipity; if (isset($serendipity['dbConn'])) { return $serendipity['dbConn']; } $serendipity['dbConn'] = mysqli_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']); mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']); return $serendipity['dbConn']; } function serendipity_db_schema_import($query) { static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}'); static $replace = array('int(11) not null auto_increment', 'primary key', 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); return serendipity_db_query(str_replace($search, $replace, $query)); } /* probes the usability of the DB during installation */ function serendipity_db_probe($hash, &$errs) { global $serendipity; if (!function_exists('mysqli_connect')) { $errs[] = 'No mySQLi extension found. Please check your webserver installation or contact your systems administrator regarding this problem.'; return false; } if (!($c = @mysqli_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) { $errs[] = 'Could not connect to database; check your settings.'; $errs[] = 'The mySQL error was: ' . mysqli_connect_error(); return false; } $serendipity['dbConn'] = $c; if ( !@mysqli_select_db($c, $hash['dbName']) ) { $errs[] = 'The database you specified does not exist.'; $errs[] = 'The mySQL error was: ' . mysqli_error($c); return false; } return true; } function serendipity_db_concat($string) { return 'concat(' . $string . ')'; } /* vim: set sts=4 ts=4 expandtab : */ ?> --- NEW FILE: mysql.inc.php --- <?php # $Id: mysql.inc.php,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ /* Issues a query to the underlying database; * returns: * false if there was an error, * true if the query succeeded but did not generate any rows * array of field values if it returned a single row and $single is true * array of array of field values if it returned row(s) */ function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { global $serendipity; static $type_map = array( 'assoc' => MYSQL_ASSOC, 'num' => MYSQL_NUM, 'both' => MYSQL_BOTH ); // highlight_string(var_export($sql, 1)); $c = mysql_query($sql, $serendipity['dbConn']); if (mysql_error($serendipity['dbConn']) != '') { return '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']); } if (!$c) { if (!$serendipity['production']) { print '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']); if (function_exists('debug_backtrace') && $reportErr == true) { highlight_string(var_export(debug_backtrace(), 1)); } } return false; } if ($c === true) { return true; } $result_type = $type_map[$result_type]; switch(mysql_num_rows($c)) { case 0: if ($single) { return false; } return true; case 1: if ($single) { return mysql_fetch_array($c, $result_type); } default: if ($single) { return mysql_fetch_array($c, $result_type); } $rows = array(); while (($row = mysql_fetch_array($c, $result_type))) { if (!empty($assocKey) && !empty($assocVal)) { // You can fetch a key-associated array via the two function parameters assocKey and assocVal $rows[$row[$assocKey]] = $row[$assocVal]; } else { $rows[] = $row; } } return $rows; } } function serendipity_db_insert_id() { global $serendipity; return mysql_insert_id($serendipity['dbConn']); } function serendipity_db_affected_rows() { global $serendipity; return mysql_affected_rows($serendipity['dbConn']); } function serendipity_db_escape_string($string) { return mysql_escape_string($string); } function serendipity_db_limit($start, $offset) { return $start . ', ' . $offset; } function serendipity_db_limit_sql($limitstring) { return ' LIMIT ' . $limitstring; } function serendipity_db_connect() { global $serendipity; if (isset($serendipity['dbConn'])) { return $serendipity['dbConn']; } $serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']); mysql_select_db($serendipity['dbName']); return $serendipity['dbConn']; } function serendipity_db_schema_import($query) { static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}'); static $replace = array('int(11) not null auto_increment', 'primary key', 'unsigned' , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\''); return serendipity_db_query(str_replace($search, $replace, $query)); } /* probes the usability of the DB during installation */ function serendipity_db_probe($hash, &$errs) { global $serendipity; if (!function_exists('mysql_connect')) { $errs[] = 'No mySQL extension found. Please check your webserver installation or contact your systems administrator regarding this problem.'; return false; } if (!($c = @mysql_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) { $errs[] = 'Could not connect to database; check your settings.'; $errs[] = 'The mySQL error was: ' . mysql_error(); return false; } $serendipity['dbConn'] = $c; if (!@mysql_select_db($hash['dbName'])) { $errs[] = 'The database you specified does not exist.'; $errs[] = 'The mySQL error was: ' . mysql_error(); return false; } return true; } function serendipity_db_concat($string) { return 'concat(' . $string . ')'; } /* vim: set sts=4 ts=4 expandtab : */ ?> --- NEW FILE: postgres.inc.php --- <?php # $Id: postgres.inc.php,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ function serendipity_db_connect() { global $serendipity; $serendipity['dbConn'] = pg_connect( sprintf( '%sdbname=%s user=%s password=%s', strlen($serendipity['dbHost']) ? ('host=' . $serendipity['dbHost'] . ' ') : '', $serendipity['dbName'], $serendipity['dbUser'], $serendipity['dbPass'] ) ); return $serendipity['dbConn']; } function serendipity_db_escape_string($string) { return pg_escape_string($string); } function serendipity_db_limit($start, $offset) { return $offset . ', ' . $start; } function serendipity_db_limit_sql($limitstring) { $limit_split = split(',', $limitstring); if (count($limit_split) > 1) { $limit = ' LIMIT ' . $limit_split[0] . ' OFFSET ' . $limit_split[1]; } else { $limit = ' LIMIT ' . $limit_split[0]; } return $limit; } function serendipity_db_affected_rows() { global $serendipity; return pg_affected_rows($serendipity['dbLastResult']); } function serendipity_db_insert_id($table = '', $id = '') { global $serendipity; if (empty($table) || empty($id)) { return pg_last_oid($serendipity['dbLastResult']); } else { $oid = pg_last_oid($serendipity['dbLastResult']); $query = "SELECT $id FROM {$serendipity['dbPrefix']}$table WHERE oid=$oid"; $res = pg_query($serendipity['dbConn'], $query); if (pg_num_rows($res)) { $insert_id = pg_fetch_array($res, 0, PGSQL_ASSOC); return $insert_id[$id]; } else { return $oid; } } } function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { global $serendipity; static $type_map = array( 'assoc' => PGSQL_ASSOC, 'num' => PGSQL_NUM, 'both' => PGSQL_BOTH ); if ($reportErr || !$serendipity['production']) { $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql); } else { $serendipity['dbLastResult'] = @pg_query($serendipity['dbConn'], $sql); } if (!$serendipity['dbLastResult']) { if (!$serendipity['production']) { print "Error in $sql<br/>\n"; print pg_last_error($serendipity['dbConn']) . "<BR/>\n"; if (function_exists('debug_backtrace')) { highlight_string(var_export(debug_backtrace(), 1)); } print "<br><code>$sql</code>\n"; } return false; } if ($serendipity['dbLastResult'] === true) { return true; } $result_type = $type_map[$result_type]; $n = pg_num_rows($serendipity['dbLastResult']); switch ($n) { case 0: if ($single) { return false; } return true; case 1: if ($single) { return pg_fetch_array($serendipity['dbLastResult'], 0, $result_type); } default: $rows = array(); for ($i = 0; $i < $n; $i++) { if (!empty($assocKey) && !empty($assocVal)) { // You can fetch a key-associated array via the two function parameters assocKey and assocVal $row = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type); $rows[$row[$assocKey]] = $row[$assocVal]; } else { $rows[] = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type); } } return $rows; } } function serendipity_db_schema_import($query) { static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)'); static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2', 'int4', 'int4', 'int4'); if (stristr($query, '{FULLTEXT_MYSQL}')) { return true; } return serendipity_db_query(str_replace($search, $replace, $query)); } function serendipity_db_probe($hash, &$errs) { global $serendipity; if (!function_exists('pg_connect')) { $errs[] = 'No PostgreSQL extension found. Please check your webserver installation or contact your systems administrator regarding this problem.'; return false; } $serendipity['dbConn'] = pg_connect( sprintf( '%sdbname=%s user=%s password=%s', strlen($hash['dbHost']) ? ('host=' . $hash['dbHost'] . ' ') : '', $hash['dbName'], $hash['dbUser'], $hash['dbPass'] ) ); if (!$serendipity['dbConn']) { $errs[] = 'Could not connect to database; check your settings.'; return false; } return true; } function serendipity_db_concat($string) { return 'concat_text(' . $string . ')'; } /* vim: set sts=4 ts=4 expandtab : */ ?> --- NEW FILE: sqlite.inc.php --- <?php # $Id: sqlite.inc.php,v 1.1.2.1 2004/11/06 11:22:50 garvinhicking Exp $ if (!function_exists('sqlite_open')) { @dl('sqlite.so'); @dl('sqlite.dll'); } function serendipity_db_connect() { global $serendipity; if (isset($serendipity['dbConn'])) { return $serendipity['dbConn']; } $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db'); return $serendipity['dbConn']; } function serendipity_db_escape_string($string) { static $search = array("\x00", '%', "'", '\"'); static $replace = array('%00', '%25', "''", '\\\"'); return str_replace($search, $replace, $string); } function serendipity_db_affected_rows() { global $serendipity; return sqlite_changes($serendipity['dbConn']); } function serendipity_db_insert_id() { global $serendipity; return sqlite_last_insert_rowid($serendipity['dbConn']); } function serendipity_db_sqlite_fetch_array($res, $type = SQLITE_BOTH) { static $search = array('%00', '%25'); static $replace = array("\x00", '%'); $row = sqlite_fetch_array($res, $type); if (!is_array($row)) { return $row; } /* strip any slashes, correct fieldname */ foreach ($row as $i => $v) { // TODO: If a query of the format 'SELECT a.id, b.text FROM table' is used, // the sqlite extension will give us key indizes 'a.id' and 'b.text' // instead of just 'id' and 'text' like in mysql/postgresql extension. // To fix that, we use a preg-regex; but that is quite performance costy. // Either we always need to use 'SELECT a.id AS id, b.text AS text' in query, // or the sqlite extension may get fixed. :-) $row[preg_replace('@^.+\.(.*)@', '\1', $i)] = str_replace($search, $replace, $v); } return $row; } function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=true, $assocKey=false, $assocVal=false) { global $serendipity; static $type_map = array( 'assoc' => SQLITE_ASSOC, 'num' => SQLITE_NUM, 'both' => SQLITE_BOTH ); static $debug = false; if ($debug) $fp = @fopen('sqlite.log', 'a'); if ($reportErr) { $res = sqlite_query($sql, $serendipity['dbConn']); } else { $res = @sqlite_query($sql, $serendipity['dbConn']); } if (!$res) { if (!$serendipity['production']) { var_dump($res); var_dump($sql); return "problem with query"; } if ($debug) fwrite($fp, '[' . date('d.m.Y H:i') . '] [ERROR] SQLITE QUERY: ' . $sql . "\n\n"); return false; } elseif ($debug) { fwrite($fp, '[' . date('d.m.Y H:i') . '] SQLITE QUERY: ' . $sql . "\n\n"); } if ($res === true) { return true; } if (sqlite_num_rows($res) == 0) { if ($single) { return false; } return true; } else { $rows = array(); while (($row = serendipity_db_sqlite_fetch_array($res, $type_map[$result_type]))) { if (!empty($assocKey) && !empty($assocVal)) { // You can fetch a key-associated array via the two function parameters assocKey and assocVal $rows[$row[$assocKey]] = $row[$assocVal]; } else { $rows[] = $row; } } if ($debug) fwrite($fp, '[' . date('d.m.Y H:i') . '] SQLITE RESULT: ' . print_r($rows, true). "\n\n"); if ($debug) fclose($fp); if ($single && count($rows) == 1) { return $rows[0]; } return $rows; } } function serendipity_db_probe($hash, &$errs) { global $serendipity; $dbName = (isset($hash['sqlitedbName']) ? $hash['sqlitedbName'] : $hash['dbName']); if (!function_exists('sqlite_open')) { $errs[] = 'SQLite extension not installed. Run "pear install sqlite" on your webserver or contact your systems administrator regarding this problem.'; return false; } $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . $dbName . '.db'); if ($serendipity['dbConn']) { return true; } $errs[] = "Unable to open \"{$serendipity['serendipityPath']}$dbName.db\" - check permissions (directory needs to be writeable for webserver)!"; return false; } function serendipity_db_schema_import($query) { static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}'); static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL'); if (stristr($query, '{FULLTEXT_MYSQL}')) { return true; } return serendipity_db_query(str_replace($search, $replace, $query)); } function serendipity_db_limit($start, $offset) { return $start . ', ' . $offset; } function serendipity_db_limit_sql($limitstring) { return ' LIMIT ' . $limitstring; } function serendipity_db_concat($string) { return 'concat(' . $string . ')'; } /* vim: set sts=4 ts=4 expandtab : */ ?> |
