php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 543)

A reliable, secure & extensible PHP blog | Not mainstream since 2002

Brought to you by: garvinhicking, jhermanns

php-blog-cvs — Serendipity commit list

You can subscribe to this list here.

2003	Jan	Feb	Mar (179)	Apr (56)	May (53)	Jun (65)	Jul (70)	Aug (89)	Sep (50)	Oct (38)	Nov (12)	Dec (12)
2004	Jan (57)	Feb (226)	Mar (172)	Apr (194)	May (120)	Jun (162)	Jul (297)	Aug (156)	Sep (312)	Oct (180)	Nov (358)	Dec (362)
2005	Jan (275)	Feb (224)	Mar (202)	Apr (157)	May (133)	Jun (115)	Jul (211)	Aug (257)	Sep (135)	Oct (116)	Nov (106)	Dec (81)
2006	Jan (74)	Feb (94)	Mar (59)	Apr (125)	May (50)	Jun (71)	Jul (45)	Aug (80)	Sep (3)	Oct (44)	Nov (50)	Dec (38)
2007	Jan (46)	Feb (33)	Mar (24)	Apr (28)	May (19)	Jun (37)	Jul (66)	Aug (73)	Sep (87)	Oct (33)	Nov (39)	Dec (37)
2008	Jan (20)	Feb (54)	Mar (47)	Apr (68)	May (10)	Jun (13)	Jul (13)	Aug (25)	Sep (11)	Oct (22)	Nov (22)	Dec (34)
2009	Jan (34)	Feb (35)	Mar (11)	Apr (10)	May (15)	Jun (18)	Jul (28)	Aug (22)	Sep (9)	Oct (12)	Nov (6)	Dec (32)
2010	Jan (11)	Feb (7)	Mar (9)	Apr (3)	May (16)	Jun (1)	Jul (2)	Aug (25)	Sep (9)	Oct (8)	Nov (4)	Dec (8)
2011	Jan (17)	Feb (1)	Mar (6)	Apr (7)	May (5)	Jun (2)	Jul (12)	Aug (3)	Sep (18)	Oct (3)	Nov (2)	Dec
2012	Jan (92)	Feb (74)	Mar (64)	Apr (55)	May (44)	Jun (91)	Jul (35)	Aug (42)	Sep (32)	Oct (56)	Nov (42)	Dec (81)
2013	Jan (117)	Feb (130)	Mar (33)	Apr (36)	May (155)	Jun (241)	Jul (113)	Aug (70)	Sep (50)	Oct (55)	Nov (34)	Dec (36)
2014	Jan (94)	Feb (67)	Mar (177)	Apr (67)	May (147)	Jun (137)	Jul (58)	Aug (56)	Sep (62)	Oct (35)	Nov (118)	Dec (53)
2015	Jan (204)	Feb (165)	Mar (275)	Apr (42)	May (58)	Jun (91)	Jul (81)	Aug (62)	Sep (23)	Oct (63)	Nov (29)	Dec (110)
2016	Jan (82)	Feb (55)	Mar (48)	Apr (92)	May (77)	Jun (41)	Jul (27)	Aug (41)	Sep (101)	Oct (84)	Nov (12)	Dec (18)
2017	Jan (44)	Feb (40)	Mar (23)	Apr (79)	May (27)	Jun (12)	Jul (20)	Aug (14)	Sep (3)	Oct (9)	Nov (4)	Dec (9)
2018	Jan (5)	Feb (23)	Mar (150)	Apr (114)	May (63)	Jun (25)	Jul (23)	Aug (54)	Sep (43)	Oct (10)	Nov (9)	Dec (1)
2019	Jan (1)	Feb (27)	Mar (27)	Apr (64)	May (21)	Jun (17)	Jul (12)	Aug (81)	Sep (15)	Oct (25)	Nov (15)	Dec (13)
2020	Jan (5)	Feb (4)	Mar (95)	Apr (59)	May (53)	Jun (22)	Jul (3)	Aug (13)	Sep (10)	Oct (4)	Nov (3)	Dec (1)
2021	Jan (20)	Feb (32)	Mar (34)	Apr (22)	May (58)	Jun (43)	Jul (35)	Aug (2)	Sep (14)	Oct (1)	Nov (2)	Dec
2022	Jan (2)	Feb (6)	Mar (4)	Apr	May (5)	Jun (4)	Jul (3)	Aug (5)	Sep (6)	Oct (3)	Nov (38)	Dec (15)
2023	Jan (26)	Feb (12)	Mar (3)	Apr (9)	May (2)	Jun (5)	Jul (8)	Aug	Sep (39)	Oct (11)	Nov (3)	Dec (3)
2024	Jan (19)	Feb (20)	Mar (15)	Apr (12)	May (2)	Jun (12)	Jul (4)	Aug (9)	Sep	Oct	Nov	Dec
2025	Jan (72)	Feb (80)	Mar (92)	Apr (35)	May (19)	Jun (14)	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 541 542 543 544 545 .. 551 > >> (Page 543 of 551)

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

From: <ste...@us...> - 2003-04-10 14:50:35

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
fix for andrei


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_config.inc.php	4 Apr 2003 16:42:42 -0000	1.7
+++ serendipity_config.inc.php	10 Apr 2003 14:50:30 -0000	1.8
@@ -2,19 +2,19 @@
 define('IN_serendipity', true);
 include_once('compat.php');
 
-// For security reasons (serendipity relies on register_globals on)
-$serendipity = array();
-
 $serendipity['production'] = 1;
+if (!isset($serendipity['serendipityPath'])) {
+	$serendipity['serendipityPath'] = './';
+}
 
