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

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

Brought to you by: garvinhicking, jhermanns

php-blog-cvs — Serendipity commit list

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 529 530 531 532 533 .. 551 > >> (Page 531 of 551)

[php-blog-cvs] serendipity serendipity_config.inc.php,1.29,1.30

From: <tom...@us...> - 2003-09-07 21:22:17

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Fixed bug after installation causing language inclusion to fail


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_config.inc.php	4 Sep 2003 16:23:46 -0000	1.29
+++ serendipity_config.inc.php	7 Sep 2003 21:22:11 -0000	1.30
@@ -6,10 +6,14 @@
 
 $serendipity['version'] = '0.3';
 $serendipity['production'] = 1;
-
-// Rewrite always on
 $serendipity['rewrite'] = true;
 
+/* Load main language file */
+require_once('serendipity_lang.inc.php');
+
+/* Load fallback language (english) */
+@include_once("{$serendipity['serendipityPath']}/serendipity_lang_en.inc.php");
+
 
 // We need this if people want to upgrade s9y
 if (!isset($serendipity['templatePath'])) {
@@ -21,7 +25,6 @@
 }
 
 if (!file_exists("{$serendipity['serendipityPath']}serendipity_config_local.inc.php")) {
-    include_once 'serendipity_lang.inc.php';
     die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }
 
@@ -30,13 +33,11 @@
 include_once("{$serendipity['serendipityPath']}serendipity_functions.inc.php");
 
 if (serendipity_FUNCTIONS_LOADED!== true) {
-    include_once 'serendipity_lang.inc.php';
     die(sprintf(INCLUDE_ERROR, 'serendipity_functions.inc.php'));
 }
 
 // Connect to database
 if (!serendipity_db_connect()) {
-    include_once 'serendipity_lang.inc.php';
     die(DATABASE_ERROR);
 }
 
@@ -68,17 +69,6 @@
 if (!isset($serendipity['indexFile'])) {
     $serendipity['indexFile'] = 'index.php';
 }
-
-// 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',

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.36,1.37

From: <tom...@us...> - 2003-09-07 20:53:27

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Fixed bug which inserted wrong values in the database during installation


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_admin_installer.inc.php	3 Sep 2003 19:59:29 -0000	1.36
+++ serendipity_admin_installer.inc.php	7 Sep 2003 20:53:23 -0000	1.37
@@ -302,6 +302,9 @@
         $mail_comments = 0;
     }
 
+    /*
+        ------------- Install main author ------------
+    */
     $enc_pass = md5($_POST['pass']);
     $query = "INSERT INTO {$_POST['dbPrefix']}authors (
                             username,
@@ -362,7 +365,6 @@
 
     // Save all basic config variables to the database
     $p = serendipity_parseTemplate("./serendipity_config_local.tpl");
-
     foreach($p as $key => $value) {
         foreach ($value as $entry) {
             serendipity_set_config_var($entry['name'], $_POST[$entry['name']]);
@@ -420,10 +422,12 @@
             $res = serendipity_installDatabase();
             if ( $res !== false ) {
                 echo ' ' . DONE . '<br />';
+                /* Insert all the configurated options */
+                serendipity_updateConfiguration();
             } else {
                 echo '<span style="color: #FF0000">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />';
             }
-
+            
             /* Next are the files, .htaccess */
             printf(ATTEMPT_WRITE_FILE, '.htaccess');
             $res = serendipity_installFiles();
@@ -459,16 +463,20 @@
             );
 
             session_destroy();
-        }
-
-        $res = serendipity_updateConfiguration();
-        if ( is_array($res) ) {
-            echo DIAGNOSTIC_ERROR;
-            echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
+        
+        
+        /*
+            If serendipity is already installed and we are only doing a reconfiguration
+        */
         } else {
-            echo WRITTEN_N_SAVED;
+            $res = serendipity_updateConfiguration();
+            if ( is_array($res) ) {
+                echo DIAGNOSTIC_ERROR;
+                echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
+            } else {
+                echo WRITTEN_N_SAVED;
+            }
         }
-
         break;
 
     default:

[php-blog-cvs] serendipity serendipity_config.inc.php,1.28,1.29 serendipity_functions_config.inc.php,1.4,1.5

From: <tom...@us...> - 2003-09-04 16:23:56

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

Modified Files:
	serendipity_config.inc.php 
	serendipity_functions_config.inc.php 
Log Message:
* Workaround for 'true' and 'false' in the CONFIG array becomming booleans. While this is correct behaviour, some plugins to not take this into account at this time
* Made sure CONFIG vars are set in the array, right after set_config_var is run


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_config.inc.php	3 Sep 2003 20:16:50 -0000	1.28
+++ serendipity_config.inc.php	4 Sep 2003 16:23:46 -0000	1.29
@@ -49,8 +49,16 @@
 $rows = serendipity_db_query("SELECT name,value 
                                 FROM {$serendipity['dbPrefix']}config");
 foreach ($rows as $row) {
-    $serendipity[$row['name']] = $serendipity['CONFIG'][$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
+    /* fixme: temp. workaround */
+    $serendipity['CONFIG'][$row['name']] = $row['value'];
+    
+    /* Convert 'true' and 'false' in to booleans */
+    if ( isset($translation[$row['value']]) ) {
+        $row['value'] = $translation[$row['value']];
+    }
+    $serendipity[$row['name']] = $row['value'];
 }
+
 
 if ($serendipity['embed']) {
     $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];

Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_functions_config.inc.php	5 Aug 2003 14:07:41 -0000	1.4
+++ serendipity_functions_config.inc.php	4 Sep 2003 16:23:46 -0000	1.5
@@ -5,7 +5,7 @@
 
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "'");
         $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val));
