php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity comment.php,1.12,1.13 compat.php,1.2,1.3 exit.php,1.3,1.4 index.php,1.17,1.18 rss.php,1.5,1.6 search.php,1.4,1.5 serendipity.css.php,1.11,1.12 serendipity.inc.php,1.2,1.3 serendipity_admin.php,1.13,1.14 serendipity_admin_category.inc.php,1.3,1.4 serendipity_admin_css.inc.php,1.1.1.1,1.2 serendipity_admin_entries.inc.php,1.3,1.4 serendipity_admin_image_selector.php,1.5,1.6 serendipity_admin_images.inc.php,1.7,1.8 serendipity_admin_installer.inc.php,1.15,1.16 serendipity_admin_interop.inc.php,1.2,1.3 serendipity_admin_overview.inc.php,1.4,1.5 serendipity_admin_plugins.inc.php,1.4,1.5 serendipity_admin_templates.inc.php,1.1,1.2 serendipity_config.inc.php,1.12,1.13 serendipity_db.inc.php,1.2,1.3 serendipity_db_mysql.inc.php,1.6,1.7 serendipity_db_postgres.inc.php,1.4,1.5 serendipity_db_sqlite.inc.php,1.2,1.3 serendipity_entries.php,1.10,1.11 serendipity_entries_overview.inc.php,1.3,1.4 serendipity_functions.inc.php,1.93,1.94 serendipity_functions_config.inc.php,1.1,1.2 serendipity_genpage.inc.php,1.9,1.10 serendipity_lang_de.inc.php,1.11,1.12 serendipity_lang_en.inc.php,1.15,1.16 serendipity_lang_es.inc.php,1.1.1.1,1.2 serendipity_layout.inc.php,1.6,1.7 serendipity_layout_table.inc.php,1.7,1.8 serendipity_plugin_api.php,1.2,1.3 serendipity_rss_exchange.inc.php,1.1.1.1,1.2 serendipity_sidebar_items.php,1.19,1.20 serendipity_xmlrpc.php,1.5,1.6

[<gsc...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv24467

Modified Files:
	comment.php compat.php exit.php index.php rss.php search.php 
	serendipity.css.php serendipity.inc.php serendipity_admin.php 
	serendipity_admin_category.inc.php 
	serendipity_admin_css.inc.php 
	serendipity_admin_entries.inc.php 
	serendipity_admin_image_selector.php 
	serendipity_admin_images.inc.php 
	serendipity_admin_installer.inc.php 
	serendipity_admin_interop.inc.php 
	serendipity_admin_overview.inc.php 
	serendipity_admin_plugins.inc.php 
	serendipity_admin_templates.inc.php serendipity_config.inc.php 
	serendipity_db.inc.php serendipity_db_mysql.inc.php 
	serendipity_db_postgres.inc.php serendipity_db_sqlite.inc.php 
	serendipity_entries.php serendipity_entries_overview.inc.php 
	serendipity_functions.inc.php 
	serendipity_functions_config.inc.php 
	serendipity_genpage.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_layout.inc.php serendipity_layout_table.inc.php 
	serendipity_plugin_api.php serendipity_rss_exchange.inc.php 
	serendipity_sidebar_items.php serendipity_xmlrpc.php 
Log Message:
vim style cuffs


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- comment.php	4 Jul 2003 16:33:16 -0000	1.12
+++ comment.php	7 Jul 2003 19:29:10 -0000	1.13
@@ -111,4 +111,5 @@
 </html>
 <?php
 }
-?>
\ No newline at end of file
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compat.php	7 Jul 2003 12:22:21 -0000	1.2
+++ compat.php	7 Jul 2003 19:29:11 -0000	1.3
@@ -30,4 +30,5 @@
 if (!$_SERVER) {
     $_SERVER = &$HTTP_SERVER_VARS;
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit.php	7 Apr 2003 05:52:18 -0000	1.3
+++ exit.php	7 Jul 2003 19:29:11 -0000	1.4
@@ -17,4 +17,5 @@
 }
 
 header('Location: ' . $url);
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- index.php	7 Jul 2003 12:41:17 -0000	1.17
+++ index.php	7 Jul 2003 19:29:11 -0000	1.18
@@ -151,4 +151,5 @@
 if ($track_referer) {
     serendipity_track_referrer();
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rss.php	7 Jul 2003 12:41:17 -0000	1.5
+++ rss.php	7 Jul 2003 19:29:11 -0000	1.6
@@ -68,4 +68,5 @@
     print "</channel>\n";
     print "</rss>\n";
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: search.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/search.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- search.php	7 Jul 2003 12:41:17 -0000	1.4
+++ search.php	7 Jul 2003 19:29:11 -0000	1.5
@@ -2,4 +2,5 @@
 
 include_once('serendipity_config.inc.php');
 include_once('serendipity_genpage.inc.php');
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity.css.php	7 Jul 2003 12:41:17 -0000	1.11
+++ serendipity.css.php	7 Jul 2003 19:29:11 -0000	1.12
@@ -12,4 +12,5 @@
     $css = serendipity_getCSS($_REQUEST['style']);
     echo $css['data'];
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity.inc.php	7 Jul 2003 18:14:00 -0000	1.2
+++ serendipity.inc.php	7 Jul 2003 19:29:11 -0000	1.3
@@ -112,4 +112,5 @@
 
 $serendipity['user']  = $_SESSION['serendipityUser'];
 $serendipity['email'] = $_SESSION['serendipityEmail'];
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_admin.php	27 Jun 2003 13:41:38 -0000	1.13
+++ serendipity_admin.php	7 Jul 2003 19:29:11 -0000	1.14
@@ -125,3 +125,6 @@
 
     </body>
 </html>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_category.inc.php	25 Jun 2003 22:04:30 -0000	1.3
+++ serendipity_admin_category.inc.php	7 Jul 2003 19:29:11 -0000	1.4
@@ -79,3 +79,6 @@
 </table>
 
 </form>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_admin_css.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_css.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_css.inc.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity_admin_css.inc.php	7 Jul 2003 19:29:11 -0000	1.2
@@ -70,5 +70,5 @@
 		}
     break;
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_entries.inc.php	4 Jul 2003 05:29:10 -0000	1.3
+++ serendipity_admin_entries.inc.php	7 Jul 2003 19:29:11 -0000	1.4
@@ -128,5 +128,5 @@
     	serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
                              "serendipity[adminAction]" => "save"), $entry);
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_image_selector.php	25 Jun 2003 22:04:30 -0000	1.5
+++ serendipity_admin_image_selector.php	7 Jul 2003 19:29:11 -0000	1.6
@@ -104,3 +104,6 @@
 }
 ?>
 </body></html>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_images.inc.php	25 Jun 2003 22:04:30 -0000	1.7
+++ serendipity_admin_images.inc.php	7 Jul 2003 19:29:11 -0000	1.8
@@ -282,4 +282,5 @@
 
 
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin_installer.inc.php	29 Jun 2003 02:40:48 -0000	1.15
+++ serendipity_admin_installer.inc.php	7 Jul 2003 19:29:11 -0000	1.16
@@ -338,5 +338,5 @@
  * indent-tabs-mode: t
  * End:
  */
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin_interop.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_interop.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_interop.inc.php	25 Jun 2003 22:04:30 -0000	1.2
+++ serendipity_admin_interop.inc.php	7 Jul 2003 19:29:11 -0000	1.3
@@ -29,3 +29,6 @@
 <input type="submit" name="export" value="Export RSS" />
 </form>
 </p>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_overview.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_overview.inc.php	25 Jun 2003 22:04:30 -0000	1.4
+++ serendipity_admin_overview.inc.php	7 Jul 2003 19:29:11 -0000	1.5
@@ -13,3 +13,6 @@
 session_start();
 ?>
 <?php echo WELCOME_BACK; ?> <?php echo $_SESSION['serendipityUser'] ; ?>. 
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_plugins.inc.php	25 Jun 2003 22:04:30 -0000	1.4
+++ serendipity_admin_plugins.inc.php	7 Jul 2003 19:29:11 -0000	1.5
@@ -250,4 +250,5 @@
 </form>
 <?php
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_admin_templates.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_templates.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_admin_templates.inc.php	22 Jun 2003 18:04:16 -0000	1.1
+++ serendipity_admin_templates.inc.php	7 Jul 2003 19:29:11 -0000	1.2
@@ -10,4 +10,5 @@
 Select the template you wish to use for your blog
 <?php
 	serendipity_printTemplates(serendipity_fetchTemplates());
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_config.inc.php	22 Jun 2003 18:09:01 -0000	1.12
+++ serendipity_config.inc.php	7 Jul 2003 19:29:11 -0000	1.13
@@ -135,4 +135,5 @@
  * indent-tabs-mode: t
  * End:
  */
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_db.inc.php	31 Mar 2003 21:49:27 -0000	1.2
+++ serendipity_db.inc.php	7 Jul 2003 19:29:11 -0000	1.3
@@ -39,5 +39,5 @@
 	return serendipity_db_query("INSERT INTO $serendipity[dbPrefix]$table ($names) values ($vals)");
 }
 
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_db_mysql.inc.php	4 Apr 2003 00:20:23 -0000	1.6
+++ serendipity_db_mysql.inc.php	7 Jul 2003 19:29:11 -0000	1.7
@@ -114,5 +114,5 @@
 
 	return true;
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_db_postgres.inc.php	29 Jun 2003 02:40:48 -0000	1.4
+++ serendipity_db_postgres.inc.php	7 Jul 2003 19:29:11 -0000	1.5
@@ -103,5 +103,5 @@
 	}
 	return true;
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_db_sqlite.inc.php	3 Apr 2003 21:02:41 -0000	1.2
+++ serendipity_db_sqlite.inc.php	7 Jul 2003 19:29:11 -0000	1.3
@@ -119,5 +119,5 @@
 	return serendipity_db_query(str_replace($search, $replace, $query));
 
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_entries.php	27 Jun 2003 13:41:38 -0000	1.10
+++ serendipity_entries.php	7 Jul 2003 19:29:11 -0000	1.11
@@ -121,3 +121,6 @@
 
     </body>
 </html>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_entries_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries_overview.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_entries_overview.inc.php	25 Jun 2003 22:04:30 -0000	1.3
+++ serendipity_entries_overview.inc.php	7 Jul 2003 19:29:11 -0000	1.4
@@ -12,3 +12,6 @@
 if (IN_serendipity !== true) die ("Don't hack!");
 ?>
 Welcome back, <?php echo $_SESSION['serendipityUser'] ; ?>.  
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- serendipity_functions.inc.php	7 Jul 2003 19:00:48 -0000	1.93
+++ serendipity_functions.inc.php	7 Jul 2003 19:29:11 -0000	1.94
@@ -872,8 +872,42 @@
 function serendipity_markup_text($str, $entry_id = 0) {
     global $serendipity;
 
-    $ret = $str;
+  $ret = $str;
+
+<<<<<<< serendipity_functions.inc.php
+  $ret = str_replace('\_', chr(1), $ret);
+  $ret = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$ret);
+  $ret = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$ret);
+  $ret = str_replace(chr(1), '\_', $ret);
+
+  //bold
+  $ret = str_replace('\*',chr(1),$ret);
+  $ret = str_replace('**',chr(2),$ret);
+  $ret = preg_replace('/(\S)\*(\S)/','\1' . chr(1) . '\2',$ret);
+  $ret = preg_replace('/\B\*([^*]+)\*\B/','<strong>\1</strong>',$ret);
+  $ret = str_replace(chr(2),'**',$ret);
+  $ret = str_replace(chr(1),'\*',$ret);
+
+  // monospace font
+  $ret = str_replace('\%',chr(1),$ret);
+  $ret = preg_replace_callback('/%([\S ]+?)%/', 'serendipity_format_tt', $ret);
+  $ret = str_replace(chr(1),'%',$ret);
+
+  $ret = preg_replace('/\|([0-9a-fA-F]+?)\|([\S ]+?)\|/','<font color="\1">\2</font>',$ret);
+  $ret = preg_replace('/\^([[:alnum:]]+?)\^/','<sup>\1</sup>',$ret);
+  $ret = preg_replace('/\@([[:alnum:]]+?)\@/','<sub>\1</sub>',$ret);
+  $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
 
+  if ($serendipity['track_exits']) {
+    $serendipity['encodeExitsCallback_entry_id'] = $entry_id;
+
+    $ret = preg_replace_callback(
+      "#<a href=(\"|')http://([^\"']+)(\"|')#im",
+      'serendipity_encodeExitsCallback',
+      $ret
+    );
+  }
+=======
     $ret = str_replace('\_', chr(1), $ret);
     $ret = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$ret);
     $ret = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$ret);
@@ -911,8 +945,9 @@
           $ret
         );
     }
+>>>>>>> 1.93
 
-    return $ret;
+  return $ret;
 }
 
 /**
@@ -1917,4 +1952,5 @@
 }
 
 define("serendipity_FUNCTIONS_LOADED", true);
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_functions_config.inc.php	29 Jun 2003 02:40:48 -0000	1.1
+++ serendipity_functions_config.inc.php	7 Jul 2003 19:29:11 -0000	1.2
@@ -19,5 +19,5 @@
                return $defval;
        }
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_genpage.inc.php	29 Jun 2003 19:57:57 -0000	1.9
+++ serendipity_genpage.inc.php	7 Jul 2003 19:29:11 -0000	1.10
@@ -27,3 +27,6 @@
 
 </body>
 </html>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_de.inc.php	7 Jul 2003 18:14:01 -0000	1.11
+++ serendipity_lang_de.inc.php	7 Jul 2003 19:29:11 -0000	1.12
@@ -167,4 +167,5 @@
 define('LAST_UPDATED', 'Zuletzt aktualisiert');
 
 define('serendipity_LANG_LOADED', true);
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_en.inc.php	7 Jul 2003 18:14:01 -0000	1.15
+++ serendipity_lang_en.inc.php	7 Jul 2003 19:29:11 -0000	1.16
@@ -168,4 +168,5 @@
 define('LAST_UPDATED', 'Last Updated');
 
 define('serendipity_LANG_LOADED', true);
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_es.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_lang_es.inc.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_lang_es.inc.php	7 Jul 2003 19:29:11 -0000	1.2
@@ -12,5 +12,5 @@
 $serendipity["weekDayAbb"] = array("L", "Ma", "Mi", "J", "V", "S", "D");
 
 define("serendipity_LANG_LOADED", true);
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_layout.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_layout.inc.php	25 Jun 2003 22:04:30 -0000	1.6
+++ serendipity_layout.inc.php	7 Jul 2003 19:29:11 -0000	1.7
@@ -80,3 +80,6 @@
             ?>
 </div>
 </div>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_layout_table.inc.php	25 Jun 2003 22:04:30 -0000	1.7
+++ serendipity_layout_table.inc.php	7 Jul 2003 19:29:11 -0000	1.8
@@ -81,3 +81,6 @@
 ?>
 </tr>
 </table>
+<?php
+/* vim: set sts=4 ts=4 expandtab : */
+?>

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_plugin_api.php	29 Jun 2003 20:43:48 -0000	1.2
+++ serendipity_plugin_api.php	7 Jul 2003 19:29:11 -0000	1.3
@@ -285,5 +285,5 @@
 }
 
 include_once "serendipity_sidebar_items.php";
-
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_rss_exchange.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_rss_exchange.inc.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_rss_exchange.inc.php	7 Jul 2003 19:29:11 -0000	1.2
@@ -48,4 +48,5 @@
     
     return true;
 }
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_sidebar_items.php	25 Jun 2003 22:04:30 -0000	1.19
+++ serendipity_sidebar_items.php	7 Jul 2003 19:29:11 -0000	1.20
@@ -199,6 +199,6 @@
 	}
 
 }
-
+/* vim: set sts=4 ts=4 expandtab : */
 
 ?>

Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_xmlrpc.php	7 Jul 2003 18:14:01 -0000	1.5
+++ serendipity_xmlrpc.php	7 Jul 2003 19:29:11 -0000	1.6
@@ -321,10 +321,6 @@
     return  new XML_RPC_Response( new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct'));
 }
 
-$fp = fopen('/tmp/kung-log', 'a');
-fwrite($fp, $HTTP_RAW_POST_DATA);
-ob_start();
 $server = new XML_RPC_Server($dispatches,1);