-if (!file_exists("./serendipity_config_local.inc.php")) {
+if (!file_exists("{$serendipity['serendipityPath']}serendipity_config_local.inc.php")) {
 	die("Serendipity is not yet installed.  Please <a href=\"serendipity_admin.php\">install</a> it now.");
 }
 
 // Load DB configuration information
-include_once("./serendipity_config_local.inc.php");
+include_once("{$serendipity['serendipityPath']}serendipity_config_local.inc.php");
 
-include_once("./serendipity_functions.inc.php");
+include_once("{$serendipity['serendipityPath']}serendipity_functions.inc.php");
 if (serendipity_FUNCTIONS_LOADED!== true) {
 	die("serendipity error: could not include serendipity_functions.inc.php - exiting");
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.32,1.33

From: <ber...@us...> - 2003-04-07 05:59:09

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Leftover.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_functions.inc.php	7 Apr 2003 05:52:18 -0000	1.32
+++ serendipity_functions.inc.php	7 Apr 2003 05:59:05 -0000	1.33
@@ -540,8 +540,8 @@
 function serendipity_encodeExitsCallback($buffer) {
   global $serendipity;
 
-  $entry = $serendipity['encodeExitsCallback_entry_id'];
-  $url   = 'http://' . $buffer[2];
+  $entry_id = $serendipity['encodeExitsCallback_entry_id'];
+  $url      = 'http://' . $buffer[2];
 
   return sprintf(
     '<a href="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',

[php-blog-cvs] serendipity db.sql,1.13,1.14 exit.php,1.2,1.3 serendipity_functions.inc.php,1.31,1.32

From: <ber...@us...> - 2003-04-07 05:52:23

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

Modified Files:
	db.sql exit.php serendipity_functions.inc.php 
Log Message:
Consistency.

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- db.sql	5 Apr 2003 14:08:41 -0000	1.13
+++ db.sql	7 Apr 2003 05:52:17 -0000	1.14
@@ -72,8 +72,8 @@
   port varchar(5),
   path varchar(255),
   query varchar(255),
-  entry int(11) not null,
-  PRIMARY KEY  (host,day)	
+  entry_id int(11) not null,
+  PRIMARY KEY  (host,day,entry_id)	
 );
 
 #
@@ -88,8 +88,8 @@
   port varchar(5),
   path varchar(255),
   query varchar(255),  
-  entry int(11) not null,
-  PRIMARY KEY  (host,day)
+  entry_id int(11) not null,
+  PRIMARY KEY  (host,day,entry_id)
 );
 
 #

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exit.php	5 Apr 2003 14:08:42 -0000	1.2
+++ exit.php	7 Apr 2003 05:52:18 -0000	1.3
@@ -1,19 +1,19 @@
 <?php
 include_once 'serendipity_config.inc.php';
 
-$entry = 0;
-$url   = $serendipity['baseURL'];
+$entry_id = 0;
+$url      = $serendipity['baseURL'];
 
 if ( isset($_GET['url']) &&
     !empty($_GET['url'])) {
-    if ( isset($_GET['entry']) &&
-        !empty($_GET['entry'])) {
-        $entry = $_GET['entry'];
+    if ( isset($_GET['entry_id']) &&
+        !empty($_GET['entry_id'])) {
+        $entry_id = $_GET['entry_id'];
     }
 
     $url = str_replace('&amp;', '&', base64_decode($_GET['url']));
 
-    serendipity_track_url('exits', $url, $entry);
+    serendipity_track_url('exits', $url, $entry_id);
 }
 
 header('Location: ' . $url);

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_functions.inc.php	7 Apr 2003 05:44:17 -0000	1.31
+++ serendipity_functions.inc.php	7 Apr 2003 05:52:18 -0000	1.32
@@ -487,7 +487,7 @@
   return("<tt>".str_replace(' ', '&nbsp;', $arg[1])."</tt>");
 }
 
-function serendipity_markup_text($str, $entry = 0) {
+function serendipity_markup_text($str, $entry_id = 0) {
 	global $serendipity;
 
     $ret = $str;
@@ -521,7 +521,7 @@
     $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
 
     if ($serendipity['track_exits']) {
-        $serendipity['encodeExitsCallback_entry'] = $entry;
+        $serendipity['encodeExitsCallback_entry_id'] = $entry_id;
 
         $ret = preg_replace_callback(
           "#<a href=(\"|')http://([^\"']+)(\"|')#im",
@@ -540,7 +540,7 @@
 function serendipity_encodeExitsCallback($buffer) {
   global $serendipity;
 
-  $entry = $serendipity['encodeExitsCallback_entry'];
+  $entry = $serendipity['encodeExitsCallback_entry_id'];
   $url   = 'http://' . $buffer[2];
 
   return sprintf(
@@ -548,7 +548,7 @@
 
     $serendipity['baseURL'],
     base64_encode($url),
-    ($entry != 0) ? '&amp;entry=' . $entry : '',
+    ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
     $url,
     $url
   );
@@ -1457,7 +1457,7 @@
     serendipity_db_query($gc);
 }
 
-function serendipity_track_url($list, $url, $entry = 0) {
+function serendipity_track_url($list, $url, $entry_id = 0) {
     global $serendipity;
 
     $url_parts = parse_url($url);
@@ -1480,7 +1480,7 @@
         $url_parts['port'],
         $url_parts['path'],
         $url_parts['query'],
-        ($entry != 0) ? "AND entry = '$entry'" : ''
+        ($entry_id != 0) ? "AND entry_id = '$entry_id'" : ''
       )
     );
 
@@ -1491,13 +1491,13 @@
                     (day, count, scheme, host, port, path, query%s)
              VALUES ( NOW(), 1, '%s', '%s', '%s', '%s', '%s'%s)",
             $serendipity['dbPrefix'] . $list,
-            ($entry != 0) ? ', entry' : '',
+            ($entry_id != 0) ? ', entry_id' : '',
             $url_parts['scheme'],
             $url_parts['host'],
             $url_parts['port'],
             $url_parts['path'],
             $url_parts['query'],
-            ($entry != 0) ? ", '$entry'" : ''
+            ($entry_id != 0) ? ", '$entry_id'" : ''
           )
         );
     }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.30,1.31

From: <ber...@us...> - 2003-04-07 05:44:22

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
(Untested) Patch to prevent the admin interface to be logged as referrer when using the 'Back to Blog' link.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_functions.inc.php	6 Apr 2003 21:33:40 -0000	1.30
+++ serendipity_functions.inc.php	7 Apr 2003 05:44:17 -0000	1.31
@@ -1401,6 +1401,11 @@
 
 function serendipity_track_referrer($entry = 0) {
     global $serendipity;
+
+    if (stristr($_SERVER['HTTP_REFERER'], $serendipity['baseURL']) !== false) {
+        return;
+    }
+
     $url_parts = parse_url($_SERVER['HTTP_REFERER']);
     if (!$url_parts['host'] || 
         strstr($_url_parts['host'], $_SERVER['SERVER_NAME'])) {

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

From: <ber...@us...> - 2003-04-07 05:37:41

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

Modified Files:
	index.php 
Log Message:
Pass entry_id, if available, to serendipity_track_referrer() and exit() after header().

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php	30 Mar 2003 15:50:04 -0000	1.3
+++ index.php	7 Apr 2003 05:37:38 -0000	1.4
@@ -1,9 +1,10 @@
 <?php
 session_start();
 include_once("serendipity_config.inc.php");
-serendipity_track_referrer();
 
+$track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
+
 if (preg_match('@/archives/@', $uri)) {
     if (preg_match('@/(d_(\d+)\.html)@', $uri, $matches)) {
         $range = $matches[2];
@@ -33,6 +34,9 @@
     } else if (preg_match('@/(e_(\d+)\.html)@', $uri, $matches)) {
         $id = $matches[2];
     
+        serendipity_track_referrer($id);
+        $track_referer = false;
+
         $_GET['serendipity']['action'] = 'read';
         $_GET['serendipity']['id'] = $id;
 
@@ -82,9 +86,11 @@
         print $data;
     }
 } else if (preg_match('@/admin$@', $uri)) {
-    header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
+  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('@/(index\.(php|html))?@', $uri)) {
     if (count($serendipity['GET']) == 2) {
         ob_start();
@@ -108,5 +114,9 @@
 ?>
 The document, <?=$uri?> was not found.
 <?php
+}
+
+if ($track_referer) {
+    serendipity_track_referrer();
 }
 ?>

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.2,1.3 serendipity_admin_plugins.inc.php,1.2,1.3 serendipity_functions.inc.php,1.29,1.30

From: <jhe...@us...> - 2003-04-06 21:33:43

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

Modified Files:
	serendipity_admin_images.inc.php 
	serendipity_admin_plugins.inc.php 
	serendipity_functions.inc.php 
Log Message:
Fixed some bugs I introduced while internationalizing...


Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_images.inc.php	5 Apr 2003 23:46:55 -0000	1.2
+++ serendipity_admin_images.inc.php	6 Apr 2003 21:33:40 -0000	1.3
@@ -176,7 +176,7 @@
                     </tr>
                     <tr><td align="center" colspan="2"><b>Or</b></td></tr>
                     <tr>
-                    	<td nowrap='nowrap'><?=SELECT_IMAGE_TO_UP?></td>
+                    	<td nowrap='nowrap'><?=ENTER_IMAGE_TO_UP?></td>
                      	<td><input name="userfile" type="file"></td>
                     </tr>
                     <tr>

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_plugins.inc.php	5 Apr 2003 23:46:55 -0000	1.2
+++ serendipity_admin_plugins.inc.php	6 Apr 2003 21:33:40 -0000	1.3
@@ -228,12 +228,12 @@
 		if ($sort_idx == 0)
 			$moveup = "&nbsp; &nbsp;";
 		else
-			$moveup = "<a href=\"?serendipity[adminModule]=plugins&submit=move+up&serendipity[plugin_to_move]=$key\"><?=UP?></a>";
+			$moveup = "<a href=\"?serendipity[adminModule]=plugins&submit=move+up&serendipity[plugin_to_move]=$key\">".UP."</a>";
 
 		if ($sort_idx == (count($plugins)-1))
 			$movedown = "";
 		else
-			$movedown = "<a href=\"?serendipity[adminModule]=plugins&submit=move+down&serendipity[plugin_to_move]=$key\"><?=DOWN?></a>";
+			$movedown = "<a href=\"?serendipity[adminModule]=plugins&submit=move+down&serendipity[plugin_to_move]=$key\">".DOWN."</a>";
 
 
 		echo "<tr><td><input type=\"checkbox\" name=\"serendipity[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place $moveup $movedown</td></tr>\n";

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_functions.inc.php	6 Apr 2003 06:38:38 -0000	1.29
+++ serendipity_functions.inc.php	6 Apr 2003 21:33:40 -0000	1.30
@@ -329,10 +329,10 @@
             if (isset($serendipity['GET']['id'])) {
                 echo '<link rel="pingback" href="' . $serendipity['baseURL'] . "comment.php?type=pingback&entry_id={$entry['id']}\" />\n";
                 echo "\n<br />\n";
-                echo '<div class="serendipity_commentsTitle">".COMMENTS."</div>';
+                echo '<div class="serendipity_commentsTitle">'.COMMENTS.'</div>';
                 serendipity_printComments(serendipity_fetchComments($entry['id']));
                 echo "<br />\n\n";
-                echo '<div class="serendipity_commentsTitle">".ADD_COMMENT."</div>';
+                echo '<div class="serendipity_commentsTitle">'.ADD_COMMENT.'</div>';
                 serendipity_displayCommentForm($entry['id']);
             }

[php-blog-cvs] serendipity serendipity_lang_de.inc.php,1.1,1.2

From: <ste...@us...> - 2003-04-06 20:35:33

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
remove windows line crap


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_de.inc.php	6 Apr 2003 14:11:19 -0000	1.1
+++ serendipity_lang_de.inc.php	6 Apr 2003 20:35:30 -0000	1.2
@@ -16,11 +16,10 @@
 
 $serendipity["weekDayAbb"] = array("M", "Tu", "W", "Th", "F", "Sa", "Su");
 
-
-define("SERENDIPITY_ADMIN_SUITE", "Serendipity Administrationsoberfl&auml;che");
-define("HAVE_TO_BE_LOGGED_ON", "Sie m&uuml;ssen eingeloggt sein, um diese Seite zu sehen:");
-define("APPEARANCE", "Aussehen");
-define("MANAGE_CSS", "CSS verwalten");
+define("SERENDIPITY_ADMIN_SUITE", "Serendipity Administrationsoberfl&auml;che");
+define("HAVE_TO_BE_LOGGED_ON", "Sie m&uuml;ssen eingeloggt sein, um diese Seite zu sehen:");
+define("APPEARANCE", "Aussehen");
+define("MANAGE_CSS", "CSS verwalten");
 define("CONFIGURE_PLUGINS", "Plugins verwalten");
 define("ADMIN", "Admin:");
 define("CONFIGURATION", "Konfiguration");
@@ -48,8 +47,8 @@
 define("ADD_PLUGIN", "Plugin hinzuf&uuml;gen");
 define("TITLE", "Titel");
 define("PLUGIN", "Plugin");
-define("DESCRIPTION", "Beschreibung");
-define("PLACEMENT", "Platzierung");
+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");
@@ -93,7 +92,7 @@
 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("IMAGE", "Bild");
 define("ERROR_FILE_NOT_EXISTS", " Old filename doesn't exist!");
 define("ERROR_FILE_EXISTS", "Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.");
 define("ERROR_SOMETHING", "Fehler: Irgendentwas stimmt nicht.");
@@ -129,10 +128,9 @@
 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("THE_NUGGET", 'Der HTML Klotz!');
+define("SYNDICATE_THIS_BLOG", "Syndicate This Blog");
+define("QUICKJUMP", "Schnellauswahl");
 
 define("serendipity_LANG_LOADED", true);

[php-blog-cvs] serendipity serendipity_lang_de.inc.php,NONE,1.1

From: <jhe...@us...> - 2003-04-06 14:11:23

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

Added Files:
	serendipity_lang_de.inc.php 
Log Message:
German language file


--- NEW FILE: serendipity_lang_de.inc.php ---
<?php

##########################################################################
# serendipity - another blogger...                                             #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                            #
#                                                                        #
##########################################################################

// English language file
$serendipity["months"]  = array("J...@ha...", "Januar", "Februar", "M&auml;rz",
                    "April", "Mai", "Juni", "Juli", "August", "September",
                    "Oktober", "November", "Dezember");

$serendipity["weekDayAbb"] = array("M", "Tu", "W", "Th", "F", "Sa", "Su");


define("SERENDIPITY_ADMIN_SUITE", "Serendipity Administrationsoberfl&auml;che");
define("HAVE_TO_BE_LOGGED_ON", "Sie m&uuml;ssen eingeloggt sein, um diese Seite zu sehen:");
define("APPEARANCE", "Aussehen");
define("MANAGE_CSS", "CSS 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", "Ausloggen");
define("LOGGEDOUT", "Ausgeloggt.");
define("CREATE_NEW_CAT", "Neue Kategorie");
define("CREATE", "Erstellen");
define("EDIT_THIS_CAT", "\"%s - %s\" bearbeiten");
define("SAVE", "Speichern");
define("NAME", "Name");
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("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", "Administrationsoberfl&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 deinem 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", " Old filename doesn't exist!");
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("serendipity_LANG_LOADED", true);

?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.28,1.29

From: <ber...@us...> - 2003-04-06 06:38:47

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Add $entry parameter to serendipity_track_referrer() function and pass it to serendipity_track_url().

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_functions.inc.php	5 Apr 2003 23:46:55 -0000	1.28
+++ serendipity_functions.inc.php	6 Apr 2003 06:38:38 -0000	1.29
@@ -1399,7 +1399,7 @@
     return 0;
 }
 
-function serendipity_track_referrer() {
+function serendipity_track_referrer($entry = 0) {
     global $serendipity;
     $url_parts = parse_url($_SERVER['HTTP_REFERER']);
     if (!$url_parts['host'] || 
@@ -1442,7 +1442,7 @@
     serendipity_db_query($suppressp);
     serendipity_db_query($suppressu);
 
-    serendipity_track_url('referrers', $_SERVER['HTTP_REFERER']);
+    serendipity_track_url('referrers', $_SERVER['HTTP_REFERER'], $entry);
 }    
 
 function serendipity_track_referrer_gc() {

[php-blog-cvs] serendipity serendipity_xmlrpc.inc.php,1.1.1.1,NONE

From: <gsc...@us...> - 2003-04-06 04:03:11

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

Removed Files:
	serendipity_xmlrpc.inc.php 
Log Message:
moved to serendipity_xmlrpc.php


--- serendipity_xmlrpc.inc.php DELETED ---

[php-blog-cvs] serendipity serendipity_xmlrpc.php,NONE,1.1

From: <gsc...@us...> - 2003-04-06 04:02:21

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

Added Files:
	serendipity_xmlrpc.php 
Log Message:
this is not an .inc.php but a .php


--- NEW FILE: serendipity_xmlrpc.php ---
<?php
session_start();
require_once 'serendipity_config.inc.php';
require_once 'bundled-libs/XML/RPC/Server.php';

$dispatches = array('blogger.getUsersBlogs' => 
                        array('function' => 'blogger_getUsersBlogs'),
                    'blogger.getUserInfo' =>
                        array('function' => 'blogger_getUserInfo'),
                    'blogger.newPost' =>
                        array('function' => 'blogger_newPost'),
                    'blogger.editPost' =>
                        array('function' => 'blogger_editPost'),
                    'metaWeblog.newPost' =>
                        array('function' => 'metaWeblog_newPost'),
                    'metaWeblog.editPost' =>
                        array('function' => 'metaWeblog_editPost'),
                    'metaWeblog.getPost' =>
                        array('function' => 'metaWeblog_getPost'),
                    'mt.getRecentPostTitles' =>
                        array('function' => 'mt_getRecentPostTitles'),
                    'mt.getCategoryList' =>
                        array('function' => 'mt_getCategoryList'),
                    'metaWeblog.setPostCategories' =>
                        array('function' => 'metaWeblog_setPostCategories'),
                    'metaWeblog.getPostCategories' =>
                        array('function' => 'metaWeblog_getPostCategories'),
                    'metaWeblog.newMediaObject' =>
                        array('function' => 'metaWeblog_newMediaObject'),
                    'mt.supportedTextFilters' =>
                        array('function' => 'mt_supportedTextFilters'));

function blogger_getUsersBlogs($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");
    }
    $blog1 = new XML_RPC_Value(
        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');
    $r = new XML_RPC_Response($blogs);
    return($r);
}

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");
    }
    $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(''), 
              'firstname' => new XML_RPC_Value('')),
        'struct');
    $r = new XML_RPC_Response($userdata);
    return($r);
}

function mt_getCategoryList($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");
    }
    $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'),
              '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)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    $val = $message->params[3];
    $numposts = $val->getval();
    if(!serendipity_authenticate_author($username, $password)) {
        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'),
                  'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
                  '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)
{
    $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( new XML_RPC_Value(array(), 'array'));
}

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");
    }
    $val = $message->params[4];
    $entry['body']  = $val->getval();
    $id = serendipity_updertEntry($entry);
    return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
}

function blogger_editPost($message)
{
    $val = $message->params[1];
    $entry['id'] = $val->getval();
    $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");
    }
    $val = $message->params[4];
    $entry['body']  = $val->getval();
    $entry['user'] = $username;
    $id = serendipity_updateEntry($entry);
    return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
}

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");
    }
    $val = $message->params[3];
    $post_array = $val->getval();
    $entry['title'] = $post_array['title'];
    $entry['body'] = $post_array['description'];
    $entry['extended'] = $post_array['mt_text_more'];
    $id = serendipity_updertEntry($entry);
    return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
}

