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
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tom S. <tom...@us...> - 2004-11-28 02:03:32
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/templates/default Modified Files: entries.tpl Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- entries.tpl 24 Nov 2004 10:37:53 -0000 1.3 +++ entries.tpl 27 Nov 2004 22:14:19 -0000 1.4 @@ -64,7 +64,7 @@ {/if} {if $entry.is_entry_owner and not $is_preview} - | <a href="{$serendipityBaseURL}serendipity_entries.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]={$entry.id}">{$CONST.EDIT_ENTRY}</a> + | <a href="{$serendipityBaseURL}serendipity_admin.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]={$entry.id}">{$CONST.EDIT_ENTRY}</a> {/if} {$entry.add_footer} |
|
From: Tom S. <tom...@us...> - 2004-11-28 02:00:15
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23721 Modified Files: serendipity_lang_en.inc.php Log Message: - "from" Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- serendipity_lang_en.inc.php 27 Nov 2004 22:14:17 -0000 1.88 +++ serendipity_lang_en.inc.php 28 Nov 2004 01:50:52 -0000 1.89 @@ -132,7 +132,7 @@ @define('TRACKBACKS', 'Trackbacks'); @define('TRACKBACK', 'Trackback'); @define('NO_TRACKBACKS', 'No Trackbacks'); -@define('TOPICS_OF', 'Topics of'); +@define('TOPICS_OF', 'Topics from'); @define('VIEW_FULL', 'view full'); @define('VIEW_TOPICS', 'view topics'); @define('AT', 'at'); @@ -158,7 +158,7 @@ @define('COMMENTS_ENABLE', 'Allow comments to this entry'); @define('COMMENTS_CLOSED', 'The author does not allow comments to this entry'); @define('EMPTY_COMMENT', 'Your comment did not contain anything, please %sgo back%s and try again'); -@define('ENTRIES_FOR', 'Entries for %s'); +@define('ENTRIES_FOR', 'Entries from %s'); @define('DOCUMENT_NOT_FOUND', 'The document %s was not found.'); @define('USERNAME', 'Username'); @define('PASSWORD', 'Password'); |
|
From: Tom S. <tom...@us...> - 2004-11-28 01:58:45
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24195 Modified Files: entries_summary.tpl Log Message: - We don't care about sticky or dates, just give us a list Index: entries_summary.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/entries_summary.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- entries_summary.tpl 19 Nov 2004 11:06:07 -0000 1.2 +++ entries_summary.tpl 28 Nov 2004 01:53:29 -0000 1.3 @@ -1,12 +1,12 @@ <div class='serendipity_date'>{$CONST.TOPICS_OF} {$entries.entries.date|@formatTime:"%B, %Y"}</div> <div class="serendipity_entry"> + <ul> {foreach from=$entries item="entries"} - <ul> {foreach from=$entries.entries item="entry"} <li><a href="{$entry.link}">{$entry.title}</a> <br />{$CONST.POSTED_BY} {$entry.username} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li> {/foreach} - </ul> {/foreach} + </ul> </div> |
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/lang Modified Files: serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php serendipity_lang_tw.inc.php Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- serendipity_lang_cs.inc.php 26 Nov 2004 14:40:14 -0000 1.67 +++ serendipity_lang_cs.inc.php 27 Nov 2004 22:14:17 -0000 1.68 @@ -609,6 +609,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serendipity_lang_no.inc.php 26 Nov 2004 14:40:16 -0000 1.8 +++ serendipity_lang_no.inc.php 27 Nov 2004 22:14:18 -0000 1.9 @@ -604,5 +604,8 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate ?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- serendipity_lang_nl.inc.php 26 Nov 2004 14:40:16 -0000 1.43 +++ serendipity_lang_nl.inc.php 27 Nov 2004 22:14:18 -0000 1.44 @@ -614,6 +614,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- serendipity_lang_en.inc.php 26 Nov 2004 14:40:15 -0000 1.87 +++ serendipity_lang_en.inc.php 27 Nov 2004 22:14:17 -0000 1.88 @@ -606,6 +606,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_lang_tw.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_lang_tw.inc.php 26 Nov 2004 14:40:16 -0000 1.3 +++ serendipity_lang_tw.inc.php 27 Nov 2004 22:14:18 -0000 1.4 @@ -607,6 +607,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- serendipity_lang_bg.inc.php 26 Nov 2004 14:40:14 -0000 1.21 +++ serendipity_lang_bg.inc.php 27 Nov 2004 22:14:17 -0000 1.22 @@ -591,6 +591,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- serendipity_lang_pt.inc.php 26 Nov 2004 14:40:16 -0000 1.43 +++ serendipity_lang_pt.inc.php 27 Nov 2004 22:14:18 -0000 1.44 @@ -610,6 +610,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- serendipity_lang_it.inc.php 26 Nov 2004 14:40:15 -0000 1.7 +++ serendipity_lang_it.inc.php 27 Nov 2004 22:14:18 -0000 1.8 @@ -609,6 +609,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- serendipity_lang_da.inc.php 26 Nov 2004 14:40:15 -0000 1.87 +++ serendipity_lang_da.inc.php 27 Nov 2004 22:14:17 -0000 1.88 @@ -604,6 +604,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- serendipity_lang_fr.inc.php 26 Nov 2004 14:40:15 -0000 1.66 +++ serendipity_lang_fr.inc.php 27 Nov 2004 22:14:17 -0000 1.67 @@ -612,6 +612,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- serendipity_lang_cz.inc.php 26 Nov 2004 14:40:15 -0000 1.67 +++ serendipity_lang_cz.inc.php 27 Nov 2004 22:14:17 -0000 1.68 @@ -607,6 +607,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- serendipity_lang_es.inc.php 26 Nov 2004 14:40:15 -0000 1.84 +++ serendipity_lang_es.inc.php 27 Nov 2004 22:14:17 -0000 1.85 @@ -615,6 +615,9 @@ @define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate @define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate @define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- serendipity_lang_de.inc.php 26 Nov 2004 14:40:15 -0000 1.106 +++ serendipity_lang_de.inc.php 27 Nov 2004 22:14:17 -0000 1.107 @@ -606,6 +606,9 @@ @define('IFRAME_PREVIEW', 'Serendipity speichert nun den Eintrag, erstellt Trackbacks und führt etwaige XML-RPC Aufrufe durch. Die kann eine Weile dauern.'); @define('IFRAME_SAVE', 'Serendipity erstellt jetzt eine Vorschau des Eintrags...'); @define('IFRAME_WARNING', 'Ihr Browser unterstützt keine IFRAMES. Bitte öffnen Sie die Datei serendipity_config.inc.php und stellen die Variable $serendipity[\'use_iframe\'] auf FALSE.'); +@define('WELCOME_TO_ADMIN', 'Welcome to the Serendipity Administration Suite.'); // Translate +@define('PLEASE_ENTER_CREDENTIALS', 'Please enter your credentials below.'); // Translate +@define('ADMIN_FOOTER_POWERED_BY', 'Powered by Serendipity %s and PHP %s'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file |
|
From: Tom S. <tom...@us...> - 2004-11-27 22:15:06
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304 Modified Files: index.php serendipity_admin.php serendipity_config.inc.php Removed Files: serendipity_entries.php Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- serendipity_config.inc.php 26 Nov 2004 14:40:12 -0000 1.103 +++ serendipity_config.inc.php 27 Nov 2004 22:14:12 -0000 1.104 @@ -15,7 +15,7 @@ include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php'); -$serendipity['version'] = '0.8-alpha3'; +$serendipity['version'] = '0.8-alpha4'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = true; // Setting this to 'false' will enable debugging output $serendipity['rewrite'] = 'none'; @@ -70,8 +70,6 @@ @define('PATH_DELETE', 'delete'); @define('PATH_APPROVE', 'approve'); @define('PATH_FEEDS', 'feeds'); -@define('PATH_ADMIN', 'admin'); -@define('PATH_ENTRIES', 'entries'); @define('PATH_CATEGORIES', 'categories'); @define('PATH_PLUGIN', 'plugin'); @define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory @@ -88,8 +86,7 @@ @define('PAT_COMMENTSUB', '@/([0-9]+)[_\-][' . PAT_FILENAME . ']*\.html@i'); @define('PAT_FEEDS', '@/'.PATH_FEEDS.'/@'); @define('PAT_FEED', '@/(index|atom|rss|b2rss|b2rdf).(rss|rdf|rss2|xml)$@'); -@define('PAT_ADMIN', '@/'.PATH_ADMIN.'$@'); -@define('PAT_ENTRIES', '@/'.PATH_ENTRIES.'$@'); +@define('PAT_ADMIN', '@/(admin|author)(/.+)?@'); @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@'); @define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@'); @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@'); @@ -195,7 +192,7 @@ */ if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) { - die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], 'serendipity_admin.php')); + die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php')); } // We don't care who tells us what to do --- serendipity_entries.php DELETED --- Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- index.php 21 Nov 2004 16:28:54 -0000 1.59 +++ index.php 27 Nov 2004 22:14:12 -0000 1.60 @@ -176,9 +176,6 @@ } else if (preg_match(PAT_ADMIN, $uri)) { header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php"); exit; -} else if (preg_match(PAT_ENTRIES, $uri)) { - header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php"); - exit; } else if (preg_match(PAT_ARCHIVE, $uri)) { $serendipity['GET']['action'] = 'archives'; include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php'); Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- serendipity_admin.php 26 Nov 2004 14:40:12 -0000 1.44 +++ serendipity_admin.php 27 Nov 2004 22:14:12 -0000 1.45 @@ -1,12 +1,13 @@ <?php # $Id$ session_start(); + define('IN_installer', true); define('IN_upgrader', true); include('serendipity_config.inc.php'); header('Content-Type: text/html; charset=' . LANG_CHARSET); -if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout'){ +if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout') { serendipity_logout(); } else { if (IS_installed === true) { @@ -14,36 +15,37 @@ } } +// If we are inside an iframe, halt the script if (serendipity_is_iframe()) { - return true; // break out of current document + return true; } + ?> <html> <head> <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" /> - <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" /> -<?php -if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') { -?> - <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" /> -<?php -} -?> + <link rel="stylesheet" type="text/css" href="<?php echo serendipity_getTemplateFile('admin/style.css') ?>" /> </head> + <body id="serendipity_admin_page" onLoad="if (self.Spawnnugget) { Spawnnugget(); }"> + <div id="serendipityAdminFrame"> + <div id="serendipityAdminBanner"> + <?php if ( IS_installed === true && IS_up2date === true ) { ?> + <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1> + <h2><?php echo $serendipity['blogTitle'] ?></h2> + <?php } elseif ( IS_installed === false || IS_up2date === false ) { ?> + <h1><?php echo SERENDIPITY_INSTALLATION ?></h1> + <?php } ?> + </div> -<body class="s9y_wrap" id="serendipity_admin_page" onLoad="if (self.Spawnnugget) { Spawnnugget(); }"> - <div id="serendipity_banner"> -<?php if ( IS_installed === true && IS_up2date === true ) { ?> - <h1><?php echo (isset($serendipity['blogTitle']) ? $serendipity['blogTitle'] : ''); ?></h1> - <h2><?php echo SERENDIPITY_ADMIN_SUITE . ((serendipity_userLoggedIn()) ? ' ('. sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) .')' : ''); ?></h2> -<?php } elseif ( IS_installed === false || IS_up2date === false ) { ?> - <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1> - <h2><?php echo SERENDIPITY_INSTALLATION ?></h2> -<?php } ?> - </div> - <table id="mainpane"> - <tr valign="top"> + <div id="serendipityAdminInfopane"> + <?php if (serendipity_userLoggedIn()) { ?> + <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?> + <?php } ?> + </div> + + <table id="serendipityAdminMainpane" width="100%" cellspacing="0" cellpadding="0"> + <tr valign="top"> <?php if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) { if (IS_installed === false) { @@ -51,54 +53,124 @@ } elseif ( IS_up2date === false ) { $file = 'include/admin/upgrader.inc.php'; } else { - $file = ''; // For register_global users don't let us be tricked to include a different file somehow + $file = ''; // For register_global, safety } +?> + <td> + <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?> +<?php +} elseif ( serendipity_userLoggedIn() == false ) { ?> - <td class="serendipity_admin"> - <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div> - <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?> + <td id="content"> + <div class="serendipityAdminContent"> + <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div> + <br /> <?php -} elseif ( !serendipity_userLoggedIn() ) { - serendipity_printLogin(); + if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { +?> + <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> +<?php + } +?> + <form action="?" method="post"> + <input type="hidden" name="serendipity[action]" value="admin" /> + <table cellspacing="10" cellpadding="0" border="0" align="center"> + <tr> + <td><?php echo USERNAME ?></td> + <td><input type="text" name="serendipity[user]" /></td> + </tr> + <tr> + <td><?php echo PASSWORD ?></td> + <td><input type="password" name="serendipity[pass]" /></td> + </tr> + <tr> + <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?> + </tr> + <tr> + <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" /></td> + </tr> + </table> + </form> + <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a> +<?php + + + } else { ?> - <td id="serendipityLeftSideBar"> + <td id="serendipitySideBar"> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br /> + </div> + </div> + + + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo ucfirst(ENTRIES); ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?> + </div> + </div> + + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo CATEGORIES; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=category&serendipity[adminAction]=editSelect"><?php echo EDIT_CATEGORIES; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_categories', $serendipity); ?> + </div> + </div> + + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo MEDIA; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a><br /> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div> - <div class="serendipitySideBarContent"> - • <a href="?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a><br /> - • <a href="?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a><br /> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> + • <a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a><br /> +<?php } ?> + • <a href="serendipity_admin.php?serendipity[adminModule]=media&serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?> + </div> + </div> + +<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?> + </div> </div> - </div> <?php } ?> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div> - <div class="serendipitySideBarContent"> - • <a href="?serendipity[adminModule]=installer"><?php echo CONFIGURATION; ?></a><br /> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div> + <div class="serendipitySideBarContent"> + • <a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a><br /> <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> - • <a href="?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br /> <?php } ?> - • <a href="?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a><br /> - • <a href="?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a><br /> - <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> - </div> - </div> - <div class="serendipitySideBarItem"> - <div class="serendipitySideBarContent"> - • <a href="<?php echo $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ENTRIES; ?>"><?php echo AUTHOR_SUITE; ?></a><br /> - • <a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> - • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a><br /> + <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> + </div> </div> - </div> - </td> - <td id="content"> - <div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div> - <div class="serendipity_admin"> + <div class="serendipitySideBarItem"> + <div class="serendipitySideBarContent"> + • <a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a><br /> + • <a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br /> + </div> + </div> + </td> + <td id="content"> + <div class="serendipityAdminContent"> <?php if (!isset($serendipity['GET']['adminModule'])) { $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : ''); @@ -106,9 +178,11 @@ switch($serendipity['GET']['adminModule']) { case 'installer': + case 'configuration': include S9Y_INCLUDE_PATH . 'include/admin/installer.inc.php'; break; + case 'media': case 'images': include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php'; break; @@ -133,21 +207,45 @@ include S9Y_INCLUDE_PATH . 'include/admin/import.inc.php'; break; + case 'entries': + include S9Y_INCLUDE_PATH . 'include/admin/entries.inc.php'; + break; + + case 'comments': + include S9Y_INCLUDE_PATH . 'include/admin/comments.inc.php'; + break; + + case 'category': + case 'categories': + include S9Y_INCLUDE_PATH . 'include/admin/category.inc.php'; + break; + + case 'logout': + echo LOGGEDOUT; + break; + + case 'event_display': + serendipity_plugin_api::hook_event('backend_sidebar_entries_event_display_' . $serendipity['GET']['adminAction'], $serendipity); + break; + case 'logout': echo LOGGEDOUT; break; default: include S9Y_INCLUDE_PATH . 'include/admin/overview.inc.php'; + break; } } ?> - </div> - </td> - </tr> - </table> - -</body> + </div> + </td> + </tr> + </table> + <br /> + <div id="serendipityAdminFooter"><?php echo sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion()); ?></div> + </div> + </body> </html> <?php /* vim: set sts=4 ts=4 expandtab : */ |
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/include Modified Files: functions.inc.php functions_entries.inc.php functions_images.inc.php functions_installer.inc.php plugin_api.inc.php plugin_internal.inc.php Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- functions_installer.inc.php 20 Nov 2004 14:09:10 -0000 1.4 +++ functions_installer.inc.php 27 Nov 2004 22:14:14 -0000 1.5 @@ -87,7 +87,7 @@ case 'serendipityPath': $test_path1 = $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/'; $test_path2 = serendipity_getRealDir(__FILE__); - if (file_exists($test_path1 . 'serendipity_entries.php')) { + if (file_exists($test_path1 . 'serendipity_admin.php')) { return $test_path1; } else { return $test_path2; Index: functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- functions.inc.php 19 Nov 2004 11:05:29 -0000 1.2 +++ functions.inc.php 27 Nov 2004 22:14:13 -0000 1.3 @@ -671,42 +671,6 @@ return (strpos($d, "\r") === false && strpos($d, "\n") === false); } -function serendipity_printLogin() { - global $serendipity; -?> - <td id="content"> - <div class="serendipity_admin_title serendipity_center"><?php echo HAVE_TO_BE_LOGGED_ON ?></div> - <div class="serendipity_admin"> -<?php - if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { -?> - <div class="serendipity_center serendipity_msg_important"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div> -<?php - } -?> - <form action="?" method="post"> - <input type="hidden" name="serendipity[action]" value="admin" /> - <table cellspacing="3" cellpadding="0" border="0" align="center" width="300"> - <tr> - <td><?php echo USERNAME ?></td> - <td><input type="text" name="serendipity[user]" /></td> - </tr> - <tr> - <td><?php echo PASSWORD ?></td><td><input type="password" name="serendipity[pass]" /></td> - </tr> - <tr> - <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?></label></td> - </tr> - <tr> - <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> >" /></td> - </tr> - </table> - </form> - </div> - <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a> -<?php -} - define("serendipity_FUNCTIONS_LOADED", true); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- functions_entries.inc.php 26 Nov 2004 14:40:13 -0000 1.10 +++ functions_entries.inc.php 27 Nov 2004 22:14:14 -0000 1.11 @@ -1152,7 +1152,7 @@ if (!empty($errMsg)) { ?> - <span class="serendipity_msg_important"><?php echo $errMsg; ?></span> + <div class="serendipityAdminMsgError"><?php echo $errMsg; ?></div> <?php } ?> <form action="<?php echo $targetURL; ?>" method="post" <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px"> <?php echo $hidden; ?> @@ -1165,7 +1165,7 @@ <td colspan="2"> <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td><input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlspecialchars($entry['title']) : ''; ?>" size="72" /></td> + <td><input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlspecialchars($entry['title']) : ''; ?>" size="60" /></td> <td align="right"> <select name="serendipity[isdraft]"> <?php if ($_SESSION['serendipityRightPublish']) { ?><option value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option><?php } ?> @@ -1603,8 +1603,8 @@ </head> <body style="padding: 0px; margin: 0px;"> - <div id="mainpane" style="padding: 0px; margin: 0px;"> - <div id="content" style="height: 100%; padding: 0px; margin: 0px"> + <div id="mainpane" style="padding: 0px; margin: auto; width: 99%;"> + <div id="content" style="padding: 0px; margin: 0px;"> <?php // We need to restore GET/POST variables to that depending plugins inside the iframe // can still fetch all that variables; and we also tighten security by not allowing @@ -1642,7 +1642,7 @@ // it needs to be stored with the new ID. echo '<script type="text/javascript">parent.document.forms[\'serendipityEntry\'][\'serendipity[id]\'].value = "' . $serendipity['lastSavedEntry'] . '";</script>'; } - echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>'; + echo '<div class="serendipityAdminMsgSuccess">' . ENTRY_SAVED . '</div>'; } return true; @@ -1653,10 +1653,7 @@ serendipity_smarty_init(); $serendipity['smarty']->assign('is_preview', true); - echo '<strong>' . PREVIEW . '</strong>'; - echo '<div style="border:1px solid #000000; padding: 15px;">'; serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true); - echo '</div>'; return true; break; @@ -1677,16 +1674,16 @@ switch($mode) { case 'save': $attr = ' height="100" '; - echo '<div class="serendipity_msg_notice">' . IFRAME_PREVIEW . '</div><br />'; + echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_PREVIEW . '</div><br />'; break; case 'preview': $attr = ' height="300" '; - echo '<div class="serendipity_msg_notice">' . IFRAME_SAVE . '</div><br />'; + echo '<div class="serendipityAdminMsgSuccess">' . IFRAME_SAVE . '</div><br />'; break; } - echo '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&serendipity[iframe_mode]=' . $mode . '" name="serendipity_iframe" ' . $attr . ' width="95%" frameborder="1" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">' + echo '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&serendipity[iframe_mode]=' . $mode . '" id="serendipity_iframe" name="serendipity_iframe" ' . $attr . ' width="100%" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">' . IFRAME_WARNING . '</iframe><br /><br />'; } Index: plugin_internal.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- plugin_internal.inc.php 24 Nov 2004 18:52:21 -0000 1.8 +++ plugin_internal.inc.php 27 Nov 2004 22:14:14 -0000 1.9 @@ -751,7 +751,7 @@ $base = $serendipity['serendipityHTTPPath']; } - $link = $base . ($serendipity['rewrite'] == 'none' ? 'serendipity_entries.php?/' : '') . PATH_ENTRIES; + $link = $base . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] .'?/' : '') . 'admin'; $text = (($_SESSION['serendipityAuthedUser'] === true) ? SUPERUSER_OPEN_ADMIN : SUPERUSER_OPEN_LOGIN); echo '<a href="' . $link . '" title="'. $text .'">'. $text .'</a>'; } Index: plugin_api.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- plugin_api.inc.php 23 Nov 2004 12:47:02 -0000 1.5 +++ plugin_api.inc.php 27 Nov 2004 22:14:14 -0000 1.6 @@ -615,8 +615,16 @@ /* Fetches a configuration value for this plugin */ function get_config($name, $defaultvalue = null, $empty = true) { - $name = $this->instance . '/' . $name; - return serendipity_get_config_var($name, $defaultvalue, $empty); + $_res = serendipity_get_config_var($this->instance . '/' . $name, $defaultvalue, $empty); + + if (is_null($_res)) { + $cbag = new serendipity_property_bag; + $this->introspect_config_item($name, $cbag); + $_res = $cbag->get('default'); + unset($cbag); + } + + return $_res; } function set_config($name, $value) Index: functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- functions_images.inc.php 19 Nov 2004 11:05:30 -0000 1.2 +++ functions_images.inc.php 27 Nov 2004 22:14:14 -0000 1.3 @@ -288,7 +288,7 @@ $returnsize = serendipity_makeThumbnail($filename, false, $file['authorid'], '', false); printf(RESIZE_BLAHBLAH, $filename . ': ' . $returnsize[0] . 'x' . $returnsize[1]); if (!file_exists($newThumb)) { - printf('<span class="serendipity_msg_important">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); + printf('<span class="serendipityAdminMsgError">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); } else { $update = true; } @@ -298,7 +298,7 @@ printf(THUMBNAIL_USING_OWN . '<br />', $filename); $update = true; } else { - printf('<span class="serendipity_msg_important">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); + printf('<span class="serendipityAdminMsgError">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename); } } |
|
From: Tom S. <tom...@us...> - 2004-11-27 22:15:04
|
Update of /cvsroot/php-blog/serendipity/include/tpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/include/tpl Modified Files: htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: htaccess_rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- htaccess_rewrite.tpl 19 Nov 2004 11:05:34 -0000 1.2 +++ htaccess_rewrite.tpl 27 Nov 2004 22:14:16 -0000 1.3 @@ -13,8 +13,7 @@ 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_ADMIN} {indexFile}?url=admin/ [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 Index: htaccess_cgi_rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- htaccess_cgi_rewrite.tpl 19 Nov 2004 11:05:34 -0000 1.2 +++ htaccess_cgi_rewrite.tpl 27 Nov 2004 22:14:16 -0000 1.3 @@ -11,8 +11,7 @@ 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_ADMIN} {indexFile}?url=admin/ [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 |
|
From: Tom S. <tom...@us...> - 2004-11-27 22:15:04
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/docs Modified Files: NEWS Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- NEWS 26 Nov 2004 14:40:13 -0000 1.9 +++ NEWS 27 Nov 2004 22:14:13 -0000 1.10 @@ -3,11 +3,18 @@ Version 0.8 () ------------------------------------------------------------------------ + * Separate administration layout from the rest of the blog + (tomsommer) + + * Merge Administration and Author suite into one (tomsommer) + + * Allow $plugin->get_config([var]) to return the default value from + introspect_config_item() if no value is found (tomsommer) + * Preview/Saving entries now utilizes iframe techniques to faster send visual feedback and properly be able to style the entry preview independent from the Admin CSS code. [For older browsers, this can be turned of in serendipity_config.inc.php] - - EXPERIMENTAL, may not yet be ready for productive use. (garvinhicking) * Allow sending trackbacks and tracking links of https URLs. Fix |
|
From: Tom S. <tom...@us...> - 2004-11-27 22:14:49
|
Update of /cvsroot/php-blog/serendipity/templates/default/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10304/templates/default/admin Added Files: style.css Log Message: - Merged author and admin suites - New separated layout for Administration Suite - Fixed lots of layout quirks, make the admin look more unified - Fixed some invalid HTML (unclosed/excess tags) - Remove some unneeded session_start() functions in included admin files - Allow $plugin->get_config() to return the default value as defined in introspect_config_item, when only given one argument - Fixed bug in upgrader, not allowing multiple upgrade functions for a single version - Killed serendipity_printLogin() and moved it to serendipity_admin.php - Pretty up the iframe stuff - Added aliases to some adminModules --- NEW FILE: style.css --- body { font-family: Verdana; margin: 0px 0px 0px 0px; background-color: #597599; } #serendipityAdminFrame { width: 777px; margin: auto; } #serendipityAdminMainpane { background-color: #FFFFFF; border-bottom: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; height: 400px; } #serendipityAdminInfopane { background-color: #F8F9FA; font-size: x-small; padding: 5px; padding-left: 5px; border-right: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; border-bottom: 1px solid #C2C2C2; border-top: 1px solid #C2C2C2; vertical-align: middle; text-align: right; color: #5E5E5E; } #serendipityAdminBanner { background-color: #FFFFFF; border-right: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; height: 80px; } #serendipityAdminBanner h1 { padding-top: 20px; padding-left: 20px; font-size: large; margin: 0; } #serendipityAdminBanner h2 { padding-left: 30px; font-size: small; color: #BBBBBB; margin: 0; } #serendipitySideBar { font-size: small; width: 150px; padding-top: 10px; } #serendipityAdminFooter { font-size: x-small; text-align: center; color: #FFFFFF; } .serendipitySideBarTitle { padding-left: 2px; font-weight: bold; font-size: small; } .serendipitySideBarContent { padding-left: 10px; font-size: x-small; } .serendipitySideBarItem { margin-bottom: 10px; } .serendipity_admin_title { font-size: large; margin-bottom: 5px; } .serendipityAdminContent { font-size: small; padding-top: 10px; padding-right: 5px; padding-left: 5px; } .serendipity_admin_list_item.serendipity_admin_list_item_uneven { border: 1px solid #294366; background-color: #F8F9FA; margin-bottom: 5px; } .serendipity_admin_list_item.serendipity_admin_list_item_even { border: 1px solid #294366; background-color: #F2F3F2; margin-bottom: 5px; } .serendipityAdminMsgError { color: #FF0000; text-align: center; font-weight: bold; margin: 10px; } .serendipityAdminMsgSuccess { color: #00BB00; text-align: center; font-weight: bold; margin: 10px; } td, th { font-size: small; } a:visited, a:link { color: #294366; text-decoration: underline; } a:hover { color: #D40041; } input, select, textarea { background-color: #F8F9FA; font-family: verdana; font-size: small; border: 1px solid #294366; } #serendipity_iframe { border: 1px solid #294366; text-align: center; margin: auto; } |
|
From: Tom S. <tom...@us...> - 2004-11-27 18:46:03
|
Update of /cvsroot/php-blog/serendipity/templates/default/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv495/admin Log Message: Directory /cvsroot/php-blog/serendipity/templates/default/admin added to the repository |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:40:54
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30356/docs Modified Files: NEWS Log Message: Since I'm gone for the weekend, here's something for you to play with. Tom basically agreed to it, and I get it working well on my setup. However this is EXPERIMENTAL. You have been warned. If it breaks seriously, I won't be offended if anyone reverts the commit - but I don't think it's unstable, though. :-) Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- NEWS 25 Nov 2004 15:18:34 -0000 1.8 +++ NEWS 26 Nov 2004 14:40:13 -0000 1.9 @@ -3,6 +3,13 @@ Version 0.8 () ------------------------------------------------------------------------ + * Preview/Saving entries now utilizes iframe techniques to faster + send visual feedback and properly be able to style the entry + preview independent from the Admin CSS code. [For older browsers, + this can be turned of in serendipity_config.inc.php] + - EXPERIMENTAL, may not yet be ready for productive use. + (garvinhicking) + * Allow sending trackbacks and tracking links of https URLs. Fix "Entry's Links" plugin to properly display trackable links. (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:40:54
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30356 Modified Files: serendipity_admin.php serendipity_config.inc.php Log Message: Since I'm gone for the weekend, here's something for you to play with. Tom basically agreed to it, and I get it working well on my setup. However this is EXPERIMENTAL. You have been warned. If it breaks seriously, I won't be offended if anyone reverts the commit - but I don't think it's unstable, though. :-) Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- serendipity_config.inc.php 19 Nov 2004 11:24:34 -0000 1.102 +++ serendipity_config.inc.php 26 Nov 2004 14:40:12 -0000 1.103 @@ -52,6 +52,9 @@ $serendipity['fetchLimit'] = 15; } +// Should IFRAMEs be used for previewing entries and sending trackbacks? +$serendipity['use_iframe'] = true; + /* * Load main language file */ Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- serendipity_admin.php 19 Nov 2004 11:04:59 -0000 1.43 +++ serendipity_admin.php 26 Nov 2004 14:40:12 -0000 1.44 @@ -13,6 +13,10 @@ serendipity_login(); } } + +if (serendipity_is_iframe()) { + return true; // break out of current document +} ?> <html> <head> |
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30356/lang Modified Files: serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php serendipity_lang_tw.inc.php Log Message: Since I'm gone for the weekend, here's something for you to play with. Tom basically agreed to it, and I get it working well on my setup. However this is EXPERIMENTAL. You have been warned. If it breaks seriously, I won't be offended if anyone reverts the commit - but I don't think it's unstable, though. :-) Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- serendipity_lang_cs.inc.php 19 Nov 2004 11:05:35 -0000 1.66 +++ serendipity_lang_cs.inc.php 26 Nov 2004 14:40:14 -0000 1.67 @@ -606,6 +606,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- serendipity_lang_no.inc.php 19 Nov 2004 11:05:36 -0000 1.7 +++ serendipity_lang_no.inc.php 26 Nov 2004 14:40:16 -0000 1.8 @@ -601,5 +601,8 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate ?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- serendipity_lang_nl.inc.php 19 Nov 2004 11:05:36 -0000 1.42 +++ serendipity_lang_nl.inc.php 26 Nov 2004 14:40:16 -0000 1.43 @@ -611,6 +611,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- serendipity_lang_en.inc.php 19 Nov 2004 11:05:35 -0000 1.86 +++ serendipity_lang_en.inc.php 26 Nov 2004 14:40:15 -0000 1.87 @@ -603,6 +603,9 @@ @define('STATUS', 'Status after import'); @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_tw.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_lang_tw.inc.php 19 Nov 2004 11:05:36 -0000 1.2 +++ serendipity_lang_tw.inc.php 26 Nov 2004 14:40:16 -0000 1.3 @@ -604,6 +604,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- serendipity_lang_bg.inc.php 19 Nov 2004 11:05:35 -0000 1.20 +++ serendipity_lang_bg.inc.php 26 Nov 2004 14:40:14 -0000 1.21 @@ -588,6 +588,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- serendipity_lang_pt.inc.php 19 Nov 2004 11:05:36 -0000 1.42 +++ serendipity_lang_pt.inc.php 26 Nov 2004 14:40:16 -0000 1.43 @@ -607,6 +607,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- serendipity_lang_it.inc.php 20 Oct 2004 16:27:25 -0000 1.6 +++ serendipity_lang_it.inc.php 26 Nov 2004 14:40:15 -0000 1.7 @@ -551,6 +551,64 @@ @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate +@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate +@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate +@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.'); // Translate +@define('MT_DATA_FILE', 'Movable Type data file'); // Translate +@define('FORCE', 'Force'); // Translate +@define('WORDPRESS_DATA', 'WordPress data'); // Translate +@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate +@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate +@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate +@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate +@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate +@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate +@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate +@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate +@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate +@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate +@define('WEEK', 'Week'); // Translate +@define('WEEKS', 'Weeks'); // Translate +@define('MONTHS', 'Months'); // Translate +@define('DAYS', 'Days'); // Translate +@define('ARCHIVE_FREQUENCY', 'Calendar item frequency'); // Translate +@define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate +@define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate +@define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate +@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate +@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate +@define('EVENT_PLUGIN', 'event plugin'); // Translate +@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate +@define('UNKNOWN', 'Unknown'); // Translate +@define('VERSION', 'version'); // Translate +@define('NA', 'N/A'); // Translate +@define('INSTALL', 'Install'); // Translate +@define('ALREADY_INSTALLED', 'Already installed'); // Translate +@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate +@define('QUICKSAVE', 'Quicksave'); // Translate +@define('INSTALL_OFFSET', 'Server time Offset'); // Translate +@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate +@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate +@define('EXPORT_ENTRIES', 'Export entries'); // Translate +@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate +@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate +@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate +@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate +@define('IMPORT_NOW', 'Import now!'); // Translate +@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate +@define('IMPORT_FAILED', 'Import failed'); // Translate +@define('IMPORT_DONE', 'Import successfully completed'); // Translate +@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate +@define('EXPORT_FEED', 'Export full RSS feed'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate +@define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- serendipity_lang_da.inc.php 19 Nov 2004 11:05:35 -0000 1.86 +++ serendipity_lang_da.inc.php 26 Nov 2004 14:40:15 -0000 1.87 @@ -601,6 +601,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- serendipity_lang_fr.inc.php 19 Nov 2004 11:05:35 -0000 1.65 +++ serendipity_lang_fr.inc.php 26 Nov 2004 14:40:15 -0000 1.66 @@ -609,6 +609,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- serendipity_lang_cz.inc.php 19 Nov 2004 11:05:35 -0000 1.66 +++ serendipity_lang_cz.inc.php 26 Nov 2004 14:40:15 -0000 1.67 @@ -604,6 +604,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- serendipity_lang_es.inc.php 19 Nov 2004 11:05:35 -0000 1.83 +++ serendipity_lang_es.inc.php 26 Nov 2004 14:40:15 -0000 1.84 @@ -612,6 +612,9 @@ @define('STATUS', 'Status after import'); // Translate @define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate @define('ACTIVATE_AUTODISCOVERY', 'Send Trackbacks to links found in the entry'); // Translate +@define('IFRAME_PREVIEW', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while, so please stay tuned.'); // Translate +@define('IFRAME_SAVE', 'Serendipity is now creating the preview of your entry...'); // Translate +@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- serendipity_lang_de.inc.php 19 Nov 2004 11:05:35 -0000 1.105 +++ serendipity_lang_de.inc.php 26 Nov 2004 14:40:15 -0000 1.106 @@ -603,6 +603,9 @@ @define('STATUS', 'Status nach dem Importieren'); @define('IMPORT_GENERIC_RSS', 'Allgemeiner RSS-Import'); @define('ACTIVATE_AUTODISCOVERY', 'Trackbacks an erkannte Links im Eintrag senden'); +@define('IFRAME_PREVIEW', 'Serendipity speichert nun den Eintrag, erstellt Trackbacks und führt etwaige XML-RPC Aufrufe durch. Die kann eine Weile dauern.'); +@define('IFRAME_SAVE', 'Serendipity erstellt jetzt eine Vorschau des Eintrags...'); +@define('IFRAME_WARNING', 'Ihr Browser unterstützt keine IFRAMES. Bitte öffnen Sie die Datei serendipity_config.inc.php und stellen die Variable $serendipity[\'use_iframe\'] auf FALSE.'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:40:25
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30356/include/admin Modified Files: entries.inc.php Log Message: Since I'm gone for the weekend, here's something for you to play with. Tom basically agreed to it, and I get it working well on my setup. However this is EXPERIMENTAL. You have been warned. If it breaks seriously, I won't be offended if anyone reverts the commit - but I don't think it's unstable, though. :-) Index: entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- entries.inc.php 20 Nov 2004 17:16:00 -0000 1.4 +++ entries.inc.php 26 Nov 2004 14:40:14 -0000 1.5 @@ -297,43 +297,39 @@ if (is_string($res)) { echo '<div class="serendipity_msg_error">' . QUICKSAVE . ': <b>' . $res . '</b></div><br />'; } else { - // serendipity_updertEntry sets this global variable to store the entry id. Couldn't pass this - // by reference or as return value because it affects too many places inside our API and dependant - // function calls. - if (!empty($serendipity['lastSavedEntry'])) { - $entry['id'] = $serendipity['lastSavedEntry']; - } echo '<div class="serendipity_msg_notice">' . QUICKSAVE . ': ' . ENTRY_SAVED . '</div><br />'; } } // Save the entry, or just display a preview if ($serendipity['POST']['preview'] != 'true') { - $res = serendipity_updertEntry($entry); - if (is_string($res)) { - serendipity_printEntryForm( - '?', - array( - 'serendipity[action]' => 'admin', - 'serendipity[adminModule]' => 'entries', - 'serendipity[adminAction]' => 'save' - ), - $entry, - ERROR . ': <b>' . $res . '</b>'); + if ($serendipity['use_iframe']) { + serendipity_iframe_create('save', $entry); } else { - echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>'; + serendipity_iframe($entry, 'save'); } } else { // Only display the preview $serendipity['hidefooter'] = true; - if (!is_numeric($entry['timestamp'])) $entry['timestamp'] = time(); - if (!isset($entry['trackbacks']) || !$entry['trackbacks']) $entry['trackbacks'] = 0; - if (!isset($entry['comments']) || !$entry['comments']) $entry['comments'] = 0; - if (!isset($entry['username']) || !$entry['username']) $entry['username'] = $serendipity['serendipityUser']; + if (!is_numeric($entry['timestamp'])) { + $entry['timestamp'] = time(); + } + + if (!isset($entry['trackbacks']) || !$entry['trackbacks']) { + $entry['trackbacks'] = 0; + } + + if (!isset($entry['comments']) || !$entry['comments']) { + $entry['comments'] = 0; + } + + if (!isset($entry['username']) || !$entry['username']) { + $entry['username'] = $serendipity['serendipityUser']; + } $categories = (array)$entry['categories']; $entry['categories'] = array(); - foreach ( $categories as $catid ) { + foreach ($categories as $catid) { $entry['categories'][] = serendipity_fetchCategoryInfo($catid); } @@ -343,27 +339,32 @@ $serendipity['GET']['id'] = 1; } - $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend - serendipity_smarty_init(); - $serendipity['smarty']->assign('is_preview', true); + if ($serendipity['use_iframe']) { + serendipity_iframe_create('preview', $entry); + } else { + serendipity_iframe($entry, 'preview'); + } + } - echo '<strong>' . PREVIEW . '</strong>'; - echo '<div style="border:1px solid #000000; padding: 15px;">'; - serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true); - echo '</div>'; + // serendipity_updertEntry sets this global variable to store the entry id. Couldn't pass this + // by reference or as return value because it affects too many places inside our API and dependant + // function calls. + if (!empty($serendipity['lastSavedEntry'])) { + $entry['id'] = $serendipity['lastSavedEntry']; + } - serendipity_printEntryForm( - '?', - array( - 'serendipity[action]' => 'admin', - 'serendipity[adminModule]' => 'entries', - 'serendipity[adminAction]' => 'save', - 'serendipity[timestamp]' => $entry['timestamp'] - ), + serendipity_printEntryForm( + '?', + array( + 'serendipity[action]' => 'admin', + 'serendipity[adminModule]' => 'entries', + 'serendipity[adminAction]' => 'save', + 'serendipity[timestamp]' => $entry['timestamp'] + ), + + $entry + ); - $entry - ); - } break; case 'editSelect': |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:40:24
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30356/include Modified Files: functions_entries.inc.php Log Message: Since I'm gone for the weekend, here's something for you to play with. Tom basically agreed to it, and I get it working well on my setup. However this is EXPERIMENTAL. You have been warned. If it breaks seriously, I won't be offended if anyone reverts the commit - but I don't think it's unstable, though. :-) Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- functions_entries.inc.php 26 Nov 2004 14:10:01 -0000 1.9 +++ functions_entries.inc.php 26 Nov 2004 14:40:13 -0000 1.10 @@ -1145,7 +1145,7 @@ foreach($hiddens as $key => $value) { $hidden .= ' <input type="hidden" name="' . $key . '" value="' . $value . '" />' . $n; } - $hidden .= ' <input type="hidden" name="serendipity[id]" value="' . (isset($entry['id']) ? $entry['id'] : '') . '" />' . $n; + $hidden .= ' <input type="hidden" id="entryid" name="serendipity[id]" value="' . (isset($entry['id']) ? $entry['id'] : '') . '" />' . $n; $hidden .= ' <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? serendipity_serverOffsetHour($entry['timestamp']) : '') . '" />' . $n; $hidden .= ' <input type="hidden" name="serendipity[preview]" value="false" />'; $hidden .= ' <input type="hidden" name="serendipity[quicksave]" value="false" />'; @@ -1582,3 +1582,111 @@ serendipity_smarty_fetch('ARCHIVES', 'entries_archives.tpl', true); } + +function serendipity_is_iframe() { + global $serendipity; + + if ($serendipity['GET']['is_iframe'] && is_array($_SESSION['save_entry'])) { + // An iframe may NOT contain <html> and </html> tags, that's why we emit different headers here than on serendipity_admin.php +?> + <head> + <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title> + <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo (isset($serendipity['serendipityHTTPPath']) ? $serendipity['serendipityHTTPPath'] : ''); ?>serendipity.css.php" /> +<?php + if (!empty($serendipity['extCSS']) && strtolower($serendipity['extCSS']) != 'none') { +?> + <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['extCSS']; ?>" /> +<?php + } +?> + </head> + + <body style="padding: 0px; margin: 0px;"> + <div id="mainpane" style="padding: 0px; margin: 0px;"> + <div id="content" style="height: 100%; padding: 0px; margin: 0px"> +<?php + // We need to restore GET/POST variables to that depending plugins inside the iframe + // can still fetch all that variables; and we also tighten security by not allowing + // to pass any different GET/POST variables to our iframe. + $iframe_mode = $serendipity['GET']['iframe_mode']; + $serendipity['POST'] = &$_SESSION['save_entry_POST']; + $serendipity['GET'] = &$_SESSION['save_entry_POST']; // GET-Vars are the same as POST to ensure compatibility. + ignore_user_abort(true); + serendipity_iframe($_SESSION['save_entry'], $iframe_mode); +?> + </div> + </div> + </body> +<?php + return true; + } + return false; +} + +function serendipity_iframe(&$entry, $mode = null) { + global $serendipity; + + if (empty($mode) || !is_array($entry)) { + return false; + } + + switch ($mode) { + case 'save': + $res = serendipity_updertEntry($entry); + if (is_string($res)) { + echo '<div class="serendipity_msg_error">' . ERROR . ': <b>' . $res . '</b></div>'; + } else { + if (!empty($serendipity['lastSavedEntry'])) { + // Last saved entry must be propagated to entry form so that if the user re-edits it, + // it needs to be stored with the new ID. + echo '<script type="text/javascript">parent.document.forms[\'serendipityEntry\'][\'serendipity[id]\'].value = "' . $serendipity['lastSavedEntry'] . '";</script>'; + } + echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>'; + } + + return true; + break; + + case 'preview': + $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend + serendipity_smarty_init(); + $serendipity['smarty']->assign('is_preview', true); + + echo '<strong>' . PREVIEW . '</strong>'; + echo '<div style="border:1px solid #000000; padding: 15px;">'; + serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true); + echo '</div>'; + + return true; + break; + } + + return false; +} + +function serendipity_iframe_create($mode, &$entry) { + global $serendipity; + + $_SESSION['save_entry'] = $entry; + $_SESSION['save_entry_POST'] = $serendipity['POST']; + + // TODO: Use a language constant for those strings + + $attr = ''; + switch($mode) { + case 'save': + $attr = ' height="100" '; + echo '<div class="serendipity_msg_notice">' . IFRAME_PREVIEW . '</div><br />'; + break; + + case 'preview': + $attr = ' height="300" '; + echo '<div class="serendipity_msg_notice">' . IFRAME_SAVE . '</div><br />'; + break; + } + + echo '<iframe src="serendipity_admin.php?serendipity[is_iframe]=true&serendipity[iframe_mode]=' . $mode . '" name="serendipity_iframe" ' . $attr . ' width="95%" frameborder="1" marginwidth="0" marginheight="0" scrolling="auto" title="Serendipity">' + . IFRAME_WARNING + . '</iframe><br /><br />'; +} |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:22:02
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26462/include Modified Files: functions_trackbacks.inc.php Log Message: only perform https trackbacks if openssl (fopen wrapper) is active. Index: functions_trackbacks.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_trackbacks.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- functions_trackbacks.inc.php 25 Nov 2004 15:10:05 -0000 1.3 +++ functions_trackbacks.inc.php 26 Nov 2004 14:21:51 -0000 1.4 @@ -160,6 +160,8 @@ if ($u['scheme'] != 'http' && $u['scheme'] != 'https') { return; + } elseif ($u['scheme'] == 'https' && !extension_loaded('openssl')) { + return; // Trackbacks to HTTPS URLs can only be performed with openssl activated } echo '<div>• '. sprintf(TRACKBACK_CHECKING, $loc) .'</div>'; |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:10:23
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23464/include Modified Files: functions_entries.inc.php Log Message: for "short archives" we only need to title and some other things, but no body / extended body. This will save some SQL traffic. Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- functions_entries.inc.php 25 Nov 2004 17:31:47 -0000 1.8 +++ functions_entries.inc.php 26 Nov 2004 14:10:01 -0000 1.9 @@ -79,11 +79,14 @@ $cond = array(); $cond['orderby'] = $orderby; if (isset($serendipity['short_archives']) && $serendipity['short_archives']) { - // In the short listing of all titles for a month, we don't want to have a limit applied. - $limit = ''; + // In the short listing of all titles for a month, we don't want to have a limit applied. And we don't need/want toe + // full article body (consumes memory) + $limit = ''; + $full = false; } if ($full === true) { + $noCache = true; // So no entryproperties related to body/extended caching will be loaded $body = ', e.body, e.extended'; } else { $body = ''; @@ -234,7 +237,6 @@ $group ORDER BY {$cond['orderby']} $limit"; - $ret = serendipity_db_query($query); if (is_string($ret)) { |
|
From: Garvin H. <gar...@us...> - 2004-11-26 14:08:52
|
Update of /cvsroot/php-blog/serendipity/include/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23204 Modified Files: mysql.inc.php mysqli.inc.php postgres.inc.php sqlite.inc.php Log Message: let's save some ressources. thanks to isotopp for the little zval tutorial, I hope this really does what I want it to do. ;) Index: mysqli.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/mysqli.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mysqli.inc.php 19 Nov 2004 11:05:34 -0000 1.2 +++ mysqli.inc.php 26 Nov 2004 14:08:39 -0000 1.3 @@ -7,7 +7,7 @@ * 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) { +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); Index: mysql.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/mysql.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mysql.inc.php 19 Nov 2004 11:05:34 -0000 1.2 +++ mysql.inc.php 26 Nov 2004 14:08:39 -0000 1.3 @@ -7,7 +7,7 @@ * 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) { +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, Index: postgres.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/postgres.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- postgres.inc.php 19 Nov 2004 11:05:34 -0000 1.2 +++ postgres.inc.php 26 Nov 2004 14:08:39 -0000 1.3 @@ -57,7 +57,7 @@ } } -function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { +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, Index: sqlite.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/sqlite.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sqlite.inc.php 19 Nov 2004 11:05:34 -0000 1.2 +++ sqlite.inc.php 26 Nov 2004 14:08:39 -0000 1.3 @@ -64,7 +64,7 @@ return $row; } -function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=true, $assocKey=false, $assocVal=false) +function &serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=true, $assocKey=false, $assocVal=false) { global $serendipity; static $type_map = array( |
|
From: Garvin H. <gar...@us...> - 2004-11-25 17:31:58
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16267/include Modified Files: functions_entries.inc.php Log Message: entries once marked as sticky showed up as sticky happily ever after Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- functions_entries.inc.php 25 Nov 2004 12:35:57 -0000 1.7 +++ functions_entries.inc.php 25 Nov 2004 17:31:47 -0000 1.8 @@ -557,7 +557,7 @@ } $dategroup[$key]['date'] = $entries[$x]['timestamp']; - $dategroup[$key]['is_sticky'] = isset($entries[$x]['is_sticky']); + $dategroup[$key]['is_sticky'] = (isset($entries[$x]['is_sticky']) && serendipity_db_bool($entries[$x]['is_sticky']) ? true : false); $dategroup[$key]['entries'][] = &$entries[$x]; } |
|
From: Garvin H. <gar...@us...> - 2004-11-25 15:19:31
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19031/plugins/serendipity_event_trackexits Modified Files: serendipity_event_trackexits.php Log Message: more fixes for https links and wrongly exit rewritten links Index: serendipity_event_trackexits.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- serendipity_event_trackexits.php 19 Nov 2004 11:24:59 -0000 1.15 +++ serendipity_event_trackexits.php 25 Nov 2004 15:19:20 -0000 1.16 @@ -129,7 +129,7 @@ $element = $temp['element']; $eventData[$element] = preg_replace_callback( - "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm", + "#<a(.*)href=(\"|')http(s?)://([^\"']+)(\"|')#isUm", array($this, '_encodeExitsCallback'), $eventData[$element] ); @@ -180,13 +180,13 @@ global $serendipity; $entry_id = $serendipity['encodeExitsCallback_entry_id']; - $url = 'http://' . $buffer[3]; + $url = 'http' . $buffer[3] . '://' . $buffer[4]; if ($url_only) { return sprintf( '%sexit.php?url=%s%s', $serendipity['baseURL'], - base64_encode($buffer[3]), + base64_encode($buffer[4]), ($entry_id != 0) ? '&entry_id=' . $entry_id : '' ); } |
|
From: Garvin H. <gar...@us...> - 2004-11-25 15:19:31
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_entrylinks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19031/plugins/serendipity_plugin_entrylinks Modified Files: serendipity_plugin_entrylinks.php Log Message: more fixes for https links and wrongly exit rewritten links Index: serendipity_plugin_entrylinks.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- serendipity_plugin_entrylinks.php 19 Nov 2004 11:25:01 -0000 1.6 +++ serendipity_plugin_entrylinks.php 25 Nov 2004 15:19:20 -0000 1.7 @@ -176,7 +176,7 @@ $links .= '</ul>'; if ($this->get_config('markup', 'true') == 'true') { - $entry = array('html_nugget' => $links); + $entry = array('html_nugget' => $links, 'entry_id' => $id); serendipity_plugin_api::hook_event('frontend_display', $entry); echo $entry['html_nugget']; } else { |
|
From: Garvin H. <gar...@us...> - 2004-11-25 15:18:44
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18789 Modified Files: NEWS Log Message: document changes for exit tracking Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- NEWS 24 Nov 2004 15:30:00 -0000 1.7 +++ NEWS 25 Nov 2004 15:18:34 -0000 1.8 @@ -3,6 +3,10 @@ Version 0.8 () ------------------------------------------------------------------------ + * Allow sending trackbacks and tracking links of https URLs. Fix + "Entry's Links" plugin to properly display trackable links. + (garvinhicking) + * Spamblock plugin can be configured to hide E-Mail adresses when displaying comments. (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-11-25 15:10:16
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16455/include Modified Files: functions_trackbacks.inc.php Log Message: allow trackbacks to https Index: functions_trackbacks.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_trackbacks.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- functions_trackbacks.inc.php 19 Nov 2004 11:05:31 -0000 1.2 +++ functions_trackbacks.inc.php 25 Nov 2004 15:10:05 -0000 1.3 @@ -119,14 +119,14 @@ } function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text) { - if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@i', $res, $matches)) { + if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(https?:[^"]+)"@i', $res, $matches)) { echo '<div>• ' . sprintf(TRACKBACK_FAILED, TRACKBACK_NOT_FOUND) . '</div>'; return false; } $trackURI = trim($matches[2]); - if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@i', $res, $test)) { + if (preg_match('@dc:identifier\s*=\s*"(https?:[^"]+)"@i', $res, $test)) { if ($loc != $test[1]) { echo '<div>• ' . sprintf(TRACKBACK_FAILED, TRACKBACK_URI_MISMATCH) . '</div>'; return false; @@ -158,7 +158,7 @@ $u = parse_url($loc); - if ($u['scheme'] != 'http') { + if ($u['scheme'] != 'http' && $u['scheme'] != 'https') { return; } |
|
From: Garvin H. <gar...@us...> - 2004-11-25 12:36:09
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14563 Modified Files: functions_entries.inc.php Log Message: delete other references as well when removing an entry Index: functions_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- functions_entries.inc.php 24 Nov 2004 15:52:02 -0000 1.6 +++ functions_entries.inc.php 25 Nov 2004 12:35:57 -0000 1.7 @@ -992,6 +992,8 @@ serendipity_purgeEntry($id, $result[0]); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entries WHERE id=$id"); + serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entrycat WHERE entryid=$id"); + serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entryproperties WHERE entryid=$id"); serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}comments WHERE entry_id=$id"); serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'"); } |
|
From: Tom S. <tom...@us...> - 2004-11-24 18:52:33
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20349/include Modified Files: plugin_internal.inc.php Log Message: These things just keep sneaking in, sorry about that Index: plugin_internal.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- plugin_internal.inc.php 24 Nov 2004 18:44:32 -0000 1.7 +++ plugin_internal.inc.php 24 Nov 2004 18:52:21 -0000 1.8 @@ -751,8 +751,9 @@ $base = $serendipity['serendipityHTTPPath']; } + $link = $base . ($serendipity['rewrite'] == 'none' ? 'serendipity_entries.php?/' : '') . PATH_ENTRIES; $text = (($_SESSION['serendipityAuthedUser'] === true) ? SUPERUSER_OPEN_ADMIN : SUPERUSER_OPEN_LOGIN); - echo '<a href="' . serendipity_rewriteURL('admin/') . '" title="'. $text .'">'. $text .'</a>'; + echo '<a href="' . $link . '" title="'. $text .'">'. $text .'</a>'; } function introspect_config_item($name, &$propbag) |