-fwrite($fp, ob_get_contents());
-fclose($fp);
+/* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.92,1.93

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv18729

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed nesting


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- serendipity_functions.inc.php	7 Jul 2003 18:14:00 -0000	1.92
+++ serendipity_functions.inc.php	7 Jul 2003 19:00:48 -0000	1.93
@@ -550,10 +550,12 @@
 <?php
                 }
 ?>
-            </div>
         </div>
 <?php
             } // end for-loop (entries)
+?>
+    </div>
+<?php
         } // end for-loop (dates)
     } else { // else short mode
         $s = &$serendipity['GET']['range'];

[php-blog-cvs] serendipity serendipity.inc.php,1.1.1.1,1.2 serendipity_functions.inc.php,1.91,1.92 serendipity_lang_de.inc.php,1.10,1.11 serendipity_lang_en.inc.php,1.14,1.15 serendipity_xmlrpc.php,1.4,1.5

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv7381

Modified Files:
	serendipity.inc.php serendipity_functions.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_xmlrpc.php 
Log Message:
- Even more coding style (indents, single/double quotes)
- more XHTML compliance (not complete, yet)
- more translations/moved text to defines
- reordered some HTML/PHP output for less duplicates (WYSIWYG-editing)
- Inserted htmlentities() for comments output. Was vulnerable to cross-site
scripting attacks.



Index: serendipity.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity.inc.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity.inc.php	7 Jul 2003 18:14:00 -0000	1.2
@@ -1,10 +1,10 @@
 <?php
 ##########################################################################
-# serendipity - another blogger...                                             #
+# serendipity - another blogger...                                       #
 ##########################################################################
 #                                                                        #
 # (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                            #
+# http://www.jannis.to/programming/serendipity.html                      #
 #                                                                        #
 ##########################################################################
 define('IN_serendipity', true);
@@ -13,29 +13,28 @@
 // For security reasons (serendipity relies on register_globals on)
 $serendipity = array();
 
-if (!file_exists("./serendipity_config_local.inc.php"))
-	die ("serendipity is not yet installed! Go to the <a href='serendipity_admin.php'>Installation</a>");
+if (!file_exists('./serendipity_config_local.inc.php')) {
+    die ('serendipity is not yet installed! Go to the <a href="serendipity_admin.php">Installation</a>');
+}
 include_once('./serendipity_config_local.inc.php');
 
 // Put your emoticons here
-$serendipity["smiles"] = array(":'(" => $serendipity["serendipityHTTPPath"]."pixel/cry_smile.gif",
-                         ":-)"  => $serendipity["serendipityHTTPPath"]."pixel/regular_smile.gif",
-					     ":-O"  => $serendipity["serendipityHTTPPath"]."pixel/embaressed_smile.gif",
-					     ":O"  => $serendipity["serendipityHTTPPath"]."pixel/embaressed_smile.gif",
-                         ":-("  => $serendipity["serendipityHTTPPath"]."pixel/sad_smile.gif",
-                         ":("  => $serendipity["serendipityHTTPPath"]."pixel/sad_smile.gif",
-                         ":)"  => $serendipity["serendipityHTTPPath"]."pixel/regular_smile.gif",
-						 "8-)"  => $serendipity["serendipityHTTPPath"]."pixel/shades_smile.gif",
-                         ":-D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
-                         ":D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
-						 "8)"  => $serendipity["serendipityHTTPPath"]."pixel/shades_smile.gif",
-                         ":-P"  => $serendipity["serendipityHTTPPath"]."pixel/tounge_smile.gif",
-                         ";-)"  => $serendipity["serendipityHTTPPath"]."pixel/wink_smile.gif",
-                         ";)"  => $serendipity["serendipityHTTPPath"]."pixel/wink_smile.gif",
-                         ":P"  => $serendipity["serendipityHTTPPath"]."pixel/tounge_smile.gif",
-                        );
-
-
+$serendipity['smiles'] = array( ":'("  => $serendipity['serendipityHTTPPath'] . 'pixel/cry_smile.gif',
+                                ':-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
+                                ':-O'  => $serendipity['serendipityHTTPPath'] . 'pixel/embaressed_smile.gif',
+                                ':O'   => $serendipity['serendipityHTTPPath'] . 'pixel/embaressed_smile.gif',
+                                ':-('  => $serendipity['serendipityHTTPPath'] . 'pixel/sad_smile.gif',
+                                ':('   => $serendipity['serendipityHTTPPath'] . 'pixel/sad_smile.gif',
+                                ':)'   => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
+                                '8-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/shades_smile.gif',
+                                ':-D'  => $serendipity['serendipityHTTPPath'] . 'pixel/teeth_smile.gif',
+                                ':D'   => $serendipity['serendipityHTTPPath'] . 'pixel/teeth_smile.gif',
+                                '8)'   => $serendipity['serendipityHTTPPath'] . 'pixel/shades_smile.gif',
+                                ':-P'  => $serendipity['serendipityHTTPPath'] . 'pixel/tounge_smile.gif',
+                                ';-)'  => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
+                                ';)'   => $serendipity['serendipityHTTPPath'] . 'pixel/wink_smile.gif',
+                                ':P'   => $serendipity['serendipityHTTPPath'] . 'pixel/tounge_smile.gif',
+                              );
 // You're done :)
 
 /*************************************************************************
@@ -43,68 +42,74 @@
 *************************************************************************/
 
 // Make sure sessioning is running
-if (strlen(@session_id()) < 5)
-	die ("serendipity error: you _have_ to run session_start() before including serendipity_config.inc.php - exiting");
-
-include($serendipity["serendipityPath"]."/serendipity_functions.inc.php");
-if (serendipity_FUNCTIONS_LOADED!== true)
-	die ("serendipity error: could not include serendipity_functions.inc.php - exiting");
+if (strlen(@session_id()) < 5) {
+    die ('serendipity error: you _have_ to run session_start() before including serendipity_config.inc.php - exiting');
+}
 
-include($serendipity["serendipityPath"]."/serendipity_lang_".$serendipity["lang"].".inc.php");
-if (serendipity_LANG_LOADED !== true)
-	die ("serendipity error: could not include serendipity_lang_".$serendipity["lang"].".inc.php - exiting");
+include($serendipity['serendipityPath'] . '/serendipity_functions.inc.php');
+if (serendipity_FUNCTIONS_LOADED!== true) {
+    die ('serendipity error: could not include serendipity_functions.inc.php - exiting');
+}
 
+include($serendipity['serendipityPath'] . '/serendipity_lang_' . $serendipity['lang'] . '.inc.php');
+if (serendipity_LANG_LOADED !== true) {
+    die ('serendipity error: could not include serendipity_lang_' . $serendipity['lang'] . '.inc.php - exiting');
+}
 
 // Connect to database
 if (!serendipity_db_connect()) {
-	die ("serendipity error: unable to connect to database - exiting");
+    die ('serendipity error: unable to connect to database - exiting');
 }
 
 // Avoid magic_quotes_gpc issues
 // courtesy of il...@ph...
-function serendipity_strip_quotes(&$var)
-{
+function serendipity_strip_quotes(&$var) {
     if (is_array($var)) {
-		foreach ($var as $k => $v) {
-			if (is_array($v)) {
-				array_walk($var[$k], 'serendipity_strip_quotes');
-			} else {
-				$var[$k] = stripslashes($v);
-			}
-		}
+        foreach ($var as $k => $v) {
+            if (is_array($v)) {
+                array_walk($var[$k], 'serendipity_strip_quotes');
+            } else {
+                $var[$k] = stripslashes($v);
+            }
+        }
     } else {
         $var = stripslashes($var);
     }
 }
 
-if (ini_get("magic_quotes_gpc")) {
+if (ini_get('magic_quotes_gpc')) {
     if (@count($_GET)) {
-        array_walk($_GET, 'serendipity_strip_quotes');
+        array_walk($_GET,     'serendipity_strip_quotes');
     }
     if (@count($_POST)) {
-        array_walk($_POST, 'serendipity_strip_quotes');
+        array_walk($_POST,    'serendipity_strip_quotes');
     }
     if (@count($_COOKIES)) {
         array_walk($_COOKIES, 'serendipity_strip_quotes');
     }
     if (@count($_FILES)) {
-        array_walk($_FILES, 'serendipity_strip_quotes');
+        array_walk($_FILES,   'serendipity_strip_quotes');
     }
 }
 
-
 // Merge get and post into the serendipity array
-$serendipity["GET"] = &$_GET["serendipity"];
-$serendipity["POST"] = &$_POST["serendipity"];
+$serendipity['GET']  =  &$_GET['serendipity'];
+$serendipity['POST'] = &$_POST['serendipity'];
 
 // We don't care who tells us what to do
-if (!$serendipity["GET"]["action"])
-    $serendipity["GET"]["action"] = $serendipity["POST"]["action"];
-if (!$serendipity["GET"]["adminAction"])
-	$serendipity["GET"]["adminAction"] = $serendipity["POST"]["adminAction"];
+if (!$serendipity['GET']['action']) {
+    $serendipity['GET']['action'] = $serendipity['POST']['action'];
+}
+
+if (!$serendipity['GET']['adminAction']) {
+    $serendipity['GET']['adminAction'] = $serendipity['POST']['adminAction'];
+}
 
 // Some stuff...
-if (!$_SESSION["serendipityAuthedUser"]) $_SESSION["serendipityAuthedUser"] = false;
-$serendipity["user"] = $_SESSION["serendipityUser"];
-$serendipity["email"] = $_SESSION["serendipityEmail"];
+if (!$_SESSION['serendipityAuthedUser']) {
+    $_SESSION['serendipityAuthedUser'] = false;
+}
+
+$serendipity['user']  = $_SESSION['serendipityUser'];
+$serendipity['email'] = $_SESSION['serendipityEmail'];
 ?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_functions.inc.php	5 Jul 2003 19:42:11 -0000	1.91
+++ serendipity_functions.inc.php	7 Jul 2003 18:14:00 -0000	1.92
@@ -1,306 +1,380 @@
 <?php
-include_once("./serendipity_db.inc.php");
-include_once("./compat.php");
-include_once("./serendipity_functions_config.inc.php");
+include_once('./serendipity_db.inc.php');
+include_once('./compat.php');
+include_once('./serendipity_functions_config.inc.php');
+$serendipity['imageList'] = array();
 
 function serendipity_getTemplateFile($file) {
-	global $serendipity;
[...2424 lines suppressed...]
+        
+        <td>
+            &nbsp;(<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>)
+        </td>
+    </tr>
+<?php
             }
-		}
-	}
-	echo "</table>";	
+        }
+    }
+?>
+</table>
+<?php
 }
-
 
 define("serendipity_FUNCTIONS_LOADED", true);
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_de.inc.php	28 Jun 2003 18:11:01 -0000	1.10
+++ serendipity_lang_de.inc.php	7 Jul 2003 18:14:01 -0000	1.11
@@ -1,157 +1,170 @@
 <?php
 
 ##########################################################################
-# serendipity - another blogger...                                             #
+# serendipity - another blogger...                                       #
 ##########################################################################
 #                                                                        #
 # (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                            #
+# http://www.jannis.to/programming/serendipity.html                      #
 #                                                                        #
 ##########################################################################
 
 // German language file
-$serendipity["months"]  = array("J...@ha...", "Januar", "Februar", "M&auml;rz",
-                    "April", "Mai", "Juni", "Juli", "August", "September",
-                    "Oktober", "November", "Dezember");
+$serendipity['months']  = array('J...@ha...', 'Januar', 'Februar', 'M&auml;rz',
+                    'April', 'Mai', 'Juni', 'Juli', 'August', 'September',
+                    'Oktober', 'November', 'Dezember');
 
-$serendipity["weekDayAbb"] = array("Mo", "Di", "Mi", "Do", "Fr", "Sa", "So");
+$serendipity['weekDayAbb'] = array('Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So');
 