function metaWeblog_editPost($message)
{
    $val = $message->params[0];
    $postid = $val->getval();
    $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");
    }
    $val = $message->params[3];
    $post_array = $val->getval();
    $entry['title'] = $post_array['title'];
    $entry['body'] = $post_array['description'];
    $entry['extended'] = $post_array['mt_text_more'];
    $entry['user'] = $username;
    $entry['authorid'] = $serendipity['authorid'];
    $entry['id'] = $postid;
    $id = serendipity_updateEntry($entry);
    return  new XML_RPC_Response( new XML_RPC_Value($id));
}

function metaWeblog_getPost($message)
{
    global $serendipity;
    $val = $message->params[0];
    $postid = $val->getval();
    $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");
    }
    $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'),  
          'mt_allow_comments' => 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/e_$postid.html", 'string'),
          'link' => new XML_RPC_Value($serendipity['baseURL']."/archives/e_$postid.html", 'string'));
    $entry = new XML_RPC_Value($tmp, 'struct');
    return  new XML_RPC_Response($entry); 
}

function metaWeblog_setPostCategories($message)
{
    global $serendipity;
    $val = $message->params[0];
    $postid = $val->getval(); 
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    $val = $message->params[3];
    $categories = $val->getval();
    $category_ids = array();
    foreach ($categories as $cat) {
        $val = $cat['categoryId'];
        $category_ids[] = $val->getval();
    } 
    if(!serendipity_authenticate_author($username, $password)) {
        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)
{
    $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( new XML_RPC_Value(array(), 'array'));
}

function metaWeblog_newMediaObject($message)
{
    global $serendipity;
    $val = $message->params[0];
    $postid = $val->getval(); 
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    $val = $message->params[3];
    $struct = $val->getval();
    if(!serendipity_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $fp = fopen($serendipity["serendipityPath"].$serendipity['uploadPath'].$struct['name'], "w");
    fwrite($fp, $struct['bits']);
    fclose($fp);
    $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");
fwrite($fp, $HTTP_RAW_POST_DATA);
ob_start();
$server = new XML_RPC_Server($dispatches,1);
fwrite($fp, ob_get_contents());
fclose($fp);
?>

[php-blog-cvs] serendipity serendipity_admin.php,1.4,1.5 serendipity_admin_category.inc.php,1.1.1.1,1.2 serendipity_admin_image_selector.php,1.1.1.1,1.2 serendipity_admin_images.inc.php,1.1.1.1,1.2 serendipity_admin_overview.inc.php,1.2,1.3 serendipity_admin_plugins.inc.php,1.1.1.1,1.2 serendipity_entries.php,1.3,1.4 serendipity_functions.inc.php,1.27,1.28 serendipity_lang_en.inc.php,1.1.1.1,1.2 serendipity_layout.inc.php,1.2,1.3 serendipity_layout_table.inc.php,1.4,1.5 serendipity_sidebar_items.php,1.3,1.4

From: <jhe...@us...> - 2003-04-05 23:46:59

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

Modified Files:
	serendipity_admin.php serendipity_admin_category.inc.php 
	serendipity_admin_image_selector.php 
	serendipity_admin_images.inc.php 
	serendipity_admin_overview.inc.php 
	serendipity_admin_plugins.inc.php serendipity_entries.php 
	serendipity_functions.inc.php serendipity_lang_en.inc.php 
	serendipity_layout.inc.php serendipity_layout_table.inc.php 
	serendipity_sidebar_items.php 
Log Message:
Sit down, relax, here comes a big one. Now full language support,
for future code please remember to use the lang-file together with
the CONTENT_CONSTANTS if you're generating output meant to be read
by human beings. 

This was annoying!


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin.php	31 Mar 2003 21:17:26 -0000	1.4
+++ serendipity_admin.php	5 Apr 2003 23:46:55 -0000	1.5
@@ -13,7 +13,7 @@
 ?>
 <html>
 	<head>
-    	<title>Serendipity Administration Suite</title>
+    	<title><?=SERENDIPITY_ADMIN_SUITE?></title>
         <link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php">
 <?php
    if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
@@ -38,7 +38,7 @@
 		&& file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
 ?>
 		<div class='serendipity_auth_required'>
-		You have to be logged on to view this page:
+		<?=HAVE_TO_BE_LOGGED_ON?>
 		<form action="?" method="post">
 			<input type="hidden" name="serendipity[action]" value="admin">
 			<input type="text" value="username" name="serendipity[user]" onfocus="value='';">
@@ -60,27 +60,27 @@
                 <td class="serendipitySideBar">
 
 					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Appearance:</div>
+					<div class="serendipitySideBarTitle"><?=APPEARANCE?>:</div>
 					<div class="serendipitySideBarContent">
-                    &bull; <a href='?serendipity[adminModule]=css'>Manage css</a><br>
-                    &bull; <a href='?serendipity[adminModule]=plugins'>Configure Plugins</a><br>
+                    &bull; <a href='?serendipity[adminModule]=css'><?=MANAGE_CSS?></a><br>
+                    &bull; <a href='?serendipity[adminModule]=plugins'><?=CONFIGURE_PLUGINS?></a><br>
 					</div>
 					</div>
 
 					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Admin:</div>
+					<div class="serendipitySideBarTitle"><?=ADMIN?></div>
 					<div class="serendipitySideBarContent">
-                    &bull; <a href='?serendipity[adminModule]=installer'>Configuration</a><br />
-                    &bull; <a href="?serendipity[adminModule]=interop">Import/Export Entries</a><br />
+                    &bull; <a href='?serendipity[adminModule]=installer'><?=CONFIGURATION?></a><br />
+                    &bull; <a href="?serendipity[adminModule]=interop"><?=IMPORT_EXPORT_ENTRIES?></a><br />
 					</div>
 					</div>
                     &bull; <a href='<?=$serendipity['serendipityHTTPPath']?>entr
-ies'>Edit entries</a><br />
-                    &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'>Back to Weblog</a><br />
-                    &bull; <a href='?serendipity[adminModule]=logout'>Logout</a>
+ies'><?=EDIT_ENTRIES?></a><br />
+                    &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'><?=BACK_TO_BLOG?></a><br />
+                    &bull; <a href='?serendipity[adminModule]=logout'><?=LOGOUT?></a>
                 </td>
                 <td class="serendipity_admin">
-                    <div class="serendipity_admin_title">Serendipity Administration Suite</div>
+                    <div class="serendipity_admin_title"><?=SERENDIPITY_ADMIN_SUITE?></div>
                     <?php
                     	if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
                         switch($serendipity["GET"]["adminModule"]) {
@@ -107,7 +107,7 @@
 
 							case "logout":
 								session_destroy();
-                                echo "Logged out.";
+                                echo LOGGEDOUT;
                             break;
 
                             default:

Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_category.inc.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity_admin_category.inc.php	5 Apr 2003 23:46:55 -0000	1.2
@@ -40,22 +40,22 @@
 
 <?php
 if ($cat_to_edit == 0) {
-	$desc = "Create a New Category";
-	$save = "Create";
+	$desc = CREATE_NEW_CAT;
+	$save = CREATE;
 } else {
-	$desc = htmlentities("Edit \"$this_cat[category_name] - $this_cat[category_description]\"");
-	$save = "Save";
+	$desc = htmlentities(sprintf(EDIT_THIS_CAT, $this_cat[category_name], $this_cat[category_description]));
+	$save = SAVE;
 }
 ?>
 <b><?= $desc ?></b>
 <table cellpadding="5">
 <tr>
-<th>Name</th>
+<th><?=NAME?></th>
 <td><input type="text" name="serendipity[cat][name]" value="<?= htmlentities($this_cat['category_name']) ?>" /></td>
 </tr>
 
 <tr>
-<th>Description</th>
+<th><?=DESCRIPTION?></th>
 <td><input type="text" name="serendipity[cat][description]" value="<?= htmlentities($this_cat['category_description']) ?>"/></td>
 </tr>
 </table>
@@ -63,7 +63,7 @@
 <br />
 <br />
 
-<b>Click on a category to edit it</b>
+<b><?=CLICK_CAT_TO_EDIT?></b>
 
 <table>
 <?php
@@ -75,7 +75,7 @@
     }
 }
 ?>
-<tr><td>&bull; <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0">Create New Category</a></td></tr>
+<tr><td>&bull; <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?=CREATE_NEW_CAT?></a></td></tr>
 </table>
 
 </form>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_image_selector.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity_admin_image_selector.php	5 Apr 2003 23:46:55 -0000	1.2
@@ -54,7 +54,7 @@
     echo "</table>";
 
 }?>
-<html><head><title>Select an image</title></head><body>
+<html><head><title><?=SELECT_IMAGE?></title></head><body>
 <?php
 
 switch ($serendipity["GET"]["step"]) {
@@ -71,8 +71,8 @@
         echo "<input type='hidden' name='thumbName' value='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."'>";
 
         echo "<b>Image size:</b><br>";
-		echo "<input type='radio' name='serendipity[linkThumbnail]' value='no' CHECKED>I want to put the thumbnail in my entry.<br>";
-        echo "<input type='radio' name='serendipity[linkThumbnail]' value='yes'>I want to put big image in my entry.<p>";
+		echo "<input type='radio' name='serendipity[linkThumbnail]' value='no' CHECKED><?=I_WANT_THUMB?><br>";
+        echo "<input type='radio' name='serendipity[linkThumbnail]' value='yes'><?=I_WANT_BIG_IMAGE?><p>";
 
 		echo "<b>Image alignment:</b><br>";
         echo "<input type='radio' name='serendipity[align]' value=''> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_top.png' vspace='5'><br>";
@@ -80,11 +80,11 @@
         echo "<input type='radio' name='serendipity[align]' value='right'> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_right.png' vspace='5'><p>";
 
         echo "<b>Image as a link:</b><br>";
-        echo "<input type='radio' name='serendipity[isLink]' CHECKED> I don't want the image to be a hyperlink<br>";
-        echo "<input type='radio' name='serendipity[isLink]' > I want it to link to this url: ";
+        echo "<input type='radio' name='serendipity[isLink]' CHECKED> <?=I_WANT_NO_LINK?><br>";
+        echo "<input type='radio' name='serendipity[isLink]' > <?=I_WANT_IT_TO_LINK?> ";
         echo "<input type='text' name='serendipity[url]' size='30' value='".$serendipity["serendipityHTTPPath"].$serendipity["uploadPath"].$serendipity["GET"]["image"]."' onFocus='value=\"\";'><p>";
-        echo "<input type='button' value='Back' onClick='history.go(-1);'> ";
-        echo "<input type='button' value='Done' onClick='serendipity_imageSelector_done()'>";
+        echo "<input type='button' value='<?=BACK?>' onClick='history.go(-1);'> ";
+        echo "<input type='button' value='<?=DONE?>' onClick='serendipity_imageSelector_done()'>";
         echo "</form>";
     break;
 
@@ -94,7 +94,7 @@
         if (!is_numeric($serendipity["GET"]["end"]))
             $serendipity["GET"]["end"] = $serendipity["GET"]["start"]+
                                    floor(750/($serendipity["thumbSize"]+20))*floor(580/($serendipity["thumbSize"]+20));
-		echo "Click the image you want to insert:<br>";
+		echo CLICK_IMAGE_TO_INSERT."<br>";
 		serendipity_displayImageList($serendipity["GET"]["start"], $serendipity["GET"]["end"]);
 }
 ?>

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_images.inc.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ serendipity_admin_images.inc.php	5 Apr 2003 23:46:55 -0000	1.2
@@ -106,17 +106,17 @@
         }
         else {
 			if (!file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"]))
-            	echo "Error: Old filename doesn't exist!";
+            	echo ERROR_FILE_NOT_EXISTS;
             elseif (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"]))
-            	echo "Error: New filename already used, pick another!";
+            	echo ERROR_FILE_EXISTS;
             else
-            	echo "Error: Something's wrong.";
-            echo "<br><input type='button' onClick='history.go(-1);' value='Go back.'>";
+            	echo ERROR_SOMETHING;
+            echo "<br><input type='button' onClick='history.go(-1);' value='".BACK."'>";
         }
     break;
 
 	case "add":
-		echo "<b>Adding image...</b><p>";
+		echo "<b>".ADDING_IMAGE."</b><p>";
     	// First find out whether to fetch a file or accept an upload
         if ($serendipity["POST"]["url"] != "http://") {
         	if (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].
@@ -132,13 +132,13 @@
 
                 // Create thumbnail
                 serendipity_makeThumbnail(basename($serendipity["POST"]["url"]));
-                echo "Thumbnail created.<br>Done.";
+                echo THUMB_CREATED_DONE;
             }
         }
         else {
 			if (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].
                 $_FILES['userfile']['name'])) {
-				echo "Error: File already exists on your machine!";
+				echo ERROR_FILE_EXISTS_ALREADY;
             }
             else {
                 // Accept file
@@ -148,10 +148,10 @@
 
                     // Create thumbnail
                     serendipity_makeThumbnail($_FILES['userfile']['name']);
-                    echo "Thumbnail created.<br>Done.";
+                    echo THUMB_CREATED_DONE;
                 }
                 else {
-					echo "Unknown error occured, file not uploaded...";
+					echo ERROR_UNKNOWN_NOUPLOAD;
                 }
            }
         }
