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

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 .. 539 540 541 542 543 .. 551 > >> (Page 541 of 551)

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

From: <jhe...@us...> - 2003-05-24 10:23:09

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
New logo (comes without the 10/9 typo, though)


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_sidebar_items.php	23 May 2003 23:53:17 -0000	1.11
+++ serendipity_sidebar_items.php	24 May 2003 10:23:06 -0000	1.12
@@ -157,7 +157,7 @@
 		global $serendipity;
 
 		$title = POWERED_BY.":";
-		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['serendipityHTTPPath']}pixel/s10y_logo_small.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
+		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['serendipityHTTPPath']}pixel/s9y_banner_tiny.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
 	}
 }

[php-blog-cvs] serendipity serendipity_config.inc.php,1.9,1.10

From: <tom...@us...> - 2003-05-24 01:51:55

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Turning production back ON

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_config.inc.php	24 May 2003 01:17:20 -0000	1.9
+++ serendipity_config.inc.php	24 May 2003 01:51:52 -0000	1.10
@@ -2,7 +2,7 @@
 define('IN_serendipity', true);
 include_once('compat.php');
 
-$serendipity['production'] = 0;
+$serendipity['production'] = 1;
 if (!isset($serendipity['serendipityPath'])) {
 	$serendipity['serendipityPath'] = './';
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.45,1.46

From: <tom...@us...> - 2003-05-24 01:37:35

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Lets sort those comments/trackbacks by id

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_functions.inc.php	24 May 2003 01:33:19 -0000	1.45
+++ serendipity_functions.inc.php	24 May 2003 01:37:32 -0000	1.46
@@ -378,7 +378,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'NORMAL'";
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'NORMAL' ORDER BY id";
     if (isset($limit)) {
         $query .= " LIMIT $limit";
     }
@@ -393,7 +393,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'TRACKBACK' AND title!=''";
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'TRACKBACK' AND title!='' ORDER BY id";
     if (isset($limit)) {
         $query .= " LIMIT $limit";
     }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.44,1.45 comment.php,1.5,1.6

From: <tom...@us...> - 2003-05-24 01:33:23

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

Modified Files:
	serendipity_functions.inc.php comment.php 
Log Message:
We now remember commentDetails, we can also forget them, both on request - no need for javascript

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_functions.inc.php	23 May 2003 22:49:39 -0000	1.44
+++ serendipity_functions.inc.php	24 May 2003 01:33:19 -0000	1.45
@@ -12,15 +12,15 @@
 <table border="0" width="100%" cellpadding="3">
 <tr>
 <td class="serendipity_commentsLabel"><?=NAME?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="" size="30" /></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?= $serendipity['COOKIE']['name'] ?>" size="30" /></td>
 </tr>
 <tr>
 <td class="serendipity_commentsLabel"><?=EMAIL?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="" /></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?= $serendipity['COOKIE']['email'] ?>" /></td>
 </tr>
 <tr>
 <td class="serendipity_commentsLabel"><?=HOMEPAGE?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="" /></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?= $serendipity['COOKIE']['url'] ?>" /></td>
 </tr>
 <tr>
 <td class="serendipity_commentsLabel"><?=COMMENT?></td>
@@ -28,26 +28,32 @@
 </tr>
 </table>
 <?=REMEMBER_INFO?>
-<input type="checkbox" name="serendipity_remember" /><br />
+<input type="checkbox" name="serendipity[remember]" <?= $serendipity['COOKIE']['remember'] ?>/><br />
 <input type="submit" value="<?=SUBMIT_COMMENT?>" />
 </form>
-<script type="text/javascript" language="javascript">
-<!--
-if (!document.serendipity_comment['serendipity[name]'].value)
-    document.serendipity_comment['serendipity[name]'].value = getCookie("serendipity_cmt_name");
-
-if (!document.serendipity_comment['serendipity[email]'].value)
-    document.serendipity_comment['serendipity[email]'].value = getCookie("serendipity_cmt_email");
-
-if (!document.serendipity_comment['serendipity[url]'].value)
-    document.serendipity_comment['serendipity[url]'].value = getCookie("serendipity_cmt_url");
-
-if (getCookie("serendipity_cmt_name"))
-    document.serendipity_comment.serendipity_remember.checked = 1;
-// -->
-</script>
 </div>
 <?php
+}
+function serendipity_setCookie($name,$value) {
+	global $serendipity;
+	setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath']);
+	$_COOKIE[$name] = $value;
+}
+
+function serendipity_deleteCookie($name) {
+	setcookie("serendipity[$name]", "", time()-4000);
+	unset($_COOKIE[$name]);
+}
+function serendipity_rememberCommentDetails($details) {
+	foreach ( $details as $n=>$v ) {
+		serendipity_setCookie($n,$v);
+	}
+}
+function serendipity_forgetCommentDetails() {
+	global $serendipity;
+	foreach ($serendipity['COOKIE'] as $n => $v) {
+		serendipity_deleteCookie($n);
+	}
 }
 
 // Draws a little calendar in HTML

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- comment.php	22 May 2003 23:01:00 -0000	1.5
+++ comment.php	24 May 2003 01:33:19 -0000	1.6
@@ -6,6 +6,18 @@
     serendipity_deleteComment($_GET['delete'],$_GET['entry']);
 }
 