-define("SERENDIPITY_ADMIN_SUITE", "Serendipity Verwaltungsoberfl&auml;che");
-define("HAVE_TO_BE_LOGGED_ON", "Sie m&uuml;ssen angemeldet sein, um diese Seite zu sehen:");
-define("APPEARANCE", "Aussehen");
-define("MANAGE_STYLES", "Styles verwalten");
-define("CONFIGURE_PLUGINS", "Plugins verwalten");
-define("ADMIN", "Admin:");
-define("CONFIGURATION", "Konfiguration");
-define("IMPORT_EXPORT_ENTRIES", "Import/Export");
-define("BACK_TO_BLOG", "Zur&uuml;ck zum Weblog");
-define("LOGOUT", "Abmelden");
-define("LOGGEDOUT", "Abgemeldet.");
-define("CREATE_NEW_CAT", "Neue Kategorie");
-define("CREATE", "Erstellen");
-define("EDIT_THIS_CAT", "\"%s - %s\" bearbeiten");
-define("SAVE", "Speichern");
-define("NAME", "Name");
-define("SEND_MAIL_TO", "Mail schicken an");
-define("NEW_TRACKBACK_TO", "Neues Trackback f&uuml;r");
-define("NEW_COMMENT_TO", "Neuer Kommentar f&uuml;r");
-define("RECENT", "Das neueste...");
-define("OLDER", "&Auml;lteres...");
-define("ANONYMOUS", "Anonym");
-define("LINK_TO_COMMENT", "Link zu Kommentar #");
-define("DESCRIPTION", "Beschreibung");
-define("CLICK_CAT_TO_EDIT", "Zum Bearbeiten auf eine Kategorie klicken");
-define("CREATE_NEW_CAT", "Neue Kategorie");
-define("SELECT_IMAGE", "Bitte w&auml;hlen Sie ein Bild");
-define("I_WANT_THUMB", "Ich m&ouml;chte die Vorschau im Eintrag haben.");
-define("I_WANT_BIG_IMAGE", "Ich m&ouml;chte das grosse Bild im Eintrag haben.");
-define("I_WANT_NO_LINK", "Das Bild soll kein Link sein");
-define("I_WANT_IT_TO_LINK", "Das Bild soll hierhin linken:");
-define("BACK", "Zur&uuml;ck");
-define("FORWARD", "Vorw&auml;rts");
-define("DONE", "Fertig");
-define("CLICK_IMAGE_TO_INSERT", "Auf ein Bild klicken um es einzuf&uuml;gen:");
-define("WELCOME_BACK", "Willkommen zur&uuml;ck,");
-define("ADD_PLUGIN", "Plugin hinzuf&uuml;gen");
-define("TITLE", "Titel");
-define("PLUGIN", "Plugin");
-define("DESCRIPTION", "Beschreibung");
-define("PLACEMENT", "Platzierung");
-define("DELETE", "L&ouml;schen");
-define("SAVE", "Speichern");
-define("SELECT_A_PLUGIN_TO_ADD", "Neues Plugin ausw&auml;hlen");
-define("UP", "HOCH");
-define("DOWN", "RUNTER");
-define("ENTRIES", "Eintr&auml;ge:");
-define("NEW_ENTRY", "Neuer Eintrag");
-define("EDIT_ENTRIES", "Eintr&auml;ge bearbeiten");
-define("DELETE_ENTRIES", "Eintrag l&ouml;schen");
-define("CATEGORIES", "Kategorien:");
-define("EDIT_CATEGORIES", "Kategorien bearbeiten");
-define("IMAGES", "Bilder:");
-define("ADD_IMAGES", "Bilder hochladen");
-define("WARNING_THIS_BLAHBLAH", "ACHTUNG:\\nDas kann jetzt lange dauern, wenn für viele Bilder noch keine Vorschau existiert.");
-define("CREATE_THUMBS", "Vorschauen erneuern");
-define("MANAGE_IMAGES", "Bilder verwalten");
-define("ADMIN_INTERFACE", "Verwaltungsoberfl&auml;che");
-define("SERENDIPITY_AUTHORING_SUITE", "Serendipity Autorenoberfl&auml;che");
-define("NAME", "Name");
-define("EMAIL", "Email");
-define("HOMEPAGE", "Homepage");
-define("COMMENT", "Kommentar");
-define("REMEMBER_INFO", "Daten merken? ");
-define("SUBMIT_COMMENT", "Kommentar abschicken");
-define("NO_ENTRIES_TO_PRINT", "Keine Eintr&auml;ge vorhanden.");
-define("COMMENTS", "Kommentare");
-define("ADD_COMMENT", "Kommentar schreiben");
-define("NO_COMMENTS", "Noch keine Kommentare.");
-define("POSTED_BY", "Geschrieben von");
-define("TRACKBACK_FROM", "Trackback von");
-define("ON", "um");
-define("A_NEW_COMMENT_BLAHBLAH", "In Ihrem Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!");
-define("NO_CATEGORY", "Keine Kategorie");
-define("ENTRY_BODY", "Eintrag");
-define("EXTENDED_BODY", "Erweiteter Eintrag");
-define("CATEGORY", "Kategorie:");
-define("TEMPLATE_NAME", "Template Name");
-define("CHOOSE_STYLESHEET", "Bitte ein Stylesheet w&auml;hlen...");
-define("EDIT", "Bearbeiten");
-define("MAKE_DEFAULT", "Als Standard");
-define("CREATE_NEW_STYLESHEET", "Neues Stylesheet");
-define("NO_ENTRIES_BLAHBLAH", "F&uuml;r ihre Suche %s konnte kein Eintrag gefunden werden\n");
-define("YOUR_SEARCH_RETURNED_BLAHBLAH", "Ihre Suche nach %s ergab %s Treffer:");
-define("IMAGE", "Bild");
-define("ERROR_FILE_NOT_EXISTS", " Alte Datei existiert nicht!");
-define("ERROR_FILE_EXISTS", "Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.");
-define("ERROR_SOMETHING", "Fehler: Irgendentwas stimmt nicht.");
-define("ADDING_IMAGE", "Bild hinzuf&uuml;gen...");
-define("THUMB_CREATED_DONE", "Vorschau erstellt.<br>Fertig.");
-define("ERROR_FILE_EXISTS_ALREADY", "Fehler: Diese Datei existiert schon auf dem Server!");
-define("ERROR_UNKNOWNE_NOUPLOAD", "Unbekannter Fehler aufgetreten, Datei nicht hochgeladen.");
-define("ADD_IMAGE_BLAHBLAH", '<b>Bild zur Sammlung hinzuf&uuml;gen:</b><p>Hier k&ouml;nnen Sie ein Bild hochladen, oder mir sagen, von wo ich es downloaden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind meistens brauchbar, aber auf jeden Fall witzig :)<p><b>Methode w&auml;hlen:</b><br>');
-define("ENTER_IMAGE_URL", "Bildurl zum Download angeben:");
-define("ENTER_IMAGE_TO_UP", "Bild zum Hochladen eingeben:");
-define("GO", "Los!");
-define("NEWSIZE", "Neue Gr&ouml;&szlig;e ");
-define("RESIZE_BLAHBLAH", "<b>Gr&ouml;&szlig; von %s &auml;ndern</b><p>");
-define("ORIGINAL_SIZE", "Originalgr&ouml;&szlig;: <i>%sx%s</i> Pixel");
-define("HERE_YOU_CAN_ENTER_BLAHBLAH", "<p>Hier k&ouml;nnen sie die Bildgr&ouml;&szlig;e &auml;ndern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschlie&szlig;end die TAB taste dr&uuml;cken, und Sie erhalten eine Vorschau mit korrekten Proportionen.");
-define("DATE_FORMAT_1", "d.m.Y");
-define("CALENDAR", "Kalender");
-define("QUICKJUMP_CALENDAR", 'QuickJump Kalender');
-define("QUICKSEARCH", 'Schnellsuche');
-define("SEARCH_FOR_ENTRY", 'Nach Eintr&auml;gen suchen');
-define("ARCHIVES", 'Archive');
-define("BROWSE_ARCHIVES", 'Die Archive durchst&ouml;bern');
-define("TOP_REFERRER", 'Top Referrer');
-define("SHOWS_TOP_SITES", 'Zeigt die Top-Seiten, die auf Ihr Blog linken');
-define("TOP_EXITS", 'Top Exits');
-define("SHOWS_TOP_EXIT", 'Zeigt die Top-Exit-Links Ihres Blogs');
-define("SYNDICATION", 'Syndication');
-define("SHOWS_RSS_BLAHBLAH", 'Zeigt die RSS Syndication links');
-define("SUPERUSER", 'Eigent&uuml;mer');
-define("ALLOWS_YOU_BLAHBLAH", 'Link zum Konfigurieren von Serendipity und zum Schreiben von Eintr&auml;gen - WICHTIG');
-define("PLUG", 'Plug');
-define("ADVERTISES_BLAHBLAH", 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist');
-define("HTML_NUGGET", 'HTML Klotz');
-define("HOLDS_A_BLAHBLAH", 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an');
-define("TITLE_FOR_NUGGET", 'Titel f&uuml;r den Klotz');
-define("THE_NUGGET", 'Der HTML Klotz!');
-define("SYNDICATE_THIS_BLOG", "Syndicate This Blog");
-define("QUICKJUMP", "Schnellauswahl");
-define("SEARCH_TOO_SHORT", "Bitte geben Sie einen Suchbegriff mit mindestens drei Zeichen an.");
-define("YOU_CHOSE", "Sie haben sich f&uuml;r  %s entschieden");
-define("IMAGE_SIZE", "Bildgr&ouml;&szlig;e");
-define("IMAGE_AS_A_LINK", "Bild als Link");
-define("POWERED_BY", "Powered by");
-define("SUPERUSER", "Besitzer login");
-define("TRACKBACKS", "Trackbacks");
-define("TRACKBACK", "Trackback");
-define("NO_TRACKBACKS", "Keine Trackbacks");
-define("TOPICS_OF", "Themen in");
-define("VIEW_FULL", "ganz anzeigen");
-define("VIEW_TOPICS", "&Uuml;berschriften anzeigen");
-define("AT", "um");
+define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfl&auml;che');
+define('HAVE_TO_BE_LOGGED_ON', 'Sie m&uuml;ssen angemeldet sein, um diese Seite zu sehen:');
+define('APPEARANCE', 'Aussehen');
+define('MANAGE_STYLES', 'Styles verwalten');
+define('CONFIGURE_PLUGINS', 'Plugins verwalten');
+define('ADMIN', 'Admin:');
+define('CONFIGURATION', 'Konfiguration');
+define('IMPORT_EXPORT_ENTRIES', 'Import/Export');
+define('BACK_TO_BLOG', 'Zur&uuml;ck zum Weblog');
+define('LOGOUT', 'Abmelden');
+define('LOGGEDOUT', 'Abgemeldet.');
+define('CREATE_NEW_CAT', 'Neue Kategorie');
+define('CREATE', 'Erstellen');
+define('EDIT_THIS_CAT', '"%s - %s" bearbeiten');
+define('SAVE', 'Speichern');
+define('NAME', 'Name');
+define('SEND_MAIL_TO', 'Mail schicken an');
+define('NEW_TRACKBACK_TO', 'Neues Trackback f&uuml;r');
+define('NEW_COMMENT_TO', 'Neuer Kommentar f&uuml;r');
+define('RECENT', 'Das neueste...');
+define('OLDER', '&Auml;lteres...');
+define('ANONYMOUS', 'Anonym');
+define('LINK_TO_COMMENT', 'Link zu Kommentar #');
+define('DESCRIPTION', 'Beschreibung');
+define('CLICK_CAT_TO_EDIT', 'Zum Bearbeiten auf eine Kategorie klicken');
+define('CREATE_NEW_CAT', 'Neue Kategorie');
+define('SELECT_IMAGE', 'Bitte w&auml;hlen Sie ein Bild');
+define('I_WANT_THUMB', 'Ich m&ouml;chte die Vorschau im Eintrag haben.');
+define('I_WANT_BIG_IMAGE', 'Ich m&ouml;chte das grosse Bild im Eintrag haben.');
+define('I_WANT_NO_LINK', 'Das Bild soll kein Link sein');
+define('I_WANT_IT_TO_LINK', 'Das Bild soll hierhin linken:');
+define('BACK', 'Zur&uuml;ck');
+define('FORWARD', 'Vorw&auml;rts');
+define('DONE', 'Fertig');
+define('CLICK_IMAGE_TO_INSERT', 'Auf ein Bild klicken um es einzuf&uuml;gen:');
+define('WELCOME_BACK', 'Willkommen zur&uuml;ck,');
+define('ADD_PLUGIN', 'Plugin hinzuf&uuml;gen');
+define('TITLE', 'Titel');
+define('PLUGIN', 'Plugin');
+define('DESCRIPTION', 'Beschreibung');
+define('PLACEMENT', 'Platzierung');
+define('DELETE', 'L&ouml;schen');
+define('SAVE', 'Speichern');
+define('SELECT_A_PLUGIN_TO_ADD', 'Neues Plugin ausw&auml;hlen');
+define('UP', 'HOCH');
+define('DOWN', 'RUNTER');
+define('ENTRIES', 'Eintr&auml;ge:');
+define('NEW_ENTRY', 'Neuer Eintrag');
+define('EDIT_ENTRIES', 'Eintr&auml;ge bearbeiten');
+define('DELETE_ENTRIES', 'Eintrag l&ouml;schen');
+define('CATEGORIES', 'Kategorien:');
+define('EDIT_CATEGORIES', 'Kategorien bearbeiten');
+define('IMAGES', 'Bilder:');
+define('ADD_IMAGES', 'Bilder hochladen');
+define('WARNING_THIS_BLAHBLAH', "ACHTUNG:\\nDas kann jetzt lange dauern, wenn für viele Bilder noch keine Vorschau existiert.");
+define('CREATE_THUMBS', 'Vorschauen erneuern');
+define('MANAGE_IMAGES', 'Bilder verwalten');
+define('ADMIN_INTERFACE', 'Verwaltungsoberfl&auml;che');
+define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Autorenoberfl&auml;che');
+define('NAME', 'Name');
+define('EMAIL', 'Email');
+define('HOMEPAGE', 'Homepage');
+define('COMMENT', 'Kommentar');
+define('REMEMBER_INFO', 'Daten merken? ');
+define('SUBMIT_COMMENT', 'Kommentar abschicken');
+define('NO_ENTRIES_TO_PRINT', 'Keine Eintr&auml;ge vorhanden.');
+define('COMMENTS', 'Kommentare');
+define('ADD_COMMENT', 'Kommentar schreiben');
+define('NO_COMMENTS', 'Noch keine Kommentare.');
+define('POSTED_BY', 'Geschrieben von');
+define('TRACKBACK_FROM', 'Trackback von');
+define('ON', 'um');
+define('A_NEW_COMMENT_BLAHBLAH', 'In Ihrem Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
+define('NO_CATEGORY', 'Keine Kategorie');
+define('ENTRY_BODY', 'Eintrag');
+define('EXTENDED_BODY', 'Erweiteter Eintrag');
+define('CATEGORY', 'Kategorie:');
+define('TEMPLATE_NAME', 'Template Name');
+define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet w&auml;hlen...');
+define('EDIT', 'Bearbeiten');
+define('MAKE_DEFAULT', 'Als Standard');
+define('CREATE_NEW_STYLESHEET', 'Neues Stylesheet');
+define('NO_ENTRIES_BLAHBLAH', 'F&uuml;r ihre Suche %s konnte kein Eintrag gefunden werden' . "\n");
+define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Ihre Suche nach %s ergab %s Treffer:');
+define('IMAGE', 'Bild');
+define('ERROR_FILE_NOT_EXISTS', ' Alte Datei existiert nicht!');
+define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.');
+define('ERROR_SOMETHING', 'Fehler: Irgendentwas stimmt nicht.');
+define('ADDING_IMAGE', 'Bild hinzuf&uuml;gen...');
+define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br>Fertig.');
+define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
+define('ERROR_UNKNOWNE_NOUPLOAD', 'Unbekannter Fehler aufgetreten, Datei nicht hochgeladen.');
+define('ADD_IMAGE_BLAHBLAH', '<b>Bild zur Sammlung hinzuf&uuml;gen:</b><p>Hier k&ouml;nnen Sie ein Bild hochladen, oder mir sagen, von wo ich es downloaden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind meistens brauchbar, aber auf jeden Fall witzig :)<p><b>Methode w&auml;hlen:</b><br>');
+define('ENTER_IMAGE_URL', 'Bildurl zum Download angeben:');
+define('ENTER_IMAGE_TO_UP', 'Bild zum Hochladen eingeben:');
+define('GO', 'Los!');
+define('NEWSIZE', 'Neue Gr&ouml;&szlig;e ');
+define('RESIZE_BLAHBLAH', '<b>Gr&ouml;&szlig; von %s &auml;ndern</b><p>');
+define('ORIGINAL_SIZE', 'Originalgr&ouml;&szlig;: <i>%sx%s</i> Pixel');
+define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier k&ouml;nnen sie die Bildgr&ouml;&szlig;e &auml;ndern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschlie&szlig;end die TAB taste dr&uuml;cken, und Sie erhalten eine Vorschau mit korrekten Proportionen.');
+define('DATE_FORMAT_1', 'd.m.Y');
+define('CALENDAR', 'Kalender');
+define('QUICKJUMP_CALENDAR', 'QuickJump Kalender');
+define('QUICKSEARCH', 'Schnellsuche');
+define('SEARCH_FOR_ENTRY', 'Nach Eintr&auml;gen suchen');
+define('ARCHIVES', 'Archive');
+define('BROWSE_ARCHIVES', 'Die Archive durchst&ouml;bern');
+define('TOP_REFERRER', 'Top Referrer');
+define('SHOWS_TOP_SITES', 'Zeigt die Top-Seiten, die auf Ihr Blog linken');
+define('TOP_EXITS', 'Top Exits');
+define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links Ihres Blogs');
+define('SYNDICATION', 'Syndication');
+define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication links');
+define('SUPERUSER', 'Eigent&uuml;mer');
+define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Eintr&auml;gen - WICHTIG');
+define('PLUG', 'Plug');
+define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist');
+define('HTML_NUGGET', 'HTML Klotz');
+define('HOLDS_A_BLAHBLAH', 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an');
+define('TITLE_FOR_NUGGET', 'Titel f&uuml;r den Klotz');
+define('THE_NUGGET', 'Der HTML Klotz!');
+define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
+define('QUICKJUMP', 'Schnellauswahl');
+define('SEARCH_TOO_SHORT', 'Bitte geben Sie einen Suchbegriff mit mindestens drei Zeichen an.');
+define('YOU_CHOSE', 'Sie haben sich f&uuml;r  %s entschieden');
+define('IMAGE_SIZE', 'Bildgr&ouml;&szlig;e');
+define('IMAGE_AS_A_LINK', 'Bild als Link');
+define('POWERED_BY', 'Powered by');
+define('SUPERUSER', 'Besitzer login');
+define('TRACKBACKS', 'Trackbacks');
+define('TRACKBACK', 'Trackback');
+define('NO_TRACKBACKS', 'Keine Trackbacks');
+define('TOPICS_OF', 'Themen in');
+define('VIEW_FULL', 'ganz anzeigen');
+define('VIEW_TOPICS', '&Uuml;berschriften anzeigen');
+define('AT', 'um');
+define('SET_AS_TEMPLATE', 'Als Template w&auml;hlen');
+define('VIEW_EXTENDED_ENTRY', 'Gesamten Beitrag ansehen');
+define('IN', 'in');
+define('EXCERPT', 'Auszug');
+define('TRACKED', 'Aufgenommen');
+define('LINK_TO_ENTRY', 'Link zum Eintrag');
+define('LINK_TO_REMOTE_ENTRY', 'Link to remote-entry');
+define('IP_ADDRESS', 'IP-Adresse');
+define('USER', 'Benutzer');
+define('THUMBNAIL_USING_OWN', 'Using %s as it\'s own thumbnail because it is so small already.');
+define('THUMBNAIL_FAILED_COPY', 'Wanted to use %s as it\'s own thumbnail, but failed to copy!');
+define('AUTHOR', 'Author');
+define('LAST_UPDATED', 'Zuletzt aktualisiert');
 
-define("serendipity_LANG_LOADED", true);
+define('serendipity_LANG_LOADED', true);
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang_en.inc.php	28 Jun 2003 18:11:01 -0000	1.14
+++ serendipity_lang_en.inc.php	7 Jul 2003 18:14:01 -0000	1.15
@@ -1,160 +1,171 @@
 <?php
 
 ##########################################################################
-# serendipity - another blogger...                                             #
+# serendipity - another blogger...                                       #
 ##########################################################################
 #                                                                        #
 # (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                            #
+# http://www.jannis.to/programming/serendipity.html                      #
 #                                                                        #
 ##########################################################################
 
 // English language file
-$serendipity["months"]  = array("J...@ha...", "January", "February", "March",
-                    "April", "May", "June", "July", "August", "September",
-                    "October", "November", "December");
-
-$serendipity["weekDayAbb"] = array("M", "Tu", "W", "Th", "F", "Sa", "Su");
-
+$serendipity['months']  = array('J...@ha...', 'January', 'February', 'March',
+                    'April', 'May', 'June', 'July', 'August', 'September',
+                    'October', 'November', 'December');
 
-define("SERENDIPITY_ADMIN_SUITE", "Serendipity Administration Suite");
-define("HAVE_TO_BE_LOGGED_ON", "You have to be logged on to view this page:");
-define("APPEARANCE", "Appearance");
-define("MANAGE_STYLES", "Manage styles");
-define("CONFIGURE_PLUGINS", "Configure Plugins");
-define("ADMIN", "Admin:");
-define("CONFIGURATION", "Configuration");
-define("IMPORT_EXPORT_ENTRIES", "Import/Export Entries");
-define("BACK_TO_BLOG", "Back to Weblog");
-define("LOGOUT", "Logout");
-define("LOGGEDOUT", "Logged out.");
-define("CREATE_NEW_CAT", "Create a New Category");
-define("CREATE", "Create");
-define("EDIT_THIS_CAT", "Edit \"%s - %s\"");
-define("SAVE", "Save");
-define("NAME", "Name");
-define("DESCRIPTION", "Description");
-define("CLICK_CAT_TO_EDIT", "Click on a category to edit it");
-define("CREATE_NEW_CAT", "Create New Category");
-define("SELECT_IMAGE", "Select an image");
-define("I_WANT_THUMB", "I want to insert the thumbnail in my entry.");
-define("I_WANT_BIG_IMAGE", "I want to insert the larger image in my entry.");
-define("I_WANT_NO_LINK", " I don't want the image to be a hyperlink");
-define("I_WANT_IT_TO_LINK", "I want it to link to this url:");
-define("BACK", "Back");
-define("FORWARD", "Forward");
-define("ANONYMOUS", "Anonymous");
-define("LINK_TO_COMMENT", "Link to comment #");
-define("SEND_MAIL_TO", "Send a mail to ");
-define("NEW_TRACKBACK_TO", "New trackback made to");
-define("NEW_COMMENT_TO", "New comment posted to");
-define("RECENT", "Recent...");
-define("OLDER", "Older...");
-define("DONE", "Done");
-define("CLICK_IMAGE_TO_INSERT", "Click the image you want to insert:");
-define("WELCOME_BACK", "Welcome back,");
-define("ADD_PLUGIN", "Add plugin");
-define("TITLE", "Title");
-define("PLUGIN", "Plugin");
-define("DESCRIPTION", "Description");
-define("PLACEMENT", "Placement");
-define("DELETE", "Delete");
-define("SAVE", "Save");
-define("SELECT_A_PLUGIN_TO_ADD", "Select a plugin to add");
-define("UP", "UP");
-define("DOWN", "DOWN");
-define("ENTRIES", "Entries:");
-define("NEW_ENTRY", "New entry");
-define("AUTHOR_SUITE", "Authoring Suite");
-define("EDIT_ENTRIES", "Edit entries");
-define("DELETE_ENTRIES", "Delete entries");
-define("CATEGORIES", "Categories:");
-define("EDIT_CATEGORIES", "Manage Categories");
-define("IMAGES", "Images:");
-define("ADD_IMAGES", "Add images");
-define("WARNING_THIS_BLAHBLAH", "WARNING:\\nThis may take a long time if there are many images without thumbnails.");
-define("CREATE_THUMBS", "Rebuild Thumbs");
-define("MANAGE_IMAGES", "Manage images");
-define("ADMIN_INTERFACE", "Admin interface");
-define("SERENDIPITY_AUTHORING_SUITE", "Serendipity Authoring Suite");
-define("NAME", "Name");
-define("EMAIL", "Email");
-define("HOMEPAGE", "Homepage");
-define("COMMENT", "Comment");
-define("REMEMBER_INFO", "Remember Information? ");
-define("SUBMIT_COMMENT", "Submit Comment");
-define("NO_ENTRIES_TO_PRINT", "No entries to print.");
-define("COMMENTS", "Comments");
-define("ADD_COMMENT", "Add Comment");
-define("NO_COMMENTS", "No comments.");
-define("POSTED_BY", "Posted by");
-define("TRACKBACK_FROM", "Trackback from");
-define("ON", "on");
-define("A_NEW_COMMENT_BLAHBLAH", "A new comment has been posted on your blog \"%s\", in the entry entitled \"%s\".");
-define("A_NEW_TRACKBACK_BLAHBLAH", "A new trackback has been made to your blog-entry entitled \"%s\".");
-define("NO_CATEGORY", "No Category");
-define("ENTRY_BODY", "Entry Body");
-define("EXTENDED_BODY", "Extended Body");
-define("CATEGORY", "Category:");
-define("TEMPLATE_NAME", "template name");
-define("CHOOSE_STYLESHEET", "Choose a style sheet....");
-define("EDIT", "Edit");
-define("MAKE_DEFAULT", "Make default");
-define("CREATE_NEW_STYLESHEET", "Create New StyleSheet");
-define("NO_ENTRIES_BLAHBLAH", "No Entries Found for Query %s\n");
-define("YOUR_SEARCH_RETURNED_BLAHBLAH", "Your search for %s returned %s results:");
-define("SEARCH_TOO_SHORT", "Your search-query must be longer than 3 characters");
-define("IMAGE", "Image");
-define("ERROR_FILE_NOT_EXISTS", "Error: Old filename doesn't exist!");
-define("ERROR_FILE_EXISTS", "Error: New filename already used, pick another!");
-define("ERROR_SOMETHING", "Error: Something's wrong.");
-define("ADDING_IMAGE", "Adding image...");
-define("THUMB_CREATED_DONE", "Thumbnail created.<br>Done.");
-define("ERROR_FILE_EXISTS_ALREADY", "Error: File already exists on your machine!");
-define("ERROR_UNKNOWNE_NOUPLOAD", "Unknown error occured, file not uploaded...");
-define("ADD_IMAGE_BLAHBLAH", '<b>Add an image to your repository:</b><p>Here you can upload images, or tell me to fetch them from somewhere in the web! If you don\'t have appropriate images, search for images on google matching your thoughts. Try <a href="http://images.google.com" target="_blank">Google\'s image search</a>, the results are often useful and always funny :)<p><b>Select method:</b><br>');
-define("ENTER_IMAGE_URL", "Enter an URL of an image to fetch:");
-define("ENTER_IMAGE_TO_UP", "Select an image you wish to upload:");
-define("GO", "Go!");
-define("NEWSIZE", "New size: ");
-define("RESIZE_BLAHBLAH", "<b>Resize %s</b><p>");
-define("ORIGINAL_SIZE", "Original size: <i>%sx%s</i> pixel");
-define("HERE_YOU_CAN_ENTER_BLAHBLAH", "<p>Here you can adjust the images new size. If you want to keep the proportions, just enter one value and press the TAB key, I'll automatically calculate the new size so the proportions  one value and press the TAB key, I'll automatically calculate the new size so the proportions don't get messed up:");
-define("DATE_FORMAT_1", "l, F jS Y");
-define("CALENDAR", "Calendar");
-define("QUICKJUMP_CALENDAR", 'QuickJump Calendar');
-define("QUICKSEARCH", 'Quicksearch');
-define("SEARCH_FOR_ENTRY", 'Search for an entry');
-define("ARCHIVES", 'Archives');
-define("BROWSE_ARCHIVES", 'Browse archives by month');
-define("TOP_REFERRER", 'Top Referrers');
-define("SHOWS_TOP_SITES", 'Shows top sites that linked to your blogs');
-define("TOP_EXITS", 'Top Exits');
-define("SHOWS_TOP_EXIT", 'Shows top exit links from your blogs');
-define("SYNDICATION", 'Syndication');
-define("SHOWS_RSS_BLAHBLAH", 'Shows RSS syndication links');
-define("ALLOWS_YOU_BLAHBLAH", 'Allows you to configure and publish your blog');
-define("PLUG", 'Plug');
-define("ADVERTISES_BLAHBLAH", 'Advertises the origins of your blog');
-define("HTML_NUGGET", 'HTML Nugget');
-define("HOLDS_A_BLAHBLAH", 'Holds a nugget of HTML in your sidebar');
-define("TITLE_FOR_NUGGET", 'Title for the nugget');
-define("THE_NUGGET", 'The Nugget of HTML!');
-define("SYNDICATE_THIS_BLOG", "Syndicate This Blog");
-define("QUICKJUMP", "Quickjump");
-define("YOU_CHOSE", "You chose %s");
-define("IMAGE_SIZE", "Image size");
-define("IMAGE_AS_A_LINK", "Image as a link");
-define("POWERED_BY", "Powered by");
-define("SUPERUSER", "Superuser");
-define("TRACKBACKS", "Trackbacks");
-define("TRACKBACK", "Trackback");
-define("NO_TRACKBACKS", "No Trackbacks");
-define("TOPICS_OF", "Topics of");
-define("VIEW_FULL", "view full");
-define("VIEW_TOPICS", "view topics");
-define("AT", "at");
+$serendipity['weekDayAbb'] = array('M', 'Tu', 'W', 'Th', 'F', 'Sa', 'Su');
 
-define("serendipity_LANG_LOADED", true);
+define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
+define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged on to view this page:');
+define('APPEARANCE', 'Appearance');
+define('MANAGE_STYLES', 'Manage styles');
+define('CONFIGURE_PLUGINS', 'Configure Plugins');
+define('ADMIN', 'Admin:');
+define('CONFIGURATION', 'Configuration');
+define('IMPORT_EXPORT_ENTRIES', 'Import/Export Entries');
+define('BACK_TO_BLOG', 'Back to Weblog');
+define('LOGOUT', 'Logout');
+define('LOGGEDOUT', 'Logged out.');
+define('CREATE_NEW_CAT', 'Create a New Category');
+define('CREATE', 'Create');
+define('EDIT_THIS_CAT', 'Edit "%s - %s"');
+define('SAVE', 'Save');
+define('NAME', 'Name');
+define('DESCRIPTION', 'Description');
+define('CLICK_CAT_TO_EDIT', 'Click on a category to edit it');
+define('CREATE_NEW_CAT', 'Create New Category');
+define('SELECT_IMAGE', 'Select an image');
+define('I_WANT_THUMB', 'I want to insert the thumbnail in my entry.');
+define('I_WANT_BIG_IMAGE', 'I want to insert the larger image in my entry.');
+define('I_WANT_NO_LINK', ' I don\'t want the image to be a hyperlink');
+define('I_WANT_IT_TO_LINK', 'I want it to link to this url:');
+define('BACK', 'Back');
+define('FORWARD', 'Forward');
+define('ANONYMOUS', 'Anonymous');
+define('LINK_TO_COMMENT', 'Link to comment #');
+define('SEND_MAIL_TO', 'Send a mail to ');
+define('NEW_TRACKBACK_TO', 'New trackback made to');
+define('NEW_COMMENT_TO', 'New comment posted to');
+define('RECENT', 'Recent...');
+define('OLDER', 'Older...');
+define('DONE', 'Done');
+define('CLICK_IMAGE_TO_INSERT', 'Click the image you want to insert:');
+define('WELCOME_BACK', 'Welcome back,');
+define('ADD_PLUGIN', 'Add plugin');
+define('TITLE', 'Title');
+define('PLUGIN', 'Plugin');
+define('DESCRIPTION', 'Description');
+define('PLACEMENT', 'Placement');
+define('DELETE', 'Delete');
+define('SAVE', 'Save');
+define('SELECT_A_PLUGIN_TO_ADD', 'Select a plugin to add');
+define('UP', 'UP');
+define('DOWN', 'DOWN');
+define('ENTRIES', 'Entries:');
+define('NEW_ENTRY', 'New entry');
+define('AUTHOR_SUITE', 'Authoring Suite');
+define('EDIT_ENTRIES', 'Edit entries');
+define('DELETE_ENTRIES', 'Delete entries');
+define('CATEGORIES', 'Categories:');
+define('EDIT_CATEGORIES', 'Manage Categories');
+define('IMAGES', 'Images:');
+define('ADD_IMAGES', 'Add images');
+define('WARNING_THIS_BLAHBLAH', "WARNING:\\nThis may take a long time if there are many images without thumbnails.");
+define('CREATE_THUMBS', 'Rebuild Thumbs');
+define('MANAGE_IMAGES', 'Manage images');
+define('ADMIN_INTERFACE', 'Admin interface');
+define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Authoring Suite');
+define('NAME', 'Name');
+define('EMAIL', 'Email');
+define('HOMEPAGE', 'Homepage');
+define('COMMENT', 'Comment');
+define('REMEMBER_INFO', 'Remember Information? ');
+define('SUBMIT_COMMENT', 'Submit Comment');
+define('NO_ENTRIES_TO_PRINT', 'No entries to print.');
+define('COMMENTS', 'Comments');
+define('ADD_COMMENT', 'Add Comment');
+define('NO_COMMENTS', 'No comments.');
+define('POSTED_BY', 'Posted by');
+define('TRACKBACK_FROM', 'Trackback from');
+define('ON', 'on');
+define('A_NEW_COMMENT_BLAHBLAH', 'A new comment has been posted on your blog "%s", in the entry entitled "%s".');
+define('A_NEW_TRACKBACK_BLAHBLAH', 'A new trackback has been made to your blog-entry entitled "%s".');
+define('NO_CATEGORY', 'No Category');
+define('ENTRY_BODY', 'Entry Body');
+define('EXTENDED_BODY', 'Extended Body');
+define('CATEGORY', 'Category:');
+define('TEMPLATE_NAME', 'template name');
+define('CHOOSE_STYLESHEET', 'Choose a style sheet....');
+define('EDIT', 'Edit');
+define('MAKE_DEFAULT', 'Make default');
+define('CREATE_NEW_STYLESHEET', 'Create New StyleSheet');
+define('NO_ENTRIES_BLAHBLAH', 'No Entries Found for Query %s' . "\n");
+define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Your search for %s returned %s results:');
+define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters');
+define('IMAGE', 'Image');
+define('ERROR_FILE_NOT_EXISTS', 'Error: Old filename doesn\'t exist!');
+define('ERROR_FILE_EXISTS', 'Error: New filename already used, pick another!');
+define('ERROR_SOMETHING', 'Error: Something\'s wrong.');
+define('ADDING_IMAGE', 'Adding image...');
+define('THUMB_CREATED_DONE', 'Thumbnail created.<br>Done.');
+define('ERROR_FILE_EXISTS_ALREADY', 'Error: File already exists on your machine!');
+define('ERROR_UNKNOWNE_NOUPLOAD', 'Unknown error occured, file not uploaded...');
+define('ADD_IMAGE_BLAHBLAH', '<b>Add an image to your repository:</b><p>Here you can upload images, or tell me to fetch them from somewhere in the web! If you don\'t have appropriate images, search for images on google matching your thoughts. Try <a href="http://images.google.com" target="_blank">Google\'s image search</a>, the results are often useful and always funny :)<p><b>Select method:</b><br>');
+define('ENTER_IMAGE_URL', 'Enter an URL of an image to fetch:');
+define('ENTER_IMAGE_TO_UP', 'Select an image you wish to upload:');
+define('GO', 'Go!');
+define('NEWSIZE', 'New size: ');
+define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
+define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
+define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here you can adjust the images new size. If you want to keep the proportions, just enter one value and press the TAB key, I\'ll automatically calculate the new size so the proportions  one value and press the TAB key, I\'ll automatically calculate the new size so the proportions don\'t get messed up:');
+define('DATE_FORMAT_1', 'l, F jS Y');
+define('CALENDAR', 'Calendar');
+define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
+define('QUICKSEARCH', 'Quicksearch');
+define('SEARCH_FOR_ENTRY', 'Search for an entry');
+define('ARCHIVES', 'Archives');
+define('BROWSE_ARCHIVES', 'Browse archives by month');
+define('TOP_REFERRER', 'Top Referrers');
+define('SHOWS_TOP_SITES', 'Shows top sites that linked to your blogs');
+define('TOP_EXITS', 'Top Exits');
+define('SHOWS_TOP_EXIT', 'Shows top exit links from your blogs');
+define('SYNDICATION', 'Syndication');
+define('SHOWS_RSS_BLAHBLAH', 'Shows RSS syndication links');
+define('ALLOWS_YOU_BLAHBLAH', 'Allows you to configure and publish your blog');
+define('PLUG', 'Plug');
+define('ADVERTISES_BLAHBLAH', 'Advertises the origins of your blog');
+define('HTML_NUGGET', 'HTML Nugget');
+define('HOLDS_A_BLAHBLAH', 'Holds a nugget of HTML in your sidebar');
+define('TITLE_FOR_NUGGET', 'Title for the nugget');
+define('THE_NUGGET', 'The Nugget of HTML!');
+define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
+define('QUICKJUMP', 'Quickjump');
+define('YOU_CHOSE', 'You chose %s');
+define('IMAGE_SIZE', 'Image size');
+define('IMAGE_AS_A_LINK', 'Image as a link');
+define('POWERED_BY', 'Powered by');
+define('SUPERUSER', 'Superuser');
+define('TRACKBACKS', 'Trackbacks');
+define('TRACKBACK', 'Trackback');
+define('NO_TRACKBACKS', 'No Trackbacks');
+define('TOPICS_OF', 'Topics of');
+define('VIEW_FULL', 'view full');
+define('VIEW_TOPICS', 'view topics');
+define('AT', 'at');
+define('SET_AS_TEMPLATE', 'Set as template');
+define('VIEW_EXTENDED_ENTRY', 'View Extended Entry');
+define('IN', 'in');
+define('EXCERPT', 'Excerpt');
+define('TRACKED', 'Tracked');
+define('LINK_TO_ENTRY', 'Link to entry');
+define('LINK_TO_REMOTE_ENTRY', 'Link zum Remote-Eintrag');
+define('IP_ADDRESS', 'IP-address');
+define('USER', 'User');
+define('THUMBNAIL_USING_OWN', 'Using %s as it\'s own thumbnail because it is so small already.');
+define('THUMBNAIL_FAILED_COPY', 'Wanted to use %s as it\'s own thumbnail, but failed to copy!');
+define('AUTHOR', 'Author');
+define('LAST_UPDATED', 'Last Updated');
 
+define('serendipity_LANG_LOADED', true);
 ?>

Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_xmlrpc.php	26 May 2003 13:14:14 -0000	1.4
+++ serendipity_xmlrpc.php	7 Jul 2003 18:14:01 -0000	1.5
@@ -34,8 +34,7 @@
                     'mt.supportedTextFilters' =>
                         array('function' => 'mt_supportedTextFilters'));
 
-function blogger_getUsersBlogs($message)
-{
+function blogger_getUsersBlogs($message) {
     global $serendipity;
 
     $val = $message->params[1];
@@ -43,11 +42,11 @@
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $blog1 = new XML_RPC_Value(
-        array('url'  => new XML_RPC_Value($serendipity['baseURL']),
-              'blogid' => new XML_RPC_Value('1'),
+        array('url'      => new XML_RPC_Value($serendipity['baseURL']),
+              'blogid'   => new XML_RPC_Value('1'),
               'blogName' => new XML_RPC_Value($serendipity['blogTitle'])),
         'struct');
     $blogs = new XML_RPC_Value( array($blog1), 'array');
@@ -55,30 +54,28 @@
     return($r);
 }
 
-function blogger_getUserInfo($message)
-{
+function blogger_getUserInfo($message) {
     global $serendipity;
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $userdata = new XML_RPC_Value(
         array('nickname'  => new XML_RPC_Value($serendipity['serendipityUser']),
-              'userid' => new XML_RPC_Value($serendipity['authorid'], 'string'),
-              'url' => new XML_RPC_Value($serendipity['baseURL']),
-              'email' => new XML_RPC_Value($serendipity['serendipityEmail']),
-              'lastname' => new XML_RPC_Value(''),
+              'userid'    => new XML_RPC_Value($serendipity['authorid'], 'string'),
+              'url'       => new XML_RPC_Value($serendipity['baseURL']),
+              'email'     => new XML_RPC_Value($serendipity['serendipityEmail']),
+              'lastname'  => new XML_RPC_Value(''),
               'firstname' => new XML_RPC_Value('')),
         'struct');
     $r = new XML_RPC_Response($userdata);
     return($r);
 }
 
-function mt_getCategoryList($message)
-{
+function mt_getCategoryList($message) {
     global $serendipity;
 
     $val = $message->params[1];
@@ -86,22 +83,21 @@
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $cats = serendipity_fetchCategories($serendipity['authorid']);
     $xml_entries_vals = array();
     foreach ( $cats as $cat ) {
         $xml_entries_vals[] = new XML_RPC_Value(
             array(
-              'categoryId' => new XML_RPC_Value($cat['categoryid'], 'string'),
+              'categoryId'   => new XML_RPC_Value($cat['categoryid'], 'string'),
               'categoryName' => new XML_RPC_Value($cat['category_name'], 'string')), 'struct');
     }
     $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array');
     return  new XML_RPC_Response($xml_entries);
 }
 
-function mt_getRecentPostTitles($message)
-{
+function mt_getRecentPostTitles($message) {
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
@@ -109,43 +105,41 @@
     $val = $message->params[3];
     $numposts = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $entries = serendipity_fetchEntries('', false, $numposts);
     $xml_entries_vals = array();
     foreach ( $entries as $entry ) {
         $xml_entries_vals[] = new XML_RPC_Value(
             array(
-                  'postid' => new XML_RPC_Value($entry['id'], 'string'),
-                  'title' => new XML_RPC_Value($entry['title'], 'string'),
-                  'userid' => new XML_RPC_Value($entry['authorid'], 'string'),
+                  'postid'      => new XML_RPC_Value($entry['id'], 'string'),
+                  'title'       => new XML_RPC_Value($entry['title'], 'string'),
+                  'userid'      => new XML_RPC_Value($entry['authorid'], 'string'),
                   'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
-                  'postid' => new XML_RPC_Value($entry['id'], 'string')), 'struct');
+                  'postid'      => new XML_RPC_Value($entry['id'], 'string')), 'struct');
     }
     $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array');
     return new XML_RPC_Response($xml_entries);
 }
 
-function mt_supportedTextFilters($message)
-{
+function mt_supportedTextFilters($message) {
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
 }
 
-function blogger_newPost($message)
-{
+function blogger_newPost($message) {
     $val = $message->params[2];
     $username = $val->getval();
     $val = $message->params[3];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $val = $message->params[4];
     $entry['body']  = $val->getval();
@@ -153,8 +147,7 @@
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
-function blogger_editPost($message)
-{
+function blogger_editPost($message) {
     $val = $message->params[1];
     $entry['id'] = $val->getval();
     $val = $message->params[2];
@@ -162,7 +155,7 @@
     $val = $message->params[3];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $val = $message->params[4];
     $entry['body']  = $val->getval();
@@ -171,8 +164,7 @@
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
-function blogger_deletePost($message)
-{
+function blogger_deletePost($message) {
     $val = $message->params[1];
     $entry['id'] = $val->getval();
     $val = $message->params[2];
@@ -180,7 +172,7 @@
     $val = $message->params[3];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $val = $message->params[4];
     $entry['body']  = $val->getval();
@@ -189,14 +181,13 @@
     return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
 }
 
-function metaWeblog_newPost($message)
-{
+function metaWeblog_newPost($message) {
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $val = $message->params[3];
     $post_array = $val->getval();
@@ -207,8 +198,7 @@
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
-function metaWeblog_editPost($message)
-{
+function metaWeblog_editPost($message) {
     $val = $message->params[0];
     $postid = $val->getval();
     $val = $message->params[1];
@@ -216,22 +206,21 @@
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $val = $message->params[3];
     $post_array = $val->getval();
-    $entry['title'] = $post_array['title'];
-    $entry['body'] = $post_array['description'];
+    $entry['title']    = $post_array['title'];
+    $entry['body']     = $post_array['description'];
     $entry['extended'] = $post_array['mt_text_more'];
-    $entry['user'] = $username;
+    $entry['user']     = $username;
     $entry['authorid'] = $serendipity['authorid'];
-    $entry['id'] = $postid;
+    $entry['id']       = $postid;
     $id = serendipity_updertEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id));
 }
 
-function metaWeblog_getPost($message)
-{
+function metaWeblog_getPost($message) {
     global $serendipity;
     $val = $message->params[0];
     $postid = $val->getval();
@@ -240,29 +229,28 @@
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
-    $entry = serendipity_fetchEntry("id", $postid);
+    $entry = serendipity_fetchEntry('id', $postid);
 
     $tmp = array(
-          'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
-          'postid'      => new XML_RPC_Value($postid, 'string'),
-          'userid'      => new XML_RPC_Value($entry['authorid'], 'string'),
-          'description' => new XML_RPC_Value($entry['body'], 'string'),
-          'mt_text_more'=> new XML_RPC_Value($entry['extended'], 'string'),
-          'mt_excerpt'=> new XML_RPC_Value('', 'string'),
+          'dateCreated'       => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
+          'postid'            => new XML_RPC_Value($postid, 'string'),
+          'userid'            => new XML_RPC_Value($entry['authorid'], 'string'),
+          'description'       => new XML_RPC_Value($entry['body'], 'string'),
+          'mt_text_more'      => new XML_RPC_Value($entry['extended'], 'string'),
+          'mt_excerpt'        => new XML_RPC_Value('', 'string'),
           'mt_allow_comments' => new XML_RPC_Value(1, 'boolean'),
-          'mt_allow_pings' => new XML_RPC_Value(1, 'boolean'),
+          'mt_allow_pings'    => new XML_RPC_Value(1, 'boolean'),
           'mt_convert_breaks' => new XML_RPC_Value(0, 'boolean'),
-          'title' => new XML_RPC_Value($entry['title'],'string'),
-          'permalink' => new XML_RPC_Value($serendipity['baseURL']."/archives/{$postid}_.html", 'string'),
-          'link' => new XML_RPC_Value($serendipity['baseURL']."/archives/{$postid}_.html", 'string'));
+          'title'             => new XML_RPC_Value($entry['title'],'string'),
+          'permalink'         => new XML_RPC_Value($serendipity['baseURL'] . '/archives/' . $postid . '_.html', 'string'),
+          'link'              => new XML_RPC_Value($serendipity['baseURL'] . '/archives/' . $postid . '_.html', 'string'));
     $entry = new XML_RPC_Value($tmp, 'struct');
     return  new XML_RPC_Response($entry);
 }
 
-function metaweblog_deletePost($message)
-{
+function metaweblog_deletePost($message) {
     $val = $message->params[1];
     $entry['id'] = $val->getval();
     $val = $message->params[2];
@@ -270,17 +258,16 @@
     $val = $message->params[3];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     $val = $message->params[4];
-    $entry['body']  = $val->getval();
+    $entry['body'] = $val->getval();
     $entry['user'] = $username;
     $id = serendipity_deleteEntry($entry['id']);
     return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
 }
 
-function metaWeblog_setPostCategories($message)
-{
+function metaWeblog_setPostCategories($message) {
     global $serendipity;
     $val = $message->params[0];
     $postid = $val->getval();
@@ -296,26 +283,24 @@
         $category_ids[] = $val->getval();
     }
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     serendipity_updateEntryCategories($postid, $category_ids);
     return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
 }
 
-function metaWeblog_getPostCategories($message)
-{
+function metaWeblog_getPostCategories($message) {
     $val = $message->params[1];
     $username = $val->getval();
     $val = $message->params[2];
     $password = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
     return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
 }
 
-function metaWeblog_newMediaObject($message)
-{
+function metaWeblog_newMediaObject($message) {
     global $serendipity;
     $val = $message->params[0];
     $postid = $val->getval();
@@ -326,15 +311,17 @@
     $val = $message->params[3];
     $struct = $val->getval();
     if(!serendipity_authenticate_author($username, $password)) {
-        return new XML_RPC_Response('', 4, "Authentication Failed");
+        return new XML_RPC_Response('', 4, 'Authentication Failed');
     }
-    $fp = fopen($serendipity["serendipityPath"].$serendipity['uploadPath'].$struct['name'], "w");
+
+    $fp = fopen($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $struct['name'], 'w');
     fwrite($fp, $struct['bits']);
     fclose($fp);
-    $path = $serendipity["baseURL"].$serendipity['uploadPath'].$struct['name'];
+    $path = $serendipity['baseURL'] . $serendipity['uploadPath'] . $struct['name'];
     return  new XML_RPC_Response( new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct'));
 }
-$fp = fopen("/tmp/kung-log", "a");
+
+$fp = fopen('/tmp/kung-log', 'a');
 fwrite($fp, $HTTP_RAW_POST_DATA);
 ob_start();
 $server = new XML_RPC_Server($dispatches,1);

[php-blog-cvs] serendipity index.php,1.16,1.17 rss.php,1.4,1.5 search.php,1.3,1.4 serendipity.css,1.1.1.1,1.2 serendipity.css.php,1.10,1.11

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17848

Modified Files:
	index.php rss.php search.php serendipity.css 
	serendipity.css.php 
Log Message:
more code style (now commited in some bundled parts ;)


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- index.php	3 Jul 2003 22:15:47 -0000	1.16
+++ index.php	7 Jul 2003 12:41:17 -0000	1.17
@@ -1,68 +1,65 @@
 <?php
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
-header("HTTP/1.0 200\r\n");
-include_once("serendipity_config.inc.php");
+header('HTTP/1.0 200\r\n');
+include_once('serendipity_config.inc.php');
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
 
 if (preg_match('@/archives/(\d+)\.html@', $uri, $matches)) {
-    header("Content-Type: text/html; charset=ISO-8859-1");
+    header('Content-Type: text/html; charset=ISO-8859-1');
     $range = $matches[1];
-    $_GET['serendipity']['action'] = "read";
+    $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['range'] = $range;
 
 
     if (strlen($range) == 6) {
-        $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
+        $date = date('m/Y', mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
     } else {
-        $date = date("d/m/Y", strtotime($range));
+        $date = date('d/m/Y', strtotime($range));
     }
 
     $serendipity['blogSubTitle'] = "Entries for $date";
     ob_start();
-    include_once("serendipity_genpage.inc.php");
+    include_once('serendipity_genpage.inc.php');
     $data = ob_get_contents();
     ob_end_clean();
 
     if ($serendipity['pregenerate']) {
-        $fp = fopen("./archives/{$matches[1]}", "w");
+        $fp = fopen('./archives/' . $matches[1], 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
 
     echo $data;
-}
-else 
-if (preg_match('@/archives/(\d+)_short\.html@', $uri, $matches)) {
-    header("Content-Type: text/html; charset=ISO-8859-1");
+} else if (preg_match('@/archives/(\d+)_short\.html@', $uri, $matches)) {
+    header('Content-Type: text/html; charset=ISO-8859-1');
     $range = $matches[1];
-    $_GET['serendipity']['action'] = "read";
+    $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['range'] = $range;
-	$_GET['serendipity']['short'] = true;
+    $_GET['serendipity']['short'] = true;
 
     if (strlen($range) == 6) {
-        $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
+        $date = date('m/Y', mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
     } else {
-        $date = date("d/m/Y", strtotime($range));
+        $date = date('d/m/Y', strtotime($range));
     }
 
     $serendipity['blogSubTitle'] = "Topics for $date";
     ob_start();
-    include_once("serendipity_genpage.inc.php");
+    include_once('serendipity_genpage.inc.php');
     $data = ob_get_contents();
     ob_end_clean();
 
     if ($serendipity['pregenerate']) {
-        $fp = fopen("./archives/{$matches[1]}", "w");
+        $fp = fopen('./archives/' . $matches[1], 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
 
     echo $data;
-}
-else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
-    header("Content-Type: text/html; charset=ISO-8859-1");
+} else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
+    header('Content-Type: text/html; charset=ISO-8859-1');
     $id = $matches[1];
 
     serendipity_track_referrer($id);
@@ -78,18 +75,18 @@
     $serendipity['blogTitle'] = htmlspecialchars($title);
 
     ob_start();
-    include_once("serendipity_genpage.inc.php");
+    include_once('serendipity_genpage.inc.php');
     $data = ob_get_contents();
     ob_end_clean();
 
     if ($serendipity['pregenerate']) {
-        $fp = fopen("./archives/{$matches[1]}", "w");
+        $fp = fopen('./archives/' . $matches[1], 'w');
         fwrite($fp, $data);
         fclose($fp);
     }
     print $data;
 } else if (preg_match('@/feeds/@', $uri)) {
-    header("Content-Type: text/html; charset=utf-8");
+    header('Content-Type: text/html; charset=utf-8');
     if (preg_match('@/index.(rss|rdf|rss2)$@', $uri, $matches)) {
         switch ($matches[1]) {
         case 'rss':
@@ -101,14 +98,14 @@
         }
 
         ob_start();
-        include_once("rss.php");
+        include_once('rss.php');
         $data = ob_get_contents();
         ob_end_clean();
 
         $data = ltrim($data);
 
         if ($serendipity['pregenerate']) {
-            $fp = fopen("./feeds/index.{$matches[1]}", "w");
+            $fp = fopen('./feeds/index.' . $matches[1], 'w');
             fwrite($fp, $data);
             fclose($fp);
         }
@@ -116,21 +113,20 @@
         print $data;
     }
 } else if (preg_match('@/admin$@', $uri)) {
-  header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
-  exit;
+    header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
+    exit;
 } else if (preg_match('@/entries$@', $uri)) {
-	header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
-  exit;
-}
-else if (preg_match('@/archive$@', $uri)) {
-    header("Content-Type: text/html; charset=ISO-8859-1");
-	$serendipity['GET']['action']="archives";
-	include_once("serendipity_genpage.inc.php");
+    header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
+    exit;
+} else if (preg_match('@/archive$@', $uri)) {
+    header('Content-Type: text/html; charset=ISO-8859-1');
+    $serendipity['GET']['action'] = 'archives';
+    include_once('serendipity_genpage.inc.php');
 } else if (preg_match('@/(index\.(php|html))?@', $uri)) {
-    header("Content-Type: text/html; charset=ISO-8859-1");
+    header('Content-Type: text/html; charset=ISO-8859-1');
     if (count($serendipity['GET']) == 2) {
         ob_start();
-        include_once("serendipity_genpage.inc.php");
+        include_once('serendipity_genpage.inc.php');
         $data = ob_get_contents();
         ob_end_clean();
         if ($serendipity['pregenerate']) {

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rss.php	3 Jul 2003 22:10:38 -0000	1.4
+++ rss.php	7 Jul 2003 12:41:17 -0000	1.5
@@ -1,18 +1,18 @@
 <?php
 
-header("Content-Type: text/xml");
-include_once("serendipity_config.inc.php");
+header('Content-Type: text/xml');
+include_once('serendipity_config.inc.php');
 $version = $_GET['version'];
 if (empty($version)) {
     $version = '2.0';
 }
 
-$description = $serendipity['blogDescription'];
-$title = $serendipity['blogTitle'];
+$description     = $serendipity['blogDescription'];
+$title           = $serendipity['blogTitle'];
 switch ($type) {
 case 'comments':
-    $entries = serendipity_fetchComments(null, true, 15);
-    $title = $title . ' Comments';
+    $entries     = serendipity_fetchComments(null, true, 15);
+    $title       = $title . ' Comments';
     $description = 'Comments from ' . $description;
     break;
 case 'content':

Index: search.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/search.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- search.php	25 May 2003 16:36:33 -0000	1.3
+++ search.php	7 Jul 2003 12:41:17 -0000	1.4
@@ -1,5 +1,5 @@
 <?php
 
-include_once("serendipity_config.inc.php");
-include_once("serendipity_genpage.inc.php");
+include_once('serendipity_config.inc.php');
+include_once('serendipity_genpage.inc.php');
 ?>

Index: serendipity.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity.css	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity.css	7 Jul 2003 12:41:17 -0000	1.2
@@ -4,7 +4,6 @@
 
 #content {
     width: auto;
-
 }
 
 #serendipityRightSideBar {

Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity.css.php	27 Jun 2003 15:01:05 -0000	1.10
+++ serendipity.css.php	7 Jul 2003 12:41:17 -0000	1.11
@@ -1,15 +1,15 @@
 <?php
-header("Content-type: text/css");
-if (!@include_once("serendipity_config.inc.php")) {
-	readfile('serendipity.css');
-} 
-else if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css") ) {
-	echo str_replace("{TEMPLATE_PATH}", $serendipity['baseURL']."/templates/".serendipity_get_config_var('template', 'default')."/", file_get_contents($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css"));
-} else if ( file_exists($serendipity['templatePath'] ."default/style.css")) {
-	readfile ($serendipity['templatePath'] ."default/style.css");
+header('Content-type: text/css');
+
+if (!@include_once('serendipity_config.inc.php')) {
+    readfile('serendipity.css');
+} else if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css') ) {
+    echo str_replace('{TEMPLATE_PATH}', $serendipity['baseURL'] . '/templates/' . serendipity_get_config_var('template', 'default'). '/', file_get_contents($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css'));
+} else if (file_exists($serendipity['templatePath'] . 'default/style.css')) {
+    readfile ($serendipity['templatePath'] . 'default/style.css');
 } else {
-	include_once("serendipity_config.inc.php");
-	$css = serendipity_getCSS($_REQUEST['style']);
-	echo $css['data'];
+    include_once('serendipity_config.inc.php');
+    $css = serendipity_getCSS($_REQUEST['style']);
+    echo $css['data'];
 }
 ?>

[php-blog-cvs] serendipity htaccess.tpl,1.3,1.4

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv15689

Modified Files:
	htaccess.tpl 
Log Message:
tabs -> spaces


Index: htaccess.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- htaccess.tpl	30 Mar 2003 16:01:43 -0000	1.3
+++ htaccess.tpl	7 Jul 2003 12:25:14 -0000	1.4
@@ -1,15 +1,15 @@
 ErrorDocument 404 {PREFIX}index.php
 
 <Files *.tpl>
-	deny from all
+    deny from all
 </Files>
 
 <Files *.sql>
-	deny from all
+    deny from all
 </Files>
 
 <Files *.inc.php>
-	deny from all
+    deny from all
 </Files>
 
 <Files sqlite.db>

[php-blog-cvs] serendipity db.sql,1.17,1.18

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv15527

Modified Files:
	db.sql 
Log Message:
code style: tabs -> spaces


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- db.sql	4 Jul 2003 05:29:10 -0000	1.17
+++ db.sql	7 Jul 2003 12:23:44 -0000	1.18
@@ -74,7 +74,7 @@
   path varchar(255),
   query varchar(255),
   entry_id int(11) not null,
-  PRIMARY KEY  (host,day,entry_id)	
+  PRIMARY KEY  (host,day,entry_id)
 );
 
 #
@@ -108,8 +108,8 @@
 #
 
 create table {PREFIX}config (
-	name varchar(255) not null primary key,
-	value text not null
+  name varchar(255) not null primary key,
+  value text not null
 );
 
 CREATE TABLE {PREFIX}suppress (
@@ -125,10 +125,10 @@
 CREATE unique INDEX url on {PREFIX}suppress (host, ip);
 
 CREATE TABLE {PREFIX}plugins (
-	name varchar(128) not null,
-	placement varchar(6) not null default 'right',
-	sort_order int(4) not null default '0',
-	PRIMARY KEY(name)
+  name varchar(128) not null,
+  placement varchar(6) not null default 'right',
+  sort_order int(4) not null default '0',
+  PRIMARY KEY(name)
 );
 
 CREATE TABLE {PREFIX}category (

[php-blog-cvs] serendipity compat.php,1.1.1.1,1.2

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv15345

Modified Files:
	compat.php 
Log Message:
code style: replaced tabs by spaces, double quotes by single quotes.


Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- compat.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ compat.php	7 Jul 2003 12:22:21 -0000	1.2
@@ -1,7 +1,7 @@
 <?php
-if (!function_exists("file_get_contents")) {
+if (!function_exists('file_get_contents')) {
     function file_get_contents($file) {
-        $fp = fopen($file, "rb");
+        $fp = fopen($file, 'rb');
         while (!@feof($fp)) {
             $data .= fread($fp, 4096);
         }
@@ -12,22 +12,22 @@
 }
 
 if (!$_POST) {
-	$_POST = &$HTTP_POST_VARS;
+    $_POST = &$HTTP_POST_VARS;
 }
 
 if (!$_GET) {
-	$_GET = &$HTTP_GET_VARS;
+    $_GET = &$HTTP_GET_VARS;
 }
 
 if (!$_SESSION) {
-	$_SESSION = &$HTTP_SESSION_VARS;
+    $_SESSION = &$HTTP_SESSION_VARS;
 }
 
 if (!$_COOKIE) {
-	$_COOKIE = &$HTTP_COOKIE_VARS;
+    $_COOKIE = &$HTTP_COOKIE_VARS;
 }
 
 if (!$_SERVER) {
-	$_SERVER = &$HTTP_SERVER_VARS;
+    $_SERVER = &$HTTP_SERVER_VARS;
 }
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.90,1.91

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv23311

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Sadly we have to use diffirent types of LIMIT syntax, depending on the type of database

This fix allows listing of entries in the administration


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_functions.inc.php	4 Jul 2003 05:29:10 -0000	1.90
+++ serendipity_functions.inc.php	5 Jul 2003 19:42:11 -0000	1.91
@@ -274,7 +274,7 @@
     if ($full === true)
         $body = ',body, extended';
 
-	if (is_numeric($range)) {
+	if ( is_numeric($range)) {
 		$year = (int)substr($range, 0, 4);
 		$month = (int)substr($range, 4, 2);
 		$day = (int)substr($range, 6, 2);
@@ -289,7 +289,11 @@
 	}
 
     if (!empty($limit)) {
-        $limit = "LIMIT " . join (" OFFSET ", split(',', $limit));
+    	if ( strtolower($serendipity['dbType']) == 'postgres' ) {
+        	$limit = "LIMIT " . join (" OFFSET ", split(',', $limit));
+    	} else {
+		$limit = 'LIMIT '. $limit;
+	}
     }
 
     $query = "SELECT e.*, a.username, c.category_name FROM

Re: [php-blog-cvs] serendipity comment.php,1.11,1.12

[Sterling H. <ste...@bu...>]

The indentation of the closing ?> doesn't really matter, the Zend lexer
will fold that whitespace.  It is purely a style guideline.

-sterling

On Fri, 2003-07-04 at 12:33, gar...@us... wrote:
> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv21145
> 
> Modified Files:
> 	comment.php 
> Log Message:
> Removed indenting on ?> (and <?) tags, put them to top level to not let PHP introduce
> any extra spaces/linefeeds to the HTML output. (as [being] discussed on the
> mailinglist)
> 
> 
> Index: comment.php
> ===================================================================
> RCS file: /cvsroot/php-blog/serendipity/comment.php,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -d -r1.11 -r1.12
> --- comment.php	4 Jul 2003 10:36:37 -0000	1.11
> +++ comment.php	4 Jul 2003 16:33:16 -0000	1.12
> @@ -63,7 +63,7 @@
>                     . 'archives/'
>                     . $serendipity['GET']['entry_id']
>                     . '_' . serendipity_makeFilename($entry[0]['title']) . '.html';
> -        ?>
> +?>
>  <div id="serendipity_bodyLevel">
>      <div class="serendipity_commentsTitle">Trackbacks</div><br />
>      <dl>
> @@ -77,11 +77,11 @@
>      </dl>
>  <?php
>          } else {
> -        ?>
> +?>
>      <div class="serendipity_commentsTitle">Comments</div>
>  <?php
> -            serendipity_printComments(serendipity_fetchComments($id)); ?>
> -
> +            serendipity_printComments(serendipity_fetchComments($id)); 
> +?>
>  
>      <div class="serendipity_commentsTitle">Add A Comment</div>
>  <?php
> @@ -94,18 +94,18 @@
>          $comment['email']   = $serendipity['POST']['email'];
>          if ( !empty($comment['comment']) ) {
>              serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
> -        ?>
> +?>
>      Your comment was successfully added.
>      Click <a href="<?php echo $_SERVER['PHP_SELF']; ?>?serendipity[entry_id]=<?php echo $serendipity['POST']['entry_id']; ?>">here to return</a> to
>      the comments, and <a href="#" onClick="self.close()">here to close</a> this window.
>  <?php
>          } else {
> -        ?>
> +?>
>      Your comment did not contain anything, please <a href="#" onClick="history.go(-1)">go back</a> and try again
>  <?php
>          }
>      }
> -    ?>
> +?>
>  </div>
>  </body>
>  </html>
> 
> 
> 
> 
> -------------------------------------------------------
> This SF.Net email sponsored by: Free pre-built ASP.NET sites including
> Data Reports, E-commerce, Portals, and Forums are available now.
> Download today and enter to win an XBOX or Visual Studio .NET.
> http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
> _______________________________________________
> php-blog-cvs mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/php-blog-cvs
-- 
"The three most dangerous things in the world are a programmer  
 with a soldering iron, a hardware type with a program patch and  
 a user with an idea." 
    - Unknown

[php-blog-cvs] serendipity comment.php,1.11,1.12

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv21145

Modified Files:
	comment.php 
Log Message:
Removed indenting on ?> (and <?) tags, put them to top level to not let PHP introduce
any extra spaces/linefeeds to the HTML output. (as [being] discussed on the
mailinglist)


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- comment.php	4 Jul 2003 10:36:37 -0000	1.11
+++ comment.php	4 Jul 2003 16:33:16 -0000	1.12
@@ -63,7 +63,7 @@
                    . 'archives/'
                    . $serendipity['GET']['entry_id']
                    . '_' . serendipity_makeFilename($entry[0]['title']) . '.html';
-        ?>
+?>
 <div id="serendipity_bodyLevel">
     <div class="serendipity_commentsTitle">Trackbacks</div><br />
     <dl>
@@ -77,11 +77,11 @@
     </dl>
 <?php
         } else {
-        ?>
+?>
     <div class="serendipity_commentsTitle">Comments</div>
 <?php
-            serendipity_printComments(serendipity_fetchComments($id)); ?>
-
+            serendipity_printComments(serendipity_fetchComments($id)); 
+?>
 
     <div class="serendipity_commentsTitle">Add A Comment</div>
 <?php
@@ -94,18 +94,18 @@
         $comment['email']   = $serendipity['POST']['email'];
         if ( !empty($comment['comment']) ) {
             serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
-        ?>
+?>
     Your comment was successfully added.
     Click <a href="<?php echo $_SERVER['PHP_SELF']; ?>?serendipity[entry_id]=<?php echo $serendipity['POST']['entry_id']; ?>">here to return</a> to
     the comments, and <a href="#" onClick="self.close()">here to close</a> this window.
 <?php
         } else {
-        ?>
+?>
     Your comment did not contain anything, please <a href="#" onClick="history.go(-1)">go back</a> and try again
 <?php
         }
     }
-    ?>
+?>
 </div>
 </body>
 </html>

[php-blog-cvs] serendipity comment.php,1.10,1.11

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv1001

Modified Files:
	comment.php 
Log Message:
Code cleanup:

o tabs -> spaces
o indenting, spacing
o double quotes -> single Quotes
o Some echos -> ?>...<?php
o & -> &amp;
o defer global vars (PHP_SELF,...)
o '/>' for single html tags.

This makes the page to tentatively valid XHTML 1.1 code. Valid content-type/xml headers are missing though, yet. :)


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- comment.php	25 Jun 2003 22:04:30 -0000	1.10
+++ comment.php	4 Jul 2003 10:36:37 -0000	1.11
@@ -2,16 +2,16 @@
 session_start();
 include_once('serendipity_config.inc.php');
 
-if ( isset($serendipity['GET']['delete'],$serendipity['GET']['entry'],$serendipity['GET']['type']) ) {
-    serendipity_deleteComment($serendipity['GET']['delete'],$serendipity['GET']['entry'],$serendipity['GET']['type']);
+if ( isset($serendipity['GET']['delete'], $serendipity['GET']['entry'],$serendipity['GET']['type']) ) {
+    serendipity_deleteComment($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type']);
 }
 
 /* It's time to finally check if we need to remember the entered information,
    the reason we are doing this up here, is because we want to send cookie-headers */
 if ( isset($serendipity['POST']['remember']) ) {
-    $details['url'] = $serendipity['POST']['url'];
-    $details['name'] = $serendipity['POST']['name'];
-    $details['email'] = $serendipity['POST']['email'];
+    $details['url']      = $serendipity['POST']['url'];
+    $details['name']     = $serendipity['POST']['name'];
+    $details['email']    = $serendipity['POST']['email'];
     $details['remember'] = 'checked';
     serendipity_rememberCommentDetails($details);
 } elseif ( isset($serendipity['POST']['comment']) ) {
@@ -38,60 +38,77 @@
         report_trackback_failure();
     }
 } else if ($type == 'pingback') {
-    if(add_pingback($_POST['entry_id'],$HTTP_RAW_POST_DATA)) {
+    if(add_pingback($_POST['entry_id'], $HTTP_RAW_POST_DATA)) {
         report_pingback_success();
-    }
-    else {
+    } else {
         report_pingback_failure();
     }
 } else {
-$id = $serendipity['GET']['entry_id'];
+    $id = $serendipity['GET']['entry_id'];
 ?>
 <html>
 <head>
-<title>Comments</title>
-<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php?mode=comments">
+    <title>Comments</title>
+    <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php?mode=comments" />
 </head>
 <body>
+
 <?php
-if (!isset($serendipity['POST']['comment'])) {
-	if ($serendipity['GET']['type'] == "trackbacks") {
-		echo '<div class="serendipity_commentsTitle">Trackbacks</div><br />';
-		echo '<b>Trackback specific URI for this entry:<br />'.str_repeat("&nbsp;",7);
-		$tbu = $serendipity['baseURL']."comment.php?type=trackback&entry_id=".$serendipity['GET']['entry_id'];
-		echo '<a href="'.$tbu.'">'.$tbu.'</a><p />';
-		echo '<b>Direct link to this entry:<br />'.str_repeat("&nbsp;",7);
-		$query = "SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id = ". $serendipity['GET']['entry_id'];
-		$entry = serendipity_db_query($query);
-		$entry =  $serendipity['baseURL']
-			. "archives/"
-			. $serendipity['GET']['entry_id']
-			. "_".serendipity_makeFilename($entry[0]['title']).".html";
-		echo '<a href="'. $entry .'">'. $entry .'</a>';																															
-		serendipity_printTrackbacks(serendipity_fetchTrackbacks($id));
-	} else {
-?>
-<div class="serendipity_commentsTitle">Comments</div>
-<?php serendipity_printComments(serendipity_fetchComments($id)); ?>
-<div class="serendipity_commentsTitle">Add A Comment</div>
-<?php serendipity_displayCommentForm($id);
-	}
-} else {
-    $comment['url'] = $serendipity['POST']['url'];
-    $comment['comment'] = trim($serendipity['POST']['comment']);
-    $comment['name'] = $serendipity['POST']['name'];
-    $comment['email'] = $serendipity['POST']['email'];
-    if ( !empty($comment['comment']) ) {
-	serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
-?>
-Your comment was successfully added.  Click <a href="<?php echo $PHP_SELF; ?>?serendipity[entry_id]=<?php echo $serendipity['POST']['entry_id']; ?>">here</a> to return to
-the comments, and <a href="#" onClick="self.close()">here</a> to close this window.
-<?php } else {  ?>
-Your comment did not contain anything, please <a href="#" onClick="history.go(-1)">go back</a> and try again
-<?php }
-} ?>
+    if (!isset($serendipity['POST']['comment'])) {
+        if ($serendipity['GET']['type'] == 'trackbacks') {
+            $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&amp;entry_id=' . $serendipity['GET']['entry_id'];
+            $query = 'SELECT title FROM ' . $serendipity['dbPrefix'] . 'entries WHERE id = ' . $serendipity['GET']['entry_id'];
+            $entry = serendipity_db_query($query);
+            $entry =  $serendipity['baseURL']
+                   . 'archives/'
+                   . $serendipity['GET']['entry_id']
+                   . '_' . serendipity_makeFilename($entry[0]['title']) . '.html';
+        ?>
+<div id="serendipity_bodyLevel">
+    <div class="serendipity_commentsTitle">Trackbacks</div><br />
+    <dl>
+        <dt><b>Trackback specific URI for this entry:</b><br /></dt>
+        <dd><a href="<?php echo $tbu; ?>"><?php echo $tbu; ?></a><br /></dd>
+    
+        <dt><b>Direct link to this entry:</b><br /></dt>
+        <dd><a href="<?php echo $entry; ?>"><?php echo $entry; ?></a>
+            <?php serendipity_printTrackbacks(serendipity_fetchTrackbacks($id)); ?>
+        </dd>
+    </dl>
+<?php
+        } else {
+        ?>
+    <div class="serendipity_commentsTitle">Comments</div>
+<?php
+            serendipity_printComments(serendipity_fetchComments($id)); ?>
+
+
+    <div class="serendipity_commentsTitle">Add A Comment</div>
+<?php
+            serendipity_displayCommentForm($id);
+        }
+    } else {
+        $comment['url']     = $serendipity['POST']['url'];
+        $comment['comment'] = trim($serendipity['POST']['comment']);
+        $comment['name']    = $serendipity['POST']['name'];
+        $comment['email']   = $serendipity['POST']['email'];
+        if ( !empty($comment['comment']) ) {
+            serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
+        ?>
+    Your comment was successfully added.
+    Click <a href="<?php echo $_SERVER['PHP_SELF']; ?>?serendipity[entry_id]=<?php echo $serendipity['POST']['entry_id']; ?>">here to return</a> to
+    the comments, and <a href="#" onClick="self.close()">here to close</a> this window.
+<?php
+        } else {
+        ?>
+    Your comment did not contain anything, please <a href="#" onClick="history.go(-1)">go back</a> and try again
+<?php
+        }
+    }
+    ?>
+</div>
 </body>
 </html>
 <?php
 }
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity db.sql,1.16,1.17 serendipity_admin_entries.inc.php,1.2,1.3 serendipity_functions.inc.php,1.89,1.90

[<jt...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29558

Modified Files:
	db.sql serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php 
Log Message:
db.sql: reverted the patch which removed the _css table from the schema.

_admin_entries.inc.php: Fixed the "categories listing" so that if there were no categories, it didn't display garbage.
_config.inc.php: No change as far as I can remember.
_functions.inc.php: Fixed a sql query that bombed on PostgreSQL.  LIMIT X,Y is not valid with PostgreSQL, use LIMIT X OFFSET Y instead.  Please test this on Mysql Systems to make sure it still works.



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- db.sql	22 Jun 2003 19:54:23 -0000	1.16
+++ db.sql	4 Jul 2003 05:29:10 -0000	1.17
@@ -62,7 +62,7 @@
 );
 
 #
-# Table structure for table '{PREFIX}/suppxits'
+# Table structure for table '{PREFIX}exits'
 # 
 
 CREATE TABLE {PREFIX}exits (
@@ -92,6 +92,20 @@
   entry_id int(11) not null,
   PRIMARY KEY  (host,day,entry_id)
 );
+
+#
+# Table structure for table 'serendipity_css'
+#
+
+CREATE TABLE {PREFIX}css (
+  cssid {AUTOINCREMENT},
+  name varchar(40) default NULL,
+  data text
+);
+
+#
+# Table structure for table 'serendipity_config'
+#
 
 create table {PREFIX}config (
 	name varchar(255) not null primary key,

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_entries.inc.php	25 Jun 2003 22:04:30 -0000	1.2
+++ serendipity_admin_entries.inc.php	4 Jul 2003 05:29:10 -0000	1.3
@@ -13,55 +13,66 @@
 
 // A little helper we don't want in _functions.inc.php
 function serendipity_drawList($action) {
-	global $serendipity;
-
-    // Prepare variables
-    if (!is_numeric($serendipity["GET"]["offset"])) $serendipity["GET"]["offset"] = 0;
-	$perPage = 30;
-
-    // Fetch the entries
-    $entries = serendipity_fetchEntries(false, false, serendipity_db_limit($serendipity["GET"]["offset"], $perPage));
-
-    // Prepare table
-	echo "<div class='serendipity_admin_list'>";
-	echo "<div class='serendipity_admin_list_title'>".ucfirst($action)." Entries:</div>";
-	echo "<table width='100%' class='serendipity_admin_list'>";
-	
+  global $serendipity;
+  
+  // Prepare variables
+  if (!is_numeric($serendipity["GET"]["offset"])) $serendipity["GET"]["offset"] = 0;
+  $perPage = 30;
+  
+  // Fetch the entries
+  $entries = serendipity_fetchEntries(false, false, serendipity_db_limit($serendipity["GET"]["offset"], $perPage));
+  
+  // Prepare table
+  echo "<div class='serendipity_admin_list'>";
+  echo "<div class='serendipity_admin_list_title'>".ucfirst($action)." Entries:</div>";
+  echo "<table width='100%' class='serendipity_admin_list'>";
+  
+  if ( is_array($entries) ) {
     $half = (int) ((count($entries) + 1)/2);
-
-	// Print the browse buttons
+    
+    // Print the browse buttons
     echo "<tr><td align='left'>";
     if ($serendipity["GET"]["offset"] > 0) {
-		echo '<input type="button" value="&lt;&lt;&lt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.max(0,($serendipity["GET"]["offset"]-$perPage)).'\';">';
+      echo '<input type="button" value="&lt;&lt;&lt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.max(0,($serendipity["GET"]["offset"]-$perPage)).'\';">';
     }
-	echo "</td><td align='right'>";
+    echo "</td><td align='right'>";
     if (count($entries) == $perPage) {
-    	echo '<input type="button" value="&gt;&gt;&gt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.($serendipity["GET"]["offset"]+$perPage).'\';">';
+      echo '<input type="button" value="&gt;&gt;&gt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.($serendipity["GET"]["offset"]+$perPage).'\';">';
     }
-	echo "</td></tr>";
+    echo "</td></tr>";
     // Print the entries
     $count = count($entries);
-	for ($x=0; $x<$half; $x++) {
-        ?>
-		<tr>
-		<td class="serendipity_admin_list_item">
-        <?php echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ; ?>
-		<br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x]["id"] ; ?>'>
-        <?php echo htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)); ?></a>
-        </a>
-		</td>
-		<td class="serendipity_admin_list_item">
-        <?php if ($x + $half < $count) {  ?>
-        <?php echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "; ?>
-		<br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x+$half]["id"] ; ?>'>
-        <?php echo htmlentities(substr($entries[$x+$half]["title"],0,40)) ; ?></a>
-        </a>
-        <?php } ?>
+    for ($x=0; $x<$half; $x++) {
+  ?>
+ <tr>
+    <td class="serendipity_admin_list_item">
+    <?php echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ; ?>
+    <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x]["id"] ; ?>'>
+       <?php echo htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)); ?></a>
+       </a>
+       </td>
+       <td class="serendipity_admin_list_item">
+       <?php if ($x + $half < $count) {  ?>
+         <?php echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "; ?>
+         <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x+$half]["id"] ; ?>'>
+         <?php echo htmlentities(substr($entries[$x+$half]["title"],0,40)) ; ?></a>
+         </a>
+         <?php 
+         }
+    }
+  }
+  else {
+    //We've got nothing
+    ?>
+    <tr><td class="serendipity_admin_list_item" colspan="2">
+    <?php echo NO_ENTRIES_TO_PRINT ?></td></tr>
+    <?php
+  } 
+?>
 		</td>
         </tr>
 <?php         
-    }
-    echo "</table></div>";
+  echo "</table></div>";
 }
 
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- serendipity_functions.inc.php	3 Jul 2003 22:05:52 -0000	1.89
+++ serendipity_functions.inc.php	4 Jul 2003 05:29:10 -0000	1.90
@@ -289,7 +289,7 @@
 	}
 
     if (!empty($limit)) {
-        $limit = "LIMIT $limit";
+        $limit = "LIMIT " . join (" OFFSET ", split(',', $limit));
     }
 
     $query = "SELECT e.*, a.username, c.category_name FROM

[php-blog-cvs] serendipity index.php,1.15,1.16

[<ste...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv10880

Modified Files:
	index.php 
Log Message:
output utf8 for rss feeds


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- index.php	3 Jul 2003 21:42:39 -0000	1.15
+++ index.php	3 Jul 2003 22:15:47 -0000	1.16
@@ -2,92 +2,94 @@
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header("HTTP/1.0 200\r\n");
-header("Content-Type: text/html; charset=ISO-8859-1");
 include_once("serendipity_config.inc.php");
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
 
 if (preg_match('@/archives/(\d+)\.html@', $uri, $matches)) {
-        $range = $matches[1];
-        $_GET['serendipity']['action'] = "read";
-        $_GET['serendipity']['range'] = $range;
+    header("Content-Type: text/html; charset=ISO-8859-1");
+    $range = $matches[1];
+    $_GET['serendipity']['action'] = "read";
+    $_GET['serendipity']['range'] = $range;
 
 
-        if (strlen($range) == 6) {
-            $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
-        } else {
-            $date = date("d/m/Y", strtotime($range));
-        }
+    if (strlen($range) == 6) {
+        $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
+    } else {
+        $date = date("d/m/Y", strtotime($range));
+    }
 
-        $serendipity['blogSubTitle'] = "Entries for $date";
-        ob_start();
-        include_once("serendipity_genpage.inc.php");
-        $data = ob_get_contents();
-        ob_end_clean();
+    $serendipity['blogSubTitle'] = "Entries for $date";
+    ob_start();
+    include_once("serendipity_genpage.inc.php");
+    $data = ob_get_contents();
+    ob_end_clean();
 
-        if ($serendipity['pregenerate']) {
-            $fp = fopen("./archives/{$matches[1]}", "w");
-            fwrite($fp, $data);
-            fclose($fp);
-        }
+    if ($serendipity['pregenerate']) {
+        $fp = fopen("./archives/{$matches[1]}", "w");
+        fwrite($fp, $data);
+        fclose($fp);
+    }
 
-        echo $data;
+    echo $data;
 }
 else 
 if (preg_match('@/archives/(\d+)_short\.html@', $uri, $matches)) {
-        $range = $matches[1];
-        $_GET['serendipity']['action'] = "read";
-        $_GET['serendipity']['range'] = $range;
-		$_GET['serendipity']['short'] = true;
+    header("Content-Type: text/html; charset=ISO-8859-1");
+    $range = $matches[1];
+    $_GET['serendipity']['action'] = "read";
+    $_GET['serendipity']['range'] = $range;
+	$_GET['serendipity']['short'] = true;
 
-        if (strlen($range) == 6) {
-            $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
-        } else {
-            $date = date("d/m/Y", strtotime($range));
-        }
+    if (strlen($range) == 6) {
+        $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
+    } else {
+        $date = date("d/m/Y", strtotime($range));
+    }
 
-        $serendipity['blogSubTitle'] = "Topics for $date";
-        ob_start();
-        include_once("serendipity_genpage.inc.php");
-        $data = ob_get_contents();
-        ob_end_clean();
+    $serendipity['blogSubTitle'] = "Topics for $date";
+    ob_start();
+    include_once("serendipity_genpage.inc.php");
+    $data = ob_get_contents();
+    ob_end_clean();
 
-        if ($serendipity['pregenerate']) {
-            $fp = fopen("./archives/{$matches[1]}", "w");
-            fwrite($fp, $data);
-            fclose($fp);
-        }
+    if ($serendipity['pregenerate']) {
+        $fp = fopen("./archives/{$matches[1]}", "w");
+        fwrite($fp, $data);
+        fclose($fp);
+    }
 
-        echo $data;
+    echo $data;
 }
 else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
-   $id = $matches[1];
+    header("Content-Type: text/html; charset=ISO-8859-1");
+    $id = $matches[1];
 
     serendipity_track_referrer($id);
     $track_referer = false;
 
-   $_GET['serendipity']['action'] = 'read';
-   $_GET['serendipity']['id'] = $id;
+    $_GET['serendipity']['action'] = 'read';
+    $_GET['serendipity']['id'] = $id;
 
-   $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
+    $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
                                  'WHERE id=' . serendipity_db_escape_string($id), true);
-   $title = $title[0];
+    $title = $title[0];
 
-   $serendipity['blogTitle'] = htmlspecialchars($title);
+    $serendipity['blogTitle'] = htmlspecialchars($title);
 
-   ob_start();
-   include_once("serendipity_genpage.inc.php");
-   $data = ob_get_contents();
-   ob_end_clean();
+    ob_start();
+    include_once("serendipity_genpage.inc.php");
+    $data = ob_get_contents();
+    ob_end_clean();
 
-   if ($serendipity['pregenerate']) {
+    if ($serendipity['pregenerate']) {
         $fp = fopen("./archives/{$matches[1]}", "w");
         fwrite($fp, $data);
         fclose($fp);
-   }
-   print $data;
-
+    }
+    print $data;
 } else if (preg_match('@/feeds/@', $uri)) {
+    header("Content-Type: text/html; charset=utf-8");
     if (preg_match('@/index.(rss|rdf|rss2)$@', $uri, $matches)) {
         switch ($matches[1]) {
         case 'rss':
@@ -121,9 +123,11 @@
   exit;
 }
 else if (preg_match('@/archive$@', $uri)) {
+    header("Content-Type: text/html; charset=ISO-8859-1");
 	$serendipity['GET']['action']="archives";
 	include_once("serendipity_genpage.inc.php");
 } else if (preg_match('@/(index\.(php|html))?@', $uri)) {
+    header("Content-Type: text/html; charset=ISO-8859-1");
     if (count($serendipity['GET']) == 2) {
         ob_start();
         include_once("serendipity_genpage.inc.php");

[php-blog-cvs] serendipity rss.php,1.3,1.4

[<ste...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9818

Modified Files:
	rss.php 
Log Message:
xml header should be utf-8, not iso-8859-1.  This should fix the encoding
problems.

utf8 is necessary because we need to have wide character support, that way
s9y can be used by people who have weird languages with lots of symbols.


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rss.php	4 Jun 2003 16:19:27 -0000	1.3
+++ rss.php	3 Jul 2003 22:10:38 -0000	1.4
@@ -25,7 +25,7 @@
     break;
 }
 
-echo '<?xml version="1.0" encoding="iso-8859-1" ?>';
+echo '<?xml version="1.0" encoding="utf-8" ?>';
 echo "\n";
 switch ($version) {
 case '0.91':

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.88,1.89

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9164

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Reverting my fix to make room for Sterling's upcoming fix


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- serendipity_functions.inc.php	3 Jul 2003 21:49:47 -0000	1.88
+++ serendipity_functions.inc.php	3 Jul 2003 22:05:52 -0000	1.89
@@ -721,7 +721,7 @@
 function serendipity_printEntries_rss($entries, $version) {
     global $serendipity;
 
-    if ( ($version == '0.91') || ($version == '2.0') && is_array($entries) ) {
+    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>".htmlentities($entry['title'])."</title>\n";
@@ -730,15 +730,14 @@
                 // extract author information
                 $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
                 $results = serendipity_db_query($query);
-                
                 echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n";
                 echo "<content:encoded>\n";
-                echo htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])));
+                echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
                 echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
                 echo "<guid>{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html</guid>\n";
             } else {
-                echo "<description>\n" . htmlspecialchars($entry['body']) . "\n</description>\n";
+                echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
             }
             echo "</item>\n";
         }

[php-blog-cvs] Re: serendipity serendipity_functions.inc.php,1.87,1.88

[Sterling H. <ste...@bu...>]

The fix is not within that file.  Please revert it. :)

-Sterling

On Thu, 2003-07-03 at 17:58, Tom Sommer wrote:
> Sterling Hughes wrote:
> 
> > Please revert, I have a proper fix coming in a moment.
> 
> Can't you just overwrite my changes?
> Because... ehh, reverting would still bump the revision number.
> 
> doing
> 	`cvs update -j1.88 -j1.87 serendipity_functions.inc.php`
> and then
> 	`cvs commit serendipity_functions.inc.php`
> 
> (Sorry, I'm not that advanced in CVS commands, show me the wau :) )
-- 
"Reductionists like to take things apart.  The rest of us are 
 just trying to get it together." 
    - Larry Wall, Programming Perl, 3rd Edition

Re: [php-blog-cvs] serendipity serendipity_functions.inc.php,1.87,1.88

[Sterling H. <ste...@bu...>]

Please revert, I have a proper fix coming in a moment.

-Sterling

On Thu, 2003-07-03 at 17:49, tom...@us... wrote:
> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv6679
> 
> Modified Files:
> 	serendipity_functions.inc.php 
> Log Message:
> Removed utf8_encode() from RSS feeds.
> It caused wrong display of certain non-english chars
> 
> 
> Index: serendipity_functions.inc.php
> ===================================================================
> RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
> retrieving revision 1.87
> retrieving revision 1.88
> diff -u -d -r1.87 -r1.88
> --- serendipity_functions.inc.php	29 Jun 2003 20:34:57 -0000	1.87
> +++ serendipity_functions.inc.php	3 Jul 2003 21:49:47 -0000	1.88
> @@ -721,7 +721,7 @@
>  function serendipity_printEntries_rss($entries, $version) {
>      global $serendipity;
>  
> -    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
> +    if ( ($version == '0.91') || ($version == '2.0') && is_array($entries) ) {
>          foreach ($entries as $entry) {
>              echo "<item>\n";
>              echo "<title>".htmlentities($entry['title'])."</title>\n";
> @@ -730,14 +730,15 @@
>                  // extract author information
>                  $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
>                  $results = serendipity_db_query($query);
> +                
>                  echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n";
>                  echo "<content:encoded>\n";
> -                echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body']))));
> +                echo htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])));
>                  echo "\n</content:encoded>\n";
>                  echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
>                  echo "<guid>{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html</guid>\n";
>              } else {
> -                echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
> +                echo "<description>\n" . htmlspecialchars($entry['body']) . "\n</description>\n";
>              }
>              echo "</item>\n";
>          }
> 
> 
> 
> 
> -------------------------------------------------------
> This SF.Net email sponsored by: Free pre-built ASP.NET sites including
> Data Reports, E-commerce, Portals, and Forums are available now.
> Download today and enter to win an XBOX or Visual Studio .NET.
> http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
> _______________________________________________
> php-blog-cvs mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/php-blog-cvs
-- 
"Whether you think you can or think you can't -- you are right." 
    - Henry Ford

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.87,1.88

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv6679

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Removed utf8_encode() from RSS feeds.
It caused wrong display of certain non-english chars


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- serendipity_functions.inc.php	29 Jun 2003 20:34:57 -0000	1.87
+++ serendipity_functions.inc.php	3 Jul 2003 21:49:47 -0000	1.88
@@ -721,7 +721,7 @@
 function serendipity_printEntries_rss($entries, $version) {
     global $serendipity;
 
-    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
+    if ( ($version == '0.91') || ($version == '2.0') && is_array($entries) ) {
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>".htmlentities($entry['title'])."</title>\n";
@@ -730,14 +730,15 @@
                 // extract author information
                 $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
                 $results = serendipity_db_query($query);
+                
                 echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n";
                 echo "<content:encoded>\n";
-                echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body']))));
+                echo htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])));
                 echo "\n</content:encoded>\n";
                 echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
                 echo "<guid>{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html</guid>\n";
             } else {
-                echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
+                echo "<description>\n" . htmlspecialchars($entry['body']) . "\n</description>\n";
             }
             echo "</item>\n";
         }

[php-blog-cvs] serendipity index.php,1.14,1.15

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv5469

Modified Files:
	index.php 
Log Message:
Lets go back to good old ISO-8859-1
ISO-8859-2 was causing lots of problems


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- index.php	28 Jun 2003 18:11:01 -0000	1.14
+++ index.php	3 Jul 2003 21:42:39 -0000	1.15
@@ -2,7 +2,7 @@
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header("HTTP/1.0 200\r\n");
-header("Content-Type: text/html; charset=ISO-8859-2");
+header("Content-Type: text/html; charset=ISO-8859-1");
 include_once("serendipity_config.inc.php");
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];

[php-blog-cvs] serendipity serendipity_plugin_api.php,1.1.1.1,1.2

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv27819

Modified Files:
	serendipity_plugin_api.php 
Log Message:
Changed plugin header to H3, added newslines and spaces for readability


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_plugin_api.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_plugin_api.php	29 Jun 2003 20:43:48 -0000	1.2
@@ -167,7 +167,7 @@
 			$plugin->generate_content($title);
 			$content = ob_get_contents();
 			ob_end_clean();
-			echo "<div class=\"$plugin->wrap_class\"><div class=\"$plugin->title_class\">$title</div><div class=\"$plugin->content_class\">$content</div></div>\n";
+			echo "  <div class=\"$plugin->wrap_class\">\n    <h3 class=\"$plugin->title_class\">$title</h3>\n      <div class=\"$plugin->content_class\">$content\n      </div>\n    </div>\n";
 		}
 		echo "</$tagname>\n";
 	}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.86,1.87

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv26679

Modified Files:
	serendipity_functions.inc.php 
Log Message:
serendipity_date is now an H3, serendipity_title is now an H4


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- serendipity_functions.inc.php	29 Jun 2003 18:48:49 -0000	1.86
+++ serendipity_functions.inc.php	29 Jun 2003 20:34:57 -0000	1.87
@@ -382,17 +382,17 @@
 	if (!$serendipity['GET']['short']) {
 	foreach ($bydate as $date => $ents) {
 		echo "\n  <div class='serendipity_Entry_Date'>\n";
-		echo "    <div class='serendipity_date'>$date</div>\n";
+		echo "    <h3 class='serendipity_date'>$date</h3>\n";
 		foreach ($ents as $x => $entry) {
 			$entryLink = $serendipity['serendipityHTTPPath']
 			             . "archives/"
 				     . $entry['id']
 				     . "_".serendipity_makeFilename($entry['title']) .".html";
-			echo "\n    <div class='serendipity_title'>";
+			echo "\n    <h4 class='serendipity_title'>";
 			echo "<a href=\"$entryLink\">";
 			echo htmlentities($entry['title']);
 			echo "</a>";
-			echo "</div>";
+			echo "</h4>";
 
 			echo "\n    <div class='serendipity_entry'>";
             		echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id'])));
@@ -404,7 +404,7 @@
 				echo "<br><a href=\"$entryLink#extended\">View Extended Entry</a><br>";
 			}
 
-			echo "\n      <div class='serendipity_entryFooter'><br>"
+			echo "\n      <div class='serendipity_entryFooter'>"
 				. POSTED_BY." "
 				. htmlentities($entry['username'])
 				. ($entry['category_name']?(" in ${entry['category_name']}"):"")

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.8,1.9

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv20447

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
We need our template/css stylesheet no-matter what


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_genpage.inc.php	29 Jun 2003 19:20:04 -0000	1.8
+++ serendipity_genpage.inc.php	29 Jun 2003 19:57:57 -0000	1.9
@@ -3,7 +3,7 @@
 <html> 
 <head>
 <title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
-
+<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
 <?php
    if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']}\";</style>\n";
 ?>

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.7,1.8

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv10820a

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
Again


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_genpage.inc.php	29 Jun 2003 19:17:23 -0000	1.7
+++ serendipity_genpage.inc.php	29 Jun 2003 19:20:04 -0000	1.8
@@ -3,9 +3,9 @@
 <html> 
 <head>
 <title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
+
 <?php
-   if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']};\"</style>\n";
+   if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']}\";</style>\n";
 ?>
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
 <script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.6,1.7

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv10616

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
Oops, import stylesheet CORRECTLY


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_genpage.inc.php	29 Jun 2003 18:48:49 -0000	1.6
+++ serendipity_genpage.inc.php	29 Jun 2003 19:17:23 -0000	1.7
@@ -5,7 +5,7 @@
 <title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
 <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
 <?php
-   if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']}\"</style>\n";
+   if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']};\"</style>\n";
 ?>
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
 <script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.85,1.86 serendipity_genpage.inc.php,1.5,1.6

[<tro...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv6859

Modified Files:
	serendipity_functions.inc.php serendipity_genpage.inc.php 
Log Message:
More readable HTML and import stylesheet


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- serendipity_functions.inc.php	29 Jun 2003 02:40:48 -0000	1.85
+++ serendipity_functions.inc.php	29 Jun 2003 18:48:49 -0000	1.86
@@ -370,7 +370,7 @@
 	/* pre-walk the array to collect them keyed by date */
 	$bydate = array();
 	if (!is_array($entries) || $entries[0] == false) {
-  		echo "<br />".NO_ENTRIES_TO_PRINT;
+  		echo "<br />".NO_ENTRIES_TO_PRINT."\n";
 		return;
 	}
 
@@ -381,20 +381,20 @@
 	}
 	if (!$serendipity['GET']['short']) {
 	foreach ($bydate as $date => $ents) {
-		echo "<div class='serendipity_Entry_Date'>";
-		echo "<div class='serendipity_date'>$date</div>";
+		echo "\n  <div class='serendipity_Entry_Date'>\n";
+		echo "    <div class='serendipity_date'>$date</div>\n";
 		foreach ($ents as $x => $entry) {
 			$entryLink = $serendipity['serendipityHTTPPath']
 			             . "archives/"
 				     . $entry['id']
 				     . "_".serendipity_makeFilename($entry['title']) .".html";
-			echo "<div class='serendipity_title'>";
+			echo "\n    <div class='serendipity_title'>";
 			echo "<a href=\"$entryLink\">";
 			echo htmlentities($entry['title']);
 			echo "</a>";
 			echo "</div>";
 
-			echo "<div class='serendipity_entry'>";
+			echo "\n    <div class='serendipity_entry'>";
             		echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id'])));
 			if ($extended && strlen($entry['extended'])) {
                 		echo '<a name="#extended"></a>';
@@ -404,7 +404,7 @@
 				echo "<br><a href=\"$entryLink#extended\">View Extended Entry</a><br>";
 			}
 
-			echo "<div class='serendipity_entryFooter'><br>"
+			echo "\n      <div class='serendipity_entryFooter'><br>"
 				. POSTED_BY." "
 				. htmlentities($entry['username'])
 				. ($entry['category_name']?(" in ${entry['category_name']}"):"")
@@ -448,18 +448,18 @@
                 serendipity_displayCommentForm($entry['id']);
             }
 
-			echo "</div>"; // serendipity_entry
+			echo "    </div>\n"; // serendipity_entry
 		}
 
 		// Entry_Date
-		echo "</div>";
-		}
-		}
+		echo "  </div>\n";
+	}
+	}
 		else {
 			$s = &$serendipity['GET']['range'];
 			echo "<div class='serendipity_date'>".TOPICS_OF." ".
 				  date("m/Y", mktime(0,0,0,substr($s,4,2),1,substr($s, 0, 4)))
-				  ."</div>";
+				  ."  </div>\n";
 			foreach ($bydate as $date => $ents) {	
 				foreach ($ents as $x => $entry) {
 					echo "<a href=\""

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_genpage.inc.php	27 Jun 2003 13:41:38 -0000	1.5
+++ serendipity_genpage.inc.php	29 Jun 2003 18:48:49 -0000	1.6
@@ -2,16 +2,16 @@
            "http://www.w3.org/TR/html4/loose.dtd">
 <html> 
 <head>
-	<title>
-		<?php echo htmlentities($serendipity['blogTitle']); ?>
-	</title>
+<title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
 <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
 <?php
-   if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
+   if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']}\"</style>\n";
 ?>
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
 <script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>
 </head>
+
+
 <body>
 <?php
 include_once("serendipity_config.inc.php");
@@ -24,5 +24,6 @@
 	include ($serendipity['templatePath'] ."default/layout.php");
 }
 ?>
+
 </body>
 </html>