@@ -162,12 +162,8 @@
 
 	case "addSelect":
 		?>
-			<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>
+			<?=ADD_IMAGE_BLAHBLAH?>
+            
 			<table>
 				<form action="?" method="POST" enctype="multipart/form-data" >
                 	<input type="hidden" name="MAX_FILE_SIZE" value="3000000">
@@ -175,16 +171,16 @@
                     <input type="hidden" name="serendipity[adminModule]" value="images">
                     <input type="hidden" name="serendipity[adminAction]" value="add">
 					<tr>
-                    	<td nowrap='nowrap'>Enter an URL of an image to fetch:</td>
+                    	<td nowrap='nowrap'><?=ENTER_IMAGE_URL?></td>
                         <td><input type="text" name="serendipity[url]" value="http://" size="40"></td>
                     </tr>
                     <tr><td align="center" colspan="2"><b>Or</b></td></tr>
                     <tr>
-                    	<td nowrap='nowrap'>Select an image you wish to upload:</td>
+                    	<td nowrap='nowrap'><?=SELECT_IMAGE_TO_UP?></td>
                      	<td><input name="userfile" type="file"></td>
                     </tr>
                     <tr>
-                    	<td align="right" colspan="2"><input type="submit" value="Go!"></td>
+                    	<td align="right" colspan="2"><input type="submit" value="<?=GO?>"></td>
                     </tr>
                 </form>
             </table>
@@ -225,12 +221,11 @@
         //-->
         </script>
         <?php
-		echo "<b>Resize ".$serendipity["GET"]["fname"].":</b><p>";
-        echo "Original size: <i>".$s[0]."x".$s[1]."</i> pixel";
-        echo "<p>Here you can adjust the images new size. If you want to keep the proportions, just enter";
-        echo " one value and press the TAB key, I'll automatically calculate the new size so the proportions";
-        echo " don't get messed up:";
-		echo "<form name='serendipityScaleForm' action='?' method='GET'>New size: ";
+	echo sprintf(RESIZE_BLAHBLAH, $serendipity["GET"]["fname"]);
+        echo sprintf(ORIGINAL_SIZE, $s[0],$s[1]);
+        echo HERE_YOU_CAN_ENTER_BLAHBLAH;
+        
+	echo "<form name='serendipityScaleForm' action='?' method='GET'>".NEWSIZE." ";
         echo "<input type='hidden' name='serendipity[adminModule]' value='images'>";
         echo "<input type='hidden' name='serendipity[adminAction]' value='scale'>";
         echo "<input type='hidden' name='serendipity[fname]' value='".$serendipity["GET"]["fname"]."'>";

Index: serendipity_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_overview.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_overview.inc.php	30 Mar 2003 15:50:05 -0000	1.2
+++ serendipity_admin_overview.inc.php	5 Apr 2003 23:46:55 -0000	1.3
@@ -12,4 +12,4 @@
 if (IN_serendipity !== true) die ("Don't hack!");
 session_start();
 ?>