+/* It's time to finally check if we need to remember the entered information, 
+   the reason we are doing this up here, is because we want to send cookie-headers */
+if ( isset($serendipity['POST']['remember']) ) {
+    $details['url'] = $serendipity['POST']['url'];
+    $details['name'] = $serendipity['POST']['name'];
+    $details['email'] = $serendipity['POST']['email'];
+    $details['remember'] = 'checked';		
+    serendipity_rememberCommentDetails($details);
+} elseif ( isset($serendipity['POST']['comment']) ) {
+    serendipity_forgetCommentDetails();
+}
+
 
 if (!($type = @$_GET['type'])) {
     $type = 'normal';
@@ -43,26 +55,23 @@
 <body>
 <?php
 if (!isset($serendipity['POST']['comment'])) {
-if ($serendipity['GET']['type'] == "trackbacks") {
-echo '<div class="serendipity_commentsTitle">Trackbacks</div>';
-	serendipity_printTrackbacks(serendipity_fetchTrackbacks($id));
-}
-else {
+	if ($serendipity['GET']['type'] == "trackbacks") {
+		echo '<div class="serendipity_commentsTitle">Trackbacks</div>';
+		serendipity_printTrackbacks(serendipity_fetchTrackbacks($id));
+	} else {
 ?>
 <div class="serendipity_commentsTitle">Comments</div>
 <?php serendipity_printComments(serendipity_fetchComments($id)); ?>
 <div class="serendipity_commentsTitle">Add A Comment</div>
 <?php serendipity_displayCommentForm($id);
-}
+	}
 } else {
-    $remember = 0;
     $comment['url'] = $serendipity['POST']['url'];
     $comment['comment'] = trim($serendipity['POST']['comment']);
     $comment['name'] = $serendipity['POST']['name'];
     $comment['email'] = $serendipity['POST']['email'];
-
     if ( !empty($comment['comment']) ) {
-        serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
+	serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
 ?>
 Your comment was successfully added.  Click <a href="<?=$PHP_SELF?>?serendipity[entry_id]=<?=$serendipity['POST']['entry_id']?>">here</a> to return to
 the comments, and <a href="#" onClick="self.close()">here</a> to close this window.

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

From: <tom...@us...> - 2003-05-24 01:17:22

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Get cookies to

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_config.inc.php	10 Apr 2003 14:50:30 -0000	1.8
+++ serendipity_config.inc.php	24 May 2003 01:17:20 -0000	1.9
@@ -2,7 +2,7 @@
 define('IN_serendipity', true);
 include_once('compat.php');
 
-$serendipity['production'] = 1;
+$serendipity['production'] = 0;
 if (!isset($serendipity['serendipityPath'])) {
 	$serendipity['serendipityPath'] = './';
 }
@@ -96,7 +96,7 @@
 // Merge get and post into the serendipity array
 $serendipity["GET"] = &$_GET["serendipity"];
 $serendipity["POST"] = &$_POST["serendipity"];
-
+$serendipity["COOKIE"] = &$_COOKIE["serendipity"];
 // We don't care who tells us what to do
 if (!$serendipity["GET"]["action"]) {
     $serendipity["GET"]["action"] = $serendipity["POST"]["action"];

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

From: <tom...@us...> - 2003-05-24 00:07:55

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Added link back to index

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_sidebar_items.php	23 May 2003 23:09:27 -0000	1.10
+++ serendipity_sidebar_items.php	23 May 2003 23:53:17 -0000	1.11
@@ -60,6 +60,7 @@
 
 		$title = ARCHIVES;
 		$ts = mktime(0,0,0,(date("m")+1), 1, date("Y"));
+		echo "<a href='{$serendipity['serendipityHTTPPath']}'>Recent...</a><br />";
 		for($x=0; $x<3; $x++) {
 			$ts-=1;
 			if ($serendipity["rewrite"] === true)

[php-blog-cvs] serendipity TODO,1.2,1.3

From: <tom...@us...> - 2003-05-23 23:55:54

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

Modified Files:
	TODO 
Log Message:
Small update

Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TODO	29 Mar 2003 19:52:58 -0000	1.2
+++ TODO	23 May 2003 23:55:50 -0000	1.3
@@ -1,5 +1,3 @@
-* Split up the administration and entry editing sections into two 
-separate areas.
 * Split up serendipity_functions.inc.php
 * Move the library files out of the docroot
 * Unify the configuration system
@@ -13,5 +11,5 @@
 * Add a citation extractor plugin
 * Add support for multiple weblogs
 * Add the ability to have a printer friendly format for the weblog
-* Add a set of css templates that are distributed with serendipity.  choose
-a reasonable default
+* Add a set of css templates that are distributed with serendipity.  
+  - Choose a reasonable default

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.9,1.10

From: <tom...@us...> - 2003-05-23 23:09:30

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Lets try using the correct HTTPPath, shall we?

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_sidebar_items.php	22 May 2003 21:06:47 -0000	1.9
+++ serendipity_sidebar_items.php	23 May 2003 23:09:27 -0000	1.10
@@ -156,7 +156,7 @@
 		global $serendipity;
 
 		$title = POWERED_BY.":";
-		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['HTTPPath']}pixel/s10y_logo_small.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
+		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['serendipityHTTPPath']}pixel/s10y_logo_small.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
 	}
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.43,1.44

From: <tom...@us...> - 2003-05-23 22:49:44

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Why call unknown function serendipity_() ?

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_functions.inc.php	22 May 2003 23:01:00 -0000	1.43
+++ serendipity_functions.inc.php	23 May 2003 22:49:39 -0000	1.44
@@ -801,8 +801,7 @@
 /**
  *
  */
-function
-add_trackback ($id, $title, $url, $name, $excerpt)
+function add_trackback ($id, $title, $url, $name, $excerpt)
 {
     global $serendipity;
 
@@ -816,8 +815,7 @@
     return 1;
 }
 
-function
-add_pingback ($id, $postdata)
+function add_pingback ($id, $postdata)
 {
     global $serendipity;
 
@@ -828,7 +826,7 @@
         $comment['url'] = $remote;
         $comment['comment'] = '';
         $comment['name'] = '';
-        serendipity_($id, $comment, 'PINGBACK');
+        serendipity_saveComment($id, $comment, 'PINGBACK');
         return 1;
     }
     return 0;
@@ -837,8 +835,7 @@
 /**
  * Cut text
  */
-function
-serendipity_trackback_excerpt($text)
+function serendipity_trackback_excerpt($text)
 {
     return substr($text, 0, 255);
 }
@@ -893,8 +890,7 @@
 /**
  * search through link body, and automatically send a trackback ping.
  */
-function
-serendipity_handle_references($id, $author, $title, $text)
+function serendipity_handle_references($id, $author, $title, $text)
 {
     global $serendipity;

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

From: <gsc...@us...> - 2003-05-23 17:47:03

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

Modified Files:
	serendipity_xmlrpc.php 
Log Message:
added support for deletion in blogger and metaweblog APIs


Index: serendipity_xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_xmlrpc.php	6 Apr 2003 04:02:14 -0000	1.1
+++ serendipity_xmlrpc.php	23 May 2003 17:33:02 -0000	1.2
@@ -11,12 +11,16 @@
                         array('function' => 'blogger_newPost'),
                     'blogger.editPost' =>
                         array('function' => 'blogger_editPost'),
+                    'blogger.deletePost' =>
+                        array('function' => 'blogger_deletePost'),
                     'metaWeblog.newPost' =>
                         array('function' => 'metaWeblog_newPost'),
                     'metaWeblog.editPost' =>
                         array('function' => 'metaWeblog_editPost'),
                     'metaWeblog.getPost' =>
                         array('function' => 'metaWeblog_getPost'),
+                    'metaWeblog.deletePost' =>
+                        array('function' => 'metaWeblog_deletePost'),
                     'mt.getRecentPostTitles' =>
                         array('function' => 'mt_getRecentPostTitles'),
                     'mt.getCategoryList' =>
@@ -167,6 +171,24 @@
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
+function blogger_deletePost($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_deleteEntry($entry['id']);
+    return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
+}
+
 function metaWeblog_newPost($message)
 {
     $val = $message->params[1];
@@ -237,6 +259,24 @@
           '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_deletePost($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_deleteEntry($entry['id']);
+    return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
 }
 
 function metaWeblog_setPostCategories($message)

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

From: <tom...@us...> - 2003-05-22 23:52:10

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

Removed Files:
	serendipity_lang_en_gb.inc.php 
Log Message:
No longer needed

--- serendipity_lang_en_gb.inc.php DELETED ---

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.4,1.5

From: <tom...@us...> - 2003-05-22 23:19:37

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

Modified Files:
	serendipity_admin_images.inc.php 
Log Message:
Added lots of error-handling and minor tweaks

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_images.inc.php	18 May 2003 20:52:20 -0000	1.4
+++ serendipity_admin_images.inc.php	22 May 2003 23:19:33 -0000	1.5
@@ -87,12 +87,18 @@
     		break;
 
 	case "DoDelete":
+		$fThumb = serendipity_parseFileName($serendipity["fname"]);
+		$fThumb = $fThumb[0].".".$serendipity["thumbSuffix"].".".$fThumb[1];
 		if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
 			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
 				echo "Deleted the image entitled <b>". $serendipity['fname'] ."</b>";
 			} else {
 				echo "Unable to delete <b>". $serendipity['fname'] ."</b>";
 			}
+			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$fThumb) ) {
+				echo "<br>Deleted the thumbnail entitled <b>". $fThumb ."</b>";
+			}
+																	 
 		} else {
 			echo "I was unable to locate the file entitled <b>". $serendipity['fname'] ."</b>, maybe it has already been deleted?";
 		}
@@ -147,42 +153,41 @@
 	case "add":
 		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"].
