[php-blog-cvs] serendipity INSTALL,1.4,1.5 serendipity_config_local.tpl,1.11,1.12 serendipity_db.inc.php,1.5,1.6

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

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

Modified Files:
	INSTALL serendipity_config_local.tpl serendipity_db.inc.php 
Log Message:
Fixed a broken INSERT statement.\n\n*PLEASE USE Single quotes (') in SQL queries as double quotes (") do not work in postgres.

Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/serendipity/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- INSTALL	8 Jul 2003 09:13:27 -0000	1.4
+++ INSTALL	21 Jul 2003 02:34:36 -0000	1.5
@@ -21,11 +21,12 @@
 # REQUIREMENTS                                                                #
 ###############################################################################
 
-1. .htaccess support
+1. .htaccess support allowing overrides for DirectoryIndex
 2. PHP Version 4 or greater (PHP 4.3.1 or greater recommended)
 3. php.ini options:
    - error_reporting E_ALL & ~E_NOTICE (or lower)
    - file_uploads on (For import/image upload features)
+   - magic_quotes_gpc Off
 4. php extensions:
    - None at this time.
 5. Supported database engine:
@@ -68,4 +69,4 @@
 Thanks to:
                   Daniel Freudenberger     <be...@or...>
 
-# $Id$
\ No newline at end of file
+# $Id$

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_config_local.tpl	13 Jul 2003 16:16:18 -0000	1.11
+++ serendipity_config_local.tpl	21 Jul 2003 02:34:36 -0000	1.12
@@ -1,11 +1,11 @@
 <?php # $Id$
 
 // Database Settings
-$serendipity['dbType']               = '{Database type|dbType|string|mysql}';                 // Database type (mysql|postgres)
+$serendipity['dbType']               = '{Database type|dbType|string|postgres}';                 // Database type (mysql|postgres)
 $serendipity['dbHost']               = '{Database host|dbHost|string|localhost}';             // MySQL host
-$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity}';           // Username
-$serendipity['dbPass']               = '{Database password|dbPass|string|serendipity}';       // Password
-$serendipity['dbName']               = '{Database name|dbName|string|serendipity}';           // Name of your database
+$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity_test}';           // Username
+$serendipity['dbPass']               = '{Database password|dbPass|string|fl@mboy3nt}';       // Password
+$serendipity['dbName']               = '{Database name|dbName|string|serendipity_test}';           // Name of your database
 $serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_}';      // Prefix for the table names, i.e. serendipity_
 
 // Paths (note: don't forget trailing slashes for directories!!!!)
@@ -18,16 +18,16 @@
 $serendipity['indexFile']            = '{Index file|indexFile|string|index.php}';                           // Which file to use as index
 
 // General settings
-$serendipity['user']                 = '{Admin username|user|string|John Doe}';             // Username for admin login
-$serendipity['pass']                 = '{Admin password|pass|protected|john}';              // Password for admin login
-$serendipity['email']                = '{Admin email|email|string|jo...@ex...}';       // Email for admin login
+$serendipity['user']                 = '{Admin username|user|string|Joseph Tate}';             // Username for admin login
+$serendipity['pass']                 = '{Admin password|pass|protected|friendly}';              // Password for admin login
+$serendipity['email']                = '{Admin email|email|string|jt...@dr...}';       // 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['blogTitle']            = '{Blog name|blogTitle|string|Joseph Tate's personal test 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).
 $serendipity['track_exits']          = '{Track exit URLs|track_exits|bool|1}';                              // Do you want to track exit targets?
@@ -35,7 +35,7 @@
 // Imageconversion Settings
 $serendipity['magick']               = '{Use Imagemagick|magick|bool|0}';                                   // Do you have image magick installed
 $serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert}';    // Full path & name of your image magick convert binary
-$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb}';            // Thumbnails will be named original.Suffix.ext
-$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110}';                          // Dimensions of auto-generated thumbnails
+$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|stb}';            // Thumbnails will be named original.Suffix.ext
+$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|150}';                          // Dimensions of auto-generated thumbnails
 
 ?>

Index: serendipity_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_db.inc.php	8 Jul 2003 09:13:27 -0000	1.5
+++ serendipity_db.inc.php	21 Jul 2003 02:34:36 -0000	1.6
@@ -11,14 +11,14 @@
     foreach ($values as $k => $v) {
         if (strlen($set))
             $set .= ', ';
-        $set .= $k . '="' . serendipity_db_escape_string($v) . '"';
+        $set .= $k . '=\'' . serendipity_db_escape_string($v) . '\'';
     }
 
     $where = '';
     foreach ($keys as $k => $v) {
         if (strlen($where))
             $where .= ' AND ';
-        $where .= $k . '="' . serendipity_db_escape_string($v) . '"';
+        $where .= $k . '=\'' . serendipity_db_escape_string($v) . '\'';
     }
 
     if (strlen($where)) {
@@ -38,7 +38,7 @@
     foreach ($values as $k => $v) {
         if (strlen($vals))
             $vals .= ', ';
-        $vals .= '"' . serendipity_db_escape_string($v) . '"';
+        $vals .= '\'' . serendipity_db_escape_string($v) . '\'';
     }
 
     return serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}$table ($names) values ($vals)");