-Welcome back, <?= $_SESSION['serendipityUser'] ?>. 
+<?=WELCOME_BACK?> <?= $_SESSION['serendipityUser'] ?>. 

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_plugins.inc.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ serendipity_admin_plugins.inc.php	5 Apr 2003 23:46:55 -0000	1.2
@@ -134,7 +134,7 @@
 <form action="?serendipity[adminModule]=plugins" method="post">
 
 <select name="serendipity[plugin_to_add]">
-<option value="0">[ Select a plugin to add ]</option>
+<option value="0">[ <?=SELECT_A_PLUGIN_TO_ADD?> ]</option>
 <?php
 foreach ($classes as $class_name) {
 	$plugin =& serendipity_plugin_api::load_plugin($class_name);
@@ -153,7 +153,7 @@
 ?>
 </select>
 
-<input name="NEW" value="Add plugin" type="submit" />
+<input name="NEW" value="<?=ADD_PLUGIN?>" type="submit" />
 
 <br />
 <br />
@@ -161,10 +161,10 @@
 <table border="1" cellpadding="5">
 <tr>
 <th>&nbsp;</th>
-<th>Title</th>
-<th>Plugin</th>
-<th>Description</th>
-<th>Placement</th>
+<th><?=TITLE?></th>
+<th><?=PLUGIN?></th>
+<th><?=DESCRIPTION?></th>
+<th><?=PLACEMENT?></th>
 </tr>
 <?php
 
@@ -228,12 +228,12 @@
 		if ($sort_idx == 0)
 			$moveup = "&nbsp; &nbsp;";
 		else
-			$moveup = "<a href=\"?serendipity[adminModule]=plugins&submit=move+up&serendipity[plugin_to_move]=$key\">UP</a>";
+			$moveup = "<a href=\"?serendipity[adminModule]=plugins&submit=move+up&serendipity[plugin_to_move]=$key\"><?=UP?></a>";
 
 		if ($sort_idx == (count($plugins)-1))
 			$movedown = "";
 		else
-			$movedown = "<a href=\"?serendipity[adminModule]=plugins&submit=move+down&serendipity[plugin_to_move]=$key\">DOWN</a>";
+			$movedown = "<a href=\"?serendipity[adminModule]=plugins&submit=move+down&serendipity[plugin_to_move]=$key\"><?=DOWN?></a>";
 
 
 		echo "<tr><td><input type=\"checkbox\" name=\"serendipity[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place $moveup $movedown</td></tr>\n";
@@ -245,8 +245,8 @@
 </table>
 <br />
 
-<input type="submit" name="REMOVE" title="Remove Ticked Plugins" value="Delete">
-<input type="submit" name="SAVE" title="Save changes to layout" value="Save">
+<input type="submit" name="REMOVE" title="Remove Ticked Plugins" value="<?=DELETE?>">
+<input type="submit" name="SAVE" title="Save changes to layout" value="<?=SAVE?>">
 </form>
 <?php
 }

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_entries.php	31 Mar 2003 21:17:27 -0000	1.3
+++ serendipity_entries.php	5 Apr 2003 23:46:55 -0000	1.4
@@ -38,7 +38,7 @@
 		&& file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
 ?>
 		<div class='serendipity_auth_required'>
-		You have to be logged on to view this page:
+		<?=HAVE_TO_BE_LOGGED_ON?>
 		<form action="?" method="post">
 			<input type="hidden" name="serendipity[action]" value="admin">
 			<input type="text" value="username" name="serendipity[user]" onfocus="value='';">
@@ -56,35 +56,35 @@
                 <td class="serendipitySideBar">
 
 					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Entries:</div>
+					<div class="serendipitySideBarTitle"><?=ENTRIES?></div>
 					<div class="serendipitySideBarContent">
-                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'>New entry</a><br>
-                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'>Edit entries</a><br>
-                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'>Delete entries</a><br>
+                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'><?=NEW_ENTRY?></a><br>
+                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'><?=EDIT_ENTRIES?></a><br>
+                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'><?=DELETE_ENTRIES?></a><br>
 					</div>
 					</div>
 
 					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Categories:</div>
+					<div class="serendipitySideBarTitle"><?=CATEGORIES?></div>
 					<div class="serendipitySideBarContent">
-                    &bull; <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'>Edit Categories</a><br>
+                    &bull; <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'><?=EDIT_CATEGORIES?></a><br>
 					</div>
 					</div>
 
 					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Images:</div>
+					<div class="serendipitySideBarTitle"><?=IMAGES?></div>
 					<div class="serendipitySideBarContent">
-					&bull; <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'>Add images</a><br>
-                    &bull; <a href='?serendipity[adminModule]=images'>Manage images</a><br>
-                    &bull; <a href='?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs' onClick="return confirm('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
+					&bull; <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'><?=ADD_IMAGES?></a><br>
+                    &bull; <a href='?serendipity[adminModule]=images'><?=MANAGE_IMAGES?></a><br>
+                    &bull; <a href='?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs' onClick="return confirm('<?=WARNING_THIS_BLAHBLAH?>');"><?=CREATE_THUMBS?></a><br>
 					</div>
 					</div>
-                                        &bull; <a href="<?=$serendipity['serendipityHTTPPath']?>serendipity_admin.php">Admin interface</a><br />
-					&bull; <a href="<?=$serendipity['serendipityHTTPPath']?>">Back to Weblog</a><br />
-					&bull; <a href="?serendipity[adminModule]=logout">Logout</a>
+                                        &bull; <a href="<?=$serendipity['serendipityHTTPPath']?>serendipity_admin.php"><?=ADMIN_INTERFACE?></a><br />
+					&bull; <a href="<?=$serendipity['serendipityHTTPPath']?>"><?=BACK_TO_BLOG?></a><br />
+					&bull; <a href="?serendipity[adminModule]=logout"><?=LOGOUT?></a>
                 </td>
                 <td class="serendipity_admin">
-                    <div class="serendipity_admin_title">Serendipity Authoring Suite</div>
+                    <div class="serendipity_admin_title"><?=SERENDIPITY_AUTHORING_SUITE?></div>
                     <?php
                     	if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
                         switch($serendipity["GET"]["adminModule"]) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_functions.inc.php	5 Apr 2003 14:08:42 -0000	1.27
+++ serendipity_functions.inc.php	5 Apr 2003 23:46:55 -0000	1.28
@@ -11,25 +11,25 @@
 <input type="hidden" name="serendipity[entry_id]" value="<?=$id?>" />
 <table border="0" width="100%" cellpadding="3">
 <tr>
-<td class="serendipity_commentsLabel">Name</td>
+<td class="serendipity_commentsLabel"><?=NAME?></td>
 <td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="" size="30" /></td>
 </tr>
 <tr>
-<td class="serendipity_commentsLabel">Email</td>
+<td class="serendipity_commentsLabel"><?=EMAIL?></td>
 <td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="" /></td>
 </tr>
 <tr>
-<td class="serendipity_commentsLabel">Homepage</td>
+<td class="serendipity_commentsLabel"><?=HOMEPAGE?></td>
 <td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="" /></td>
 </tr>
 <tr>
-<td class="serendipity_commentsLabel">Comment</td>
+<td class="serendipity_commentsLabel"><?=COMMENT?></td>
 <td class="serendipity_commentsValue"><textarea rows="10" cols="40" name="serendipity[comment]"></textarea></td>
 </tr>
 </table>
-Remember Information? 
+<?=REMEMBER_INFO?> 
 <input type="checkbox" name="serendipity_remember" /><br />
-<input type="submit" value="Submit Comment" />
+<input type="submit" value="<?=SUBMIT_COMMENTS?>" />
 </form>
 <script type="text/javascript" language="javascript">
 <!--
@@ -259,13 +259,13 @@
 	$bydate = array();
 	
 	if (!is_array($entries)) {
-  		echo "<br />No entries to print.";
+  		echo "<br />".NO_ENTRIES_TO_PRINT;
 		return;
 	}
 
 	$lastDate = "";
 	for ($x = 0, $num_entries = count($entries); $x < $num_entries; $x++) {
-		$d = date("l, F jS Y", $entries[$x]["timestamp"]);
+		$d = date(DATE_FORMAT_1, $entries[$x]["timestamp"]);
 		$bydate[$d][] = $entries[$x];
 	}
 	
@@ -296,7 +296,7 @@
 				. $serendipity['serendipityHTTPPath']
 				. "archives/e_"
 				. $entry['id']
-				. ".html\">Posted by "
+				. ".html\">".POSTED_BY." "
 				. htmlentities($entry['username'])
 				. ($entry['category_name']?(" in ${entry['category_name']}"):"")
                 ." at "