-                basename($serendipity["POST"]["url"]))) {
-				echo "Error: File already exists on your machine!";
-			}
+        if ($serendipity["POST"]["url"] != "" && $serendipity["POST"]["url"] != "http://") {
+        	if (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].basename($serendipity["POST"]["url"]))) {
+			echo ERROR_FILE_EXISTS_ALREADY;
+		}
             else {
             	// Fetch file
-                $fp = fopen($serendipity["serendipityPath"].$serendipity["uploadPath"].basename($serendipity["POST"]["url"]), "w");
-                fwrite($fp, file_get_contents($serendipity["POST"]["url"]));
-                fclose($fp);
-				echo $serendipity["POST"]["url"]." fetched!<br>";
+                if ( !$fContent = @file_get_contents($serendipity["POST"]["url"]) ) {
+			echo "File was not located on the remote server, are you sure the URL: <b>". $serendipity["POST"]["url"] ."</b> is correct?";
+		} else {
+			$fp = fopen($serendipity["serendipityPath"].$serendipity["uploadPath"].basename($serendipity["POST"]["url"]), "w");
+			fwrite($fp, $fContent);
+                	fclose($fp);
+			
+			echo $serendipity["POST"]["url"]." fetched!<br>";
 
-                // Create thumbnail
-                serendipity_makeThumbnail(basename($serendipity["POST"]["url"]));
-                echo THUMB_CREATED_DONE;
-            }
-        }
-        else {
-			if (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].
-                $_FILES['userfile']['name'])) {
-				echo ERROR_FILE_EXISTS_ALREADY;
-            }
-            else {
-                // Accept file
-                if (move_uploaded_file($_FILES['userfile']['tmp_name'],
-                                   $serendipity["serendipityPath"].$serendipity["uploadPath"].$_FILES['userfile']['name'])) {
-                    echo $_FILES['userfile']['name']." successfully uploaded!<br>";
+               		// Create thumbnail
+                	serendipity_makeThumbnail(basename($serendipity["POST"]["url"]));
+                	echo THUMB_CREATED_DONE;
+            	}
+	    }
+        } else {
+		if (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$_FILES['userfile']['name'])) {
+			echo ERROR_FILE_EXISTS_ALREADY;
+            	} else {
+                	// Accept file
+                	if (move_uploaded_file($_FILES['userfile']['tmp_name'],$serendipity["serendipityPath"].$serendipity["uploadPath"].$_FILES['userfile']['name'])) {
+                    		echo $_FILES['userfile']['name']." successfully uploaded!<br>";
 
-                    // Create thumbnail
-                    serendipity_makeThumbnail($_FILES['userfile']['name']);
-                    echo THUMB_CREATED_DONE;
-                }
-                else {
-					echo ERROR_UNKNOWN_NOUPLOAD;
-                }
-           }
+                    		// Create thumbnail
+                    		serendipity_makeThumbnail($_FILES['userfile']['name']);
+                    		echo THUMB_CREATED_DONE;
+                	} else {
+				echo ERROR_UNKNOWN_NOUPLOAD;
+                	}
+           	}
         }
 
         // Create thumbnail
@@ -201,7 +206,7 @@
                     <input type="hidden" name="serendipity[adminAction]" value="add">
 					<tr>
                     	<td nowrap='nowrap'><?=ENTER_IMAGE_URL?></td>
-                        <td><input type="text" name="serendipity[url]" value="http://" size="40"></td>
+                        <td><input type="text" name="serendipity[url]" value="" size="40"></td>
                     </tr>
                     <tr><td align="center" colspan="2"><b>Or</b></td></tr>
                     <tr>

[php-blog-cvs] serendipity serendipity_lang_en.inc.php,1.10,1.11 serendipity_lang_de.inc.php,1.7,1.8 serendipity_functions.inc.php,1.42,1.43 comment.php,1.4,1.5

From: <jhe...@us...> - 2003-05-22 23:01:04

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

Modified Files:
	serendipity_lang_en.inc.php serendipity_lang_de.inc.php 
	serendipity_functions.inc.php comment.php 
Log Message:
Argl, have to type this in again. Hope I didn't forgget any files in this commit. It implements the trackback functionality into the blog (you can now actually see the trackbacks - hooray).

I guess there's bugs or such, so test it and tell me. Good night.


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_en.inc.php	22 May 2003 22:45:38 -0000	1.10
+++ serendipity_lang_en.inc.php	22 May 2003 23:01:00 -0000	1.11
@@ -138,6 +138,9 @@
 define("IMAGE_AS_A_LINK", "Image as a link");
 define("POWERED_BY", "Powered by");
 define("SUPERUSER", "Superuser");
+define("TRACKBACKS", "Trackbacks");
+define("TRACKBACK", "Trackback");
+define("NO_TRACKBACKS", "No Trackbacks");
 
 define("serendipity_LANG_LOADED", true);
 

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_de.inc.php	21 May 2003 18:40:09 -0000	1.7
+++ serendipity_lang_de.inc.php	22 May 2003 23:01:00 -0000	1.8
@@ -137,8 +137,9 @@
 define("IMAGE_AS_A_LINK", "Bild als Link");
 define("POWERED_BY", "Powered by");
 define("SUPERUSER", "Besitzer login");
-
-
+define("TRACKBACKS", "Trackbacks");
+define("TRACKBACK", "Trackback");
+define("NO_TRACKBACKS", "Keine Trackbacks");
 
 define("serendipity_LANG_LOADED", true);
 ?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- serendipity_functions.inc.php	22 May 2003 21:08:27 -0000	1.42
+++ serendipity_functions.inc.php	22 May 2003 23:01:00 -0000	1.43
@@ -308,9 +308,13 @@
 
 			if (!isset($serendipity['GET']['id'])) {
 				$label = $entry['comments'] == 1 ? COMMENT : COMMENTS;
-				echo " | <a href=\"{$serendipity['serendipityHTTPPath']}comment.php?serendipity[entry_id]={$entry['id']}\" "
+				echo " | <a href=\"{$serendipity['serendipityHTTPPath']}comment.php?serendipity[entry_id]={$entry['id']}&serendipity[type]=comments\" "
 					. "onClick=\"window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;\">"
 					. $entry['comments'] . " $label</a>";
+				$label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
+				echo " | <a href=\"{$serendipity['serendipityHTTPPath']}comment.php?serendipity[entry_id]={$entry['id']}&serendipity[type]=trackbacks\" "
+                                        . "onClick=\"window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;\">"
+                                        . "{$entry['trackbacks']} $label</a>";
 			}
 
 			echo "</div>"; // serendipity_time
@@ -368,7 +372,22 @@
 {
     global $serendipity;
 
-    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id";
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'NORMAL'";
+    if (isset($limit)) {
+        $query .= " LIMIT $limit";
+    }
+
+	$comments = serendipity_db_query($query);
+	if (!is_array($comments))
+		return array();
+	return $comments;
+}
+
+function serendipity_fetchTrackbacks($id, $limit = null)
+{
+    global $serendipity;
+
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'TRACKBACK' AND title!=''";
     if (isset($limit)) {
         $query .= " LIMIT $limit";
     }
@@ -414,6 +433,43 @@
     print '</table>';
 }
 
+function serendipity_printTrackbacks($comments)
+{
+    global $serendipity;
+
+    print '<table width="100%" border="0">';
+    if (!count($comments)) {
+        print "<tr><td><i>".NO_TRACKBACKS."</i></td></tr>";
+    }
+
+    foreach ($comments as $comment) {
+        $link = empty($comment['url']) ? $comment['email'] : $comment['url'];
+        $name = empty($comment['author']) ? 'Anonymous' : $comment['author'];
+		$title= strip_tags($comment['title']);
+        $type = $comment['type'] == 'trackback' ? TRACKBACK_FROM : POSTED_BY;
+?>
+    <tr>
+    <td class="serendipity_comment">
+	<a href="<?=strip_tags($link)?>" target="_blank"><?=$title?></a><br />
+	<b>Excerpt: </b>
+    <?=htmlentities(strip_tags($comment['body']))?><br />
+	<div class="serendipity_comment_source">
+    <b>Weblog: </b> <?=strip_tags($name)?><br />
+    <b>Tracked: </b><?=date("M d, h:i", $comment['timestamp'])?><p />
+    <?php
+    	if ($_SESSION["serendipityAuthedUser"] === true) {
+    ?>
+    (<a href="<?=$serendipity["baseURL"]?>comment.php?delete=<?=$comment['id']?>&entry=<?=$comment['entry_id']?>"><?= DELETE ?></a>)
+    <?php
+    	}
+    ?></div>
+    </td>
+    </tr>
+<?php
+    }
+    print '</table>';
+}
+
 function serendipity_saveComment($id, $commentInfo, $type='NORMAL') {
     global $serendipity;
 
@@ -430,10 +486,9 @@
 
     serendipity_db_query($query);
 
-	$field = ($type=='NORMAL' ? 'comments' : 'trackbacks');
-
+    $field = ($type=='NORMAL' ? 'comments' : 'trackbacks');
     $query = "UPDATE {$serendipity['dbPrefix']}entries SET $field=$field+1 WHERE id='$id'";
-    var_dump(serendipity_db_query($query));
+	 serendipity_db_query($query);
 
     $query = "SELECT email, title, mail_comments
               FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
@@ -447,6 +502,20 @@
     serendipity_purgeEntry($id, $t);
 }
 