-    
+        $serendipity['CONFIG'][$name] = $val;
         if (is_string($r)) {
             echo $r;
         }

[php-blog-cvs] serendipity serendipity_config.inc.php,1.27,1.28

From: <tom...@us...> - 2003-09-03 20:16:54

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Remove doublicate query to save configuration options in the $serendipity array


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_config.inc.php	3 Sep 2003 19:59:30 -0000	1.27
+++ serendipity_config.inc.php	3 Sep 2003 20:16:50 -0000	1.28
@@ -46,9 +46,10 @@
                     );
 
 // Load Configuration options from the database
-$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config");
+$rows = serendipity_db_query("SELECT name,value 
+                                FROM {$serendipity['dbPrefix']}config");
 foreach ($rows as $row) {
-    $serendipity[$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
+    $serendipity[$row['name']] = $serendipity['CONFIG'][$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
 }
 
 if ($serendipity['embed']) {
@@ -129,13 +130,6 @@
 $serendipity['GET']    =    &$_GET['serendipity'];
 $serendipity['POST']   =   &$_POST['serendipity'];
 $serendipity['COOKIE'] = &$_COOKIE['serendipity'];
-
-// We want our config vars cached... will save us lots of SQL queries
-$sql = "SELECT * FROM {$serendipity['dbPrefix']}config";
-$rs = serendipity_db_query($sql);
-foreach ($rs as $var) {
-    $serendipity['CONFIG'][$var['name']] = $var['value'];
-}
 
 // We don't care who tells us what to do
 if (!$serendipity['GET']['action']) {

[php-blog-cvs] serendipity TODO,1.5,1.6 serendipity_admin_installer.inc.php,1.35,1.36 serendipity_config.inc.php,1.26,1.27

From: <tom...@us...> - 2003-09-03 19:59:33

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

Modified Files:
	TODO serendipity_admin_installer.inc.php 
	serendipity_config.inc.php 
Log Message:
* Update TODO (! indicates critical features)
* Insert INSTALLED version into config file. This way we have some method of actually telling which version is INSTALLED on the system. 
   ! Can be used later when we create an upgrade script

* Rename version tag to 0.3



Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TODO	31 Aug 2003 00:13:56 -0000	1.5
+++ TODO	3 Sep 2003 19:59:29 -0000	1.6
@@ -10,8 +10,10 @@
 * Add support for multiple weblogs
 * Add the ability to have a printer friendly format for the weblog
 * Convert localization into a phpMyAdmin-like system
-* Allow for upgrades of Serendipity in the installer
+* Rename serendipity_config.inc.php to serendipity.inc.php
 
-? Split up the configuration page and the installer ?
-? Make a better "Powered By" logo ?
-? Convert some of the internal plugins into external plugins ?
+! Allow for upgrades of Serendipity in the installer
+
+? Split up the configuration page and the installer
+? Make a better "Powered By" logo
+? Convert some of the internal plugins into external plugins

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_admin_installer.inc.php	2 Sep 2003 17:31:41 -0000	1.35
+++ serendipity_admin_installer.inc.php	3 Sep 2003 19:59:29 -0000	1.36
@@ -383,6 +383,8 @@
     }
 
     fwrite($configfp, "<?php\n");
+    $v = ( (!$serendipity['versionInstalled']) ? $serendipity['version'] : $serendipity['versionInstalled']);
+    fwrite($configfp, "\t\$serendipity['versionInstalled'] = '{$v}';\n");
     fwrite($configfp, "\t\$serendipity['dbName']   = '{$_POST['dbName']}';\n");
     fwrite($configfp, "\t\$serendipity['dbPrefix'] = '{$_POST['dbPrefix']}';\n");
     fwrite($configfp, "\t\$serendipity['dbHost']   = '{$_POST['dbHost']}';\n");

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_config.inc.php	24 Aug 2003 14:26:53 -0000	1.26
+++ serendipity_config.inc.php	3 Sep 2003 19:59:30 -0000	1.27
@@ -4,7 +4,7 @@
 include_once('compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version'] = '0.3-cvs';
+$serendipity['version'] = '0.3';
 $serendipity['production'] = 1;
 
 // Rewrite always on

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.34,1.35

From: <tom...@us...> - 2003-09-02 17:31:44

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
* Fixed bug: Clicking "toggle all" only expands the first two categories
* Added check during installation for non-apache servers
* Added check during installation for non-supported PHP version


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_admin_installer.inc.php	2 Sep 2003 16:50:27 -0000	1.34
+++ serendipity_admin_installer.inc.php	2 Sep 2003 17:31:41 -0000	1.35
@@ -149,7 +149,7 @@
         <input type="hidden" name="installAction" value="check" />
         <br />
         <div align="right">
-            <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" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
     $el_count = 0;
@@ -470,10 +470,21 @@
         break;
 
     default:
+        /*  Is serendipity already installed=  */
         if ( file_exists('./serendipity_config_local.inc.php') ) {
             $from = &$serendipity;
-        }
-        else {
+        } else {
+            /* Do check for non-apache servers */
+            if ( !eregi('apache', $_SERVER['SERVER_SOFTWARE']) ) {
+                echo '<br /><font color="#FF000">WARNING!<br />You are about to attempt to install Serendipity on a non-apache webserver.<br />Serendipity requires the Apache Werbserver to function correctly!</font>';
+            }
+            
+            define('VERSION_REQUIRED', '4.3.0');
+            
+            /* Do check for required PHP version */
+            if ( version_compare(PHP_VERSION, VERSION_REQUIRED) == -1 ) {
+                echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>';
+            }
             $from = false;
         }

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.33,1.34

From: <tom...@us...> - 2003-09-02 16:50:30

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Ehhh, I need some sleep


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_admin_installer.inc.php	2 Sep 2003 16:48:50 -0000	1.33
+++ serendipity_admin_installer.inc.php	2 Sep 2003 16:50:27 -0000	1.34
@@ -211,7 +211,7 @@
 
     $fp = fopen($filename, 'r');
     while (!@feof($fp)) {
-        $line = trim(fgets($fp), 4096);
+        $line = trim(fgets($fp, 4096));
         if ($in_table) {
             $def .= $line;
             if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {

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

From: <tom...@us...> - 2003-09-02 16:48:54

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
Support fgets() on older PHP versions, where the second argument is required


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_admin_installer.inc.php	20 Aug 2003 16:08:32 -0000	1.32
+++ serendipity_admin_installer.inc.php	2 Sep 2003 16:48:50 -0000	1.33
@@ -211,7 +211,7 @@
 
     $fp = fopen($filename, 'r');
     while (!@feof($fp)) {
-        $line = trim(fgets($fp));
+        $line = trim(fgets($fp), 4096);
         if ($in_table) {
             $def .= $line;
             if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {

[php-blog-cvs] serendipity NEWS,1.21,1.22 serendipity_functions.inc.php,1.148,1.149 serendipity_db_mysql.inc.php,1.12,1.13

From: <gar...@us...> - 2003-09-01 12:25:27

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

Modified Files:
	NEWS serendipity_functions.inc.php 
	serendipity_db_mysql.inc.php 
Log Message:
Wrong SQL statement prevented entries to be printed for a date range
(archives).

Altered db_mysql.inc so that mysql_error() is evaluated. This means that s9y
will die (mostly), if any error occurs. Should make bug tracking easier. ;)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- NEWS	1 Sep 2003 11:10:15 -0000	1.21
+++ NEWS	1 Sep 2003 12:25:23 -0000	1.22
@@ -2,6 +2,7 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Fixed bug for fetching entries on a certain date. Now s9y dies with an error message if MySQL errors occur (garvinhicking)
     * Display link to trackbacks on single-article view (garvinhicking)
     * Enable preview to include extended body (garvinhicking)
     * Display author in previewed entry (tomsommer)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- serendipity_functions.inc.php	1 Sep 2003 11:10:14 -0000	1.148
+++ serendipity_functions.inc.php	1 Sep 2003 12:25:23 -0000	1.149
@@ -431,10 +431,10 @@
 
         $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
         if ($drafts) {
-            $and .= "AND $drafts";
+            $and .= " AND $drafts";
         }
     } else {
-        $and = "";
+        $and = '';
         if ($drafts) {
             $and .= "WHERE $drafts";
         }

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_db_mysql.inc.php	16 Aug 2003 21:26:42 -0000	1.12
+++ serendipity_db_mysql.inc.php	1 Sep 2003 12:25:23 -0000	1.13
@@ -19,7 +19,10 @@
     // highlight_string(var_export($sql, 1));
 
     $c = mysql_query($sql);
-
+    if (mysql_error() != '') {
+        return mysql_error();
+    }
+    
     if (!$c) {
         if (!$serendipity['production']) {
             print mysql_error();

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.147,1.148 NEWS,1.20,1.21

From: <gar...@us...> - 2003-09-01 11:10:18

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

Modified Files:
	serendipity_functions.inc.php NEWS 
Log Message:
Display link to Trackbacks for the page, where you can see a single articles
(archives/...).

When I view a linked entry to any blog I have just made a trackback to, I
like to be able to see the other trackbacks as well, when clicking on the
link. Moveable Type does this, and I'd like to have serendipity display the
trackbacs as well. Currently you have to switch to the date-view, where the
article appears to get a grip of the existing trackbacks.

So, please update your s9y's or comment on this. ;-)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- serendipity_functions.inc.php	31 Aug 2003 21:41:49 -0000	1.147
+++ serendipity_functions.inc.php	1 Sep 2003 11:10:14 -0000	1.148
@@ -604,12 +604,12 @@
                     echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&amp;serendipity[type]=comments"';
                     echo '      onClick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
                     echo $label . '(' . $entry['comments'] . ')</a>';
-
-                    $label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
-                    echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&amp;serendipity[type]=trackbacks"';
-                    echo '      onClick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
-                    echo $label . ' (' . $entry['trackbacks'] . ')</a>';
                 }
+
+                $label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
+                echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&amp;serendipity[type]=trackbacks"';
+                echo '      onClick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
+                echo $label . ' (' . $entry['trackbacks'] . ')</a>';
 ?>
                 </div>
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- NEWS	31 Aug 2003 22:09:47 -0000	1.20
+++ NEWS	1 Sep 2003 11:10:15 -0000	1.21
@@ -2,6 +2,7 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Display link to trackbacks on single-article view (garvinhicking)
     * Enable preview to include extended body (garvinhicking)
     * Display author in previewed entry (tomsommer)
     * Added option to preview entries (jhermanns)

[php-blog-cvs] serendipity NEWS,1.19,1.20

From: <tom...@us...> - 2003-08-31 22:09:50

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

Modified Files:
	NEWS 
Log Message:
.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- NEWS	31 Aug 2003 21:41:49 -0000	1.19
+++ NEWS	31 Aug 2003 22:09:47 -0000	1.20
@@ -2,9 +2,10 @@
 
 Version 0.3 ()
 ------------------------------------
-    * Preview now also prints extended body. (garvinhicking)
-    * Added "preview entry" functionality (jhermanns)
-    * Added ability to save draft entries (jhermanns)
+    * Enable preview to include extended body (garvinhicking)
+    * Display author in previewed entry (tomsommer)
+    * Added option to preview entries (jhermanns)
+    * Added ability to save drafts of entries (jhermanns)
     * Fixed some links not being formatted for exit-tracking, if the link appeared more than once in an entry (tomsommer)
     * Added radio-button and "spacer" configuration directives for the plugins (garvinhicking)
     * RSS-feeds and fields can now be customized within the plugin configuration (garvinhicking

[php-blog-cvs] serendipity NEWS,1.18,1.19 db.sql,1.21,1.22 serendipity_admin_entries.inc.php,1.10,1.11 serendipity_functions.inc.php,1.146,1.147 serendipity_lang_de.inc.php,1.27,1.28

From: <gar...@us...> - 2003-08-31 21:41:54

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

Modified Files:
	NEWS db.sql serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
Log Message:
* Preview for extended entry
* German language fix
* Fixed db.sql to be up-to date.
* Code style

Please, guys - try to stick to our coding guidelines:
- Spaces instead of TABs,
- Single quotes, where possible
- Spacing inside variables/concatenations

and please document any changes to the DB scheme at least in db.sql and in
your changelog message.

BTW: I like the Preview-functionality, works great. :)



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- NEWS	30 Aug 2003 15:03:43 -0000	1.18
+++ NEWS	31 Aug 2003 21:41:49 -0000	1.19
@@ -2,6 +2,9 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Preview now also prints extended body. (garvinhicking)
+    * Added "preview entry" functionality (jhermanns)
+    * Added ability to save draft entries (jhermanns)
     * Fixed some links not being formatted for exit-tracking, if the link appeared more than once in an entry (tomsommer)
     * Added radio-button and "spacer" configuration directives for the plugins (garvinhicking)
     * RSS-feeds and fields can now be customized within the plugin configuration (garvinhicking

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- db.sql	16 Aug 2003 11:05:48 -0000	1.21
+++ db.sql	31 Aug 2003 21:41:49 -0000	1.22
@@ -46,7 +46,8 @@
   exflag int(1) default null,
   author varchar(20) default null,
   authorid int(11) default null,
-  categoryid int(11) default null
+  categoryid int(11) default null,
+  isdraft enum('true', 'false') not null default 'false'
 );
 
 CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended);

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_entries.inc.php	31 Aug 2003 17:20:57 -0000	1.10
+++ serendipity_admin_entries.inc.php	31 Aug 2003 21:41:49 -0000	1.11
@@ -32,7 +32,7 @@
                    $serendipity['GET']['offset'],
                    $perPage
                  ),
-				 'true'
+                 'true'
                );
     $string_action = ($action == 'delete' ? DELETE_ENTRIES : EDIT_ENTRIES);
 
@@ -78,7 +78,7 @@
             <td class="serendipity_admin_list_item">
                 <?php echo date('d.m.y, H:i', $entries[$x]['timestamp']) . ': '; ?>
                 <br />
-                <?php if ($entries[$x]['isdraft']=='true') echo DRAFT.":"?>                
+                <?php if ($entries[$x]['isdraft'] == 'true') echo DRAFT . ':'; ?>                
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x]['id']; ?>">
                     <?php echo htmlentities(substr(empty($entries[$x]['title']) ? $entries[$x]['body'] : $entries[$x]['title'], 0, 40)); ?>
                 </a>
@@ -90,7 +90,7 @@
 ?>
                 <?php echo date('d.m.y, H:i', $entries[$x + $half]['timestamp']) . ': '; ?>
                 <br />
-                <?php if ($entries[$x+$half]['isdraft']=='true') echo DRAFT.":"?>
+                <?php if ($entries[$x + $half]['isdraft'] == 'true') echo DRAFT . ':'; ?>
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x + $half]['id']; ?>">
                     <?php echo htmlentities(substr($entries[$x + $half]['title'], 0, 40)); ?>
                 </a>
@@ -145,29 +145,29 @@
             } else {
                 echo ENTRY_SAVED;
             }
-        }
-        
-        // Only display the preview
-        else {
-            if (!is_numeric($entry['timestamp'])) $entry['timestamp'] = time();
-            if (!$entry['trackbacks']) $entry['trackbacks'] = 0;
-            if (!$entry['comments'])   $entry['comments']   = 0;
-            if (!$entry['username'])   $entry['username']   = $serendipity['serendipityUser'];
+        } else {
+            // Only display the preview
+            if (!is_numeric($entry['timestamp'])) $entry['timestamp']  = time();
+            if (!$entry['trackbacks'])            $entry['trackbacks'] = 0;
+            if (!$entry['comments'])              $entry['comments']   = 0;
+            if (!$entry['username'])              $entry['username']   = $serendipity['serendipityUser'];
             
-            echo "<strong>". PREVIEW ."</strong>";
+            echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';
-            serendipity_printEntries(array($entry));
+            serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0));
             echo '</div>';
+
             serendipity_printEntryForm(
                 '?',
                 array(
-                'serendipity[action]'      => 'admin',
-                'serendipity[adminModule]' => 'entries',
-                'serendipity[adminAction]' => 'save',
-                'serendipity[timestamp]'   => $entry['timestamp']
+                  'serendipity[action]'      => 'admin',
+                  'serendipity[adminModule]' => 'entries',
+                  'serendipity[adminAction]' => 'save',
+                  'serendipity[timestamp]'   => $entry['timestamp']
                 ),
-            $entry
-        );
+
+                $entry
+            );
         }
         break;
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- serendipity_functions.inc.php	30 Aug 2003 17:30:32 -0000	1.146
+++ serendipity_functions.inc.php	31 Aug 2003 21:41:49 -0000	1.147
@@ -403,36 +403,41 @@
 * Give it a range in YYYYMMDD format to gather the desired entries
 * (For february 2002 you would pass 200202 e.g.
 **/
-function serendipity_fetchEntries($range = null, $full = true, $limit = "", $fetchDrafts = 'false') {
+function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = 'false') {
     global $serendipity;
 
-    if ($full === true)
+    if ($full === true) {
         $body = ',body, extended';
+    }
 
-	if ($fetchDrafts == 'false')
-		$drafts = "isdraft LIKE 'false'";
+    if ($fetchDrafts == 'false') {
+        $drafts = 'isdraft LIKE "false"';
+    }
 
-    if ( is_numeric($range)) {
+    if (is_numeric($range)) {
         $year = (int)substr($range, 0, 4);
         $month = (int)substr($range, 4, 2);
         $day = (int)substr($range, 6, 2);
 
         $startts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
-        if ( $day == 0 ) {
+
+        if ($day == 0) {
             $month++;
         } else {
             $day++;
         }
+
         $endts = mktime(0, 0, 0, $month, ($day == 0 ? 1 : $day), $year);
 
         $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
-		if ($drafts)
-			$and .= "AND $drafts";
-
+        if ($drafts) {
+            $and .= "AND $drafts";
+        }
     } else {
         $and = "";
-		if ($drafts)
-			$and .= "WHERE $drafts";
+        if ($drafts) {
+            $and .= "WHERE $drafts";
+        }
     }
 
     if (!empty($limit)) {
@@ -518,7 +523,7 @@
                             title,
                             body,
                             extended,
-			    trackbacks
+                            trackbacks
                     FROM
                             {$serendipity['dbPrefix']}entries
                     WHERE
@@ -547,7 +552,7 @@
 /**
 * Prints the entries you fetched with serendipity_fetchEntries/searchEntries in HTML.
 **/
-function serendipity_printEntries($entries, $extended=0) {
+function serendipity_printEntries($entries, $extended = 0) {
     global $serendipity;
 
     /* pre-walk the array to collect them keyed by date */
@@ -1673,7 +1678,7 @@
     }
 
     $in = $loadfn($infilename);
-    if ( is_null($newheight) ) {
+    if (is_null($newheight)) {
         $newheight = (imagesy($in) / imagesx($in)) * $newwidth;
     }
     $out = imagecreatetruecolor($newwidth, $newheight);
@@ -1682,7 +1687,7 @@
     $out = null;
     $in  = null;
 
-    return "OK!";
+    return 'OK!';
 }
 
 /**
@@ -1774,8 +1779,11 @@
     $serendipity['EditorBrowsers'] = '(IE|Mozilla)';
     $cats = serendipity_fetchCategories();
 
-    if ($entry['isdraft'] == 'true') $draftD = " SELECTED";
-    else $draftP = " SELECTED";
+    if ($entry['isdraft'] == 'true') {
+        $draftD = ' SELECTED';
+    } else {
+        $draftP = ' SELECTED';
+    }
 
     $n = "\n";
     $cat_list = '<select name="serendipity[categoryid]">' . $n;
@@ -1815,10 +1823,10 @@
                 <?php echo ($serendipity['wysiwyg'] ? '<td>' . CATEGORY . ' ' . $cat_list . '</td>' : ''); ?>
             </tr>
             <tr>
-                    <td><b><?php echo TYPE?>:</b>
+                    <td><b><?php echo TYPE; ?>:</b>
                         <select name="serendipity[isdraft]">
-                            <option  value="false" <?php echo $draftP?>><?php echo PUBLISH?></option>
-                            <option  value="true"  <?php echo $draftD?>><?php echo DRAFT?></option>
+                            <option  value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option>
+                            <option  value="true"  <?php echo $draftD; ?>><?php echo DRAFT; ?></option>
                         </select>
                     </td>
                     <td align="right"><b><?php echo CATEGORY; ?></b> <?php echo $cat_list ; ?></td>
@@ -1863,7 +1871,7 @@
 
             <tr>
                 <td colspan="2" align="right">
-                    <input type="button" value="- <?php echo PREVIEW?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();"/>
+                    <input type="button" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();"/>
                     <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
                 </td>
             </tr>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_de.inc.php	30 Aug 2003 16:57:55 -0000	1.27
+++ serendipity_lang_de.inc.php	31 Aug 2003 21:41:49 -0000	1.28
@@ -92,7 +92,7 @@
 define('A_NEW_COMMENT_BLAHBLAH', 'In Ihrem Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
 define('NO_CATEGORY', 'Keine Kategorie');
 define('ENTRY_BODY', 'Eintrag');
-define('EXTENDED_BODY', 'Erweiteter Eintrag');
+define('EXTENDED_BODY', 'Erweiterter Eintrag');
 define('CATEGORY', 'Kategorie:');
 define('TEMPLATE_NAME', 'Template Name');
 define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet w&auml;hlen...');

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

From: <tom...@us...> - 2003-08-31 17:21:02

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

Modified Files:
	serendipity_admin_entries.inc.php 
Log Message:
Show the username in the preview


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_entries.inc.php	30 Aug 2003 17:00:29 -0000	1.9
+++ serendipity_admin_entries.inc.php	31 Aug 2003 17:20:57 -0000	1.10
@@ -151,8 +151,10 @@
         else {
             if (!is_numeric($entry['timestamp'])) $entry['timestamp'] = time();
             if (!$entry['trackbacks']) $entry['trackbacks'] = 0;
-            if (!$entry['comments']) $entry['comments']   = 0;
-            echo "<h3>".PREVIEW."</h3>";
+            if (!$entry['comments'])   $entry['comments']   = 0;
+            if (!$entry['username'])   $entry['username']   = $serendipity['serendipityUser'];
+            
+            echo "<strong>". PREVIEW ."</strong>";
             echo '<div style="border:1px solid #000000; padding: 15px;">';
             serendipity_printEntries(array($entry));
             echo '</div>';

[php-blog-cvs] serendipity TODO,1.4,1.5

From: <tom...@us...> - 2003-08-31 00:13:59

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

Modified Files:
	TODO 
Log Message:
Attempting to rethink TODO list


Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TODO	8 Jul 2003 09:12:52 -0000	1.4
+++ TODO	31 Aug 2003 00:13:56 -0000	1.5
@@ -1,17 +1,17 @@
 # $Id$
 
 * Split up serendipity_functions.inc.php
-* Move the library files out of the docroot
-* Unify the configuration system
+* Move the library files out of the doc-root
 * Make uploads per-user
-* XHTML 1.0 Strict Compliance
-* Finalize the database schema
-* Add the ability to import and export RSS feeds
 * Generate RSS 1.0 Feeds
-* Finalize the plugin api
+* Finalize the plugin API
 * Add an OPML plugin for easy blogroll inclusion
 * Add a citation extractor plugin
 * Add support for multiple weblogs
 * Add the ability to have a printer friendly format for the weblog
-* Add a set of css templates that are distributed with serendipity.  
-  - Choose a reasonable default
+* Convert localization into a phpMyAdmin-like system
+* Allow for upgrades of Serendipity in the installer
+
+? Split up the configuration page and the installer ?
+? Make a better "Powered By" logo ?
+? Convert some of the internal plugins into external plugins ?

Re: [php-blog-cvs] Re: serendipity serendipity_admin_entries.inc.php,1.7,1.8 serendipity_functions.inc.php,1.144,1.145 serendipity_lang_de.inc.php,1.26,1.27 serendipity_lang_en.inc.php,1.36,1.37

From: christian m. <ch...@ch...> - 2003-08-30 20:04:19

Tom Sommer wrote:

> jhe...@us... wrote:
>
>> Update of /cvsroot/php-blog/serendipity
>> In directory sc8-pr-cvs1:/tmp/cvs-serv10561
>>
>> Modified Files:
>>     serendipity_admin_entries.inc.php 
>>     serendipity_functions.inc.php serendipity_lang_de.inc.php 
>>     serendipity_lang_en.inc.php Log Message:
>> Added ability to preview entries before saving them - no db structure 
>> update needed. Please test.
>
>
> I love this, but why do we need "Drafts" then?
>

i love  this  feature, because it gives you the option to write and  
re-think about something. the option to write a huge text partly  and 
complete it somewhere else,
without accessing your filesystems remotely.

greets,
muesli

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.145,1.146

From: <tom...@us...> - 2003-08-30 17:30:35

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
When creating a thumbnail, we nolonger make it $width x $width

We calculate the relative height based on the original image and the new width

This should avoid all those "stretched" thumbnails.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- serendipity_functions.inc.php	30 Aug 2003 16:57:55 -0000	1.145
+++ serendipity_functions.inc.php	30 Aug 2003 17:30:32 -0000	1.146
@@ -1629,7 +1629,7 @@
     return array($f, $suf);
 }
 
-function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newheight)
+function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newheight=null)
 {
     if (!function_exists('imagecopyresampled')) {
         return false;
@@ -1673,6 +1673,9 @@
     }
 
     $in = $loadfn($infilename);
+    if ( is_null($newheight) ) {
+        $newheight = (imagesy($in) / imagesx($in)) * $newwidth;
+    }
     $out = imagecreatetruecolor($newwidth, $newheight);
     imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, imagesx($in), imagesy($in));
     $savefn($out, $outfilename);
@@ -1701,7 +1704,7 @@
     $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f . '.' . $serendipity['thumbSuffix'] . '.' . $suf;
 
     if ($serendipity['magick'] !== true) {
-        return serendipity_resize_image_gd($infile, $outfile, $size, $size);
+        return serendipity_resize_image_gd($infile, $outfile, $size);
     }
 
     /*if ($serendipity["dim"] == "height") $newSize = "*x".$serendipity["thumbSize"];

[php-blog-cvs] Re: serendipity serendipity_admin_entries.inc.php,1.8,1.9

From: Tom S. <web...@ts...> - 2003-08-30 17:29:49

jhe...@us... wrote:

> Bugfix: timestamp got corrupted while previewing.

Another bug: The author is not displayed in the preview


-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

[php-blog-cvs] Re: serendipity serendipity_admin_entries.inc.php,1.7,1.8 serendipity_functions.inc.php,1.144,1.145 serendipity_lang_de.inc.php,1.26,1.27 serendipity_lang_en.inc.php,1.36,1.37

From: Tom S. <web...@ts...> - 2003-08-30 17:19:47

jhe...@us... wrote:

> Added ability to preview entries before saving them - no db structure
> update needed. Please test.

WOW, it works great, look great and is a cool feature...

Thanks for adding it

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

[php-blog-cvs] Re: serendipity serendipity_admin_entries.inc.php,1.7,1.8 serendipity_functions.inc.php,1.144,1.145 serendipity_lang_de.inc.php,1.26,1.27 serendipity_lang_en.inc.php,1.36,1.37

From: Tom S. <web...@ts...> - 2003-08-30 17:10:55

jhe...@us... wrote:
> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv10561
> 
> Modified Files:
> 	serendipity_admin_entries.inc.php 
> 	serendipity_functions.inc.php serendipity_lang_de.inc.php 
> 	serendipity_lang_en.inc.php 
> Log Message:
> Added ability to preview entries before saving them - no db structure update needed. Please test.

I love this, but why do we need "Drafts" then?

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

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

From: <jhe...@us...> - 2003-08-30 17:00:34

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

Modified Files:
	serendipity_admin_entries.inc.php 
Log Message:
Bugfix: timestamp got corrupted while previewing.


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin_entries.inc.php	30 Aug 2003 16:57:55 -0000	1.8
+++ serendipity_admin_entries.inc.php	30 Aug 2003 17:00:29 -0000	1.9
@@ -149,9 +149,9 @@
         
         // Only display the preview
         else {
-            $entry['timestamp'] = time();
-            $entry['trackbacks'] = 0;
-            $entry['comments']   = 0;
+            if (!is_numeric($entry['timestamp'])) $entry['timestamp'] = time();
+            if (!$entry['trackbacks']) $entry['trackbacks'] = 0;
+            if (!$entry['comments']) $entry['comments']   = 0;
             echo "<h3>".PREVIEW."</h3>";
             echo '<div style="border:1px solid #000000; padding: 15px;">';
             serendipity_printEntries(array($entry));

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.7,1.8 serendipity_functions.inc.php,1.144,1.145 serendipity_lang_de.inc.php,1.26,1.27 serendipity_lang_en.inc.php,1.36,1.37

From: <jhe...@us...> - 2003-08-30 16:58:01

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

Modified Files:
	serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php 
Log Message:
Added ability to preview entries before saving them - no db structure update needed. Please test.


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_entries.inc.php	30 Aug 2003 09:55:09 -0000	1.7
+++ serendipity_admin_entries.inc.php	30 Aug 2003 16:57:55 -0000	1.8
@@ -128,23 +128,45 @@
                    'categoryid' => $serendipity['POST']['categoryid'],
                    'isdraft'    => $serendipity['POST']['isdraft']
                  );
-
-        $res = serendipity_updertEntry($entry);
-
-        if (is_string($res)) {
+                 
+        // Save the entry, or just display a preview
+        if ($serendipity['POST']['preview'] != 'true') {
+            $res = serendipity_updertEntry($entry);
+            if (is_string($res)) {
+                serendipity_printEntryForm(
+                  '?',
+                  array(
+                    'serendipity[action]'      => 'admin',
+                    'serendipity[adminModule]' => 'entries',
+                    'serendipity[adminAction]' => 'save'
+                  ),
+                  $entry,
+                  ERROR . ': <b>' . $res . '</b>');
+            } else {
+                echo ENTRY_SAVED;
+            }
+        }
+        
+        // Only display the preview
+        else {
+            $entry['timestamp'] = time();
+            $entry['trackbacks'] = 0;
+            $entry['comments']   = 0;
+            echo "<h3>".PREVIEW."</h3>";
+            echo '<div style="border:1px solid #000000; padding: 15px;">';
+            serendipity_printEntries(array($entry));
+            echo '</div>';
             serendipity_printEntryForm(
-              '?',
-              array(
+                '?',
+                array(
                 'serendipity[action]'      => 'admin',
                 'serendipity[adminModule]' => 'entries',
-                'serendipity[adminAction]' => 'save'
-              ),
-              $entry,
-              ERROR . ': <b>' . $res . '</b>');
-        } else {
-            echo ENTRY_SAVED;
+                'serendipity[adminAction]' => 'save',
+                'serendipity[timestamp]'   => $entry['timestamp']
+                ),
+            $entry
+        );
         }
-
         break;
 
     case 'editSelect':

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- serendipity_functions.inc.php	30 Aug 2003 16:17:46 -0000	1.144
+++ serendipity_functions.inc.php	30 Aug 2003 16:57:55 -0000	1.145
@@ -1795,6 +1795,7 @@
     }
     $hidden .= '        <input type="hidden" name="serendipity[id]" value="' . $entry['id'] . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . $entry['timestamp'] . '" />' . $n;
+    $hidden .= '        <input type="hidden" name="serendipity[preview]" value="false" />';
 ?>
         <span style="color: #FF0000;"><?php echo $errMsg; ?></span>
         <form action="<?php echo $targetURL; ?>" method="post" <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipityEntry" style="margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px">
@@ -1859,6 +1860,7 @@
 
             <tr>
                 <td colspan="2" align="right">
+                    <input type="button" value="- <?php echo PREVIEW?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();"/>
                     <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
                 </td>
             </tr>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_de.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_de.inc.php	30 Aug 2003 09:55:09 -0000	1.26
+++ serendipity_lang_de.inc.php	30 Aug 2003 16:57:55 -0000	1.27
@@ -270,6 +270,7 @@
 define('TYPE', 'Typ');
 define('DRAFT', 'Entwurf');
 define('PUBLISH', 'Ver&ouml;ffentlichung');
+define('PREVIEW', 'Vorschau');
 
 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.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_en.inc.php	30 Aug 2003 09:55:09 -0000	1.36
+++ serendipity_lang_en.inc.php	30 Aug 2003 16:57:55 -0000	1.37
@@ -270,6 +270,7 @@
 define('TYPE', 'Type');
 define('DRAFT', 'Draft');
 define('PUBLISH', 'Publish');
+define('PREVIEW', 'Preview');
 
 define('serendipity_LANG_LOADED', true);
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.143,1.144

From: <mu...@us...> - 2003-08-30 16:17:58

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Search results didn't have a trackbacker counter, since the "trackbacks" field was missing in the query-string. Fixed.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- serendipity_functions.inc.php	30 Aug 2003 14:56:03 -0000	1.143
+++ serendipity_functions.inc.php	30 Aug 2003 16:17:46 -0000	1.144
@@ -517,7 +517,8 @@
                             comments,
                             title,
                             body,
-                            extended
+                            extended,
+			    trackbacks
                     FROM
                             {$serendipity['dbPrefix']}entries
                     WHERE

[php-blog-cvs] serendipity NEWS,1.17,1.18

From: <tom...@us...> - 2003-08-30 15:03:47

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

Modified Files:
	NEWS 
Log Message:
Update


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- NEWS	25 Aug 2003 16:43:27 -0000	1.17
+++ NEWS	30 Aug 2003 15:03:43 -0000	1.18
@@ -2,8 +2,14 @@
 
 Version 0.3 ()
 ------------------------------------
+    * Fixed some links not being formatted for exit-tracking, if the link appeared more than once in an entry (tomsommer)
     * Added radio-button and "spacer" configuration directives for the plugins (garvinhicking)
-    * RSS-feeds and fields can now be customized within the plugin configuration (garvinhicking)
+    * RSS-feeds and fields can now be customized within the plugin configuration (garvinhicking
+    * Send X-Powered-By and X-Engine mail-headers with each mail Serendipity sends, for easier debugging (tomsommer)
+    * Added Powered-By META tag to identify Serendipity Blogs even if the admin has disabled the power-by plugin (tomsommer)
+    * Allow for descriptions of each configuration-category (tomsommer)
+    * Timestamps in comments are now shown in 24-hour format (tomsommer)
+    * Send X-Powered-By and X-Engine mail-headers with each mail Serendipity sends, for easier debugging (tomsommer)
     * Trackback pings where only accepted on a POST method. Moveable Type uses GET, so we now accept both. (garvinhicking)
     * Fixed issue where trackbackpings were only sent to links in extended entry, if one existed, discarding the standard body (garvinhicking)
     * Fixed issue where two users sharing same username & password would not be able to log in correctly, causing errors on the admin pages (tomsommer)

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.142,1.143

From: <tom...@us...> - 2003-08-30 14:56:10

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed strange problem with some URLs not being formatted for exit-tracking if the URL appears more than once


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- serendipity_functions.inc.php	30 Aug 2003 09:55:09 -0000	1.142
+++ serendipity_functions.inc.php	30 Aug 2003 14:56:03 -0000	1.143
@@ -1162,7 +1162,7 @@
         $serendipity['encodeExitsCallback_entry_id'] = $entry_id;
 
         $ret = preg_replace_callback(
-          "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#im",
+          "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm",
           'serendipity_encodeExitsCallback',
           $ret
         );
@@ -1180,7 +1180,7 @@
 */
 function serendipity_encodeExitsCallback($buffer) {
     global $serendipity;
-
+    
     $entry_id = $serendipity['encodeExitsCallback_entry_id'];
     $url      = 'http://' . $buffer[3];

[php-blog-cvs] Re: serendipity serendipity_admin_entries.inc.php,1.6,1.7 serendipity_functions.inc.php,1.141,1.142 serendipity_lang_de.inc.php,1.25,1.26 serendipity_lang_en.inc.php,1.35,1.36

From: Tom S. <web...@ts...> - 2003-08-30 11:19:58

jhe...@us... wrote:

> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv13833
> 
> Modified Files:
> 	serendipity_admin_entries.inc.php 
> 	serendipity_functions.inc.php serendipity_lang_de.inc.php 
> 	serendipity_lang_en.inc.php 
> Log Message:
> We now support drafts! Please test.

Is there a database change to this?!?!??!?

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

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

Flat | Threaded

<< < 1 .. 529 530 531 532 533 .. 551 > >> (Page 531 of 551)