@@ -304,7 +304,7 @@
 				. "</a>";
 
 			if (!isset($serendipity['GET']['id'])) {
-				$label = $entry['comments'] == 1 ? "Comment" : "Comments";
+				$label = $entry['comments'] == 1 ? COMMENT : COMMENTS;
 				echo " | <a href=\"{$serendipity['serendipityHTTPPath']}comment.php?serendipity[entry_id]={$entry['id']}\" "
 					. "onClick=\"window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;\">"
 					. $entry['comments'] . " $label</a>";
@@ -329,10 +329,10 @@
             if (isset($serendipity['GET']['id'])) {
                 echo '<link rel="pingback" href="' . $serendipity['baseURL'] . "comment.php?type=pingback&entry_id={$entry['id']}\" />\n";
                 echo "\n<br />\n";
-                echo '<div class="serendipity_commentsTitle">Comments</div>';
+                echo '<div class="serendipity_commentsTitle">".COMMENTS."</div>';
                 serendipity_printComments(serendipity_fetchComments($entry['id']));
                 echo "<br />\n\n";
-                echo '<div class="serendipity_commentsTitle">Add Comment</div>';
+                echo '<div class="serendipity_commentsTitle">".ADD_COMMENT."</div>';
                 serendipity_displayCommentForm($entry['id']);
             }
 
@@ -366,20 +366,20 @@
 
     print '<table width="100%" border="0">';
     if (!count($comments)) {
-        print "<tr><td><i>No comments.</i></td></tr>";
+        print "<tr><td><i>".NO_COMMENTS."</i></td></tr>";
     }
 
     foreach ($comments as $comment) {
         $link = empty($comment['url']) ? $comment['email'] : $comment['url'];
         $name = empty($comment['author']) ? 'Anonymous' : $comment['author'];
-        $type = $comment['type'] == 'trackback' ? 'Trackback from' : 'Posted by';
+        $type = $comment['type'] == 'trackback' ? TRACKBACK_FROM : POSTED_BY;
 ?>
     <tr>
     <td class="serendipity_comment">
     <a name="c<?=$comment['id']?>"></a>
     <?=nl2br(serendipity_markup_text(serendipity_emoticate($comment['body'])))?><br />
 	<div class="serendipity_comment_source">
-    <?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> on 
+    <?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> <?=ON?> 
     <a href="<?=$PHP_SELF?>#comment<?=$comment['id']?>"><?=date("M d, h:i", $comment['timestamp'])?></a>
 	</div>
     </td>
@@ -421,15 +421,15 @@
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment) {
     global $serendipity;
-    $text = "
-A new comment has been posted on your blog $serendipity[blogTitle], on entry #$id.
+    $text = 
+sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity[blogTitle],$id)."
 
 IP Address: $_SERVER[REMOTE_ADDR]
-Name: $fromName
-Email Address: $fromEmail
+".NAME.": $fromName
+".EMAIL.": $fromEmail
 URL: $fromUrl
 
-Comments:
+".COMMENTS.":
 
 $comment
 
@@ -1153,7 +1153,7 @@
 
 	$cats = serendipity_fetchCategories();
 
-	$cat_list = "<select name=\"serendipity[categoryid]\"><option value=\"0\">[No Category]</option>\n";
+	$cat_list = "<select name=\"serendipity[categoryid]\"><option value=\"0\">[".NO_CATEGORY."]</option>\n";
 	if (is_array($cats)) {
 		foreach ($cats as $cat_data) {
 			$selected = $cat_data['categoryid'] == $entry['categoryid'] ? " selected" : "";
@@ -1184,10 +1184,10 @@
 				<td align="left">
                 	<input type="text" name="serendipity[title]" value="<?=$entry["title"]?>" size=30>
                 </td>
-				<td>Category: <?= $cat_list ?></td>
+				<td><?=Category?> <?= $cat_list ?></td>
     		</tr>
             <tr>
-                <td colspan="2">Entry Body</td>
+                <td colspan="2"><?=ENTRY_BODY?></td>
             </tr>   
     		<tr>
 				<td colspan="2">
@@ -1195,7 +1195,7 @@
                 </td>
     		</tr>
             <tr>
-                <td colspan="2">Extended Body</td>
+                <td colspan="2"><?=EXTENDED_BODY?></td>
             </tr>   
     		<tr>
 				<td colspan="2">
@@ -1232,17 +1232,17 @@
                 	<input type="text" name="serendipity[title]" value="<?=htmlentities($entry["title"])?>" size=30>
                 </td>
                 <td nowrap="nowrap" align="right">
-					Category: <?= $cat_list ?>
+					<?=CATEGORY?> <?= $cat_list ?>
                 	<input type="button" value=" B " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
                     <input type="button" value=" U " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
                     <input type="button" value=" I " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
 					<input type="button" value="<img>" onClick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
-                    <input type="button" value="Image" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
+                    <input type="button" value="<?=IMAGE?>" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
                     <input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
                 </td>
     		</tr>
             <tr>
-                <td colspan="2">Entry Body</td>
+                <td colspan="2"><?=ENTRY_BODY?></td>
             </tr>   
     		<tr>
 				<td colspan="2">
@@ -1250,7 +1250,7 @@
                 </td>
     		</tr>
             <tr>
-                <td colspan="2">Extended Body</td>
+                <td colspan="2"><?=EXTENDED_BODY?></td>
             </tr>   
     		<tr>
 				<td colspan="2">
@@ -1259,7 +1259,7 @@
     		</tr>
             <tr>
             	<td colspan="2" align="right">
-                	<input type="submit" value="save">
+                	<input type="submit" value="<?=SAVE?>">
                 </td>
             </tr>
             </form>
@@ -1314,7 +1314,7 @@
 				echo "<input type='hidden' name='serendipity[cssid]' value='{$css[cssid]}'>\n";
 	?>
             <tr>
-                <td align="left">template name</td>
+                <td align="left"><?=TEMPLATE_NAME?></td>
             </tr>
 			<tr>
 				<td align="left">
@@ -1331,14 +1331,14 @@
     		</tr>
             <tr>
             	<td colspan="2" align="right">
-                	<input type="submit" value="save">
+                	<input type="submit" value="<?=SAVE?>">
                 </td>
             </tr>
 	<?php
 		} else {	/* admin */
 	?>
 			<tr>
-				<td>Choose a style sheet....</td>
+				<td><?=CHOOSE_STYLESHEET?></td>
 			</tr>
 			<tr>
 				<td align="left">
@@ -1347,14 +1347,14 @@
 			</tr>
 			<tr>
 				<td>
-					<input type="submit" name="EDIT" value="Edit">
-					<input type="submit" name="DELETE" value="Delete">
-					<input type="submit" name="DEFAULT" value="Make default">
+					<input type="submit" name="EDIT" value="<?=EDIT?>">
+					<input type="submit" name="DELETE" value="<?=DELETE?>">
+					<input type="submit" name="DEFAULT" value="<?=MAKE_DEFAULT?>">
 				</td>
 			</tr>
 			<tr>
 				<td>	
-					<input type="submit" name="NEW" value="Create New StyleSheet">
+					<input type="submit" name="NEW" value="<?=CREATE_NEW_STYLESHEET?>">
 				</td>
 			</tr>
 

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_lang_en.inc.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity_lang_en.inc.php	5 Apr 2003 23:46:56 -0000	1.2
@@ -16,6 +16,124 @@
 
 $serendipity["weekDayAbb"] = array("M", "Tu", "W", "Th", "F", "Sa", "Su");
 
+
+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_CSS", "Manage css");
+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 put the thumbnail in my entry.");
+define("I_WANT_BIG_IMAGE", "I want to put big 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("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("EDIT_ENTRIES", "Edit entries");
+define("DELETE_ENTRIES", "Delete entries");
+define("CATEGORIES", "Categories:");
+define("EDIT_CATEGORIES", "Edit 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, on entry #%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("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("SUPERUSER", 'Superuser');
+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("serendipity_LANG_LOADED", true);

Index: serendipity_layout.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_layout.inc.php	29 Mar 2003 16:51:30 -0000	1.2
+++ serendipity_layout.inc.php	5 Apr 2003 23:46:56 -0000	1.3
@@ -60,11 +60,10 @@
                     case "search":
 						$r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]);
 						if ($r === true) {
-							echo "No Entries Found for Query {$serendipity['GET']['searchTerm']}\n";
+							echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm'];
 							break;
 						}
-                        echo "Your search for ".$serendipity["GET"]["searchTerm"]." returned ".
-							 count($r)." results: ";
+                        echo sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity["GET"]["searchTerm"], count($r));
                         serendipity_printEntries($r);
                     break;
 

Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_layout_table.inc.php	4 Apr 2003 16:32:37 -0000	1.4
+++ serendipity_layout_table.inc.php	5 Apr 2003 23:46:56 -0000	1.5
@@ -50,11 +50,10 @@
                     case "search":
 						$r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]);
 						if ($r === true) {
-							echo "No Entries Found for Query {$serendipity['GET']['searchTerm']}\n";
+							echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']);
 							break;
 						}
-                        echo "Your search for ".$serendipity["GET"]["searchTerm"]." returned ".
-							 count($r)." results: ";
+                        echo sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity["GET"]["searchTerm"], count($r));
                         serendipity_printEntries($r);
                     break;
 

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_sidebar_items.php	1 Apr 2003 09:37:26 -0000	1.3
+++ serendipity_sidebar_items.php	5 Apr 2003 23:46:56 -0000	1.4
@@ -1,18 +1,18 @@
 <?php
 
 class serendipity_calendar_plugin extends serendipity_plugin {
-	
+
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Calendar');
-		$propbag->add('description', 'QuickJump Calendar');
+		$propbag->add('name',	CALENDAR);
+		$propbag->add('description', QUICKJUMP_CALENDAR);
 	}
 
 	function generate_content(&$title)
 	{
 		global $serendipity;
 
-		$title = "Quickjump:";
+		$title = QUICKJUMP;
 		if (!$serendipity["GET"]["calendarZoom"]) {
 			if (!$serendipity["GET"]["range"]) {
 				$serendipity["GET"]["calendarZoom"] = date("Y").date("m");
@@ -30,15 +30,15 @@
 class serendipity_quicksearch_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Quicksearch');
-		$propbag->add('description', 'Search for an entry');
+		$propbag->add('name',	QUICKSEARCH);
+		$propbag->add('description', SEARCH_FOR_ENTRY);
 	}
 
 	function generate_content(&$title)
 	{
 		global $serendipity;
 
-		$title = "Quicksearch:";
+		$title = QUICKSEARCH;
 
 	    echo "<form action=\"$serendipity[serendipityHTTPPath]search.php\" METHOD=\"GET\">\n"
 		.	"<input type=\"hidden\" name=\"serendipity[action]\" value=\"search\">\n"
@@ -50,15 +50,15 @@
 class serendipity_archives_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Archives');
-		$propbag->add('description', 'Browse archives by month');
+		$propbag->add('name',	ARCHIVES);
+		$propbag->add('description', BROWSE_ARCHIVES);
 	}
 
 	function generate_content(&$title)
 	{
 		global $serendipity;
 
-		$title = "Archives:";
+		$title = ARCHIVES;
 		$ts = mktime(0,0,0,(date("m")+1), 1, date("Y"));
 		for($x=0; $x<3; $x++) {
 			$ts-=1;
@@ -77,15 +77,15 @@
 class serendipity_topreferrers_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Top Referrers');
-		$propbag->add('description', 'Shows top sites that linked to your blogs');
+		$propbag->add('name',	TOP_REFERRER);
+		$propbag->add('description', SHOWS_TOP_SITES);
 	}
 
 	function generate_content(&$title)
 	{
 		global $serendipity;
 
-		$title = "Top Referrers";
+		$title = TOP_REFERRER;
 		echo serendipity_displayTopReferrers();
 	}
 }
@@ -93,15 +93,15 @@
 class serendipity_topexits_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Top Exits');
-		$propbag->add('description', 'Shows top exit links from your blogs');
+		$propbag->add('name',	TOP_EXITS);
+		$propbag->add('description', SHOWS_TOP_EXIT);
 	}
 
 	function generate_content(&$title)
 	{
 		global $serendipity;
 
-		$title = "Top Exits";
+		$title = TOP_EXITS;
 		echo serendipity_displayTopExits();
 	}
 }
@@ -109,21 +109,21 @@
 class serendipity_syndication_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Syndication');