+/**
+* Adds a comment
+**/
+function serendipity_addComment($entry, $id) {
+	global $serendipity;
+
+    $querystring = "INSERT INTO ".$serendipity["dbPrefix"]."comments VALUES ".
+                   "VALUES (NULL, $id, ".time().", '".strip_tags($entry["author"])."', ".
+                   "'".strip_tags($entry["email"])."', '".strip_tags($entry["url"])."', '$REMOTE_ADDR', ".
+                   "'".strip_tags($entry["body"])."')";
+    serendipity_db_query($querystring);
+    serendipity_db_query("UPDATE ".$serendipity["dbPrefix"]." SET comments=comments+1 WHERE id LIKE $id");
+}
+
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment) {
     global $serendipity;
     $text =
@@ -1157,21 +1226,6 @@
 
     return $i;
 }
-
-/**
-* Adds a comment
-**/
-function serendipity_addComment($entry, $id) {
-	global $serendipity;
-
-    $querystring = "INSERT INTO ".$serendipity["dbPrefix"]."comments VALUES ".
-                   "VALUES (NULL, $id, ".time().", '".strip_tags($entry["author"])."', ".
-                   "'".strip_tags($entry["email"])."', '".strip_tags($entry["url"])."', '$REMOTE_ADDR', ".
-                   "'".strip_tags($entry["body"])."')";
-    serendipity_db_query($querystring);
-    serendipity_db_query("UPDATE ".$serendipity["dbPrefix"]." SET comments=comments+1 WHERE id LIKE $id");
-}
-
 
 /**
 * Prints a form to enter new diary entries

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- comment.php	1 May 2003 13:09:25 -0000	1.4
+++ comment.php	22 May 2003 23:01:00 -0000	1.5
@@ -6,7 +6,7 @@
     serendipity_deleteComment($_GET['delete'],$_GET['entry']);
 }
 
-					    
+
 if (!($type = @$_GET['type'])) {
     $type = 'normal';
 }
@@ -19,7 +19,7 @@
         $id = $matches[1];
     }
 
-    if (add_trackback($id, $_POST['title'], $_POST['url'], 
+    if (add_trackback($id, $_POST['title'], $_POST['url'],
                       $_POST['blog_name'], $_POST['excerpt'])) {
         report_trackback_success();
     } else {
@@ -43,11 +43,17 @@
 <body>
 <?php
 if (!isset($serendipity['POST']['comment'])) {
+if ($serendipity['GET']['type'] == "trackbacks") {
+echo '<div class="serendipity_commentsTitle">Trackbacks</div>';
+	serendipity_printTrackbacks(serendipity_fetchTrackbacks($id));
+}
+else {
 ?>
 <div class="serendipity_commentsTitle">Comments</div>
 <?php serendipity_printComments(serendipity_fetchComments($id)); ?>
 <div class="serendipity_commentsTitle">Add A Comment</div>
 <?php serendipity_displayCommentForm($id);
+}
 } else {
     $remember = 0;
     $comment['url'] = $serendipity['POST']['url'];
@@ -62,7 +68,7 @@
 the comments, and <a href="#" onClick="self.close()">here</a> to close this window.
 <?php } else {  ?>
 Your comment did not contain anything, please <a href="#" onClick="history.go(-1)">go back</a> and try again
-<?php } 
+<?php }
 } ?>
 </body>
 </html>

[php-blog-cvs] serendipity serendipity_lang_en.inc.php,1.9,1.10

From: <tom...@us...> - 2003-05-22 22:45:42

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
More fitting

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_lang_en.inc.php	22 May 2003 12:47:30 -0000	1.9
+++ serendipity_lang_en.inc.php	22 May 2003 22:45:38 -0000	1.10
@@ -61,7 +61,7 @@
 define("EDIT_ENTRIES", "Edit entries");
 define("DELETE_ENTRIES", "Delete entries");
 define("CATEGORIES", "Categories:");
-define("EDIT_CATEGORIES", "Edit Categories");
+define("EDIT_CATEGORIES", "Manage Categories");
 define("IMAGES", "Images:");
 define("ADD_IMAGES", "Add images");
 define("WARNING_THIS_BLAHBLAH", "WARNING:\\nThis may take a long time if there are many images without thumbnails.");

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.41,1.42

From: <jhe...@us...> - 2003-05-22 21:08:30

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
!!!!ATTENTION - UPDATE YOUR DATABASE STRUCTURE!!!!

Modify the entries table, so that there is a field 'trackbacks'.
Similar to the comments field (int4, unsigned, default 0).

Trackbacks are now seperately counted.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_functions.inc.php	21 May 2003 22:01:29 -0000	1.41
+++ serendipity_functions.inc.php	22 May 2003 21:08:27 -0000	1.42
@@ -27,7 +27,7 @@
 <td class="serendipity_commentsValue"><textarea rows="10" cols="40" name="serendipity[comment]"></textarea></td>
 </tr>
 </table>
-<?=REMEMBER_INFO?> 
+<?=REMEMBER_INFO?>
 <input type="checkbox" name="serendipity_remember" /><br />
 <input type="submit" value="<?=SUBMIT_COMMENT?>" />
 </form>
@@ -87,7 +87,7 @@
 		$endts = mktime(0, 0, 0, $month + 1, 1, $year);
 
         // Find out about diary entries
-        $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts"; 
+        $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts";
         $rows = serendipity_db_query($querystring);
         $activeDays = array();
 		if (is_array($rows)) {
@@ -136,7 +136,7 @@
 				if ($y==6) $cellProp = "LastInRow";
                 if ($x==4) $cellProp = "LastRow";
 				if ($x==4 && $y==6) $cellProp = "LastInLastRow";
-            
+
                 // Start printing
                 if (($x>0 || $y>=$firstDayWeekDay) && $currDay<=$nrOfDays) {
                     /*
@@ -154,7 +154,7 @@
                     print ($currDay);
                     if ($activeDays[$currDay] > 1) print ("</A>");
                     if (date("m") == $month && date("Y") == $year && $currDay == date("j")) echo "</I>";
-                    
+
                     print("</TD>");
                     $currDay++;
                 }
@@ -232,7 +232,7 @@
 	if ($authorid === null) {
 		$authorid = $serendipity['authorid'];
 	}
-	
+
     $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE authorid = $authorid";
 
 	return serendipity_db_query($querystring);
@@ -260,7 +260,7 @@
 
 	/* pre-walk the array to collect them keyed by date */
 	$bydate = array();
-	
+
 	if (!is_array($entries)) {
   		echo "<br />".NO_ENTRIES_TO_PRINT;
 		return;
@@ -271,7 +271,7 @@
 		$d = date(DATE_FORMAT_1, $entries[$x]["timestamp"]);
 		$bydate[$d][] = $entries[$x];
 	}
-	
+
 	foreach ($bydate as $date => $ents) {
 		echo "<div class='serendipity_Entry_Date'>";
 		echo "<div class='serendipity_date'>$date</div>";
@@ -280,13 +280,13 @@
 			echo "<div class='serendipity_title'>";
 			echo htmlentities($entry['title']);
 			echo "</div>";
-			
+
 			echo "<div class='serendipity_entry'>";
             echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id'])));
 			if ($extended && strlen($entry['extended'])) {
                 echo '<a name="#extended"></a>';
                 echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'], $entry['id'])));
-			} 
+			}
 			if ($entry['exflag'] && !$extended) {
 				echo "<br><div class='serendipity_time'><a href=\""
 					. $serendipity['serendipityHTTPPath']
@@ -294,7 +294,7 @@
 					. $entry['id']
 					. ".html#extended\">View Extended Entry</a></div><br>";
 			}
