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
|
|
From: Sterling H. <ste...@bu...> - 2003-08-10 21:59:38
|
> - if($_SESSION['serendipityAuthedUser'] == true) {
> + if( $_SESSION['serendipityAuthedUser'] == true ) {
I'm normally not a bitch about whitespace, but:
a) Please don't mix whitespace commits with code commits
b) Please don't change good style to bad style, the correct (and
consistent) style is either:
if (condition)
or
if(condition)
and not:
if ( condition )
-Sterling
--
Premature optimization is the root of all evil
- Donald E. Knuth
|
|
From: <tom...@us...> - 2003-08-10 18:10:03
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv14517
Modified Files:
serendipity.css.php
Log Message:
What was that doing there?
Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity.css.php 10 Aug 2003 17:58:21 -0000 1.20
+++ serendipity.css.php 10 Aug 2003 18:10:00 -0000 1.21
@@ -17,7 +17,7 @@
}
include_once('serendipity_config.inc.php');
if ( file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css') ) {
- serendipity_printStylesheet($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css');
+ serendipity_printStylesheet($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css');
} else {
$css = serendipity_getCSS($_REQUEST['style']);
echo $css['data'];
|
|
From: <tom...@us...> - 2003-08-10 17:58:24
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv12542
Modified Files:
serendipity.css.php
Log Message:
We don't have get_config_var during installation, so we can't use it in printStylesheet(), use dirname() to calculate TEMPLATE_PATH instead
Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity.css.php 20 Jul 2003 00:28:52 -0000 1.19
+++ serendipity.css.php 10 Aug 2003 17:58:21 -0000 1.20
@@ -3,7 +3,7 @@
header('Content-type: text/css');
function serendipity_printStylesheet($file) {
global $serendipity;
- echo str_replace('{TEMPLATE_PATH}', $serendipity['serendipityHTTPPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') .'/', file_get_contents($file));
+ echo str_replace('{TEMPLATE_PATH}', dirname($file) .'/', file_get_contents($file));
}
|
|
From: <tom...@us...> - 2003-08-10 17:56:13
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv12276
Modified Files:
serendipity_admin.php serendipity_entries.php
serendipity_functions.inc.php
Log Message:
New way of logging in.
This will provide a better overview (and unified function) of the login procedures.
It also fixes a number of problems with correct HTML during login and installation
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin.php 5 Aug 2003 14:07:40 -0000 1.17
+++ serendipity_admin.php 10 Aug 2003 17:56:10 -0000 1.18
@@ -10,14 +10,6 @@
include_once 'serendipity_lang.inc.php';
$_SESSION['serendipityAuthedUser'] = true;
}
-
-// User logs in?
-if($_SESSION['serendipityAuthedUser']
- || serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
-
- $_SESSION['serendipityAuthedUser'] = true;
- $serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
-}
?>
<html>
<head>
@@ -44,34 +36,20 @@
}
?>
</div>
-
-<?php
-// User has to log in
-if ($_SESSION['serendipityAuthedUser'] !== true
- && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
-?>
- <div class='serendipity_auth_required'>
- <?php echo HAVE_TO_BE_LOGGED_ON; ?>
- <form action="?" method="post">
- <div>
- <input type="hidden" name="serendipity[action]" value="admin" />
- <input type="text" name="serendipity[user]" value="<?php echo USERNAME; ?>" onfocus="value='';" />
- <input type="password" name="serendipity[pass]" value="<?php echo PASSWORD ?>" onfocus="value='';" />
- <input type="submit" name="submit" value=">" />
- </form>
- </div>
+ <table id="mainpane">
+ <tr id="content" valign="top">
<?php
-} elseif (!file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
+if ( !file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php') ) {
// User just installed serendipity, let him go to configure mode
?>
- <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
- <p><?php include('serendipity_admin_installer.inc.php'); ?>
+ <td class="serendipity_admin">
+ <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
+ <p><?php include('serendipity_admin_installer.inc.php'); ?>
<?php
+} elseif ( !serendipity_userLoggedIn() ) {
+ serendipity_printLogin();
} else {
- // User is logged in
?>
- <table id="mainpane">
- <tr id="content" valign="top">
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
<div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div>
@@ -133,13 +111,11 @@
default:
include 'serendipity_admin_overview.inc.php';
}
+}
?>
</td>
</tr>
</table>
-<?php
-}
-?>
</body>
</html>
Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_entries.php 16 Jul 2003 11:59:28 -0000 1.14
+++ serendipity_entries.php 10 Aug 2003 17:56:10 -0000 1.15
@@ -7,12 +7,6 @@
$_SESSION['serendipityAuthedUser'] = true;
}
-// User logs in?
-if ($_SESSION['serendipityAuthedUser']
- || serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
- $_SESSION['serendipityAuthedUser'] = true;
- $serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
-}
?>
<html>
<head>
@@ -45,23 +39,9 @@
<table id="mainpane">
<tr id="content" valign="top">
<?php
-// User has to log in
-if ($_SESSION['serendipityAuthedUser'] !== true
- && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
-?>
- <td class="serendipity_admin">
- <div class='serendipity_auth_required'>
- <?php echo HAVE_TO_BE_LOGGED_ON; ?>
- <form action="?" method="post">
- <input type="hidden" name="serendipity[action]" value="admin" />
- <input type="text" name="serendipity[user]" value="username" onfocus="value='';" />
- <input type="password" name="serendipity[pass]" value="password" onfocus="value='';" />
- <input type="submit" name="submit" value=">">
- </form>
- </div>
-<?php
+if ( !serendipity_userLoggedIn() ) {
+ serendipity_printLogin();
} else {
- // User is logged in
?>
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
@@ -126,13 +106,11 @@
default:
include 'serendipity_entries_overview.inc.php';
}
+ }
?>
</td>
</tr>
</table>
-<?php
-}
-?>
</body>
</html>
<?php
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- serendipity_functions.inc.php 10 Aug 2003 16:56:25 -0000 1.122
+++ serendipity_functions.inc.php 10 Aug 2003 17:56:10 -0000 1.123
@@ -5,6 +5,37 @@
include_once('./serendipity_functions_config.inc.php');
$serendipity['imageList'] = array();
+function serendipity_userLoggedIn() {
+ global $serendipity;
+ if ( serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass']) ) {
+ $_SESSION['serendipityAuthedUser'] = true;
+ $serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
+ return true;
+ }
+
+ if ( $_SESSION['serendipityAuthedUser'] === true && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php') ) {
+ return true;
+ } else {
+ return false;
+ }
+
+}
+
+function serendipity_printLogin() {
+?>
+ <td class="serendipity_admin">
+ <div class='serendipity_auth_required'>
+ <?php echo HAVE_TO_BE_LOGGED_ON; ?>
+ <form action="?" method="post">
+ <input type="hidden" name="serendipity[action]" value="admin" />
+ <input type="text" name="serendipity[user]" value="<?php echo USERNAME; ?>" onfocus="value='';" />
+ <input type="password" name="serendipity[pass]" value="<?php echo PASSWORD ?>" onfocus="value='';" />
+ <input type="submit" name="submit" value=">" />
+ </form>
+ </div>
+<?php
+}
+
function serendipity_getTemplateFile($file) {
global $serendipity;
if ( file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/'. $file) ) {
@@ -1752,11 +1783,11 @@
function serendipity_authenticate_author($username, $password) {
global $serendipity;
- if($_SESSION['serendipityAuthedUser'] == true) {
+ if( $_SESSION['serendipityAuthedUser'] == true ) {
$serendipity['serendipityUser'] = $_SESSION['serendipityUser'];
$serendipity['serendipityEmail'] = $_SESSION['serendipityEmail'];
$serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
- return 1;
+ return true;
}
$password = md5($password);
@@ -1778,10 +1809,10 @@
$_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username;
$_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email'];
$_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid'];
- return 1;
+ return true;
}
- return 0;
+ return false;
}
function serendipity_track_referrer($entry = 0) {
|
|
From: <tom...@us...> - 2003-08-10 16:56:29
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv3056
Modified Files:
serendipity_functions.inc.php
Log Message:
Don't send notification if user is an admin.
Will prevent mails getting sent when oneself submits a comment.
This needs to be removed once we go Multi-User?
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- serendipity_functions.inc.php 9 Aug 2003 00:57:49 -0000 1.121
+++ serendipity_functions.inc.php 10 Aug 2003 16:56:25 -0000 1.122
@@ -776,7 +776,7 @@
AND e.authorid = a.authorid";
$row = serendipity_db_query($query, true);
- if($row['mail_comments']) {
+ if( $row['mail_comments'] ) {
serendipity_sendComment($row['email'], $name, $email, $url, $id, $row['title'], $comments, $type);
}
serendipity_purgeEntry($id, $t);
@@ -798,6 +798,10 @@
function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
global $serendipity;
+
+ if ( $_SESSION['serendipityAuthedUser'] && $type == 'NORMAL' ) {
+ return true;
+ }
$entryURI = serendipity_archiveURL($id, $title);
@@ -829,7 +833,7 @@
. "\n" . 'The best blog around, you can use it too.'
. "\n" . 'Check out <http://s9y.org> to find out how.';
- mail($to, $subject, $text.$signature, "From: $fromName <$fromEmail>\r\n");
+ return mail($to, $subject, $text.$signature, "From: $fromName <$fromEmail>\r\n");
}
function serendipity_fetchReferences($id)
@@ -1192,7 +1196,7 @@
if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@i', $res, $matches)) {
return;
}
-
+
if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@i', $res, $test)) {
if ($loc != $test[1]) {
return;
@@ -1209,18 +1213,12 @@
}
function serendipity_reference_autodiscover($loc, $url, $author, $title, $text) {
- $fp = @fopen($loc, 'r');
- if(!$fp) {
- return;
- }
-
- while(!feof($fp)) {
- $res .= fgets($fp, 1024);
+ $res = @file_get_contents($loc);
+
+ if ( strlen($res) != 0 ) {
+ serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text);
+ serendipity_pingback_autodiscover($loc, $res);
}
-
- fclose($fp);
- serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text);
- serendipity_pingback_autodiscover($loc, $res);
}
/**
@@ -1343,6 +1341,7 @@
if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?>([^<]*)</a>@i', $text, $matches)) {
return;
}
+
// remove full matches
array_shift($matches);
|
|
From: <tom...@us...> - 2003-08-09 12:45:07
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv26452
Modified Files:
serendipity_admin_installer.inc.php
Log Message:
Trying not to use static colors in the installer, so that it will be usable on black/dark themes to
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_admin_installer.inc.php 9 Aug 2003 12:41:39 -0000 1.26
+++ serendipity_admin_installer.inc.php 9 Aug 2003 12:45:04 -0000 1.27
@@ -162,7 +162,7 @@
<tr>
<td>
- <table width="100%" cellspacing="2" cellpadding="3" style="display: none;" id="el<?php echo $el_count; ?>">
+ <table width="100%" cellspacing="0" cellpadding="3" style="display: none;" id="el<?php echo $el_count; ?>">
<?php
for ($x=0; $x<count($value); $x++) {
if (@is_array($from)) {
@@ -170,13 +170,13 @@
}
?>
<tr>
- <td align="left" bgcolor="#D8D8D8" valign="top">
+ <td style="border-bottom: 1px #000000 solid" align="left" valign="top">
<strong><span style="font-size: 9pt"><?php echo $value[$x]['longname']; ?></span></strong>
<br />
<span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
</th>
- <td align="left" bgcolor="#E0E0E0" valign="top" width="1">
+ <td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="1">
<?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $from[$value[$x]['name']], $value[$x]['default']); ?>
</th>
</tr>
|
|
From: <tom...@us...> - 2003-08-09 12:41:42
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv22498
Modified Files:
serendipity_admin_installer.inc.php
serendipity_lang_en.inc.php
Log Message:
Yeah, but it needs to look better...
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_admin_installer.inc.php 9 Aug 2003 00:57:49 -0000 1.25
+++ serendipity_admin_installer.inc.php 9 Aug 2003 12:41:39 -0000 1.26
@@ -147,9 +147,7 @@
<input type="hidden" name="installAction" value="check" />
<br />
<div align="right">
- <a href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" /></a>
-
- <a href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><?php echo TOGGLE_ALL; ?></a><br />
+ <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" /> <span style="font-size: 8pt"><?php echo TOGGLE_ALL; ?></a></a><br />
</div>
<?php
$el_count = 0;
@@ -159,9 +157,7 @@
<table width="100%" cellspacing="2">
<tr>
<th align="left" colspan="2" style="padding-left: 15px;">
- <a href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /></a>
-
- <a href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><?php echo $key; ?></a></th>
+ <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /> <span style="font-size: 8pt"><?php echo $key; ?></span></a></th>
</tr>
<tr>
@@ -175,7 +171,7 @@
?>
<tr>
<td align="left" bgcolor="#D8D8D8" valign="top">
- <strong><?php echo $value[$x]['longname']; ?></strong>
+ <strong><span style="font-size: 9pt"><?php echo $value[$x]['longname']; ?></span></strong>
<br />
<span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
</th>
Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_en.inc.php 9 Aug 2003 00:57:49 -0000 1.26
+++ serendipity_lang_en.inc.php 9 Aug 2003 12:41:39 -0000 1.27
@@ -243,7 +243,7 @@
define('SCALING_IMAGE', 'Scaling %s to %s x %s px');
define('KEEP_PROPORTIONS', 'Keep proportions');
define('REALLY_SCALE_IMAGE', 'Really scale the image? No way back!');
-define('TOGGLE_ALL', 'Toggle display all options');
+define('TOGGLE_ALL', 'Toggle expand all');
define('TOGGLE_OPTION', 'Toggle option');
define('serendipity_LANG_LOADED', true);
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv3567
Modified Files:
serendipity_admin_installer.inc.php
serendipity_config_local.tpl serendipity_functions.inc.php
serendipity_lang_de.inc.php serendipity_lang_en.inc.php NEWS
Log Message:
o Nested display of installer using DHTML (on a non-capable browser it's
displayed like before)
o New config category 'Appearance' for installer
o New config option blockReferer to block some hosts from being put into the
referers table
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_admin_installer.inc.php 5 Aug 2003 14:07:40 -0000 1.24
+++ serendipity_admin_installer.inc.php 9 Aug 2003 00:57:49 -0000 1.25
@@ -19,7 +19,7 @@
return sprintf(
'http%s://%s%s%s/',
-
+
$ssl ? 's' : '',
$_SERVER['HTTP_HOST'],
(($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
@@ -62,7 +62,7 @@
$current = trim(substr($l, 2));
$config[$current] = array();
}
-
+
break;
// A configure option
@@ -108,22 +108,65 @@
function serendipity_printConfigTemplate($t, $from = false) {
global $serendipity;
?>
+<script type="text/javascript" language="JavaScript">
+function showConfig(id) {
+ if (document.getElementById) {
+ el = document.getElementById(id);
+ if (el.style.display == 'none') {
+ document.getElementById('option' + id).src = 'pixel/minus.png';
+ el.style.display = '';
+ } else {
+ document.getElementById('option' + id).src = 'pixel/plus.png';
+ el.style.display = 'none';
+ }
+ }
+}
+
+var state='';
+function showConfigAll(count) {
+ if (document.getElementById) {
+ for (i = 1; i <= count; i++) {
+ document.getElementById('el' + i).style.display = state;
+ document.getElementById('optionel' + i).src = 'pixel/' + (state == '' ? 'minus.png' : 'plus.png');
+ }
+
+ if (state == '') {
+ document.getElementById('optionall').src = 'pixel/minus.png';
+ state = 'none';
+ } else {
+ document.getElementById('optionall').src = 'pixel/plus.png';
+ state = '';
+ }
+ }
+}
+</script>
+
<form action="?" method="POST">
<div>
<input type="hidden" name="serendipity[adminModule]" value="installer" />
<input type="hidden" name="installAction" value="check" />
<br />
+ <div align="right">
+ <a href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" /></a>
+
+ <a href="#" onclick="showConfigAll(<?php echo count($t); ?>)" title="<?php echo TOGGLE_ALL; ?>"><?php echo TOGGLE_ALL; ?></a><br />
+ </div>
<?php
+ $el_count = 0;
foreach ($t as $key => $value) {
+ $el_count++;
?>
<table width="100%" cellspacing="2">
<tr>
- <th align="left" colspan="2"><?php echo $key; ?></th>
+ <th align="left" colspan="2" style="padding-left: 15px;">
+ <a href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /></a>
+
+ <a href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><?php echo $key; ?></a></th>
</tr>
-
+
<tr>
<td>
- <table width="100%" cellspacing="2" cellpadding="3">
+ <table width="100%" cellspacing="2" cellpadding="3" style="display: none;" id="el<?php echo $el_count; ?>">
<?php
for ($x=0; $x<count($value); $x++) {
if (@is_array($from)) {
@@ -136,7 +179,7 @@
<br />
<span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
</th>
-
+
<td align="left" bgcolor="#E0E0E0" valign="top" width="1">
<?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $from[$value[$x]['name']], $value[$x]['default']); ?>
</th>
@@ -144,7 +187,7 @@
<?php
}
?>
- </table>
+ </table><br /><br />
</td>
</tr>
</table>
@@ -280,12 +323,12 @@
'{PREFIX}',
'{indexFile}'
),
-
+
array(
$_POST['serendipityHTTPPath'],
$_POST['indexFile']
),
-
+
implode('', $a)
);
@@ -347,16 +390,16 @@
/* If we already have serendipity installed, all we need to do is write the configuration again */
if (IN_serendipity !== true) {
$res = serendipity_checkInstallation();
-
+
if (is_array($res)) {
echo DIAGNOSTIC_ERROR . '<br /><br />';
echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
serendipity_printConfigTemplate(serendipity_parseTemplate('./serendipity_config_local.tpl'), $_POST);
die();
}
-
+
echo '<br />';
-
+
/* We are good to go, lets install databases etc. */
echo ATTEMPT_SETUP_DATABASE;
$res = serendipity_installDatabase();
@@ -365,7 +408,7 @@
} else {
echo '<span style="color: #FF0000">- ' . $res . '</span><br />';
}
-
+
/* Next are the files, .htaccess */
printf(ATTEMPT_WRITE_FILE, '.htaccess');
$res = serendipity_installFiles();
@@ -375,31 +418,31 @@
} else {
echo DONE . '<br />';
}
-
+
/* We are now installed */
define('IN_serendipity', true);
-
+
/* register default plugins */
$GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
$GLOBALS['serendipity']['dbName'] = $_POST['dbName'];
-
+
include_once 'serendipity_plugin_api.php';
serendipity_plugin_api::register_default_plugins();
-
+
printf(
SERENDIPITY_INSTALLED . '<br />',
-
+
'<p><strong>',
'</strong></p>',
-
+
$_POST['pass'],
$_POST['user'],
-
+
'<br /><br />',
-
+
$_POST['serendipityHTTPPath']
);
-
+
session_destroy();
}
@@ -420,7 +463,7 @@
else {
$from = false;
}
-
+
serendipity_printConfigTemplate(serendipity_parseTemplate('./serendipity_config_local.tpl'), $from);
}
Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_config_local.tpl 21 Jul 2003 02:37:12 -0000 1.13
+++ serendipity_config_local.tpl 9 Aug 2003 00:57:49 -0000 1.14
@@ -22,15 +22,18 @@
$serendipity['pass'] = '{Admin password|pass|protected|john}'; // Password for admin login
$serendipity['email'] = '{Admin email|email|string|jo...@ex...}'; // Email for admin login
$serendipity['want_mail'] = '{Send mails to admin?|want_mail|bool|1}'; // Do you want to receive emails when comments are posted to your entries?
-$serendipity['extCSS'] = '{External Stylesheet|extCSS|string|none}'; // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
-$serendipity['wysiwyg'] = '{Use WYSIWYG editor|wysiwyg|bool|0}'; // Do you want to use the WYSIWYG editor (CAUTION: only turn this on if you use Microsoft's Internet Explorer!!!)?
-$serendipity['XHTML11'] = '{Force XHTML 1.1 compliance|XHTML11|bool|0}'; // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
-$serendipity['embed'] = '{Is serendipity embedded?|embed|bool|0}'; // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers.
$serendipity['blogTitle'] = '{Blog name|blogTitle|string|John Doe's personal blog}'; // The title of your blog
$serendipity['blogDescription'] = '{Blog description|blogDescription|string|Welcome to my blog...}'; // Description of your blog
$serendipity['lang'] = '{Language file|lang|string|en}'; // Language (for 'en' you need serendipity_lang_en.inc.php).
+
+// Appearance and options
+$serendipity['extCSS'] = '{External Stylesheet|extCSS|string|none}'; // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
+$serendipity['wysiwyg'] = '{Use WYSIWYG editor|wysiwyg|bool|0}'; // Do you want to use the WYSIWYG editor (CAUTION: only turn this on if you use Microsoft's Internet Explorer!!!)?
+$serendipity['XHTML11'] = '{Force XHTML 1.1 compliance|XHTML11|bool|0}'; // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
+$serendipity['embed'] = '{Is serendipity embedded?|embed|bool|0}'; // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers.
$serendipity['track_exits'] = '{Track exit URLs|track_exits|bool|1}'; // Do you want to track exit targets?
+$serendipity['blockReferer'] = '{Blocked Referers|blockReferer|string|;}'; // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
// Imageconversion Settings
$serendipity['magick'] = '{Use Imagemagick|magick|bool|0}'; // Do you have image magick installed
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- serendipity_functions.inc.php 8 Aug 2003 23:54:23 -0000 1.120
+++ serendipity_functions.inc.php 9 Aug 2003 00:57:49 -0000 1.121
@@ -1792,11 +1792,23 @@
return;
}
+ if (!is_array($serendipity['_blockReferer'])) {
+ // Only generate an array once per call
+ $serendipity['_blockReferer'] = array();
+ $serendipity['_blockReferer'] = @explode(';', $serendipity['blockReferer']);
+ }
+
$url_parts = parse_url($_SERVER['HTTP_REFERER']);
$host_parts = explode('.', $url_parts['host']);
if (!$url_parts['host'] ||
strstr($url_parts['host'], $_SERVER['SERVER_NAME'])) {
return;
+ }
+
+ foreach($serendipity['_blockReferer'] AS $idx => $hostname) {
+ if (strstr($url_pars['host'], $hostname)) {
+ return;
+ }
}
if (rand(0, 100) < 1) {
Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_de.inc.php 8 Aug 2003 23:22:02 -0000 1.19
+++ serendipity_lang_de.inc.php 9 Aug 2003 00:57:49 -0000 1.20
@@ -243,6 +243,8 @@
define('KEEP_PROPORTIONS', 'Proportionen beibehalten');
define('REALLY_SCALE_IMAGE', 'Bildgröße wirklich verändert? Kein zurück!');
define('RUNNING', 'Sie benutzen serendipity v.');
+define('TOGGLE_ALL', 'Alle Optionen ein-/ausblenden');
+define('TOGGLE_OPTION', 'Option ein-/ausblenden');
define('serendipity_LANG_LOADED', true);
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_en.inc.php 8 Aug 2003 21:01:22 -0000 1.25
+++ serendipity_lang_en.inc.php 9 Aug 2003 00:57:49 -0000 1.26
@@ -243,6 +243,8 @@
define('SCALING_IMAGE', 'Scaling %s to %s x %s px');
define('KEEP_PROPORTIONS', 'Keep proportions');
define('REALLY_SCALE_IMAGE', 'Really scale the image? No way back!');
+define('TOGGLE_ALL', 'Toggle display all options');
+define('TOGGLE_OPTION', 'Toggle option');
define('serendipity_LANG_LOADED', true);
/* vim: set sts=4 ts=4 expandtab : */
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- NEWS 5 Aug 2003 14:07:40 -0000 1.7
+++ NEWS 9 Aug 2003 00:57:49 -0000 1.8
@@ -2,6 +2,10 @@
Version 0.3 ()
------------------------------------
+ * Fixed trackback functionality (tomsommer)
+ * New config section ('Appearance') and new option to block certain hosts from being put into the referer table (garvinhicking)
+ * Categories can now be folded in DHTML-compatible browsers for better overview (garvinhicking)
+ * Conserve linebreaks in RSS comments. (garvinhicking)
* Allow deleting categories (moving articles to another category) (garvinhicking)
* Autodetect language on installation (garvinhicking)
* RSS feeds properly utf8encoded, added <webMaster>,<managingEditor>,<comments>,<category> and <generator> tag (garvinhicking)
|
|
From: <gar...@us...> - 2003-08-08 23:54:26
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29036
Modified Files:
serendipity_functions.inc.php
Log Message:
o nl2br() for RSS-Feed output. We do want our linebreaks conserved, don't we? :)
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- serendipity_functions.inc.php 8 Aug 2003 22:02:47 -0000 1.119
+++ serendipity_functions.inc.php 8 Aug 2003 23:54:23 -0000 1.120
@@ -40,11 +40,11 @@
$data[strtolower($currSec)][] = trim($j[0]);
}
}
-
+
foreach ($data as $k => $v) {
$data[$k] = implode("\n", $v);
}
-
+
return $data;
}
@@ -76,15 +76,15 @@
<tr>
<td colspan="3"><strong><?php echo $info['name']; ?></strong></td>
</tr>
-
+
<tr>
<td width="100"><?php echo $preview; ?></td>
-
+
<td valign="top">
<?php echo AUTHOR; ?> : <?php echo $info['author'];?><br />
<?php echo LAST_UPDATED; ?>: <?php echo $info['date']; ?>
</td>
-
+
<td valign="middle">
<div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
</td>
@@ -240,7 +240,7 @@
<tr>
<?php
foreach($serendipity['weekDayAbb'] AS $weekKey => $weekVal) {
-?>
+?>
<td class="serendipity_weekDayName" align="center"><?php echo $weekVal; ?></td>
<?php
}
@@ -256,7 +256,7 @@
if ($currDay>$nrOfDays) {
break;
}
-
+
// Prepare row
for ($y=0; $y<7; $y++) {
// Be able to print borders nicely
@@ -271,22 +271,22 @@
} else {
$cellProp = '';
}
-
+
// Start printing
if ( ($x > 0 || $y >= $firstDayWeekDay)
&& $currDay <= $nrOfDays) {
-
+
if ($activeDays[$currDay] > 1) {
$cellProp .= 'Active';
}
-
+
// Print day
if ($serendipity['rewrite'] == true) {
$link = $serendipity['serendipityHTTPPath'] . 'archives/' . date('Ymd', mktime(0,0,0, $month, $currDay, $year)) . '.html';
} else {
$link = 'fixme!';
}
-
+
if (date('m') == $month
&& date('Y') == $year
&& $currDay == date('j')) {
@@ -296,7 +296,7 @@
$att_start = '';
$att_end = '';
}
-
+
if ($activeDays[$currDay] > 1) {
$lnk_start = '<a href="' . $link . '">'; //?month=".sprintf("%02d",$month)."&year=$year'>");
$lnk_end = '</a>';
@@ -304,7 +304,7 @@
$lnk_start = '';
$lnk_end = '';
}
-
+
$currDay++;
?>
<td class="serendipity_calendarDay<?php echo $cellProp; ?>">
@@ -340,7 +340,7 @@
$year = (int)substr($range, 0, 4);
$month = (int)substr($range, 4, 2);
$day = (int)substr($range, 6, 2);
-
+
$startts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
if ( $day == 0 ) {
$month++;
@@ -348,7 +348,7 @@
$day++;
}
$endts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
-
+
$and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
} else {
$and = "";
@@ -372,7 +372,7 @@
LEFT JOIN {$serendipity['dbPrefix']}category c
ON e.categoryid = c.categoryid)
LEFT JOIN {$serendipity['dbPrefix']}authors a
- ON e.authorid = a.authorid $and
+ ON e.authorid = a.authorid $and
ORDER BY
timestamp DESC
$limit";
@@ -491,13 +491,13 @@
<?php
foreach ($ents as $x => $entry) {
$entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
-
+
$html_extended = '';
if ($extended && strlen($entry['extended'])) {
$html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="#extended"></a>';
$html_extended .= nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'], $entry['id'])));
}
-
+
if ($entry['exflag'] && !$extended) {
$html_extended = '<br /><a href="' . $entryLink . '#extended">' . VIEW_EXTENDED_ENTRY . '</a><br />';
}
@@ -507,7 +507,7 @@
<div class="serendipity_entry">
<?php echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id']))) . $html_extended; ?>
-
+
<div class='serendipity_entryFooter'>
<?php
echo ' ' . POSTED_BY . ' ' . htmlentities($entry['username']) . ($entry['category_name'] ? ' ' . IN . " ${entry['category_name']} " : ' ') . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
@@ -525,7 +525,7 @@
}
?>
</div>
-
+
<!--
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
@@ -543,7 +543,7 @@
?>
<link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&entry_id=<?php echo$entry['id']; ?>" />
<br />
-
+
<div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
<?php echo serendipity_printComments(serendipity_fetchComments($entry['id'])); ?>
<br />
@@ -602,7 +602,7 @@
} else {
$limit = '';
}
-
+
if (!empty($id)) {
$and = 'AND co.entry_id=' . $id;
}
@@ -627,7 +627,7 @@
if (!is_array($comments)) {
return array();
}
-
+
return $comments;
}
@@ -644,7 +644,7 @@
if (!is_array($comments)) {
return array();
}
-
+
return $comments;
}
@@ -684,15 +684,15 @@
} else {
echo htmlentities($name);
}
-
+
/* Link to the user's website, if the URL is valid */
if ( $comment['type'] != 'trackback' && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^http://', $comment['url']) ) {
echo ' (<a href="' . str_replace('"', '"', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlentities($comment['url']) . '">Link</a>)';
}
-
+
/* Show when the entry was made */
echo ' ' . ON . ' ' . date('M d, h:i', $comment['timestamp']);
-
+
if ( $_SESSION['serendipityAuthedUser'] === true ) {
echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&serendipity[entry]=' . $comment['entry_id'] . '&serendipity[type]=comments">' . DELETE . '</a>)';
}
@@ -869,7 +869,7 @@
<comments><?php echo $guid; ?></comments>
<author><?php echo htmlentities($entry['email']) . ' (' . htmlentities($entry['username']) . ')'; ?></author>
<content:encoded>
- <?php echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])))); ?>
+ <?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body']))))); ?>
</content:encoded>
<pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
<guid><?php echo $guid; ?></guid>
@@ -877,7 +877,7 @@
} else {
?>
<description>
- <?php echo utf8_encode(htmlspecialchars($entry['body'])); ?>
+ <?php echo utf8_encode(htmlspecialchars(nl2br($entry['body']))); ?>
</description>
<?php
}
@@ -898,7 +898,7 @@
function serendipity_content_rewrite($str) {
global $serendipity;
-
+
// Do this only once!
if (!class_exists('serendipity_plugin_api')) {
include_once('serendipity_plugin_api.php');
@@ -915,7 +915,7 @@
$plugins = serendipity_plugin_api::enum_plugins();
if (is_array($plugins)) {
-
+
// store the rewrite items in our main container for later usage.
$serendipity['content_rewrite']['data']['rewrite_from'] = array();
$serendipity['content_rewrite']['data']['rewrite_to'] = array();
@@ -927,10 +927,10 @@
$plugin->introspect($bag);
if ($bag->get('rewrite_active') === true) {
-
+
// Store necessary data in our main container
$serendipity['content_rewrite']['string'] = $plugin->get_config('rewrite_string');
-
+
if ($serendipity['content_rewrite']['string'] != '') {
$rewrite_from = $bag->get('rewrite_from');
$serendipity['content_rewrite']['data']['rewrite_char'][$serendipity['content_rewrite']['string']] = &$plugin->get_config('rewrite_char');
@@ -938,12 +938,12 @@
foreach($rewrite_from AS $nr => $key) {
$serendipity['content_rewrite']['data']['rewrite_from'][$serendipity['content_rewrite']['string']][] = $plugin->get_config($key);
}
-
+
$rewrite_to = $bag->get('rewrite_to');
foreach($rewrite_to AS $nr => $key) {
$serendipity['content_rewrite']['data']['rewrite_to'][$serendipity['content_rewrite']['string']][] = $plugin->get_config($key);
}
-
+
// We now have at least one active plugin.
$serendipity['content_rewrite']['active'] = true;
}
@@ -951,7 +951,7 @@
}
}
}
-
+
// Check if we have any plugin data needing rewrite
if (is_array($serendipity['content_rewrite']['data']['rewrite_from'])) {
foreach($serendipity['content_rewrite']['data']['rewrite_from'] AS $rewrite_string => $rewrite_values) {
@@ -965,7 +965,7 @@
'{from}',
'{to}'
),
-
+
array(
str_replace(
$serendipity['content_rewrite']['data']['rewrite_char'][$rewrite_string],
@@ -975,20 +975,20 @@
$serendipity['content_rewrite']['data']['rewrite_to'][$rewrite_string][$key]
),
-
+
$rewrite_string
);
-
+
// Build a regular expression (ungreedy, multiline) with our quoted value. $val here is the word needing the replacement
$regex = '°([^\d\w])(' . preg_quote($val) . ')([^\d\w])°msU';
-
+
// \1 and \3 are the prepend/append strings (usually whitespaces) and $new containing the new value
$str = preg_replace($regex, '\1' . $new . '\3', $str);
}
}
}
}
-
+
return $str;
}
@@ -1047,10 +1047,10 @@
*/
function serendipity_encodeExitsCallback($buffer) {
global $serendipity;
-
+
$entry_id = $serendipity['encodeExitsCallback_entry_id'];
$url = 'http://' . $buffer[3];
-
+
return sprintf(
'<a%shref="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
$buffer[1],
@@ -1235,7 +1235,7 @@
if ( empty($url) ) {
return 0;
}
-
+
// If title is not provided, the value for url will be set as the title
// This is a protocol rule.
if ( empty($title) ) {
@@ -1414,21 +1414,21 @@
if (!is_numeric($entry['id'])) {
/* we need to insert */
-
+
unset($entry['id']);
$entry['comments'] = 0;
-
+
$res = serendipity_db_insert('entries', $entry);
-
+
$entry['id'] = serendipity_db_insert_id();
$newEntry = 1;
} else {
/* we need to update */
-
+
$res = serendipity_db_update('entries', array('id' => $entry['id']), $entry);
$newEntry = 0;
}
-
+
if (is_string($res)) {
return $res;
}
@@ -1512,19 +1512,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;
}
@@ -1616,7 +1616,7 @@
$fdim = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x]);
$checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-
+
if (!file_exists($checkfile) && ($fdim[0] > $serendipity['thumbSize'] || $fdim[1] > $serendipity['thumbSize'])) {
printf(RESIZE_BLAHBLAH, $files[$x] . ': ' . serendipity_makeThumbnail($files[$x]));
$i++;
@@ -1641,7 +1641,7 @@
$serendipity['EditorBrowsers'] = '(IE|Mozilla)';
$cats = serendipity_fetchCategories();
-
+
$n = "\n";
$cat_list = '<select name="serendipity[categoryid]">' . $n;
$cat_list .= ' <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
@@ -1656,7 +1656,7 @@
}
}
$cat_list .= '</select>' . $n;
-
+
$hidden = '';
foreach($hiddens as $key => $value) {
$hidden .= ' <input type="hidden" name="' . $key . '" value="' . $value . '" />' . $n;
@@ -1798,7 +1798,7 @@
strstr($url_parts['host'], $_SERVER['SERVER_NAME'])) {
return;
}
-
+
if (rand(0, 100) < 1) {
serendipity_track_referrer_gc();
}
@@ -2006,7 +2006,7 @@
if ($x <= date('m') || $currYear < date('Y')) {
$out[$currYear][$x] = array($entries, $a, $b, $c, $d);
}
-
+
if ($entries > $max) {
$max = $entries;
}
@@ -2035,12 +2035,12 @@
<img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
<?php echo $months[$y][1] . $serendipity['months'][$y] . $months[$y][2] . ' (' . $months[$y][0] . ' ' . ENTRIES . ')'; ?>
</td>
-
+
<td>
<img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="35" hspace="0" vspace="0" alt="" />
(<?php echo $months[$y][1] . VIEW_FULL . $months[$y][2]; ?>)
</td>
-
+
<td>
(<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>)
</td>
@@ -2057,7 +2057,7 @@
function serendipity_xhtml_target($target)
{
global $serendipity;
-
+
if ($serendipity['XHTML11']) {
return ' onclick="window.open(this.href, \'target' . time() . '\'); return false;" ';
} else {
|
|
From: <gar...@us...> - 2003-08-08 23:33:51
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv26374
Modified Files:
serendipity_config.inc.php
Log Message:
Corrected fallback (languages were always english)
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_config.inc.php 8 Aug 2003 21:01:22 -0000 1.20
+++ serendipity_config.inc.php 8 Aug 2003 23:33:48 -0000 1.21
@@ -56,16 +56,17 @@
$serendipity['indexFile'] = 'index.php';
}
-// Load fallback language, english
-include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
-// Load chosen language information
+// Load basic language information
include_once("{$serendipity['serendipityPath']}/serendipity_lang_{$serendipity['lang']}.inc.php");
-
if (serendipity_LANG_LOADED !== true) {
include_once 'serendipity_lang.inc.php';
die(sprintf(INCLUDE_ERROR, "serendipity_lang_{$serendipity['lang']}.inc.php"));
}
+// Load fallback language, english (will load any defines which were not yet defined in the chosen language file, if they are ever not in-synch)
+include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
+
+
// A Set of emoticons to rewrite
$serendipity['smiles'] = array( ":'(" => $serendipity['serendipityHTTPPath'] . 'pixel/cry_smile.gif',
':-)' => $serendipity['serendipityHTTPPath'] . 'pixel/regular_smile.gif',
@@ -135,7 +136,7 @@
// We don't care who tells us what to do
if (!$serendipity['GET']['action']) {
$serendipity['GET']['action'] = $serendipity['POST']['action'];
-}
+}
if (!$serendipity['GET']['adminAction']) {
$serendipity['GET']['adminAction'] = $serendipity['POST']['adminAction'];
@@ -149,7 +150,7 @@
$serendipity['user'] = $_SESSION['serendipityUser'];
$serendipity['email'] = $_SESSION['serendipityEmail'];
-/**
+/**
* Local Variables:
* c-basic-offset: 4
* tab-width: 4
|
|
From: <gar...@us...> - 2003-08-08 23:22:05
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv24814
Modified Files:
serendipity_lang_de.inc.php
Log Message:
Please always keep the english and other language files in synch!
Put empty defines in the language files you are maybe not capable of.
Otherwise we'll have serious issues regarding missing strings and having to
compare the two language files.
Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_de.inc.php 5 Aug 2003 14:07:41 -0000 1.18
+++ serendipity_lang_de.inc.php 8 Aug 2003 23:22:02 -0000 1.19
@@ -242,6 +242,7 @@
define('SCALING_IMAGE', 'Ändere Größe von %s nach %s x %s px');
define('KEEP_PROPORTIONS', 'Proportionen beibehalten');
define('REALLY_SCALE_IMAGE', 'Bildgröße wirklich verändert? Kein zurück!');
+define('RUNNING', 'Sie benutzen serendipity v.');
define('serendipity_LANG_LOADED', true);
/* vim: set sts=4 ts=4 expandtab : */
|
|
From: <tom...@us...> - 2003-08-08 22:29:40
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv16733
Modified Files:
comment.php
Log Message:
Wrong nesting
Trackback-display is now aligned correctly
Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- comment.php 19 Jul 2003 11:10:36 -0000 1.18
+++ comment.php 8 Aug 2003 22:29:37 -0000 1.19
@@ -73,18 +73,15 @@
. $serendipity['GET']['entry_id']
. '_' . serendipity_makeFilename($entry[0]['title']) . '.html';
?>
-<div id="serendipity_bodyLevel">
<div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?></div><br />
<dl>
<dt><b><?php echo TRACKBACK_SPECIFIC; ?>:</b><br /></dt>
<dd><a href="<?php echo $tbu; ?>"><?php echo $tbu; ?></a><br /></dd>
<dt><b><?php echo DIRECT_LINK; ?>:</b><br /></dt>
- <dd><a href="<?php echo $entry; ?>"><?php echo $entry; ?></a>
- <?php serendipity_printTrackbacks(serendipity_fetchTrackbacks($id)); ?>
- </dd>
+ <dd><a href="<?php echo $entry; ?>"><?php echo $entry; ?></a></dd>
</dl>
-</div>
+ <?php serendipity_printTrackbacks(serendipity_fetchTrackbacks($id)); ?>
<?php
} else {
?>
|
|
From: <tom...@us...> - 2003-08-08 22:02:50
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv12321
Modified Files:
serendipity_functions.inc.php
Log Message:
More trackback fixing, should be working now (I hope)
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- serendipity_functions.inc.php 8 Aug 2003 21:28:26 -0000 1.118
+++ serendipity_functions.inc.php 8 Aug 2003 22:02:47 -0000 1.119
@@ -635,7 +635,7 @@
{
global $serendipity;
- $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'TRACKBACK' AND title!='' ORDER BY id";
+ $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type = 'TRACKBACK' ORDER BY id";
if (isset($limit)) {
$query .= " LIMIT $limit";
}
@@ -1230,11 +1230,17 @@
{
global $serendipity;
- // We can't accept a trackback if we don't get any URl, basic rule...
+ // We can't accept a trackback if we don't get any URL
+ // This is a protocol rule.
if ( empty($url) ) {
return 0;
}
-
+
+ // If title is not provided, the value for url will be set as the title
+ // This is a protocol rule.
+ if ( empty($title) ) {
+ $title = $url;
+ }
$comment['title'] = $title;
$comment['url'] = $url;
$comment['name'] = $name;
|
|
From: <tom...@us...> - 2003-08-08 21:28:29
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv7406
Modified Files:
serendipity_functions.inc.php
Log Message:
Fixed MAJOR bug preventing people from identifying a correct trackback URI
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- serendipity_functions.inc.php 8 Aug 2003 20:52:49 -0000 1.117
+++ serendipity_functions.inc.php 8 Aug 2003 21:28:26 -0000 1.118
@@ -534,7 +534,7 @@
rdf:about="<?php echo $serendipity['baseURL']; ?>feeds/ei_<?php echo $entry['id']; ?>.rdf"
trackback:ping="<?php echo $serendipity['baseURL']; ?>comment.php?type=trackback&entry_id=<?php echo $entry['id']; ?>"
dc:title="<?php echo $entry['title']; ?>"
- dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['$title']); ?>" />
+ dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title']); ?>" />
</rdf:RDF>
-->
|
|
From: <tom...@us...> - 2003-08-08 21:01:25
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv3396
Modified Files:
serendipity_config.inc.php serendipity_admin_overview.inc.php
serendipity_lang_en.inc.php
Log Message:
* Added english as fallback language.
* Added display of current s9y version in Administration Suite
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_config.inc.php 8 Aug 2003 20:50:50 -0000 1.19
+++ serendipity_config.inc.php 8 Aug 2003 21:01:22 -0000 1.20
@@ -56,8 +56,11 @@
$serendipity['indexFile'] = 'index.php';
}
-// Load basic language information
+// Load fallback language, english
+include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
+// Load chosen language information
include_once("{$serendipity['serendipityPath']}/serendipity_lang_{$serendipity['lang']}.inc.php");
+
if (serendipity_LANG_LOADED !== true) {
include_once 'serendipity_lang.inc.php';
die(sprintf(INCLUDE_ERROR, "serendipity_lang_{$serendipity['lang']}.inc.php"));
Index: serendipity_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_overview.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_overview.inc.php 5 Aug 2003 14:07:40 -0000 1.7
+++ serendipity_admin_overview.inc.php 8 Aug 2003 21:01:22 -0000 1.8
@@ -13,8 +13,7 @@
die ("Don't hack!");
}
-session_start();
echo WELCOME_BACK . ' ' . $_SESSION['serendipityUser'] . '.';
-
+echo '<br /><br />'. RUNNING . $serendipity['version'];
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_en.inc.php 5 Aug 2003 14:07:41 -0000 1.24
+++ serendipity_lang_en.inc.php 8 Aug 2003 21:01:22 -0000 1.25
@@ -52,6 +52,7 @@
define('DONE', 'Done');
define('CLICK_IMAGE_TO_INSERT', 'Click the image you want to insert:');
define('WELCOME_BACK', 'Welcome back,');
+define('RUNNING', 'You are running Serendipity v.');
define('ADD_PLUGIN', 'Add plugin');
define('TITLE', 'Title');
define('PLUGIN', 'Plugin');
|
|
From: <tom...@us...> - 2003-08-08 20:52:53
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv2337
Modified Files:
serendipity_functions.inc.php
Log Message:
Forgot CRLF
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_functions.inc.php 8 Aug 2003 20:50:50 -0000 1.116
+++ serendipity_functions.inc.php 8 Aug 2003 20:52:49 -0000 1.117
@@ -1173,7 +1173,7 @@
fwrite($sock, "POST {$target['path']}{$target['query']} HTTP/1.1\r\n");
fwrite($sock, "Host: {$target['host']}\r\n");
- fwrite($sock, "User-Agent: Serendipity/". $serendipity['version']);
+ fwrite($sock, "User-Agent: Serendipity/{$serendipity['version']}\r\n");
fwrite($sock, "Content-type: application/x-www-form-urlencoded\r\n");
fwrite($sock, "Content-length: " . strlen($data) . "\r\n");
fwrite($sock, "Connection: close\r\n\r\n");
|
|
From: <tom...@us...> - 2003-08-08 20:50:56
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv1766
Modified Files:
serendipity_functions.inc.php serendipity_config.inc.php
Log Message:
Be cool like MoveableType and send our User-Agent with our trackbacks
Also added $serendipitt['version'] (currently: 0.3-cvs)
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_functions.inc.php 8 Aug 2003 14:56:36 -0000 1.115
+++ serendipity_functions.inc.php 8 Aug 2003 20:50:50 -0000 1.116
@@ -1156,6 +1156,7 @@
* Send a trackback ping
*/
function _serendipity_send($loc, $data) {
+ global $serendipity;
$target = parse_url($loc);
if ($target['query'] != '') {
$target['query'] = '?' . $target['query'];
@@ -1172,6 +1173,7 @@
fwrite($sock, "POST {$target['path']}{$target['query']} HTTP/1.1\r\n");
fwrite($sock, "Host: {$target['host']}\r\n");
+ fwrite($sock, "User-Agent: Serendipity/". $serendipity['version']);
fwrite($sock, "Content-type: application/x-www-form-urlencoded\r\n");
fwrite($sock, "Content-length: " . strlen($data) . "\r\n");
fwrite($sock, "Connection: close\r\n\r\n");
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_config.inc.php 5 Aug 2003 14:07:40 -0000 1.18
+++ serendipity_config.inc.php 8 Aug 2003 20:50:50 -0000 1.19
@@ -4,11 +4,14 @@
include_once('compat.php');
ini_set('session.use_trans_sid', 0);
+$serendipity['version'] = '0.3-cvs';
$serendipity['production'] = 1;
+
// Rewrite always on
$serendipity['rewrite'] = true;
-// We need this if people want to upgrade s9y
+
+// We need this if people want to upgrade s9y
if (!isset($serendipity['templatePath'])) {
$serendipity['templatePath'] = 'templates/';
}
|
|
From: <tom...@us...> - 2003-08-08 14:56:41
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv6318
Modified Files:
serendipity_functions.inc.php
Log Message:
Now using <div> tags to display comments.
This means you have to replace "TD.serendipity_comment" in style.css with ".serendipity_comment" (In older themes)
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_functions.inc.php 8 Aug 2003 14:38:42 -0000 1.114
+++ serendipity_functions.inc.php 8 Aug 2003 14:56:36 -0000 1.115
@@ -653,15 +653,10 @@
global $serendipity;
?>
-<table width="100%" border="0">
<?php
if (!count($comments)) {
?>
- <tr>
- <td>
- <i><?php echo NO_COMMENTS; ?></i>
- </td>
- </tr>
+ <div align="center"><?php echo NO_COMMENTS; ?></div>
<?php
}
@@ -676,8 +671,7 @@
$name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
$body = htmlentities($comment['body']);
?>
- <tr>
- <td class="serendipity_comment">
+ <div class="serendipity_comment">
<a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>
<?php echo nl2br(serendipity_markup_text(serendipity_emoticate($body))); ?><br />
@@ -705,13 +699,10 @@
?>
</div>
- </td>
- </tr>
+ </div>
+ <br />
<?php
}
-?>
-</table>
-<?php
}
function serendipity_printTrackbacks($comments)
|
|
From: <tom...@us...> - 2003-08-08 14:38:45
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv3426
Modified Files:
serendipity_functions.inc.php
Log Message:
Fixed b0rked SQL query sorting comments in the wrong direction
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- serendipity_functions.inc.php 8 Aug 2003 10:00:20 -0000 1.113
+++ serendipity_functions.inc.php 8 Aug 2003 14:38:42 -0000 1.114
@@ -614,14 +614,12 @@
e.id AS entryid,
c.category_name
FROM
- ({$serendipity['dbPrefix']}comments co
- LEFT JOIN {$serendipity['dbPrefix']}entries e
- ON co.entry_id = e.id
- LEFT JOIN {$serendipity['dbPrefix']}category c
- ON e.categoryid = c.categoryid)
+ {$serendipity['dbPrefix']}comments co
+ LEFT JOIN {$serendipity['dbPrefix']}entries e ON (co.entry_id = e.id)
+ LEFT JOIN {$serendipity['dbPrefix']}category c ON (e.categoryid = c.categoryid)
WHERE co.type LIKE 'NORMAL' $and
ORDER BY
- co.id DESC
+ co.id
$limit";
$comments = serendipity_db_query($query);
|
|
From: <gar...@us...> - 2003-08-08 10:00:28
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv24881
Modified Files:
serendipity_admin_image_selector.php
serendipity_admin_images.inc.php serendipity_functions.inc.php
Log Message:
o Fixed a parse error in serendipity_admin_image_selector
o Fixed a quote-sign in serendipity_admin_images.inc.php
o Exit-Callback Function now also catches links with any tags before the
'href'. '<a class="..." href="...">' did not work before.
o Fixed the entry-id-link in the comments RSS-Feed
Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_image_selector.php 5 Aug 2003 14:07:40 -0000 1.9
+++ serendipity_admin_image_selector.php 8 Aug 2003 10:00:18 -0000 1.10
@@ -58,7 +58,7 @@
// Display thumbnails
?>
<td height="<?php echo $serendipity['thumbSize']; ?>" align="center" valign="middle">
- <a href="?serendipity[step]=1&serendipity[image]="<?php echo $files[$x]; ?>">
+ <a href="?serendipity[step]=1&serendipity[image]=<?php echo $files[$x]; ?>">
<img src="<?php echo $imgsrc; ?>" hspace="15" border="0" />
</a>
</td>
Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_images.inc.php 5 Aug 2003 14:07:40 -0000 1.10
+++ serendipity_admin_images.inc.php 8 Aug 2003 10:00:19 -0000 1.11
@@ -125,7 +125,7 @@
if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
printf(DELETE_IMAGE . '<br />', $file);
} else {
- printf(DELETE_IMAGE_FAIL . '<br />' $file);
+ printf(DELETE_IMAGE_FAIL . '<br />', $file);
}
if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $fThumb) ) {
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- serendipity_functions.inc.php 5 Aug 2003 14:07:40 -0000 1.112
+++ serendipity_functions.inc.php 8 Aug 2003 10:00:20 -0000 1.113
@@ -611,6 +611,7 @@
co.*,
co.author AS username,
e.title,
+ e.id AS entryid,
c.category_name
FROM
({$serendipity['dbPrefix']}comments co
@@ -857,7 +858,7 @@
if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
foreach ($entries as $entry) {
- $guid = serendipity_archiveURL($entry['id'], $entry['title']);
+ $guid = serendipity_archiveURL(($entry['entryid'] != '' ? $entry['entryid'] : $entry['id']), $entry['title']);
if ($comments == true) {
// Display username as part of the title for easier feed-readability
$entry['title'] = $entry['username'] . ': ' . $entry['title'];
@@ -1039,7 +1040,7 @@
$serendipity['encodeExitsCallback_entry_id'] = $entry_id;
$ret = preg_replace_callback(
- "#<a href=(\"|')http://([^\"']+)(\"|')#im",
+ "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#im",
'serendipity_encodeExitsCallback',
$ret
);
@@ -1059,11 +1060,12 @@
global $serendipity;
$entry_id = $serendipity['encodeExitsCallback_entry_id'];
- $url = 'http://' . $buffer[2];
+ $url = 'http://' . $buffer[3];
return sprintf(
- '<a href="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
- $serendipity['baseURL'],
+ '<a%shref="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
+ $buffer[1],
+ $serendipity['serendipityHTTPPath'],
base64_encode($url),
($entry_id != 0) ? '&entry_id=' . $entry_id : '',
$url,
|
|
From: <gar...@us...> - 2003-08-05 14:32:38
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv21311
Modified Files:
db.sql
Log Message:
autoincrement can only be used in conjunction with primary key on mysql
Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- db.sql 25 Jul 2003 01:03:18 -0000 1.19
+++ db.sql 5 Aug 2003 14:32:35 -0000 1.20
@@ -56,7 +56,7 @@
create table {PREFIX}references (
id {AUTOINCREMENT} {PRIMARY},
- entry_id {AUTOINCREMENT},
+ entry_id int(10) {UNSIGNED} not null default '0',
link text,
name text
);
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv16268
Modified Files:
NEWS rss.php serendipity_admin.php
serendipity_admin_category.inc.php
serendipity_admin_css.inc.php
serendipity_admin_entries.inc.php
serendipity_admin_image_selector.php
serendipity_admin_images.inc.php
serendipity_admin_installer.inc.php
serendipity_admin_interop.inc.php
serendipity_admin_overview.inc.php
serendipity_admin_templates.inc.php serendipity_config.inc.php
serendipity_functions.inc.php serendipity_lang_de.inc.php
serendipity_lang_en.inc.php
serendipity_functions_config.inc.php
Added Files:
serendipity_lang.inc.php
Log Message:
o Lots of languages moved to defines
o Much code style (this were the only files left)
o Some XHTML cleanup
o NEWS-update
o Allow deleting categories (moving articles to another category)
o Autodetect language on installation
o RSS feeds: added <webMaster>, <managingEditor>, <comments>, <category> and <generator> tag
o RSS feed now contains <image> link to pixel/rss_banner.png (if existing), otherwise use pixel/s9y_banner_tiny.png
o enjoy the sun.
--- NEW FILE: serendipity_lang.inc.php ---
<?php # $Id: serendipity_lang.inc.php,v 1.1 2003/08/05 14:07:41 garvinhicking Exp $
// If no config file is loaded, language includes are not available.
// Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
if (serendipity_LANG_LOADED !== true) {
$supported_languages = array('en', 'de');
$possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
if (is_array($possible_languages)) {
foreach($possible_languages AS $index => $lang) {
$preferred_language = preg_replace('|^([^\-_]*)|msU', '\1', $lang);
if (in_array($preferred_language, $supported_languages)) {
include_once('serendipity_lang_' . $preferred_language . '.inc.php');
break;
}
}
}
// What the heck does the user accept, then? Forcing english!
if (serendipity_LANG_LOADED !== true) {
include_once('serendipity_lang_en.inc.php');
}
}
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NEWS 29 Jul 2003 19:41:32 -0000 1.6
+++ NEWS 5 Aug 2003 14:07:40 -0000 1.7
@@ -2,6 +2,15 @@
Version 0.3 ()
------------------------------------
+ * Allow deleting categories (moving articles to another category) (garvinhicking)
+ * Autodetect language on installation (garvinhicking)
+ * RSS feeds properly utf8encoded, added <webMaster>,<managingEditor>,<comments>,<category> and <generator> tag (garvinhicking)
+ * RSS feed now contains <image> link to pixel/rss_banner.png (if existing), otherwise use pixel/s9y_banner_tiny.png (garvinhicking)
+ * External Plugin for hotword/acronym replacements, as well as any other content-rewriting plugin (garvinhicking)
+ * Allow embeding of serendipity in your custom homepage (wrapFile directive - see http://blog.supergarv.de/ for example) (garvinhicking)
+ * Plugins: Show updated values after submit, remove config entries when a plugin is removed (garvinhicking)
+ * Added an RSS-feed for comments to entries only (garvinhicking)
+ * Fixed archives to not properly show entries from the first/last day of a month (garvinhicking)
* Fixed the database by separating primary key from {AUTOINCREMENT} (jtate)
* Rewrote installer (tomsommer)
* Added support for postgres (jtate)
Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rss.php 2 Aug 2003 15:14:19 -0000 1.8
+++ rss.php 5 Aug 2003 14:07:40 -0000 1.9
@@ -30,6 +30,29 @@
$title = utf8_encode($title);
$description = utf8_encode($description);
+if (file_exists($serendipity['serendipityPath'] . 'pixel/rss_banner.png')) {
+ $i = getimagesize($serendipity['serendipityPath'] . 'pixel/rss_banner.png');
+ $image = <<<IMAGE
+<image>
+ <url>{$serendipity['baseURL']}pixel/rss_banner.png</url>
+ <title>RSS: $title - $description</title>
+ <link>{$serendipity['baseURL']}</link>
+ <width>{$i[0]}</width>
+ <height>{$i[1]}</height>
+</image>
+IMAGE;
+} else {
+ $image = <<<IMAGE
+<image>
+ <url>{$serendipity['baseURL']}pixel/s9y_banner_tiny.png</url>
+ <title>RSS: $title - $description</title>
+ <link>{$serendipity['baseURL']}</link>
+ <width>100</width>
+ <height>21</height>
+</image>
+IMAGE;
+}
+
echo '<?xml version="1.0" encoding="utf-8" ?>';
echo "\n";
switch ($version) {
@@ -41,6 +64,8 @@
<title>$title</title>
<link>{$serendipity['baseURL']}</link>
<description>$description</description>
+<language>{$serendipity['CONFIG']['lang']}</language>
+$image
HEAD;
break;
@@ -54,11 +79,16 @@
xmlns:content="http://purl.org/rss/1.0/modules/content/"
xmlns:robot="http://www.edwardbear.org/def/xml/robot">
<channel>
-<title>$title</title>
-<link>{$serendipity['baseURL']}</link>
-<description>$description</description>
-<dc:language>{$serendipity['lang']}</dc:language>
+ <title>$title</title>
+ <link>{$serendipity['baseURL']}</link>
+ <description>$description</description>
+ <dc:language>{$serendipity['lang']}</dc:language>
+ <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
+ <webMaster>{$serendipity['CONFIG']['email']}</webMaster>
+ <managingEditor>{$serendipity['CONFIG']['email']}</managingEditor>
+ <generator>Serendipity - http://www.s9y.org/</generator>
+ $image
HEAD;
break;
default:
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_admin.php 16 Jul 2003 11:58:24 -0000 1.16
+++ serendipity_admin.php 5 Aug 2003 14:07:40 -0000 1.17
@@ -5,6 +5,9 @@
if (file_exists('./serendipity_config_local.inc.php')) {
include('serendipity_config.inc.php');
} else {
+ // If no config file is loaded, language includes are not available.
+ // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
+ include_once 'serendipity_lang.inc.php';
$_SESSION['serendipityAuthedUser'] = true;
}
Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_category.inc.php 8 Jul 2003 09:13:27 -0000 1.5
+++ serendipity_admin_category.inc.php 5 Aug 2003 14:07:40 -0000 1.6
@@ -1,84 +1,113 @@
<?php # $Id$
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
session_start();
$cat_to_edit = (int)$_GET['serendipity']['cat']['catid'];
-$msg = "";
+$msg = '';
if (isset($_POST['SAVE'])) {
- $name = addslashes($_POST['serendipity']['cat']['name']);
- $desc = addslashes($_POST['serendipity']['cat']['description']);
- if ($cat_to_edit == 0) {
- $query = "INSERT INTO $serendipity[dbPrefix]category (category_name, category_description, authorid) values ('$name', '$desc', $_SESSION[serendipityAuthorid])";
- } else {
- $query = "UPDATE $serendipity[dbPrefix]category SET category_name='$name', category_description='$desc' where categoryid=$cat_to_edit";
- }
-
- $r = serendipity_db_query($query);
- if (is_string($r)) {
- $msg = $r;
- } else {
- $msg = "Category Saved";
- }
+ $name = addslashes($_POST['serendipity']['cat']['name']);
+ $desc = addslashes($_POST['serendipity']['cat']['description']);
+ if ($cat_to_edit == 0) {
+ $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid) values ('$name', '$desc', {$_SESSION['serendipityAuthorid']})";
+ } else {
+ $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc' where categoryid=$cat_to_edit";
+ }
+
+ $r = serendipity_db_query($query);
+ if (is_string($r)) {
+ $msg = $r;
+ } else {
+ $msg = CATEGORY_SAVED;
+ }
+} elseif (isset($_POST['REMOVE'])) {
+ if ($cat_to_edit != 0) {
+ $remaining_cat = (int)$_POST['serendipity']['cat']['remaining_catid'];
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE categoryid=$cat_to_edit");
+ serendipity_db_query("UPDATE {$serendipity['dbPrefix']}entries SET categoryid=$remaining_cat WHERE categoryid=$cat_to_edit");
+ $msg = sprintf(CATEGORY_DELETED, $cat_to_edit, $remaining_cat);
+ } else {
+ $msg = INVALID_CATEGORY;
+ }
+
+ $cat_to_edit = 0;
}
$cats = serendipity_fetchCategories();
-if ($cat_to_edit > 0 && count($cats)) {
- foreach ($cats as $cat_data) {
- if ($cat_data['categoryid'] == $cat_to_edit) {
- $this_cat = $cat_data;
- break;
- }
- }
+$existing_cats_table = '';
+$existing_cats_dropdown = '<select name="serendipity[cat][remaining_catid]">' . "\n";
+if (count($cats)) {
+ foreach ($cats as $cat_data) {
+ if ($cat_to_edit > 0 && $cat_data['categoryid'] == $cat_to_edit && !isset($this_cat)) {
+ $this_cat = $cat_data;
+ } elseif ($cat_to_edit > 0) {
+ $existing_cats_dropdown .= '<option value="' . $cat_data['categoryid'] . '">' . htmlentities($cat_data['category_name']) . '</option>' . "\n";
+ }
+
+ $name = htmlentities($cat_data['category_name']);
+ $desc = htmlentities($cat_data['category_description']);
+ $existing_cats_table .= <<<CAT
+ <tr>
+ <td>
+ • <a href="?serendipity[adminModule]=category&serendipity[cat][catid]={$cat_data['categoryid']}">$name - $desc</a>
+ </td>
+ </tr>
+CAT;
+ }
}
-
+$existing_cats_dropdown .= '</select>';
?>
-<font color="red"><?php echo $msg ; ?></font>
+<div style="color: red"><?php echo $msg ; ?></div>
+
<form method="POST" name="serendipityCategory">
<?php
if ($cat_to_edit == 0) {
- $desc = CREATE_NEW_CAT;
- $save = CREATE;
+ $desc = CREATE_NEW_CAT;
+ $save = CREATE;
+ $remove = '';
} else {
- $desc = htmlentities(sprintf(EDIT_THIS_CAT, $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;
+ $remove = str_repeat(' ', 10) . '<input type="submit" name="REMOVE" value="' . DELETE . '"> <b>>></b> ' . sprintf(CATEGORY_REMAINING, $existing_cats_dropdown);
}
?>
-<b><?php echo $desc ; ?></b>
+
+<b><?php echo $desc; ?></b>
<table cellpadding="5">
-<tr>
-<th><?php echo NAME; ?></th>
-<td><input type="text" name="serendipity[cat][name]" value="<?php echo htmlentities($this_cat['category_name']) ; ?>" /></td>
-</tr>
+ <tr>
+ <th><?php echo NAME; ?></th>
+ <td><input type="text" name="serendipity[cat][name]" value="<?php echo htmlentities($this_cat['category_name']); ?>" /></td>
+ </tr>
-<tr>
-<th><?php echo DESCRIPTION; ?></th>
-<td><input type="text" name="serendipity[cat][description]" value="<?php echo htmlentities($this_cat['category_description']) ; ?>"/></td>
-</tr>
+ <tr>
+ <th><?php echo DESCRIPTION; ?></th>
+ <td><input type="text" name="serendipity[cat][description]" value="<?php echo htmlentities($this_cat['category_description']); ?>" /></td>
+ </tr>
</table>
-<input type="submit" name="SAVE" value="<?php echo $save ; ?>">
+
+<div>
+ <input type="submit" name="SAVE" value="<?php echo $save; ?>"/>
+ <?php echo $remove; ?>
+</div>
<br />
<br />
<b><?php echo CLICK_CAT_TO_EDIT; ?></b>
<table>
-<?php
-if (is_array($cats)) {
- foreach ($cats as $cat_data) {
- $name = htmlentities($cat_data['category_name']);
- $desc = htmlentities($cat_data['category_description']);
- echo "<tr><td>• <a href=\"?serendipity[adminModule]=category&serendipity[cat][catid]=$cat_data[categoryid]\">$name - $desc</a></td></tr>\n";
- }
-}
-?>
-<tr><td>• <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></td></tr>
+<?php echo $existing_cats_table; ?>
+ <tr>
+ <td>
+ • <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a>
+ </td>
+ </tr>
</table>
-
</form>
<?php
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_admin_css.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_css.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_css.inc.php 8 Jul 2003 09:13:27 -0000 1.3
+++ serendipity_admin_css.inc.php 5 Aug 2003 14:07:40 -0000 1.4
@@ -1,73 +1,77 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
-// A little helper we don't want in _functions.inc.php
-switch($serendipity["GET"]["adminAction"]) {
+switch($serendipity['GET']['adminAction']) {
+ case 'save':
+ $entry = array(
+ 'cssid' => $serendipity['POST']['cssid'],
+ 'name' => $serendipity['POST']['name'],
+ 'data' => $serendipity['POST']['data']
+ );
- case "save":
- $entry = array("cssid" => $serendipity["POST"]["cssid"],
- "name"=>$serendipity["POST"]["name"],
- "data" =>$serendipity["POST"]["data"]);
$res = serendipity_updateCSS($entry);
- if (is_string($res))
+
+ if (is_string($res)) {
serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css", "serendipity[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
- else
+ } else {
serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css", "serendipity[adminAction]" => "save"), $entry);
- break;
+ }
+ break;
- case "edit":
- serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css",
+ case 'edit':
+ serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css",
"serendipity[adminAction]" => "save"), $entry);
- break;
+ break;
default:
+ if (isset($_POST['NEW'])) {
+ serendipity_printCSSForm("?", "edit",
+ array(
+ "serendipity[action]" => "admin",
+ "serendipity[adminModule]" => "css",
+ "serendipity[adminAction]" => "save"
+ ),
+ array(
+ "cssid" => 0,
+ "name" => "New",
+ "data" => file_get_contents("serendipity.css")
+ )
+ );
+ } else if (isset($_POST['EDIT'])) {
+ serendipity_printCSSForm("?", "edit",
+ array(
+ "serendipity[action]" => "admin",
+ "serendipity[adminModule]" => "css",
+ "serendipity[adminAction]" => "save"
+ ),
+ $_POST['serendipity']['cssid']
+ );
- if (isset($_POST['NEW'])) {
- serendipity_printCSSForm("?", "edit",
- array(
- "serendipity[action]" => "admin",
- "serendipity[adminModule]" => "css",
- "serendipity[adminAction]" => "save"
- ),
- array(
- "cssid" => 0,
- "name" => "New",
- "data" => file_get_contents("serendipity.css")
- )
- );
- } else if (isset($_POST['EDIT'])) {
- serendipity_printCSSForm("?", "edit",
- array(
- "serendipity[action]" => "admin",
- "serendipity[adminModule]" => "css",
- "serendipity[adminAction]" => "save"
- ),
- $_POST['serendipity']['cssid']
- );
-
- } else if (isset($_POST['DEFAULT'])) {
- $css = serendipity_getCSS($_POST['serendipity']['cssid']);
- serendipity_set_config_var("default_css", $css['name']);
- } else if (isset($_POST['DELETE'])) {
- if (is_numeric($_POST['serendipity']['cssid'])) {
- $id = serendipity_db_escape_string($_POST['serendipity']['cssid']);
- serendipity_db_query("delete from $serendipity[dbPrefix]css where cssid='$id'");
- }
- serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
- } else {
+ } else if (isset($_POST['DEFAULT'])) {
+ $css = serendipity_getCSS($_POST['serendipity']['cssid']);
+ serendipity_set_config_var("default_css", $css['name']);
+ } else if (isset($_POST['DELETE'])) {
+ if (is_numeric($_POST['serendipity']['cssid'])) {
+ $id = serendipity_db_escape_string($_POST['serendipity']['cssid']);
+ serendipity_db_query("delete from $serendipity[dbPrefix]css where cssid='$id'");
+ }
+ serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
+ } else {
- serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
- }
+ serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
+ }
break;
}
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_entries.inc.php 8 Jul 2003 09:13:27 -0000 1.5
+++ serendipity_admin_entries.inc.php 5 Aug 2003 14:07:40 -0000 1.6
@@ -1,132 +1,186 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
// A little helper we don't want in _functions.inc.php
function serendipity_drawList($action) {
- global $serendipity;
-
- // Prepare variables
- if (!is_numeric($serendipity["GET"]["offset"])) $serendipity["GET"]["offset"] = 0;
- $perPage = 30;
-
- // Fetch the entries
- $entries = serendipity_fetchEntries(false, false, serendipity_db_limit($serendipity["GET"]["offset"], $perPage));
-
- // Prepare table
- echo "<div class='serendipity_admin_list'>";
- echo "<div class='serendipity_admin_list_title'>".ucfirst($action)." Entries:</div>";
- echo "<table width='100%' class='serendipity_admin_list'>";
+ global $serendipity;
- if ( is_array($entries) ) {
- $half = (int) ((count($entries) + 1)/2);
-
- // Print the browse buttons
- echo "<tr><td align='left'>";
- if ($serendipity["GET"]["offset"] > 0) {
- echo '<input type="button" value="<<<" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.max(0,($serendipity["GET"]["offset"]-$perPage)).'\';">';
- }
- echo "</td><td align='right'>";
- if (count($entries) == $perPage) {
- echo '<input type="button" value=">>>" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.($serendipity["GET"]["offset"]+$perPage).'\';">';
- }
- echo "</td></tr>";
- // Print the entries
- $count = count($entries);
- for ($x=0; $x<$half; $x++) {
- ?>
- <tr>
- <td class="serendipity_admin_list_item">
- <?php echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ; ?>
- <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x]["id"] ; ?>'>
- <?php echo htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)); ?></a>
- </a>
- </td>
- <td class="serendipity_admin_list_item">
- <?php if ($x + $half < $count) { ?>
- <?php echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "; ?>
- <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x+$half]["id"] ; ?>'>
- <?php echo htmlentities(substr($entries[$x+$half]["title"],0,40)) ; ?></a>
- </a>
- <?php
- }
+ // Prepare variables
+ if (!is_numeric($serendipity['GET']['offset'])) {
+ $serendipity['GET']['offset'] = 0;
}
- }
- else {
- //We've got nothing
- ?>
- <tr><td class="serendipity_admin_list_item" colspan="2">
- <?php echo NO_ENTRIES_TO_PRINT ?></td></tr>
- <?php
- }
+
+ $perPage = 30;
+
+ // Fetch the entries
+ $entries = serendipity_fetchEntries(
+ false,
+ false,
+ serendipity_db_limit(
+ $serendipity['GET']['offset'],
+ $perPage
+ )
+ );
+ $string_action = ($action == 'delete' ? DELETE_ENTRIES : EDIT_ENTRIES);
+
+ // Prepare table
?>
- </td>
+<div class="serendipity_admin_list">
+ <div class="serendipity_admin_list_title"><?php echo $string_action; ?>:</div>
+
+ <table width="100%" class="serendipity_admin_list">
+<?php
+ if (is_array($entries)) {
+ $half = (int) ((count($entries) + 1)/2);
+
+ // Print the browse buttons
+?>
+ <tr>
+ <td>
+<?php
+ if ($serendipity['GET']['offset'] > 0) {
+?>
+ <input type="button" value="<<<" onClick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo max(0, ($serendipity['GET']['offset'] - $perPage)); ?>';" />
+<?php
+ }
+?>
+ </td>
+
+ <td align="right">
+<?php
+ if (count($entries) == $perPage) {
+?>
+ <input type="button" value=">>>" onClick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo $serendipity['GET']['offset'] + $perPage; ?>';" />
+<?php
+ }
+?>
+ </td>
</tr>
-<?php
- echo "</table></div>";
+<?php
+ // Print the entries
+ $count = count($entries);
+ for ($x=0; $x < $half; $x++) {
+?>
+ <tr>
+ <td class="serendipity_admin_list_item">
+ <?php echo date('d.m.y, H:i', $entries[$x]['timestamp']) . ': '; ?>
+ <br />
+ <a href="?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action; ?>&serendipity[id]=<?php echo $entries[$x]['id']; ?>">
+ <?php echo htmlentities(substr(empty($entries[$x]['title']) ? $entries[$x]['body'] : $entries[$x]['title'], 0, 40)); ?>
+ </a>
+ </td>
+
+ <td class="serendipity_admin_list_item">
+<?php
+ if ($x + $half < $count) {
+?>
+ <?php echo date('d.m.y, H:i', $entries[$x + $half]['timestamp']) . ': '; ?>
+ <br />
+ <a href="?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action; ?>&serendipity[id]=<?php echo $entries[$x + $half]['id']; ?>">
+ <?php echo htmlentities(substr($entries[$x + $half]['title'], 0, 40)); ?>
+ </a>
+<?php
+ }
+?>
+ </td>
+ </tr>
+<?php
+ }
+ } else {
+ // We've got nothing
+?>
+ <tr>
+ <td class="serendipity_admin_list_item" colspan="2">
+ <?php echo NO_ENTRIES_TO_PRINT ?>
+ </td>
+ </tr>
+<?php
+ }
+?>
+ </table>
+</div>
+<?php
}
+switch($serendipity['GET']['adminAction']) {
+ case 'save':
+ $entry = array(
+ 'id' => $serendipity['POST']['id'],
+ 'title' => $serendipity['POST']['title'],
+ 'timestamp' => $serendipity['POST']['timestamp'],
+ 'body' => $serendipity['POST']['body'],
+ 'extended' => $serendipity['POST']['extended'],
+ 'categoryid' => $serendipity['POST']['categoryid']
+ );
-switch($serendipity["GET"]["adminAction"]) {
-
- case "save":
- $entry = array("id" => $serendipity["POST"]["id"],
- "title"=>$serendipity["POST"]["title"],
- "timestamp" => $serendipity["POST"]["timestamp"],
- "body" =>$serendipity["POST"]["body"],
- "extended" => $serendipity["POST"]["extended"],
- "categoryid" => $serendipity['POST']['categoryid']
- );
- $res = serendipity_updertEntry($entry);
- if (is_string($res))
- serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
- "serendipity[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
- else
- echo "Entry saved.";
- break;
-
- case "edit":
- $entry = serendipity_fetchEntry("id", $serendipity["GET"]["id"]);
-
- serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
- "serendipity[adminAction]" => "save"), $entry);
- break;
+ $res = serendipity_updertEntry($entry);
+
+ if (is_string($res)) {
+ serendipity_printEntryForm(
+ '?',
+ array(
+ 'serendipity[action]' => 'admin',
+ 'serendipity[adminModule]' => 'entries',
+ 'serendipity[adminAction]' => 'save'
+ ),
+ $entry,
+ ERROR . ': <b>' . $res . '</b>');
+ } else {
+ echo ENTRY_SAVED;
+ }
+ break;
- case "editSelect":
- serendipity_drawList("edit");
- break;
+ case 'editSelect':
+ serendipity_drawList('edit');
+ break;
- case "deleteSelect":
- serendipity_drawList("delete");
- break;
+ case 'deleteSelect':
+ serendipity_drawList('delete');
+ break;
- case "delete":
- echo "Are you sure you want to delete #".$serendipity["GET"]["id"]." permanently?<br>";
- echo "<input type='button' value='Not really...' onClick='history.go(-1);'>";
- echo str_repeat(" ", 10);
- $newLoc = "?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=doDelete&serendipity[id]="
- .$serendipity["GET"]["id"];
- echo "<input type='button' value='Dump it!' onClick='location.href=\"$newLoc\"'>";
- break;
+ case 'delete':
+ $newLoc = '?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=doDelete&serendipity[id]=' . $serendipity['GET']['id'];
+ printf(DELETE_SURE, $serendipity['GET']['id']);
+?>
+<br />
+<div>
+ <input type="button" value="<?php echo NOT_REALLY; ?>" onClick="history.go(-1);" />
+ <span style="width: 50px;"></span>
+ <input type="button" value="<?php echo DUMP_IT; ?>" onClick="location.href='<?php echo $newLoc; ?>'" />
+</div>
+<?php
+ break;
- case "doDelete":
- serendipity_deleteEntry($serendipity["GET"]["id"]);
- echo "R.I.P entry #".$serendipity["GET"]["id"];
- break;
+ case 'doDelete':
+ serendipity_deleteEntry($serendipity['GET']['id']);
+ printf(RIP_ENTRY, $serendipity['GET']['id']);
+ break;
- default:
- serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
- "serendipity[adminAction]" => "save"), $entry);
+ case 'edit':
+ $entry = serendipity_fetchEntry('id', $serendipity['GET']['id']);
+ default:
+ serendipity_printEntryForm(
+ '?',
+ array(
+ 'serendipity[action]' => 'admin',
+ 'serendipity[adminModule]' => 'entries',
+ 'serendipity[adminAction]' => 'save'
+ ),
+ $entry
+ );
}
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin_image_selector.php 8 Jul 2003 13:51:19 -0000 1.8
+++ serendipity_admin_image_selector.php 5 Aug 2003 14:07:40 -0000 1.9
@@ -1,110 +1,169 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
+
session_start();
-include("serendipity_config.inc.php");
+include('serendipity_config.inc.php');
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
-if ($_SESSION["serendipityAuthedUser"] !== true) die("Log in...");
+if ($_SESSION['serendipityAuthedUser'] !== true) {
+ die(HAVE_TO_BE_LOGGED_ON);
+}
function serendipity_displayImageList($start = 0, $end = 20) {
- global $serendipity;
-
+ global $serendipity;
serendipity_fetchImages(true);
- $inc = $end - $start;
- $files = array_slice($serendipity["imageList"], $start, $inc);
+ $inc = $end - $start;
+ $files = array_slice($serendipity['imageList'], $start, $inc);
if ($start > 0) {
- $left = "<input type='button' value='<<<' onClick=\"location.href='?serendipity[start]=" . max(0, $start - $inc) . "&serendipity[end]=$start';\">\n";
+ $left = '<input type="button" value="<<<" onClick="location.href=\'?serendipity[start]=' . max(0, $start - $inc) . '&serendipity[end]=' . $start . '\';">' . "\n";
}
if (count($serendipity["imageList"]) > $end) {
- $right = "<input type='button' value='>>>' onClick=\"location.href='?serendipity[start]=$end&serendipity[end]=" . ($end + $inc) . "'\">\n";
+ $right = '<input type="button" value=">>>" onClick="location.href=\'?serendipity[start]=' . $end . '&serendipity[end]=' . ($end + $inc) . '\';">' . "\n";
}
- $lineBreak = floor(750/($serendipity["thumbSize"]+20));
- echo "<table border='0'>";
- echo "<tr><td align='left' colspan='".floor($lineBreak/2)."'>$left</td><td align='right' colspan='".ceil($lineBreak/2)."'>$right</td></tr><tr>";
+ $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));
+?>
+<table border="0">
+ <tr>
+ <td align="left" colspan="<?php echo floor($linebreak/2); ?>">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="<?php echo ceil($linebreak/2); ?>">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+
+ <tr>
+<?php
for ($x=0; $x<count($files); $x++) {
-
- // Parse filename and image info
- $f = serendipity_parseFileName($files[$x]);
- $i = getimagesize($serendipity["serendipityPath"].$serendipity["uploadPath"]."/".$files[$x]);
-
+ // Parse filename and image info
+ $f = serendipity_parseFileName($files[$x]);
+ $i = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $files[$x]);
+ $imgsrc = $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
// Display thumbnails
- echo "<td height='".$serendipity["thumbSize"]."' align='center' valign='middle'>";
- echo "<a href='?serendipity[step]=1&serendipity[image]=".$files[$x]."'>";
- echo "<img src='".$serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."' hspace='15' border='0'>";
- echo "</a>";
- echo "</td>";
-
+?>
+ <td height="<?php echo $serendipity['thumbSize']; ?>" align="center" valign="middle">
+ <a href="?serendipity[step]=1&serendipity[image]="<?php echo $files[$x]; ?>">
+ <img src="<?php echo $imgsrc; ?>" hspace="15" border="0" />
+ </a>
+ </td>
+<?php
// Newline?
- if (($x+1)%$lineBreak == 0) echo "</tr><tr>";
+ if (($x+1)%$lineBreak == 0) {
+?>
+ </tr>
+ <tr>
+<?php
+ }
}
- echo "</tr><tr><td align='left' colspan='".floor($lineBreak/2)."'>$left</td><td align='right' colspan='".ceil($lineBreak/2)."'>$right</td></tr>";
- echo "</table>";
+?>
+ </tr>
+ <tr>
+ <td align="left" colspan="<?php echo floor($linebreak/2); ?>">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="<?php echo ceil($linebreak/2); ?>">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+</table>
+<?php
+}
-}?>
+?>
<html>
- <head>
- <title><?php echo SELECT_IMAGE; ?></title>
- <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
- </head>
+ <head>
+ <title><?php echo SELECT_IMAGE; ?></title>
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
+ </head>
<body>
+
<?php
+switch ($serendipity['GET']['step']) {
+ case '1':
+ $f = serendipity_parseFileName($serendipity["GET"]["image"]);
+ $imgsrc = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+ $imgName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
+ $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+?>
+<script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
+<script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
-switch ($serendipity["GET"]["step"]) {
+<div>
+ <img align="right" src="<?php echo $imgsrc; ?>">
+ <h1><?php printf(YOU_CHOSE, $serendipity['GET']['image']); ?></h1>
+ <p>
+ <form action="#" method="GET" name="serendipity[selForm]" onSubmit="serendipity_imageSelector_done()">
+ <div>
+ <input type="hidden" name="imgName" value="<?php echo $imgName; ?>" />
+ <input type="hidden" name="thumbName" value="<?php echo $thumbName; ?>" />
- case "1":
- ?>
- <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
- <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
- <?php
- $f = serendipity_parseFileName($serendipity["GET"]["image"]);
- echo "<img align='right' src='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."'>";
- echo "<h1>".sprintf(YOU_CHOSE,$serendipity["GET"]["image"])."</h1><p>";
- echo "<form action='#' method='GET' name='serendipity[selForm]' onSubmit='serendipity_imageSelector_done()'>";
- echo "<input type='hidden' name='imgName' value='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadHTTPPath"].$serendipity["GET"]["image"]."'>";
- echo "<input type='hidden' name='thumbName' value='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."'>";
+ <b><?php echo IMAGE_SIZE; ?>:</b>
+ <br />
+ <input type="radio" name="serendipity[linkThumbnail]" value="no" checked="checked" /><?php echo I_WANT_THUMB; ?><br />
+ <input type="radio" name="serendipity[linkThumbnail]" value="yes" /><?php echo I_WANT_BIG_IMAGE; ?><br />
+ <br />
- echo "<b>".IMAGE_SIZE.":</b><br>";
- 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>";
+ <b><?php echo IMAGE_ALIGNMENT; ?>:</b>
+ <br />
+ <input type="radio" name="serendipity[align]" value="" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_top.png" vspace="5"><br />
+ <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_left.png" vspace="5"><br />
+ <input type="radio" name="serendipity[align]" value="right" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_right.png" vspace="5"><br />
+ <br />
- 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>";
- echo "<input type='radio' name='serendipity[align]' value='left' CHECKED> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_left.png' vspace='5'><br>";
- echo "<input type='radio' name='serendipity[align]' value='right'> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_right.png' vspace='5'><p>";
+ <b><?php echo IMAGE_AS_A_LINK; ?>:</b>
+ <br />
+ <input type="radio" name="serendipity[isLink]" checked="checked" /> <?php echo I_WANT_NO_LINK; ?><br />
+ <input type="radio" name="serendipity[isLink]" /> <?php echo I_WANT_IT_TO_LINK; ?>
+ <input type="text" name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
+ <br />
- echo "<b>".IMAGE_AS_A_LINK.":</b><br>";
- 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 "</form>";
+ <input type="button" value="<?php echo BACK; ?>" onClick="history.go(-1);" />
+ <input type="button" value="<?php echo DONE; ?>" onClick="serendipity_imageSelector_done()" />
+ </div>
+ </form>
+ </p>
+<?php
break;
- default:
- echo "<b>Select an image:</b><p>";
- if (!is_numeric($serendipity["GET"]["start"])) $serendipity["GET"]["start"] = 0;
- if (!is_numeric($serendipity["GET"]["end"]))
- $serendipity["GET"]["end"] = $serendipity["GET"]["start"]+
- floor(750/($serendipity["thumbSize"]+20))*floor(580/($serendipity["thumbSize"]+20));
- echo CLICK_IMAGE_TO_INSERT."<br>";
- serendipity_displayImageList($serendipity["GET"]["start"], $serendipity["GET"]["end"]);
+ default:
+ if (!is_numeric($serendipity['GET']['start'])) {
+ $serendipity['GET']['start'] = 0;
+ }
+
+ if (!is_numeric($serendipity['GET']['end'])) {
+ $serendipity['GET']['end'] = $serendipity['GET']['start']+ floor(750/($serendipity['thumbSize']+20))*floor(580/($serendipity['thumbSize']+20));
+ }
+?>
+ <b><?php echo SELECT_IMAGE; ?></b>
+ <br />
+
+ <?php echo CLICK_IMAGE_TO_INSERT; ?>
+ <br />
+
+ <?php serendipity_displayImageList($serendipity['GET']['start'], $serendipity['GET']['end']);
}
?>
-</body></html>
+
+</body>
+</html>
+
<?php
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_images.inc.php 8 Jul 2003 09:13:27 -0000 1.9
+++ serendipity_admin_images.inc.php 5 Aug 2003 14:07:40 -0000 1.10
@@ -1,286 +1,359 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
function serendipity_displayImageList($start = 0, $end = 20) {
- global $serendipity;
+ global $serendipity;
serendipity_fetchImages(true);
$inc = $end - $start;
- $files = @array_slice($serendipity["imageList"], $start, $inc);
- ?>
- <script language="javascript">
- <!--
- function rename(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);
- }
- //-->
- </script>
- <div class="serendipity_admin_list">
- <div class="serendipity_admin_list_title">Image manager:</div>
- <?php
+ $files = @array_slice($serendipity['imageList'], $start, $inc);
if ($start > 0) {
- $left = "<input type='button' value='<<<' onClick=\"location.href='{$_SERVER['REQUEST_URI']}&start=" . max(0, $start - $inc) . "&end=$start';\">\n";
+ $left = '<input type="button" value="<<<" onClick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . max(0, $start - $inc) . '&end=' . $start . '\';" />' . "\n";
}
if (count($serendipity["imageList"]) > $end) {
- $right = "<input type='button' value='>>>' onClick=\"location.href='{$_SERVER['REQUEST_URI']}&start=$end&end=" . ($end + $inc) . "'\">\n";
+ $right = '<input type="button" value=">>>" onClick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . $end . '&end=' . ($end + $inc) . '\';" />' . "\n";
}
-
- echo "<table class='serendipity_admin_list'>";
- echo "<tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr><tr>";
- for ($x=0; $x<count($files); $x++) {
-
- // Parse filename and image info
- $f = serendipity_parseFileName($files[$x]);
- $i = @getimagesize($serendipity["serendipityPath"].$serendipity["uploadPath"]."/".$files[$x]);
-
- echo "<td class='serendipity_admin_list_item' width='50%' nowrap>";
-
- // Display a thumbnail?
- 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'>";
+?>
+ <script type="text/javascript" language="javascript">
+ <!--
+ function rename(fname) {
+ if(newname = prompt('<?php echo ENTER_NEW_NAME; ?>' + fname, fname)) {
+ location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[oldname]='+ escape(fname) + '&serendipity[newname]='+ escape(newname);
+ }
}
+ //-->
+ </script>
- // Display image name and resolution
- echo "<br>". $i[0]."x".$i[1]."<br>";
+ <div class="serendipity_admin_list">
+ <div class="serendipity_admin_list_title"><?php echo IMAGE_MANAGER; ?></div>
- // 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).",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 "<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>";
+ <table class="serendipity_admin_list">
+ <tr>
+ <td align="left" colspan="2">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="2">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+
+ <tr>
+<?php
+ for ($x=0; $x<count($files); $x++) {
+ // Parse filename and image info
+ $f = serendipity_parseFileName($files[$x]);
+ $i = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $files[$x]);
+ $_imgsrc = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+ $imgsrc = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+ if (file_exists($_imgsrc)) {
+ $preview = '<img align="left" src="' . $imgsrc . '" hspace="15" alt="" />';
+ } else {
+ $preview = '';
+ }
+?>
+ <td class="serendipity_admin_list_item" width="50%" nowrap="nowrap">
+ <b><?php echo $files[$x]; ?></b>
+ <br />
+
+ <?php echo $preview; ?>
+ <br />
+ <?php echo $i[0] . 'x' . $i[1]; ?>
+ <br />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png" border="0" onClick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $files[$x]; ?>','Zoom','height=<?php echo ($i[1] + 20); ?>,width=<?php echo ($i[0] + 20); ?>,toolbar=no,menubar=no,location=no');" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_RENAME; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onClick="rename('<?php echo addslashes($files[$x]); ?>')" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png" border="0" onClick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onClick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
+ </td>
+<?php
// Linebreak?
- if (($x+1)%2 == 0) echo "</tr><tr>";
+ if (($x+1)%2 == 0) {
+?>
+ </tr>
+ <tr>
+<?php
+ }
}
- echo "</tr><tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr>";
- echo "</table></div>";
+?>
+ </tr>
+ <tr>
+ <td align="left" colspan="2">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="2">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+ </table>
+ </div>
+<?php
}
+switch ($serendipity['GET']['adminAction']) {
+ case 'genThumbs':
+ set_time_limit(0);
+ ignore_user_abort();
+ echo '<b>' . RESIZING . '</b><br /><br />';
+ flush();
+ $i = serendipity_generateThumbs();
+ printf(RESIZE_DONE, $i);
+ break;
-switch ($serendipity["GET"]["adminAction"]) {
+ case 'DoDelete':
+ $file = $serendipity['GET']['fname'];
+ $fThumb = serendipity_parseFileName($file);
+ $fThumb = $fThumb[0] . '.' . $serendipity['thumbSuffix'] . '.' . $fThumb[1];
+ if ( file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
+ if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
+ printf(DELETE_IMAGE . '<br />', $file);
+ } else {
+ printf(DELETE_IMAGE_FAIL . '<br />' $file);
+ }
- case "genThumbs":
- set_time_limit(0);
- ignore_user_abort();
- echo "<b>Resizing:</b><p>";
- flush();
- $i = serendipity_generateThumbs();
- echo "Done (resized $i images).";
- break;
+ if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $fThumb) ) {
+ printf(DELETE_THUMBNAIL . '<br />', $fThumb);
+ }
+ } else {
+ printf(FILE_NOT_FOUND, $file);
+ }
+ break;
- case "DoDelete":
- $file = $serendipity['GET']['fname'];
- $fThumb = serendipity_parseFileName($file);
- $fThumb = $fThumb[0].".".$serendipity["thumbSuffix"].".".$fThumb[1];
- if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
- if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
- echo "Deleted the image entitled <b>". $file ."</b>";
- } else {
- echo "Unable to delete <b>". $file ."</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>". $file ."</b>, maybe it has already been deleted?";
- }
+ case 'delete':
+ $file = $serendipity['GET']['fname'];
+ $abortLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_entries.php?serendipity[adminModule]=images';
+ $newLoc = $abortLoc . '&serendipity[adminAction]=DoDelete&serendipity[fname]=' . $file;
- break;
- case "delete":
- $file = $serendipity['GET']['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]=". $file;
- echo "<input type='button' value='Delete the image' onClick='location.href=\"$newLoc\"'>";
-
- echo str_repeat(" ", 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"]) &&
- !file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"])) {
+ printf(ABOUT_TO_DELETE_FILE, $file);
+?>
+ <form method="get" name="delete_image">
+ <div>
+ <input type="button" value="<?php echo IMAGE_DELETE ?>" onClick="location.href='<?php echo $newLoc; ?>'" />
+
+ <input type="button" value="<?php echo ABORT_NOW ?>" onClick="location.href='<?php echo $abortLoc; ?>'" />
+ </div>
+ </form>
+<?php
+ break;
- // Rename file
- rename($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"],
- $serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"]);
+ case 'rename':
+ $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['oldname'];
+ $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'];
+ if ($serendipity['GET']['oldname'] != '' && $serendipity['GET']['newname']!= '' &&
+ file_exists($oldfile) &&
+ !file_exists($newfile)) {
+
+ // Rename file
+ rename($oldfile, $newfile);
+
// Rename thumbnail
- $f = serendipity_parseFileName($serendipity["GET"]["oldname"]);
- $f2= serendipity_parseFileName($serendipity["GET"]["newname"]);
- rename($serendipity["serendipityPath"].$serendipity["uploadPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1],
- $serendipity["serendipityPath"].$serendipity["uploadPath"].$f2[0].".".$serendipity["thumbSuffix"].".".$f2[1]);
-
+ $f = serendipity_parseFileName($serendipity['GET']['oldname']);
+ $f2= serendipity_parseFileName($serendipity['GET']['newname']);
+ rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1],
+ $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f2[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f2[1]);
+
// Forward user to overview (we don't want the user's back button to rename things again)
- echo "<script language='javascript'>\nlocation.href='?serendipity[adminModule]=images';\n</script>";
- }
- else {
- if (!file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"]))
- echo ERROR_FILE_NOT_EXISTS;
- elseif (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"]))
- echo ERROR_FILE_EXISTS;
- else
- echo ERROR_SOMETHING;
- echo "<br><input type='button' onClick='history.go(-1);' value='".BACK."'>";
+?>
+ <script language="javascript" type="text/javascript">
+ location.href="?serendipity[adminModule]=images";
+ </script>
+<?php
+ } else {
+ if (!file_exists($oldfile)) {
+ echo ERROR_FILE_NOT_EXISTS;
+ } elseif (file_exists($newfile)) {
+ echo ERROR_FILE_EXISTS;
+ } else {
+ echo ERROR_SOMETHING;
+ }
+?>
+ <br />
+ <input type="button" onclick="history.go(-1);" value="<?php echo BACK; ?>" />
+<?php
}
- break;
+ break;
- case "add":
- echo "<b>".ADDING_IMAGE."</b><p>";
- // First find out whether to fetch a file or accept an upload
- 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
- 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>";
+ case 'add':
+?>
+ <b><?php echo ADDING_IMAGE; ?></b>
+ <br /><br />
...
[truncated message content] |
|
From: <gar...@us...> - 2003-08-03 15:19:33
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv31391
Modified Files:
serendipity_functions.inc.php
Log Message:
<category> is only for RSS > 0.91
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_functions.inc.php 2 Aug 2003 15:14:19 -0000 1.110
+++ serendipity_functions.inc.php 3 Aug 2003 15:19:22 -0000 1.111
@@ -866,7 +866,6 @@
<item>
<title><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>
<link><?php echo $guid; ?></link>
- <category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
<?php
if ($version == '2.0') {
// extract author information
@@ -876,6 +875,7 @@
$entry['email'] = $results[0]['email'];
}
?>
+ <category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
<author><?php echo htmlentities($entry['email']) . ' (' . htmlentities($entry['username']) . ')'; ?></author>
<content:encoded>
<?php echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])))); ?>
|
|
From: <gar...@us...> - 2003-08-02 15:14:22
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1:/tmp/cvs-serv31398 Modified Files: .cvsignore rss.php serendipity_admin_installer.inc.php serendipity_functions.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_sidebar_items.php Log Message: o Added the 'plugins' directory to CVS to provide some bundled external plugins for examples o Removed creating the plugins directory in the installer, removed plugins from .cvsignore o Fixed the RSS feed for comments to be feeded. Implemented them into the RSS/XML sidebar item plugin. o Fixed some more language issues, outsourced strings to constants. o UTF8encode description and title in the RSS feeds o Implemented 'category' tag for RSS2.0 feed o Optimized RSS-feed SQL queries to be only used if no email was already provided from an earlier query o Added a 'content rewrite' external plugin. Allows any strings to be rewritten to customized strings. See my other posts about this for details. o Force inline display of emoticons (XHTML) Happy testing. :) I checked all changes now for a week in my personal blog (www.supergarv.de/serendipity/) with the new plugin, and without problems . Index: .cvsignore =================================================================== RCS file: /cvsroot/php-blog/serendipity/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 29 Mar 2003 15:39:03 -0000 1.2 +++ .cvsignore 2 Aug 2003 15:14:19 -0000 1.3 @@ -2,5 +2,4 @@ serendipity_config_local.inc.php .htaccess uploads -archives -plugins +archives \ No newline at end of file Index: rss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/rss.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- rss.php 8 Jul 2003 09:13:27 -0000 1.7 +++ rss.php 2 Aug 2003 15:14:19 -0000 1.8 @@ -9,11 +9,13 @@ $description = $serendipity['blogDescription']; $title = $serendipity['blogTitle']; -switch ($type) { +$comments = FALSE; +switch ($_GET['type']) { case 'comments': - $entries = serendipity_fetchComments(null, true, 15); - $title = $title . ' Comments'; - $description = 'Comments from ' . $description; + $entries = serendipity_fetchComments(null, 15); + $title = $title . ' ' . COMMENTS; + $description = COMMENTS_FROM . ' ' . $description; + $comments = TRUE; break; case 'content': default: @@ -25,6 +27,9 @@ break; } +$title = utf8_encode($title); +$description = utf8_encode($description); + echo '<?xml version="1.0" encoding="utf-8" ?>'; echo "\n"; switch ($version) { @@ -49,9 +54,9 @@ xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:robot="http://www.edwardbear.org/def/xml/robot"> <channel> -<title>{$serendipity['blogTitle']}</title> +<title>$title</title> <link>{$serendipity['baseURL']}</link> -<description>{$serendipity['blogDescription']}</description> +<description>$description</description> <dc:language>{$serendipity['lang']}</dc:language> HEAD; @@ -60,7 +65,7 @@ die("Invalid RSS version specified\n"); } -serendipity_printEntries_rss($entries, $version); +serendipity_printEntries_rss($entries, $version, $comments); switch ($version) { case '0.91': Index: serendipity_admin_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_admin_installer.inc.php 23 Jul 2003 21:12:38 -0000 1.22 +++ serendipity_admin_installer.inc.php 2 Aug 2003 15:14:19 -0000 1.23 @@ -184,12 +184,7 @@ $errs[] = " -> and <i>chmod g+rwx ".$_POST["serendipityPath"]."archives</i>"; } - // Attempt to create the plugins dir - if ( !is_dir($_POST['serendipityPath'] . "plugins") && @mkdir($_POST['serendipityPath'] . "plugins", 0770) !== true ) { - $errs[] = "Couldn't create the plugins directory, you do it:"; - $errs[] = " -> Run <i>mkdir ".$_POST["serendipityPath"]."plugins</i>"; - $errs[] = " -> and <i>chmod g+rwx ".$_POST["serendipityPath"]."plugins</i>"; - } + // plugins directory now part of basic CVS // Check imagick if ($_POST["magick"] == "true" && !is_executable($_POST["convert"])) { Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- serendipity_functions.inc.php 26 Jul 2003 09:04:58 -0000 1.109 +++ serendipity_functions.inc.php 2 Aug 2003 15:14:19 -0000 1.110 @@ -365,6 +365,7 @@ $query = "SELECT e.*, a.username, + a.email, c.category_name FROM ({$serendipity['dbPrefix']}entries AS e @@ -592,16 +593,42 @@ { global $serendipity; - $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type LIKE 'NORMAL' ORDER BY id"; - if (isset($limit)) { - $query .= " LIMIT $limit"; + if (!empty($limit)) { + if ( strtolower($serendipity['dbType']) == 'postgres' ) { + $limit = 'LIMIT ' . join (' OFFSET ', split(',', $limit)); + } else { + $limit = 'LIMIT '. $limit; + } + } else { + $limit = ''; + } + + if (!empty($id)) { + $and = 'AND co.entry_id=' . $id; } + $query = "SELECT + co.*, + co.author AS username, + e.title, + c.category_name + FROM + ({$serendipity['dbPrefix']}comments co + LEFT JOIN {$serendipity['dbPrefix']}entries e + ON co.entry_id = e.id + LEFT JOIN {$serendipity['dbPrefix']}category c + ON e.categoryid = c.categoryid) + WHERE co.type LIKE 'NORMAL' $and + ORDER BY + co.id DESC + $limit"; + $comments = serendipity_db_query($query); + if (!is_array($comments)) { return array(); } - + return $comments; } @@ -825,23 +852,31 @@ } -function serendipity_printEntries_rss($entries, $version) { +function serendipity_printEntries_rss($entries, $version, $comments = false) { global $serendipity; if ($version == '0.91' || $version == '2.0' && is_array($entries)) { foreach ($entries as $entry) { $guid = serendipity_archiveURL($entry['id'], $entry['title']); + if ($comments == true) { + // Display username as part of the title for easier feed-readability + $entry['title'] = $entry['username'] . ': ' . $entry['title']; + } ?> <item> - <title><?php echo htmlentities($entry['title']); ?></title> + <title><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title> <link><?php echo $guid; ?></link> + <category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category> <?php if ($version == '2.0') { // extract author information - $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'"; - $results = serendipity_db_query($query); + if (empty($entry['email'])) { + $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'"; + $results = serendipity_db_query($query); + $entry['email'] = $results[0]['email']; + } ?> - <author><?php echo htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ')'; ?></author> + <author><?php echo htmlentities($entry['email']) . ' (' . htmlentities($entry['username']) . ')'; ?></author> <content:encoded> <?php echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])))); ?> </content:encoded> @@ -870,6 +905,102 @@ return('<tt>' . str_replace(' ', ' ', $arg[1]) . '</tt>'); } +function serendipity_content_rewrite($str) { + global $serendipity; + + // Do this only once! + if (!class_exists('serendipity_plugin_api')) { + include_once('serendipity_plugin_api.php'); + } + + // If this variable is not set, this function is called for the first time. + // Now let's search for plugins needing content rewriting + if (!isset($serendipity['content_rewrite']['active'])) { + + // We set this to false, so when this function is called later, it won't have to enumerate all plugins again + $serendipity['content_rewrite']['active'] = false; + + // Get those nifty plugins + $plugins = serendipity_plugin_api::enum_plugins(); + + if (is_array($plugins)) { + + // store the rewrite items in our main container for later usage. + $serendipity['content_rewrite']['data']['rewrite_from'] = array(); + $serendipity['content_rewrite']['data']['rewrite_to'] = array(); + + // load each plugin to make some introspection + foreach ($plugins as $plugin_data) { + $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']); + $bag = new serendipity_property_bag; + $plugin->introspect($bag); + + if ($bag->get('rewrite_active') === true) { + + // Store necessary data in our main container + $serendipity['content_rewrite']['string'] = $plugin->get_config('rewrite_string'); + + if ($serendipity['content_rewrite']['string'] != '') { + $rewrite_from = $bag->get('rewrite_from'); + $serendipity['content_rewrite']['data']['rewrite_char'][$serendipity['content_rewrite']['string']] = &$plugin->get_config('rewrite_char'); + + foreach($rewrite_from AS $nr => $key) { + $serendipity['content_rewrite']['data']['rewrite_from'][$serendipity['content_rewrite']['string']][] = $plugin->get_config($key); + } + + $rewrite_to = $bag->get('rewrite_to'); + foreach($rewrite_to AS $nr => $key) { + $serendipity['content_rewrite']['data']['rewrite_to'][$serendipity['content_rewrite']['string']][] = $plugin->get_config($key); + } + + // We now have at least one active plugin. + $serendipity['content_rewrite']['active'] = true; + } + } + } + } + } + + // Check if we have any plugin data needing rewrite + if (is_array($serendipity['content_rewrite']['data']['rewrite_from'])) { + foreach($serendipity['content_rewrite']['data']['rewrite_from'] AS $rewrite_string => $rewrite_values) { + foreach($rewrite_values AS $key => $val) { + if (trim($val) != '') { + + // Use the supplied rewrite string and replace the {from} and {to} values with the ones we got from the plugin + $new = + str_replace( + array( + '{from}', + '{to}' + ), + + array( + str_replace( + $serendipity['content_rewrite']['data']['rewrite_char'][$rewrite_string], + '', + $val + ), + + $serendipity['content_rewrite']['data']['rewrite_to'][$rewrite_string][$key] + ), + + $rewrite_string + ); + + // Build a regular expression (ungreedy, multiline) with our quoted value. $val here is the word needing the replacement + $regex = '°([^\d\w])(' . preg_quote($val) . ')([^\d\w])°msU'; + + // \1 and \3 are the prepend/append strings (usually whitespaces) and $new containing the new value + $str = preg_replace($regex, '\1' . $new . '\3', $str); + } + } + } + } + + return $str; +} + function serendipity_markup_text($str, $entry_id = 0) { global $serendipity; @@ -913,6 +1044,9 @@ ); } + // Do some content rewrite, if necessary + $ret = serendipity_content_rewrite($ret); + return $ret; } @@ -943,7 +1077,7 @@ global $serendipity; foreach ($serendipity['smiles'] as $key => $value) { - $str = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m", "$1<img src=\"$value\" alt=\"$key\" />$2", $str); + $str = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m", "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" />$2", $str); } return $str; Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- serendipity_lang_de.inc.php 16 Jul 2003 11:58:24 -0000 1.16 +++ serendipity_lang_de.inc.php 2 Aug 2003 15:14:19 -0000 1.17 @@ -181,6 +181,7 @@ define('HIDDEN', 'versteckt'); define('REMOVE_TICKED_PLUGINS', 'Markierte plugins entfernen'); define('SAVE_CHANGES_TO_LAYOUT', 'Änderungen am Layout speichern'); +define('COMMENTS_FROM', 'Kommentare von'); define('serendipity_LANG_LOADED', true); /* vim: set sts=4 ts=4 expandtab : */ Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_en.inc.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_lang_en.inc.php 18 Jul 2003 17:51:15 -0000 1.22 +++ serendipity_lang_en.inc.php 2 Aug 2003 15:14:19 -0000 1.23 @@ -181,6 +181,7 @@ define('HIDDEN', 'hidden'); define('REMOVE_TICKED_PLUGINS', 'Remove ticked plugins'); define('SAVE_CHANGES_TO_LAYOUT', 'Save changes to layout'); +define('COMMENTS_FROM', 'Comments from'); define('serendipity_LANG_LOADED', true); /* vim: set sts=4 ts=4 expandtab : */ Index: serendipity_sidebar_items.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- serendipity_sidebar_items.php 16 Jul 2003 12:08:22 -0000 1.22 +++ serendipity_sidebar_items.php 2 Aug 2003 15:14:19 -0000 1.23 @@ -145,6 +145,9 @@ <br /> <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a> <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0">RSS 2.0 feed</a> + <br /> + <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a> + <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments">RSS 2.0 <?php echo COMMENTS; ?></a> <?php } } |
|
From: <tom...@us...> - 2003-07-30 16:38:38
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv12078
Modified Files:
serendipity_db_mysql.inc.php
Log Message:
Attempting to fix bug 780149.
We select the database during _connect and just use mysql_query()
Thereby the _probe function will be the one setting the database for us (during installation), and the rest of the queries will just use that database
Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_db_mysql.inc.php 25 Jul 2003 01:03:18 -0000 1.10
+++ serendipity_db_mysql.inc.php 30 Jul 2003 16:38:35 -0000 1.11
@@ -18,7 +18,7 @@
// highlight_string(var_export($sql, 1));
- $c = mysql_db_query($serendipity['dbName'], $sql);
+ $c = mysql_query($sql);
if (!$c) {
if (!$serendipity['production']) {
@@ -84,7 +84,7 @@
}
$serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
-
+ mysql_select_db($serendipity['dbName']);
return $serendipity['dbConn'];
}
|