-		$propbag->add('description', 'Shows RSS syndication links');
+		$propbag->add('name',	SYNDICATION);
+		$propbag->add('description', SHOWS_RSS_BLAHBLAH);
 	}
 
 	function generate_content(&$title)
 	{
 		global $serendipity;
 
-		$title = "Syndicate This Blog";
+		$title = SYNDICATE_THIS_BLOG;
 ?>
-            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a> 
-            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php'>RSS 0.91 feed</a> 
+            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
+            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php'>RSS 0.91 feed</a>
             <br/>
-            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a> 
-            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a> 
+            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
+            <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a>
 <?php
 	}
 }
@@ -131,8 +131,8 @@
 class serendipity_superuser_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Superuser');
-		$propbag->add('description', 'Allows you to configure and publish your blog');
+		$propbag->add('name',	SUPERUSER);
+		$propbag->add('description', ALLOWS_YOU_BLAHBLAH);
 	}
 
 	function generate_content(&$title)
@@ -147,8 +147,8 @@
 class serendipity_plug_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	'Plug');
-		$propbag->add('description', 'Advertises the origins of your blog');
+		$propbag->add('name',	PLUG);
+		$propbag->add('description', ADVERTISES_BLAHBLAH);
 	}
 
 	function generate_content(&$title)
@@ -156,34 +156,34 @@
 		global $serendipity;
 
 		$title = "";
-		echo "<div class=\"serendipityPlug\">This blog is powered by <a href=\"http://php-blog.sf.net/\">serendipity</a>!</div>";
+		echo "<div class=\"serendipityPlug\">Blog software: <a href=\"http://php-blog.sf.net/\">serendipity</a>!</div>";
 	}
 }
 
 class serendipity_html_nugget_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',			'HTML Nugget');
-		$propbag->add('description',	'Holds a nugget of HTML in your sidebar');
+		$propbag->add('name',			HTML_NUGGET);
+		$propbag->add('description',	HOLDS_A_BLAHBLAH);
 		$propbag->add('configuration',	array(
 			'title',
 			'content',
 			));
 	}
-	
+
 	function introspect_config_item($name, &$propbag)
 	{
 		switch($name) {
 			case 'title':
 				$propbag->add('type',			'string');
 				$propbag->add('name',			'Title');
-				$propbag->add('description',	'Title for the nugget');
+				$propbag->add('description',	TITLE_FOR_NUGGET);
 				break;
-				
+
 			case 'content':
 				$propbag->add('type',			'html');
 				$propbag->add('name',			'Content');
-				$propbag->add('description',	'The Nugget of HTML!');
+				$propbag->add('description',	THE_NUGGET);
 				break;
 			default:
 				return false;

[php-blog-cvs] serendipity db.sql,1.12,1.13 exit.php,1.1,1.2 serendipity_functions.inc.php,1.26,1.27

From: <ber...@us...> - 2003-04-05 14:08:46

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

Modified Files:
	db.sql exit.php serendipity_functions.inc.php 
Log Message:
Add 'entry' column to 'exits' and 'referrers' tables to keep track of which blog entry was linked from or referred to. Currently this only works for exits, have to think of a way for the referrers, but the framework is there.

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- db.sql	3 Apr 2003 20:07:39 -0000	1.12
+++ db.sql	5 Apr 2003 14:08:41 -0000	1.13
@@ -72,6 +72,7 @@
   port varchar(5),
   path varchar(255),
   query varchar(255),
+  entry int(11) not null,
   PRIMARY KEY  (host,day)	
 );
 
@@ -87,6 +88,7 @@
   port varchar(5),
   path varchar(255),
   query varchar(255),  
+  entry int(11) not null,
   PRIMARY KEY  (host,day)
 );
 

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit.php	2 Apr 2003 07:06:07 -0000	1.1
+++ exit.php	5 Apr 2003 14:08:42 -0000	1.2
@@ -1,12 +1,19 @@
 <?php
 include_once 'serendipity_config.inc.php';
 
-$url = $serendipity['baseURL'];
+$entry = 0;
+$url   = $serendipity['baseURL'];
 
 if ( isset($_GET['url']) &&
     !empty($_GET['url'])) {
+    if ( isset($_GET['entry']) &&
+        !empty($_GET['entry'])) {
+        $entry = $_GET['entry'];
+    }
+
     $url = str_replace('&amp;', '&', base64_decode($_GET['url']));
-    serendipity_track_exit($url);
+
+    serendipity_track_url('exits', $url, $entry);
 }
 
 header('Location: ' . $url);

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_functions.inc.php	4 Apr 2003 16:32:36 -0000	1.26
+++ serendipity_functions.inc.php	5 Apr 2003 14:08:42 -0000	1.27
@@ -279,10 +279,10 @@
 			echo "</div>";
 			
 			echo "<div class='serendipity_entry'>";
-            echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'])));
+            echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id'])));
 			if ($extended && strlen($entry['extended'])) {
                 echo '<a name="#extended"></a>';
-                echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'])));
+                echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'], $entry['id'])));
 			} 
 			if ($entry['exflag'] && !$extended) {
 				echo "<br><div class='serendipity_time'><a href=\""
@@ -487,7 +487,7 @@
   return("<tt>".str_replace(' ', '&nbsp;', $arg[1])."</tt>");
 }
 