-		
+
 			echo "<div class='serendipity_time'><br><a href=\""
 				. $serendipity['serendipityHTTPPath']
 				. "archives/e_"
@@ -312,9 +312,9 @@
 					. "onClick=\"window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;\">"
 					. $entry['comments'] . " $label</a>";
 			}
-				
+
 			echo "</div>"; // serendipity_time
-		
+
 
 
             echo "\n<!--\n";
@@ -362,9 +362,9 @@
     } else {
         die('What are you up to? You need to be an admin to delete comments');
     }
-}			  
+}
 
-function serendipity_fetchComments($id, $limit = null) 
+function serendipity_fetchComments($id, $limit = null)
 {
     global $serendipity;
 
@@ -398,7 +398,7 @@
     <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>
     <?php
     	if ($_SESSION["serendipityAuthedUser"] === true) {
@@ -422,24 +422,26 @@
     $commentsFixed = serendipity_db_escape_string($commentInfo['comment']);
     $name = serendipity_db_escape_string($commentInfo['name']);
     $url = serendipity_db_escape_string($commentInfo['url']);
-    $email = serendipity_db_escape_string($commentInfo['email']);   
+    $email = serendipity_db_escape_string($commentInfo['email']);
 
     $t = time();
-    $query = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title)"; 
+    $query = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title)";
     $query .= " VALUES ('$id', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title')";
 
     serendipity_db_query($query);
 
-    $query = "UPDATE {$serendipity['dbPrefix']}entries SET comments=comments+1 WHERE id='$id'";
-    serendipity_db_query($query);
+	$field = ($type=='NORMAL' ? 'comments' : 'trackbacks');
 
-    $query = "SELECT email, title, mail_comments 
+    $query = "UPDATE {$serendipity['dbPrefix']}entries SET $field=$field+1 WHERE id='$id'";
+    var_dump(serendipity_db_query($query));
+
+    $query = "SELECT email, title, mail_comments
               FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
               WHERE e.id  = '$id'
               AND e.authorid = a.authorid";
     $row = serendipity_db_query($query, true);
     if($row['mail_comments']) {
-        serendipity_sendComment($row['email'], $name, $email, $url, $id, 
+        serendipity_sendComment($row['email'], $name, $email, $url, $id,
                           $row['title'], $comments);
     }
     serendipity_purgeEntry($id, $t);
@@ -447,7 +449,7 @@
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment) {
     global $serendipity;
-    $text = 
+    $text =
 sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity[blogTitle],$id)."
 
 IP Address: $_SERVER[REMOTE_ADDR]
@@ -459,13 +461,13 @@
 
 $comment
 
--- 
+--
 Powered by serendipity.
 My blog runs on PHP.  Yours can too.
 http://php-blog.sf.net/ to find out how.";
 mail($to, "[$serendipity[blogTitle]] New comment posted to $title",  $text,
      "From: $fromName <$fromEmail>\r\n");
-     
+
 }
 
 function serendipity_fetchReferences($id)
@@ -490,7 +492,7 @@
                 // extract author information
                 $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
                 $results = serendipity_db_query($query);
-                echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n"; 
+                echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n";
                 echo "<content:encoded>\n";
                 echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
@@ -522,7 +524,7 @@
     $ret = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$ret);
     $ret = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$ret);
     $ret = str_replace(chr(1), '\_', $ret);
-    
+
     //bold
     $ret = str_replace('\*',chr(1),$ret);
     $ret = str_replace('**',chr(2),$ret);
@@ -611,7 +613,7 @@
     @unlink("{$serendipity['serendipityPath']}/feeds/index.rss");
     @unlink("{$serendipity['serendipityPath']}/feeds/index.rss2");
     @unlink("{$serendipity['serendipityPath']}/index.html");
-}    
+}
 
 
 /**
@@ -640,9 +642,9 @@
         $pingback = $_SERVER['X-PINGBACK'];
     }
     else if(preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@', $body, $matches)) {
-        $pingback = $matches[1]; 
+        $pingback = $matches[1];
     }
-    else {  
+    else {
         return;
     }
         // xml-rpc hack
@@ -662,7 +664,7 @@
 </methodCall>";
         _serendipity_send($pingback, $query);
         return;
-}    
+}
 
 /**
  * Send a trackback ping
@@ -716,8 +718,8 @@
 
 function serendipity_reference_autodiscover($loc, $url, $author, $title, $text) {
     $fp = @fopen($loc, "r");
-    if(!$fp) { 
-        return; 
+    if(!$fp) {
+        return;
     }
     while(!feof($fp)) {
         $res .= fgets($fp, 1024);
@@ -732,7 +734,7 @@
  */
 function
 add_trackback ($id, $title, $url, $name, $excerpt)
-{   
+{
     global $serendipity;
 
     $comment['title'] = $title;
@@ -741,13 +743,13 @@
     $comment['comment'] = $excerpt;
 
     serendipity_saveComment($id, $comment, 'TRACKBACK');
-    
+
     return 1;
-} 
+}
 
 function
 add_pingback ($id, $postdata)
-{   
+{
     global $serendipity;
 
     if(preg_match('@<methodcall>\s*<methodName>\s*pingback.ping\s*</methodName>\s*<params>\s*<param>\s*<value>\s*<string>([^<])*</string>\s*</value>\s*</param>\s*<param>\s*<value>\s*<string>([^<])*</string>\s*</value>\s*</param>\s*</params>\s*</methodCall>@i', $postdata, $matches)) {
@@ -756,18 +758,18 @@
         $comment['title'] = '';
         $comment['url'] = $remote;
         $comment['comment'] = '';
-        $comment['name'] = ''; 
-        serendipity_saveComment($id, $comment, 'PINGBACK');
+        $comment['name'] = '';
+        serendipity_($id, $comment, 'PINGBACK');
         return 1;
     }
     return 0;
-} 
+}
 
 /**
  * Cut text
  */
 function
-serendipity_trackback_excerpt($text) 
+serendipity_trackback_excerpt($text)
 {
     return substr($text, 0, 255);
 }
@@ -794,7 +796,7 @@
 }
 
 function report_pingback_success ()
-{   
+{
 print <<<SUCCESS
 <?xml version="1.0"?>
 <methodResponse>
@@ -822,11 +824,11 @@
 /**
  * search through link body, and automatically send a trackback ping.
  */
-function 
+function
 serendipity_handle_references($id, $author, $title, $text)
 {
     global $serendipity;
-    
+
     if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?>([^<]*)</a>@i', $text, $matches)) {
         return;
     }
@@ -885,11 +887,11 @@
 
     $newEntry = 0;
     $exflag = 0;
-    
+
 	if (!is_numeric($entry["timestamp"])) {
 		$entry["timestamp"] = time();
 	}
-	
+
     if(strlen($entry["extended"])) {
         $exflag = 1;
     }
@@ -903,9 +905,9 @@
 
 		unset($entry['id']);
 		$entry['comments'] = 0;
-		
+
 		$res = serendipity_db_insert("entries", $entry);
-	
+
 		$entry['id'] = serendipity_db_insert_id();
         $newEntry = 1;
 	} else {
@@ -918,7 +920,7 @@
 	if (is_string($res)) {
 		return $res;
 	}
-	
+
     if($exflag) {
         serendipity_handle_references($entry['id'], $serendipity['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
     }
@@ -927,7 +929,7 @@
     }
 
     serendipity_purgeEntry($entry['id'], $entry['timestamp']);
-   
+
     return (int)$entry['id'];
 }
 
@@ -943,7 +945,7 @@
     if(strlen($entry["extended"])) {
         $exflag = 1;
     }
-    $querystring = "UPDATE ".$serendipity["dbPrefix"]."entries 
+    $querystring = "UPDATE ".$serendipity["dbPrefix"]."entries
                     SET title = '".serendipity_db_escape_string($entry["title"])."',
                         body = '".serendipity_db_escape_string($entry["body"])."',
                         extended = '".serendipity_db_escape_string($entry["extended"])."',
@@ -997,7 +999,7 @@
 	} else {
 		$res = serendipity_db_update('css', array('cssid' => $css['cssid']), $css);
 	}
-		
+
 	if (is_string($res)) {
 		return $res;
 	}
@@ -1048,19 +1050,19 @@
 			$loadfn = "imagecreatefromgif";
 			$savefn = "imagegif";
 			break;
-			
+
 		case 'jpeg':
 		case 'jpg':
 		case 'jfif':
 			$loadfn = "imagecreatefromjpeg";
 			$savefn = "imagejpeg";
 			break;
-			
+
 		case 'png':
 			$loadfn = "imagecreatefrompng";
 			$savefn = "imagepng";
 			break;
-			
+
 		default:
 			return false;
 	}