-function serendipity_markup_text($str) {
+function serendipity_markup_text($str, $entry = 0) {
 	global $serendipity;
 
     $ret = $str;
@@ -521,6 +521,8 @@
     $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
 
     if ($serendipity['track_exits']) {
+        $serendipity['encodeExitsCallback_entry'] = $entry;
+
         $ret = preg_replace_callback(
           "#<a href=(\"|')http://([^\"']+)(\"|')#im",
           'serendipity_encodeExitsCallback',
@@ -538,13 +540,15 @@
 function serendipity_encodeExitsCallback($buffer) {
   global $serendipity;
 
-  $url = 'http://' . $buffer[2];
+  $entry = $serendipity['encodeExitsCallback_entry'];
+  $url   = 'http://' . $buffer[2];
 
   return sprintf(
-    '<a href="%sexit.php?url=%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
+    '<a href="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
 
     $serendipity['baseURL'],
     base64_encode($url),
+    ($entry != 0) ? '&amp;entry=' . $entry : '',
     $url,
     $url
   );
@@ -1448,43 +1452,47 @@
     serendipity_db_query($gc);
 }
 
-function serendipity_track_exit($url) {
-    serendipity_track_url('exits', $url);
-}
-
-function serendipity_track_url($list, $url) {
+function serendipity_track_url($list, $url, $entry = 0) {
     global $serendipity;
 
-    $url_parts   = parse_url($url);
+    $url_parts = parse_url($url);
 
     serendipity_db_query(
       @sprintf(
         "UPDATE %s
             SET count = count + 1
-          WHERE scheme = '$url_parts[scheme]'
-            AND host = '$url_parts[host]'
-            AND port = '$url_parts[port]'
-            AND path = '$url_parts[path]'
-            AND query = '$url_parts[query]'
-            AND day = NOW()",
+          WHERE scheme = '%s'
+            AND host   = '%s'
+            AND port   = '%s'
+            AND path   = '%s'
+            AND query  = '%s'
+            AND day    = NOW()
+                %s",
 
-        $serendipity['dbPrefix'].$list
+        $serendipity['dbPrefix'] . $list,
+        $url_parts['scheme'],
+        $url_parts['host'],
+        $url_parts['port'],
+        $url_parts['path'],
+        $url_parts['query'],
+        ($entry != 0) ? "AND entry = '$entry'" : ''
       )
     );
 
     if (serendipity_db_affected_rows() == 0) {
         serendipity_db_query(
           sprintf(
-            "INSERT INTO %s%s
-                    (day, count, scheme, host, port, path, query)
-             VALUES ( NOW(), 1, '%s', '%s', '%s', '%s', '%s')",
-            $serendipity['dbPrefix'],
-            $list,
-            $url_parts[scheme],
-            $url_parts[host],
-            $url_parts[port],
-            $url_parts[path],
-            $url_parts[query]
+            "INSERT INTO %s
+                    (day, count, scheme, host, port, path, query%s)
+             VALUES ( NOW(), 1, '%s', '%s', '%s', '%s', '%s'%s)",
+            $serendipity['dbPrefix'] . $list,
+            ($entry != 0) ? ', entry' : '',
+            $url_parts['scheme'],
+            $url_parts['host'],
+            $url_parts['port'],
+            $url_parts['path'],
+            $url_parts['query'],
+            ($entry != 0) ? ", '$entry'" : ''
           )
         );
     }

Re: [php-blog-cvs] serendipity serendipity_config.inc.php,1.6,1.7

From: Sterling H. <ste...@bu...> - 2003-04-05 00:18:19

On Fri, 2003-04-04 at 19:14, christian muehlhaeuser wrote:
> On Saturday 05 April 2003 01:51, Sterling Hughes wrote:
> > On Fri, 2003-04-04 at 18:56, christian muehlhaeuser wrote:
> > > just noticed.
> > >
> > > first line of .htaccess: "ErrorDocument 404 index.php"
> > > shouldnt it be: "ErrorDocument 404 /index.php" ?
> > >
> > > at least this is the only way i got my /archives to work.
> > >
> > > ....muesli
> >
> > htaccess.tpl:
> >
> > ErrorDocument 404 {PREFIX}index.php
> >
> > which is correct.
> >
> > -Sterling
> 
> then something else is wrong. my .htaccess wasn't updated after i changed my 
> settings in the configuration. and so my "archives" and "edit entries" didnt 
> work.
> 

Fixed in cvs, thanks.

-Sterling

> ...muesli
-- 
"The computer programmer is a creator of universes for which he  
 alone is responsible. Universes of virtually unlimited complexity  
 can be created in the form of computer programs." 
    - Joseph Weizenbaum

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

From: <ste...@us...> - 2003-04-05 00:18:00

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
muesli rightly points out that we need to regenerate the .htaccess file


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin_installer.inc.php	3 Apr 2003 19:52:25 -0000	1.8
+++ serendipity_admin_installer.inc.php	5 Apr 2003 00:17:57 -0000	1.9
@@ -201,20 +201,6 @@
 		 serendipity_printConfigTemplate(serendipity_parseTemplate("./serendipity_config_local.tpl"), $_POST);
 	 } else {
 		 if (IN_serendipity !== true) {
-			 // Create .htaccess
-			 $a = file("./htaccess.tpl");
-			 $fp = @fopen("./.htaccess", "w");
-			 if (!is_resource($fp)) {
-				 echo "<font color='#ff0000'>Error: Could not create .htaccess file, create it yourself:<pre>\n";
-				 echo implode("\n", $a);
-			 }
-			 else {
-				 for($x=0; $x<count($a); $x++) {
-					 fwrite($fp, str_replace("{PREFIX}", $_POST["serendipityHTTPPath"],$a[$x])."\n");
-				 }
-				 fclose($fp);
-			 }
-
 			 // Create tables
 			 echo "Attempting to setup Database...<br>";
 			 $queries = serendipity_parse_sql_tables('./db.sql');
@@ -242,6 +228,19 @@
 			 if (is_string($res)) {
 				 echo $res;
 			 }
+		}
+		// Create .htaccess
+		$a = file("./htaccess.tpl");
+		$fp = @fopen("./.htaccess", "w");
+		if (!is_resource($fp)) {
+			echo "<font color='#ff0000'>Error: Could not create .htaccess file, create it yourself:<pre>\n";
+			echo implode("\n", $a);
+		}
+		else {
+			for($x = 0; $x < count($a); $x++) {
+				fwrite($fp, str_replace("{PREFIX}", $_POST["serendipityHTTPPath"],$a[$x])."\n");
+			}
+			fclose($fp);
 		}
 
 		// Save all basic config variables to the database

Re: [php-blog-cvs] serendipity serendipity_config.inc.php,1.6,1.7

From: christian m. <ch...@ch...> - 2003-04-05 00:14:44

On Saturday 05 April 2003 01:51, Sterling Hughes wrote:
> On Fri, 2003-04-04 at 18:56, christian muehlhaeuser wrote:
> > just noticed.
> >
> > first line of .htaccess: "ErrorDocument 404 index.php"
> > shouldnt it be: "ErrorDocument 404 /index.php" ?
> >
> > at least this is the only way i got my /archives to work.
> >
> > ....muesli
>
> htaccess.tpl:
>
> ErrorDocument 404 {PREFIX}index.php
>
> which is correct.
>
> -Sterling

then something else is wrong. my .htaccess wasn't updated after i changed my 
settings in the configuration. and so my "archives" and "edit entries" didnt 
work.

...muesli

Re: [php-blog-cvs] serendipity serendipity_config.inc.php,1.6,1.7

From: Sterling H. <ste...@bu...> - 2003-04-05 00:11:43

On Fri, 2003-04-04 at 18:56, christian muehlhaeuser wrote:
> just noticed.
> 
> first line of .htaccess: "ErrorDocument 404 index.php"
> shouldnt it be: "ErrorDocument 404 /index.php" ?
> 
> at least this is the only way i got my /archives to work.
> 
> ....muesli
> 

htaccess.tpl:

ErrorDocument 404 {PREFIX}index.php

which is correct.

-Sterling

-- 
"Programming today is a race between software engineers stirring to  
 build bigger and better idiot-proof programs, and the universe trying  
 to produce bigger and better idiots. So far, the universe is winning." 
    - Unknown

Re: [php-blog-cvs] serendipity serendipity_config.inc.php,1.6,1.7

From: christian m. <ch...@ch...> - 2003-04-04 23:57:06

just noticed.

first line of .htaccess: "ErrorDocument 404 index.php"
shouldnt it be: "ErrorDocument 404 /index.php" ?

at least this is the only way i got my /archives to work.

...muesli

Re: [php-blog-cvs] serendipity serendipity_config.inc.php,1.5,1.6 serendipity_functions.inc.php,1.25,1.26 serendipity_layout_table.inc.php,1.3,1.4

From: Wez F. <we...@th...> - 2003-04-04 16:43:53

So, no :D but two :-D ?

--Wez.

On Fri, 4 Apr 2003 jhe...@us... wrote:

>  							   ":-D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
> -							   ":D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
> +							   ":-D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",

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

From: <ste...@us...> - 2003-04-04 16:42:49

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
:-D was already supported, you just removed support for :D


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_config.inc.php	4 Apr 2003 16:32:34 -0000	1.6
+++ serendipity_config.inc.php	4 Apr 2003 16:42:42 -0000	1.7
@@ -51,7 +51,7 @@
 							   ":)"  => $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",
+							   ":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",

[php-blog-cvs] serendipity serendipity_config.inc.php,1.5,1.6 serendipity_functions.inc.php,1.25,1.26 serendipity_layout_table.inc.php,1.3,1.4

From: <jhe...@us...> - 2003-04-04 16:32:46

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

Modified Files:
	serendipity_config.inc.php serendipity_functions.inc.php 
	serendipity_layout_table.inc.php 
Log Message:
More userfriendly


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_config.inc.php	3 Apr 2003 19:55:25 -0000	1.5
+++ serendipity_config.inc.php	4 Apr 2003 16:32:34 -0000	1.6
@@ -51,7 +51,7 @@
 							   ":)"  => $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",
+							   ":-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",

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_functions.inc.php	3 Apr 2003 20:19:23 -0000	1.25
+++ serendipity_functions.inc.php	4 Apr 2003 16:32:36 -0000	1.26
@@ -1458,7 +1458,7 @@
     $url_parts   = parse_url($url);
 
     serendipity_db_query(
-      sprintf(
+      @sprintf(
         "UPDATE %s
             SET count = count + 1
           WHERE scheme = '$url_parts[scheme]'

Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_layout_table.inc.php	29 Mar 2003 16:51:30 -0000	1.3
+++ serendipity_layout_table.inc.php	4 Apr 2003 16:32:37 -0000	1.4
@@ -14,7 +14,7 @@
 
 ?>
 <div id="serendipity_banner">
-	<h1><?= $serendipity['blogTitle'] ?></h1>
+	<h1><?= htmlentities($serendipity['blogTitle']) ?></h1>
 <?php
 	$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
 	if (strlen($sub)) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.24,1.25

From: <jhe...@us...> - 2003-04-03 20:19:32

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
I wanted to take a wild guess too


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_functions.inc.php	3 Apr 2003 19:31:54 -0000	1.24
+++ serendipity_functions.inc.php	3 Apr 2003 20:19:23 -0000	1.25
@@ -1459,7 +1459,7 @@
 
     serendipity_db_query(
       sprintf(
-        "UPDATE %s%s
+        "UPDATE %s
             SET count = count + 1
           WHERE scheme = '$url_parts[scheme]'
             AND host = '$url_parts[host]'
@@ -1468,8 +1468,7 @@
             AND query = '$url_parts[query]'
             AND day = NOW()",
 
-        $serendipity['dbPrefix'],
-        $list
+        $serendipity['dbPrefix'].$list
       )
     );

[php-blog-cvs] serendipity db.sql,1.11,1.12

From: <ste...@us...> - 2003-04-03 20:07:44

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

Modified Files:
	db.sql 
Log Message:
taking a wild guess here


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- db.sql	3 Apr 2003 19:52:25 -0000	1.11
+++ db.sql	3 Apr 2003 20:07:39 -0000	1.12
@@ -65,10 +65,14 @@
 # 
 
 CREATE TABLE {PREFIX}exits (
-  url varchar(128) NOT NULL default '',
   day date NOT NULL,
   count int(11) NOT NULL default '0',
-  PRIMARY KEY  (url,day)
+  scheme varchar(5),
+  host varchar(128) NOT NULL,
+  port varchar(5),
+  path varchar(255),
+  query varchar(255),
+  PRIMARY KEY  (host,day)	
 );
 
 #

[php-blog-cvs] serendipity serendipity_config.inc.php,1.4,1.5 serendipity_db_mysql.inc.php,1.3,1.4 serendipity_db_postgres.inc.php,1.1.1.1,1.2

From: <ste...@us...> - 2003-04-03 19:55:32

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

Modified Files:
	serendipity_config.inc.php serendipity_db_mysql.inc.php 
	serendipity_db_postgres.inc.php 
Log Message:
fix referrer errors


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_config.inc.php	2 Apr 2003 21:02:06 -0000	1.4
+++ serendipity_config.inc.php	3 Apr 2003 19:55:25 -0000	1.5
@@ -5,7 +5,7 @@
 // For security reasons (serendipity relies on register_globals on)
 $serendipity = array();
 
-
+$serendipity['production'] = 1;
 
 if (!file_exists("./serendipity_config_local.inc.php")) {
 	die("Serendipity is not yet installed.  Please <a href=\"serendipity_admin.php\">install</a> it now.");

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_db_mysql.inc.php	31 Mar 2003 21:49:27 -0000	1.3
+++ serendipity_db_mysql.inc.php	3 Apr 2003 19:55:26 -0000	1.4
@@ -21,7 +21,7 @@
 	$c = mysql_db_query($serendipity['dbName'], $sql);
 	if (!$c) {
 		print mysql_error();
-		if (function_exists("debug_backtrace")) {
+		if (!$serendipity['production'] && function_exists("debug_backtrace")) {
             highlight_string(var_export(debug_backtrace(), 1));
         }
 		return false;

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_db_postgres.inc.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity_db_postgres.inc.php	3 Apr 2003 19:55:26 -0000	1.2
@@ -46,7 +46,7 @@
 
 	if (!$serendipity['dbLastResult']) {
 		print pg_last_error($serendipity['dbConn']);
-		if (function_exists("debug_backtrace")) {
+		if (!$serendipity['production'] && function_exists("debug_backtrace")) {
             highlight_string(var_export(debug_backtrace(), 1));
         }
 		return false;

[php-blog-cvs] serendipity db.sql,1.10,1.11 serendipity_admin_installer.inc.php,1.7,1.8

From: <ste...@us...> - 2003-04-03 19:52:30

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

Modified Files:
	db.sql serendipity_admin_installer.inc.php 
Log Message:
properly create the indexes


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- db.sql	3 Apr 2003 19:47:03 -0000	1.10
+++ db.sql	3 Apr 2003 19:52:25 -0000	1.11
@@ -47,7 +47,7 @@
   categoryid int(11) default null
 );
 
-CREATE FULLTEXT INDEX entry on {PREFIX}entries (title,body,extended);
+CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended);
 
 #
 # table structure for table '{PREFIX}references'

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_installer.inc.php	3 Apr 2003 16:32:28 -0000	1.7
+++ serendipity_admin_installer.inc.php	3 Apr 2003 19:52:25 -0000	1.8
@@ -131,6 +131,10 @@
                 $in_table = 1;
                 $def = $line;
             }
+	
+			if (preg_match('#^create\s*(\{fulltext\}|unique)\s*index#i', $line)) {
+				array_push($queries, $line);
+			}
         }
     }
     fclose($fp);

469 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 541 542 543 544 545 .. 551 > >> (Page 543 of 551)