@@ -1090,10 +1092,10 @@
 	$t = serendipity_parseFileName($file);
     $f = $t[0];
     $suf = $t[1];
-   
+
 	$infile = $serendipity["serendipityPath"] . $serendipity["uploadPath"] . $file;
 	$outfile = $serendipity["serendipityPath"] . $serendipity["uploadPath"] . $f . "." . $serendipity["thumbSuffix"] . "." . $suf;
-   
+
 	if ($serendipity["magick"] !== true) {
 		return serendipity_resize_image_gd($infile, $outfile, $size, $size);
 	}
@@ -1117,7 +1119,7 @@
     if($serendipity["magick"] !== true) {
 		return serendipity_resize_image_gd($infile, $outfile, $width, $height);
 	}
-	
+
 	$cmd = $serendipity["convert"]." -scale ".$width."x$height $infile $outfile";
     $res = `$cmd`;
     return $res;
@@ -1131,7 +1133,7 @@
 
 	$i=0;
     serendipity_fetchImages();
-    
+
     $files = $serendipity["imageList"];
     for($x=0; $x<count($files); $x++) {
 		$f = serendipity_parseFileName($files[$x]);
@@ -1214,7 +1216,7 @@
     		</tr>
             <tr>
                 <td colspan="2"><?=ENTRY_BODY?></td>
-            </tr>   
+            </tr>
     		<tr>
 				<td colspan="2">
                 	<textarea name="serendipity[body]" id="serendipity[body]" cols=80 rows=20><?=$entry["body"]?></textarea>
@@ -1222,7 +1224,7 @@
     		</tr>
             <tr>
                 <td colspan="2"><?=EXTENDED_BODY?></td>
-            </tr>   
+            </tr>
     		<tr>
 				<td colspan="2">
                 	<textarea name="serendipity[extended]" id="serendipity[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
@@ -1269,7 +1271,7 @@
     		</tr>
             <tr>
                 <td colspan="2"><?=ENTRY_BODY?></td>
-            </tr>   
+            </tr>
     		<tr>
 				<td colspan="2">
                 	<textarea name="serendipity[body]" cols=80 rows=20><?=htmlentities($entry["body"])?></textarea>
@@ -1277,7 +1279,7 @@
     		</tr>
             <tr>
                 <td colspan="2"><?=EXTENDED_BODY?></td>
-            </tr>   
+            </tr>
     		<tr>
 				<td colspan="2">
                 	<textarea name="serendipity[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
@@ -1322,7 +1324,7 @@
 				$marker = "";
 			}
 
-			
+
 			$avail_options .= ">$marker" . htmlentities($cssname) . "</option>";
 		}
 	}
@@ -1349,7 +1351,7 @@
     		</tr>
             <tr>
                 <td colspan="2">CSS</td>
-            </tr>   
+            </tr>
     		<tr>
 				<td colspan="2">
                 	<textarea name="serendipity[data]" cols=80 rows=20><?=htmlentities($css["data"])?></textarea>
@@ -1379,7 +1381,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>	
+				<td>
 					<input type="submit" name="NEW" value="<?=CREATE_NEW_STYLESHEET?>">
 				</td>
 			</tr>
@@ -1405,7 +1407,7 @@
         return 1;
     }
 	$password = md5($password);
-    $query = "SELECT 
+    $query = "SELECT
                 *
               FROM
                 $serendipity[dbPrefix]authors
@@ -1433,16 +1435,16 @@
     }
 
     $url_parts = parse_url($_SERVER['HTTP_REFERER']);
-    if (!$url_parts['host'] || 
+    if (!$url_parts['host'] ||
         strstr($_url_parts['host'], $_SERVER['SERVER_NAME'])) {
         return;
     }
 
     if (rand(0, 100) < 1) {
         serendipity_track_referrer_gc();
-    } 
+    }
 
-    $suppressq = "SELECT count(1) 
+    $suppressq = "SELECT count(1)
                   FROM $serendipity[dbPrefix]suppress
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND scheme = '$url_parts[scheme]'
@@ -1452,7 +1454,7 @@
                   AND query = '$url_parts[query]'
                   AND last > now() - 900";
 
-  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress 
+  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND scheme = '$url_parts[scheme]'
                   AND host = '$url_parts[host]'
@@ -1460,7 +1462,7 @@
                   AND query = '$url_parts[query]'
                   AND path = '$url_parts[path]'";
     $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
-                  (ip, last, scheme, host, port, path, query)   
+                  (ip, last, scheme, host, port, path, query)
                   VALUES ('$_SERVER[REMOTE_ADDR]', now(), '$url_parts[scheme]', '$url_parts[host]', '$url_parts[port]', '$url_parts[path]', '$url_parts[query]')";
 
     $count = serendipity_db_query($suppressq, true);
@@ -1468,17 +1470,17 @@
     if ($count[0] > 0) {
         serendipity_db_query($suppressu);
         return;
-    } 
+    }
 
     serendipity_db_query($suppressp);
     serendipity_db_query($suppressu);
 
     serendipity_track_url('referrers', $_SERVER['HTTP_REFERER'], $entry);
-}    
+}
 
 function serendipity_track_referrer_gc() {
     global $serendipity;
-    
+
     $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900";
     serendipity_db_query($gc);
 }
@@ -1542,10 +1544,10 @@
 
     $query = "SELECT host, SUM(count) AS total
               FROM {$serendipity['dbPrefix']}$list
-              GROUP BY host 
+              GROUP BY host
               ORDER BY total DESC, host
               LIMIT $limit";
-    
+
     $rows = serendipity_db_query($query);
 
     if (is_array($rows)) {
@@ -1584,7 +1586,7 @@
     global $serendipity;
 
 	$names = array();
-		
+
 	$query = "SELECT cssid, name FROM $serendipity[dbPrefix]css ORDER BY name";
     $rows = serendipity_db_query($query);
 	foreach ($rows as $row) {
@@ -1615,7 +1617,7 @@
 {
 	static $init = false;
 	global $serendipity;
-	
+
 	if (isset ($serendipity["wysiwyg"]) && $serendipity["wysiwyg"]) {
 
 		if (!$init) {

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.8,1.9

From: <jhe...@us...> - 2003-05-22 21:06:50

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Superuser-login initially sends you to authoring suit now.


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_sidebar_items.php	22 May 2003 12:40:54 -0000	1.8
+++ serendipity_sidebar_items.php	22 May 2003 21:06:47 -0000	1.9
@@ -140,7 +140,7 @@
 		global $serendipity;
 
 		$title = SUPERUSER.":";
-		echo "<a href=\"$serendipity[serendipityHTTPPath]serendipity_admin.php\">\$ su -</a>";
+		echo "<a href=\"$serendipity[serendipityHTTPPath]entries\">\$ su -</a>";
 	}
 }

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

From: <tom...@us...> - 2003-05-22 12:47:33

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
Duplicate translation of SUPERUSER?

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_en.inc.php	21 May 2003 18:40:09 -0000	1.8
+++ serendipity_lang_en.inc.php	22 May 2003 12:47:30 -0000	1.9
@@ -124,7 +124,6 @@
 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');

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.7,1.8

From: <tom...@us...> - 2003-05-22 12:40:57

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Since we now use graphics in our Powered By, lets set the text as alt attr instead (and remove a bad <a>)

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_sidebar_items.php	22 May 2003 05:20:07 -0000	1.7
+++ serendipity_sidebar_items.php	22 May 2003 12:40:54 -0000	1.8
@@ -156,7 +156,7 @@
 		global $serendipity;
 
 		$title = POWERED_BY.":";
-		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['HTTPPath']}pixel/s10y_logo_small.png\" alt=\"s10y\" border=\"0\"/></a><br /> <a href=\"http://php-blog.sf.net/\">:serendipity</a> </div>";
+		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['HTTPPath']}pixel/s10y_logo_small.png\" alt=\":serendipity\" border=\"0\"/></a></div>";
 	}
 }

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.6,1.7

From: <ber...@us...> - 2003-05-22 05:20:10

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Relative path.

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_sidebar_items.php	21 May 2003 18:40:09 -0000	1.6
+++ serendipity_sidebar_items.php	22 May 2003 05:20:07 -0000	1.7
@@ -156,7 +156,7 @@
 		global $serendipity;
 
 		$title = POWERED_BY.":";
-		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['HTTPPath']}/pixel/s10y_logo_small.png\" alt=\"s10y\" border=\"0\"/></a><br /> <a href=\"http://php-blog.sf.net/\">:serendipity</a> </div>";
+		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['HTTPPath']}pixel/s10y_logo_small.png\" alt=\"s10y\" border=\"0\"/></a><br /> <a href=\"http://php-blog.sf.net/\">:serendipity</a> </div>";
 	}
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.40,1.41

From: <tom...@us...> - 2003-05-21 22:01:33

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Made comment-emails look pretty

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_functions.inc.php	21 May 2003 00:20:09 -0000	1.40
+++ serendipity_functions.inc.php	21 May 2003 22:01:29 -0000	1.41
@@ -418,14 +418,15 @@
     global $serendipity;
 
     $title = serendipity_db_escape_string($commentInfo['title']);
-    $comments = serendipity_db_escape_string($commentInfo['comment']);
+    $comments = $commentInfo['comment'];
+    $commentsFixed = serendipity_db_escape_string($commentInfo['comment']);
     $name = serendipity_db_escape_string($commentInfo['name']);
     $url = serendipity_db_escape_string($commentInfo['url']);
     $email = serendipity_db_escape_string($commentInfo['email']);   
 
     $t = time();
     $query = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title)"; 
-    $query .= " VALUES ('$id', '$name', '$email', '$url', '$comments', '$type', '$t', '$title')";
+    $query .= " VALUES ('$id', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title')";
 
     serendipity_db_query($query);

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.5,1.6 serendipity_lang_en.inc.php,1.7,1.8 serendipity_lang_de.inc.php,1.6,1.7

From: <jhe...@us...> - 2003-05-21 18:40:12

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

Modified Files:
	serendipity_sidebar_items.php serendipity_lang_en.inc.php 
	serendipity_lang_de.inc.php 
Log Message:
Hope, I didn't fsck anything up. This is a first draft of a s10y (:serendipity) logo...


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_sidebar_items.php	2 May 2003 21:21:33 -0000	1.5
+++ serendipity_sidebar_items.php	21 May 2003 18:40:09 -0000	1.6
@@ -139,7 +139,7 @@
 	{
 		global $serendipity;
 
-		$title = "Superuser:";
+		$title = SUPERUSER.":";
 		echo "<a href=\"$serendipity[serendipityHTTPPath]serendipity_admin.php\">\$ su -</a>";
 	}
 }
@@ -147,7 +147,7 @@
 class serendipity_plug_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{
-		$propbag->add('name',	PLUG);
+		$propbag->add('name',	POWERED_BY);
 		$propbag->add('description', ADVERTISES_BLAHBLAH);
 	}
 
@@ -155,8 +155,8 @@
 	{
 		global $serendipity;
 
-		$title = "";
-		echo "<div class=\"serendipityPlug\">Blog software: <a href=\"http://php-blog.sf.net/\">serendipity</a>!</div>";
+		$title = POWERED_BY.":";
+		echo "<div class=\"serendipityPlug\"><a href=\"http://php-blog.sf.net\"><img src=\"{$serendipity['HTTPPath']}/pixel/s10y_logo_small.png\" alt=\"s10y\" border=\"0\"/></a><br /> <a href=\"http://php-blog.sf.net/\">:serendipity</a> </div>";
 	}
 }
 

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_en.inc.php	21 May 2003 15:49:51 -0000	1.7
+++ serendipity_lang_en.inc.php	21 May 2003 18:40:09 -0000	1.8
@@ -137,8 +137,8 @@
 define("YOU_CHOSE", "You chose %s");
 define("IMAGE_SIZE", "Image size");
 define("IMAGE_AS_A_LINK", "Image as a link");
-
-
+define("POWERED_BY", "Powered by");
+define("SUPERUSER", "Superuser");
 
 define("serendipity_LANG_LOADED", true);
 

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_de.inc.php	12 May 2003 14:58:34 -0000	1.6
+++ serendipity_lang_de.inc.php	21 May 2003 18:40:09 -0000	1.7
@@ -135,6 +135,8 @@
 define("YOU_CHOSE", "Sie haben sich f&uuml;r  %s entschieden");
 define("IMAGE_SIZE", "Bildgr&ouml;&szlig;e");
 define("IMAGE_AS_A_LINK", "Bild als Link");
+define("POWERED_BY", "Powered by");
+define("SUPERUSER", "Besitzer login");

[php-blog-cvs] serendipity serendipity_admin.php,1.7,1.8 serendipity_lang_en.inc.php,1.6,1.7

From: <tom...@us...> - 2003-05-21 15:49:54

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

Modified Files:
	serendipity_admin.php serendipity_lang_en.inc.php 
Log Message:
Changed caption from 'Edit entries' to 'Authoring Suite'

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin.php	21 May 2003 15:47:49 -0000	1.7
+++ serendipity_admin.php	21 May 2003 15:49:50 -0000	1.8
@@ -75,7 +75,7 @@
 					</div>
 					</div>
                     &bull; <a href='<?=$serendipity['serendipityHTTPPath']?>entr
-ies'><?=EDIT_ENTRIES?></a><br />
+ies'><?=AUTHOR_SUITE?></a><br />
                     &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'><?=BACK_TO_BLOG?></a><br />
                     &bull; <a href='?serendipity[adminModule]=logout'><?=LOGOUT?></a>
                 </td>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_en.inc.php	18 May 2003 14:49:00 -0000	1.6
+++ serendipity_lang_en.inc.php	21 May 2003 15:49:51 -0000	1.7
@@ -57,6 +57,7 @@
 define("DOWN", "DOWN");
 define("ENTRIES", "Entries:");
 define("NEW_ENTRY", "New entry");
+define("AUTHOR_SUITE", "Authoring Suite");
 define("EDIT_ENTRIES", "Edit entries");
 define("DELETE_ENTRIES", "Delete entries");
 define("CATEGORIES", "Categories:");

[php-blog-cvs] serendipity serendipity_admin.php,1.6,1.7

From: <tom...@us...> - 2003-05-21 15:47:52

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

Modified Files:
	serendipity_admin.php 
Log Message:
Backed out 1.6, it totally broke author suite

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_admin.php	14 May 2003 17:33:21 -0000	1.6
+++ serendipity_admin.php	21 May 2003 15:47:49 -0000	1.7
@@ -74,7 +74,8 @@
                     &bull; <a href="?serendipity[adminModule]=interop"><?=IMPORT_EXPORT_ENTRIES?></a><br />
 					</div>
 					</div>
-                    &bull; <a href='?serendipity[adminModule]=entries'><?=EDIT_ENTRIES?></a><br />
+                    &bull; <a href='<?=$serendipity['serendipityHTTPPath']?>entr
+ies'><?=EDIT_ENTRIES?></a><br />
                     &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'><?=BACK_TO_BLOG?></a><br />
                     &bull; <a href='?serendipity[adminModule]=logout'><?=LOGOUT?></a>
                 </td>
@@ -98,10 +99,6 @@
 
 							case "plugins":
 								include "serendipity_admin_plugins.inc.php";
-								break;
-
-							case "entries":
-								include "serendipity_admin_entries.inc.php";
 								break;
 
                             case "interop":

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.39,1.40

From: <jhe...@us...> - 2003-05-21 00:20:16

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Thumbnails look much prettier like this when using imagick.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_functions.inc.php	28 Apr 2003 21:13:40 -0000	1.39
+++ serendipity_functions.inc.php	21 May 2003 00:20:09 -0000	1.40
@@ -133,7 +133,9 @@
                 // Be able to print borders nicely
                 $cellProp       = "";
                 if ($y==0) $cellProp = "FirstInRow";
+				if ($y==6) $cellProp = "LastInRow";
                 if ($x==4) $cellProp = "LastRow";
+				if ($x==4 && $y==6) $cellProp = "LastInLastRow";
             
                 // Start printing
                 if (($x>0 || $y>=$firstDayWeekDay) && $currDay<=$nrOfDays) {
@@ -157,7 +159,7 @@
                     $currDay++;
                 }
                 else {
-                    print ("<TD CLASS='serendipity_calendarBlankDay'>&nbsp;</TD>");
+                    print ("<TD CLASS='serendipity_calendarBlankDay$cellProp'>&nbsp;</TD>");
                 }
             }
             print ("</TR>");
@@ -1098,7 +1100,7 @@
 	/*if ($serendipity["dim"] == "height") $newSize = "*x".$serendipity["thumbSize"];
     else $newSize = $serendipity["thumbSize"]."x*"; */
     $newSize = $size."x$size";
-    $cmd = $serendipity["convert"]." ".$infile." -sample $newSize -antialias $outfile  2>&1";
+    $cmd = $serendipity["convert"]." -antialias -scale $newSize $infile $outfile  2>&1";
     $res = `$cmd`;
 	return $res;
 }

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.3,1.4

From: <tom...@us...> - 2003-05-18 20:52:24

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

Modified Files:
	serendipity_admin_images.inc.php 
Log Message:
Fixed layout; Added Delete feature; Improved rename JS; Suppressed errors from getimagesize

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_images.inc.php	6 Apr 2003 21:33:40 -0000	1.3
+++ serendipity_admin_images.inc.php	18 May 2003 20:52:20 -0000	1.4
@@ -21,7 +21,7 @@
 	<script language="javascript">
     <!--
 		function rename(fname) {
-			if(newname = prompt('Enter the new name for '+fname))
+			if(newname = prompt('Enter the new name for '+fname, fname))
                 location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[oldname]='+
                               escape(fname)+'&serendipity[newname]='+escape(newname);
         }
@@ -45,25 +45,25 @@
 
     	// Parse filename and image info
     	$f = serendipity_parseFileName($files[$x]);
-        $i = getimagesize($serendipity["serendipityPath"].$serendipity["uploadPath"]."/".$files[$x]);
+        $i = @getimagesize($serendipity["serendipityPath"].$serendipity["uploadPath"]."/".$files[$x]);
 
-		echo "<td class='serendipity_admin_list_item'>";
+		echo "<td class='serendipity_admin_list_item' width='50%' nowrap>";
 
         // Display a thumbnail?
-        if (file_exists($serendipity["serendipityPath"] . $serendipity["uploadPath"] . $f[0] . "." . $serendipity["thumbSuffix"] . "." . $f[1])) {
+        echo "<b>".$files[$x]."</b><br>";
+	if (file_exists($serendipity["serendipityPath"] . $serendipity["uploadPath"] . $f[0] . "." . $serendipity["thumbSuffix"] . "." . $f[1])) {
 			echo "<img align='left' src='".$serendipity['serendipityHTTPPath'] . $serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."' hspace='15'>";
         }
 
         // Display image name and resolution
-		echo "<b>".$files[$x]."</b><br>";
-        echo $i[0]."x".$i[1]."<br>";
+        echo "<br>". $i[0]."x".$i[1]."<br>";
 
         // Display tools
-        echo "<img class='serendipityImageButton' alt='Fullsize' src='".$serendipity["serendipityHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open(".
-             "'".$serendipity["serendipityHTTPPath"].$serendipity["uploadHTTPPath"].$files[$x]."','Zoom','height=".($i[1]+20).",width=".($i[0]+20)."');\">";
+        echo "<img class='serendipityImageButton' alt='Fullsize' src='".$serendipity["serendipityHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open('".$serendipity["serendipityHTTPPath"].$serendipity["uploadHTTPPath"].$files[$x]."','Zoom','height=".($i[1]+20).",width=".($i[0]+20).",toolbar=no,menubar=no,location=no');\">";
         echo "<img class='serendipityImageButton' alt='Rename this image' src='".$serendipity["serendipityHTTPPath"]."pixel/rename.png' onClick='rename(\"".addslashes($files[$x])."\")' border='0'>";
         echo "<img class='serendipityImageButton' alt='Resize this image' src='".$serendipity["serendipityHTTPPath"]."pixel/scale.png' border='0' onClick='location.href=\"?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=".rawurlencode($files[$x])."\";'>";
-        echo "</td>";
+        echo "<img class='serendipityImageButton' alt='Delete this image' src='".$serendipity["serendipityHTTPPath"]."pixel/delete.png' onClick='location.href=\"?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=".rawurlencode($files[$x])."\";' border='0'>";
+	echo "</td>";
 
         // Linebreak?
         if (($x+1)%2 == 0) echo "</tr><tr>";
@@ -78,14 +78,43 @@
 switch ($serendipity["GET"]["adminAction"]) {
 
 	case "genThumbs":
-    	set_time_limit(0);
-        ignore_user_abort();
-        echo "<b>Resizing:</b><p>";
-        flush();
+    		set_time_limit(0);
+        	ignore_user_abort();
+        	echo "<b>Resizing:</b><p>";
+        	flush();
 		$i = serendipity_generateThumbs();
-        echo "Done (resized $i images).";
-    break;
+        	echo "Done (resized $i images).";
+    		break;
 
+	case "DoDelete":
+		if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
+			if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["fname"]) ) {
+				echo "Deleted the image entitled <b>". $serendipity['fname'] ."</b>";
+			} else {
+				echo "Unable to delete <b>". $serendipity['fname'] ."</b>";
+			}
+		} else {
+			echo "I was unable to locate the file entitled <b>". $serendipity['fname'] ."</b>, maybe it has already been deleted?";
+		}
+
+		break;	
+	case "delete":
+		$file = $serendipity['fname'];
+		
+		
+		echo "You are about to delete <b>$file</b><br>";
+		echo "If you are using this file in some of your entries, it will cause dead images<br>";
+		echo "Are you sure you wish to proceed?<p>";
+		
+		$newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images&serendipity[adminAction]=DoDelete&serendipity[fname]=". $serendipity['fname'];
+		echo "<input type='button' value='Delete the image' onClick='location.href=\"$newLoc\"'>";
+			 	 
+		echo str_repeat("&nbsp;", 10);
+					 	 
+		$newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images";
+		echo "<input type='button' value='Abort now' onClick='location.href=\"$newLoc\"'>";
+		break;
+	
 	case "rename":
 		if ($serendipity["GET"]["oldname"] != "" && $serendipity["GET"]["newname"]!= "" &&
             file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"]) &&

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

Flat | Threaded

<< < 1 .. 539 540 541 542 543 .. 551 > >> (Page 541 of 551)