php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_fr.inc.php,1.58.2.8,1.58.2.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3553/lang

Modified Files:
      Tag: branch-smarty
	serendipity_lang_fr.inc.php 
Log Message:
fixed escpaing for javascript


Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58.2.8
retrieving revision 1.58.2.9
diff -u -d -r1.58.2.8 -r1.58.2.9
--- serendipity_lang_fr.inc.php	28 Oct 2004 20:17:21 -0000	1.58.2.8
+++ serendipity_lang_fr.inc.php	3 Nov 2004 10:05:53 -0000	1.58.2.9
@@ -490,7 +490,7 @@
 @define('COMMENT_EDITED', 'Le commentaire sélectionné a été modifié');
 @define('HIDE', 'Cacher');
 @define('VIEW_EXTENDED_ENTRY', 'Continuer à lire "%s"');
-@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Ce lien n\'est pas fait pour être cliqué. Il contient le lien de traçage pour ce billet. Vous pouvez utiliser ce lien pour envoyer un ping ou faire un traçage sur ce billet à partir de votre blog. Pour copier le lien, faites un clic droit sur le lien, et sélectionnez \'Copier le lien\' dans Internet Explorer ou \'Copier le lien\' dans Mozilla.');
+@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Ce lien n\\\'est pas fait pour être cliqué. Il contient le lien de traçage pour ce billet. Vous pouvez utiliser ce lien pour envoyer un ping ou faire un traçage sur ce billet à partir de votre blog. Pour copier le lien, faites un clic droit sur le lien, et sélectionnez \\\'Copier le lien\\\' dans Internet Explorer ou \\\'Copier le lien\\\' dans Mozilla.');
 @define('THIS_TRACKBACK_NEEDS_REVIEW', 'Attention: Ce traçage doit être approuvé avant qu\'il puisse être affiché.');
 @define('DELETE_TRACKBACK', 'Supprimer le traçage');
 @define('APPROVE_TRACKBACK', 'Approuver le traçage');

[php-blog-cvs] serendipity index.php,1.49.2.7,1.49.2.8 NEWS,1.214.2.45,1.214.2.46 serendipity_functions_installer.inc.php,1.35.2.2,1.35.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2561

Modified Files:
      Tag: branch-smarty
	index.php NEWS serendipity_functions_installer.inc.php 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.45
retrieving revision 1.214.2.46
diff -u -d -r1.214.2.45 -r1.214.2.46
--- NEWS	2 Nov 2004 16:01:25 -0000	1.214.2.45
+++ NEWS	3 Nov 2004 10:00:50 -0000	1.214.2.46
@@ -59,6 +59,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Better detection if Apache ErrorDocument can be used
+      (garvinhicking)
+
     * Fixed PostgreSQL index key names (names are now unique, and
       combined indizes on the entries text-columns are no longer set)
       (jtate, garvinhicking)

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- serendipity_functions_installer.inc.php	6 Oct 2004 19:18:15 -0000	1.35.2.2
+++ serendipity_functions_installer.inc.php	3 Nov 2004 10:00:50 -0000	1.35.2.3
@@ -297,7 +297,7 @@
                 fclose($sock);
             }
 
-            if (preg_match('@^HTTP/\d\.\d 200@', $response)) {
+            if (preg_match('@^HTTP/\d\.\d 200@', $response) && preg_match('@X\-Blog: Serendipity@', $response)) {
                 $serendipity['rewrite_default'] = 'errordocs';
             } else {
                 $serendipity['rewrite_default'] = 'none';

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.7
retrieving revision 1.49.2.8
diff -u -d -r1.49.2.7 -r1.49.2.8
--- index.php	16 Oct 2004 17:27:11 -0000	1.49.2.7
+++ index.php	3 Nov 2004 10:00:50 -0000	1.49.2.8
@@ -14,6 +14,7 @@
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header('HTTP/1.0 200\r\n');
+header('X-Blog: Serendipity'); // Used for installer detection
 
 // Session and serendipity_login() are needed to also remember an autologin
 // user on the frontend

[php-blog-cvs] serendipity index.php,1.52,1.53 NEWS,1.248,1.249 serendipity_functions_installer.inc.php,1.35,1.36

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2212

Modified Files:
	index.php NEWS serendipity_functions_installer.inc.php 
Log Message:
Better auto-detection for installation to check for availibility of the
ErrorDocument directive within apache. Previously we only checked for a 
200 header, but it was possible that per-host 404-redirection already emits
a customized HTTP/200 document.
Now our index.php uses an X-Blog header which the installation script checks 
for.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- NEWS	2 Nov 2004 16:00:32 -0000	1.248
+++ NEWS	3 Nov 2004 10:00:16 -0000	1.249
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Better detection if Apache ErrorDocument can be used
+      (garvinhicking)
+
     * Fixed PostgreSQL index key names (names are now unique, and
       combined indizes on the entries text-columns are no longer set)
       (jtate, garvinhicking)

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_functions_installer.inc.php	30 Aug 2004 09:29:23 -0000	1.35
+++ serendipity_functions_installer.inc.php	3 Nov 2004 10:00:16 -0000	1.36
@@ -297,7 +297,7 @@
                 fclose($sock);
             }
 
-            if (preg_match('@^HTTP/\d\.\d 200@', $response)) {
+            if (preg_match('@^HTTP/\d\.\d 200@', $response) && preg_match('@X\-Blog: Serendipity@', $response)) {
                 $serendipity['rewrite_default'] = 'errordocs';
             } else {
                 $serendipity['rewrite_default'] = 'none';

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- index.php	16 Oct 2004 09:09:46 -0000	1.52
+++ index.php	3 Nov 2004 10:00:16 -0000	1.53
@@ -3,6 +3,7 @@
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header('HTTP/1.0 200\r\n');
+header('X-Blog: Serendipity'); // Used for installer detection
 
 // Session and serendipity_login() are needed to also remember an autologin
 // user on the frontend

[php-blog-cvs] serendipity NEWS,1.214.2.44,1.214.2.45

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31456

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.44
retrieving revision 1.214.2.45
diff -u -d -r1.214.2.44 -r1.214.2.45
--- NEWS	2 Nov 2004 10:04:22 -0000	1.214.2.44
+++ NEWS	2 Nov 2004 16:01:25 -0000	1.214.2.45
@@ -63,6 +63,9 @@
       combined indizes on the entries text-columns are no longer set)
       (jtate, garvinhicking)
 
+    * Fixed bug with MySQL 3.x where the category was not properly set
+      when editing (garvinhicking)
+
     * Fixed karma plugin to not track clicks when previewing an entry
       (garvinhicking)
 

[php-blog-cvs] serendipity NEWS,1.247,1.248

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31337

Modified Files:
	NEWS 
Log Message:
document


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- NEWS	2 Nov 2004 09:07:03 -0000	1.247
+++ NEWS	2 Nov 2004 16:00:32 -0000	1.248
@@ -7,6 +7,9 @@
       combined indizes on the entries text-columns are no longer set)
       (jtate, garvinhicking)
 
+    * Fixed bug with MySQL 3.x where the category was not properly set
+      when editing (garvinhicking)
+
     * Fixed karma plugin to not track clicks when previewing an entry
       (garvinhicking)
 

[php-blog-cvs] serendipity NEWS,1.214.2.43,1.214.2.44 exit.php,1.6.2.1,1.6.2.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28838

Modified Files:
      Tag: branch-smarty
	NEWS exit.php 
Log Message:
use 301 header redirect for our exit.php urls


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.43
retrieving revision 1.214.2.44
diff -u -d -r1.214.2.43 -r1.214.2.44
--- NEWS	2 Nov 2004 09:08:31 -0000	1.214.2.43
+++ NEWS	2 Nov 2004 10:04:22 -0000	1.214.2.44
@@ -3,7 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * New plugin manager (tomsommer)
+    * exit.php redirection will emit a 301 Moved Permanently header for
+      the new location. (garvinhicking)
+
+    * Reworked plugin manager for easier plugin installation (tomsommer)
 
     * Karma plugin works with enabled entryproperties plugin and can
       be configured to only show Hit-statistics for an entry without

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- exit.php	16 Oct 2004 09:12:15 -0000	1.6.2.1
+++ exit.php	2 Nov 2004 10:04:35 -0000	1.6.2.2
@@ -24,6 +24,7 @@
 }
 
 if (serendipity_isResponseClean($url)) {
+    header('HTTP/1.0 301 Moved Permanently');
     header('Location: ' . $url);
 }
 exit;

[php-blog-cvs] serendipity/sql db.sql,1.18.2.2,1.18.2.3 db_update_0.6_0.6.1_mysql.sql,1.2.2.1,1.2.2.2 db_update_0.6_0.6.1_postgres.sql,1.3.2.1,1.3.2.2 db_update_0.8-alpha1_0.8-alpha2_mysql.sql,1.1.2.2,1.1.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19713/sql

Modified Files:
      Tag: branch-smarty
	db.sql db_update_0.6_0.6.1_mysql.sql 
	db_update_0.6_0.6.1_postgres.sql 
	db_update_0.8-alpha1_0.8-alpha2_mysql.sql 
Log Message:
MFH


Index: db_update_0.6_0.6.1_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_mysql.sql,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- db_update_0.6_0.6.1_mysql.sql	13 Oct 2004 09:31:17 -0000	1.2.2.1
+++ db_update_0.6_0.6.1_mysql.sql	2 Nov 2004 09:08:32 -0000	1.2.2.2
@@ -3,13 +3,13 @@
 UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;
 
 ALTER TABLE {PREFIX}config  ADD authorid  INT UNSIGNED NOT NULL DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX configauthorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP PRIMARY KEY;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD authorid  INT UNSIGNED DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
+CREATE INDEX pluginauthorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD authorid  INT UNSIGNED DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}images (authorid);
+CREATE INDEX imagesauthorid_idx ON {PREFIX}images (authorid);

Index: db_update_0.6_0.6.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_postgres.sql,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- db_update_0.6_0.6.1_postgres.sql	13 Oct 2004 09:31:17 -0000	1.3.2.1
+++ db_update_0.6_0.6.1_postgres.sql	2 Nov 2004 09:08:32 -0000	1.3.2.2
@@ -8,15 +8,15 @@
 UPDATE {PREFIX}config SET authorid=0;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET NOT NULL;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX configauthorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP CONSTRAINT {PREFIX}config_pkey;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}plugins  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
+CREATE INDEX pluginsauthorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}images  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}images (authorid);
+CREATE INDEX imagesauthorid_idx ON {PREFIX}images (authorid);

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- db.sql	13 Oct 2004 09:31:16 -0000	1.18.2.2
+++ db.sql	2 Nov 2004 09:08:31 -0000	1.18.2.3
@@ -65,7 +65,8 @@
   moderate_comments {BOOLEAN}
 );
 
-CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
+# FULLTEXT_MYSQL is ignored on all Non-MySQL setups (SQLite, PostgreSQL)
+CREATE {FULLTEXT_MYSQL} INDEX entry_idx on {PREFIX}entries (title,body,extended);
 CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
 CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 
@@ -122,7 +123,7 @@
   authorid int(11) default '0'
 );
 
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX configauthorid_idx ON {PREFIX}config (authorid);
 
 CREATE TABLE {PREFIX}suppress (
   ip varchar(15) default NULL,
@@ -144,7 +145,7 @@
   PRIMARY KEY(name)
 );
 
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX pluginauthorid_idx ON {PREFIX}plugins (authorid);
 
 CREATE TABLE {PREFIX}category (
   categoryid {AUTOINCREMENT} {PRIMARY},
@@ -171,6 +172,7 @@
   path text
 );
 
+CREATE INDEX imagesauthorid_idx ON {PREFIX}images (authorid);
 CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);
 
 CREATE TABLE {PREFIX}entrycat (
@@ -186,5 +188,5 @@
   value text
 );
 
-CREATE INDEX entryid_idx ON {PREFIX}entryproperties (entryid);
+CREATE INDEX entrypropid_idx ON {PREFIX}entryproperties (entryid);
 CREATE UNIQUE INDEX prop_idx ON {PREFIX}entryproperties (entryid, property);

Index: db_update_0.8-alpha1_0.8-alpha2_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/Attic/db_update_0.8-alpha1_0.8-alpha2_mysql.sql,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- db_update_0.8-alpha1_0.8-alpha2_mysql.sql	13 Oct 2004 09:31:17 -0000	1.1.2.2
+++ db_update_0.8-alpha1_0.8-alpha2_mysql.sql	2 Nov 2004 09:08:32 -0000	1.1.2.3
@@ -5,4 +5,4 @@
 );
 
 CREATE UNIQUE INDEX prop_idx ON {PREFIX}entryproperties (entryid, property);
-CREATE INDEX entryid_idx ON {PREFIX}entryproperties (entryid);
+CREATE INDEX entrypropid_idx ON {PREFIX}entryproperties (entryid);

[php-blog-cvs] serendipity NEWS,1.214.2.42,1.214.2.43 serendipity_db_mysql.inc.php,1.22.2.3,1.22.2.4 serendipity_db_mysqli.inc.php,1.4,1.4.2.1 serendipity_db_postgres.inc.php,1.18.2.1,1.18.2.2 serendipity_db_sqlite.inc.php,1.10,1.10.2.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19713

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_db_mysql.inc.php 
	serendipity_db_mysqli.inc.php serendipity_db_postgres.inc.php 
	serendipity_db_sqlite.inc.php 
Log Message:
MFH


Index: serendipity_db_mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysqli.inc.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- serendipity_db_mysqli.inc.php	26 Aug 2004 10:51:28 -0000	1.4
+++ serendipity_db_mysqli.inc.php	2 Nov 2004 09:08:31 -0000	1.4.2.1
@@ -100,9 +100,9 @@
 
 function serendipity_db_schema_import($query) {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- serendipity_db_mysql.inc.php	12 Oct 2004 21:00:11 -0000	1.22.2.3
+++ serendipity_db_mysql.inc.php	2 Nov 2004 09:08:31 -0000	1.22.2.4
@@ -104,9 +104,9 @@
 
 function serendipity_db_schema_import($query) {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- serendipity_db_sqlite.inc.php	30 Aug 2004 09:29:23 -0000	1.10
+++ serendipity_db_sqlite.inc.php	2 Nov 2004 09:08:31 -0000	1.10.2.1
@@ -154,6 +154,10 @@
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
     static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL');
 
+    if (stristr($query, '{FULLTEXT_MYSQL}')) {
+        return true;
+    }
+
     return serendipity_db_query(str_replace($search, $replace, $query));
 }
 

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- serendipity_db_postgres.inc.php	13 Oct 2004 09:31:15 -0000	1.18.2.1
+++ serendipity_db_postgres.inc.php	2 Nov 2004 09:08:31 -0000	1.18.2.2
@@ -122,6 +122,10 @@
     static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2',
         'int4', 'int4', 'int4');
 
+    if (stristr($query, '{FULLTEXT_MYSQL}')) {
+        return true;
+    }
+
     return serendipity_db_query(str_replace($search, $replace, $query));
 }
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.42
retrieving revision 1.214.2.43
diff -u -d -r1.214.2.42 -r1.214.2.43
--- NEWS	29 Oct 2004 11:37:36 -0000	1.214.2.42
+++ NEWS	2 Nov 2004 09:08:31 -0000	1.214.2.43
@@ -56,6 +56,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed PostgreSQL index key names (names are now unique, and
+      combined indizes on the entries text-columns are no longer set)
+      (jtate, garvinhicking)
+
     * Fixed karma plugin to not track clicks when previewing an entry
       (garvinhicking)
 

[php-blog-cvs] serendipity/sql db.sql,1.21,1.22 db_update_0.6_0.6.1_mysql.sql,1.3,1.4 db_update_0.6_0.6.1_postgres.sql,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19153/sql

Modified Files:
	db.sql db_update_0.6_0.6.1_mysql.sql 
	db_update_0.6_0.6.1_postgres.sql 
Log Message:
PGSql does not allow unlimited text-indices or duplicate index names on ANY
table of a database. Isn't that sweet? :-)
As I don't know a cool method to fix existing keys (apart from jtates method
of using the 0.7 update file) I'll leave it fixed only for fresh or > 0.6.9
update installations. CVS users should have means to fix it themselves; for
MySQL the index names impose no problem.


Index: db_update_0.6_0.6.1_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_mysql.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db_update_0.6_0.6.1_mysql.sql	13 Oct 2004 08:57:52 -0000	1.3
+++ db_update_0.6_0.6.1_mysql.sql	2 Nov 2004 09:07:06 -0000	1.4
@@ -3,13 +3,13 @@
 UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;
 
 ALTER TABLE {PREFIX}config  ADD authorid  INT UNSIGNED NOT NULL DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX configauthorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP PRIMARY KEY;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD authorid  INT UNSIGNED DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
+CREATE INDEX pluginauthorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD authorid  INT UNSIGNED DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}images (authorid);
+CREATE INDEX imagesauthorid_idx ON {PREFIX}images (authorid);

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- db.sql	1 Nov 2004 14:11:27 -0000	1.21
+++ db.sql	2 Nov 2004 09:07:05 -0000	1.22
@@ -65,8 +65,8 @@
   moderate_comments {BOOLEAN}
 );
 
-#Creating an index on the body and extended body is a bad idea
-CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
+# FULLTEXT_MYSQL is ignored on all Non-MySQL setups (SQLite, PostgreSQL)
+CREATE {FULLTEXT_MYSQL} INDEX entry_idx on {PREFIX}entries (title,body,extended);
 CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
 CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 
@@ -123,7 +123,7 @@
   authorid int(11) default '0'
 );
 
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX configauthorid_idx ON {PREFIX}config (authorid);
 
 CREATE TABLE {PREFIX}suppress (
   ip varchar(15) default NULL,
@@ -145,7 +145,7 @@
   PRIMARY KEY(name)
 );
 
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX pluginauthorid_idx ON {PREFIX}plugins (authorid);
 
 CREATE TABLE {PREFIX}category (
   categoryid {AUTOINCREMENT} {PRIMARY},
@@ -172,6 +172,7 @@
   path text
 );
 
+CREATE INDEX imagesauthorid_idx ON {PREFIX}images (authorid);
 CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);
 
 CREATE TABLE {PREFIX}entrycat (

Index: db_update_0.6_0.6.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_postgres.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db_update_0.6_0.6.1_postgres.sql	13 Oct 2004 08:57:52 -0000	1.4
+++ db_update_0.6_0.6.1_postgres.sql	2 Nov 2004 09:07:06 -0000	1.5
@@ -8,15 +8,15 @@
 UPDATE {PREFIX}config SET authorid=0;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET NOT NULL;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
+CREATE INDEX configauthorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP CONSTRAINT {PREFIX}config_pkey;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}plugins  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
+CREATE INDEX pluginsauthorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}images  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX authorid_idx ON {PREFIX}images (authorid);
+CREATE INDEX imagesauthorid_idx ON {PREFIX}images (authorid);

[php-blog-cvs] serendipity serendipity_db_mysqli.inc.php,1.4,1.5 serendipity_db_mysql.inc.php,1.22,1.23 serendipity_db_postgres.inc.php,1.19,1.20 serendipity_db_sqlite.inc.php,1.10,1.11 NEWS,1.246,1.247

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19153

Modified Files:
	serendipity_db_mysqli.inc.php serendipity_db_mysql.inc.php 
	serendipity_db_postgres.inc.php serendipity_db_sqlite.inc.php 
	NEWS 
Log Message:
PGSql does not allow unlimited text-indices or duplicate index names on ANY
table of a database. Isn't that sweet? :-)
As I don't know a cool method to fix existing keys (apart from jtates method
of using the 0.7 update file) I'll leave it fixed only for fresh or > 0.6.9
update installations. CVS users should have means to fix it themselves; for
MySQL the index names impose no problem.


Index: serendipity_db_mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysqli.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_db_mysqli.inc.php	26 Aug 2004 10:51:28 -0000	1.4
+++ serendipity_db_mysqli.inc.php	2 Nov 2004 09:07:03 -0000	1.5
@@ -100,9 +100,9 @@
 
 function serendipity_db_schema_import($query) {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- NEWS	29 Oct 2004 11:37:23 -0000	1.246
+++ NEWS	2 Nov 2004 09:07:03 -0000	1.247
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed PostgreSQL index key names (names are now unique, and
+      combined indizes on the entries text-columns are no longer set)
+      (jtate, garvinhicking)
+
     * Fixed karma plugin to not track clicks when previewing an entry
       (garvinhicking)
 

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_db_mysql.inc.php	26 Aug 2004 10:51:28 -0000	1.22
+++ serendipity_db_mysql.inc.php	2 Nov 2004 09:07:03 -0000	1.23
@@ -100,9 +100,9 @@
 
 function serendipity_db_schema_import($query) {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_db_sqlite.inc.php	30 Aug 2004 09:29:23 -0000	1.10
+++ serendipity_db_sqlite.inc.php	2 Nov 2004 09:07:03 -0000	1.11
@@ -154,6 +154,10 @@
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
     static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL');
 
+    if (stristr($query, '{FULLTEXT_MYSQL}')) {
+        return true;
+    }
+
     return serendipity_db_query(str_replace($search, $replace, $query));
 }
 

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_db_postgres.inc.php	13 Oct 2004 08:57:52 -0000	1.19
+++ serendipity_db_postgres.inc.php	2 Nov 2004 09:07:03 -0000	1.20
@@ -122,6 +122,10 @@
     static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2',
         'int4', 'int4', 'int4');
 
+    if (stristr($query, '{FULLTEXT_MYSQL}')) {
+        return true;
+    }
+
     return serendipity_db_query(str_replace($search, $replace, $query));
 }
 

Re: [php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql, NONE,1.1 db_update_0.6.9_0.7.0_postgresql.sql,NONE,1.1 db.sql,1.19, 1.20

[Joseph T. <dra...@gm...>]

Reverted for mysql.  Postgresql users should drop that index, and
recreate it using the sql statements in
db_update_0.6.9_0.7.0_postgresql.sql


On Mon, 1 Nov 2004 12:30:45 +0100 (CET), Garvin Hicking
<squ...@su...> wrote:
> Hi Joseph!
> 
> > I think this introduces our very first irreparable shift.  Unless we
> > can figure out a way to keep fulltext searching working on MySQL and to allow
> > more than 4000 characters in a blog entry on PostgreSQL we'll need to split the
> > SQL into two files, at least for the indices.
> 
> Hm, if postgresql really sucks that much that it can't define indexes not
> affecting the size of the indexed columns, then that's true. But I somehow can't
> believe that there is no workaround? I'll try to look into finding a good way to
> make an optional SQLite/MySQL statement which does not affect postgresql.
> Something like
> 
> /*[CONDITIONAL:MYSQL,MYSQLI,SQLITE] CREATE {FULLTEXT} INDEX on ...*/
> 
> and then strip the comment characters if the conditionals are met. But it would
> really suck to need to insert that into 0.7 at this stage :(
> 
> > BTW, in what way does this "break" full text searching.  It *should*
> > only make them slower as there's no index to reference when searching. I guess I
> > haven't a clue about how that works.
> 
> It breaks it fully, because without fulltext keys, the fulltext search of mysql
> does not work. Since I currently am busy, would someone please revert the
> change? If users are upgrading to CVS, they are screwed...
> 
> 
> 
> Regards,
> Garvin.
> 
> --
> Garvin Hicking   | Web-Entwickler | Make me happy:
> www.supergarv.de | #ICQ 21392242  | http://wishes.garv.info/
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by:
> Sybase ASE Linux Express Edition - download now for FREE
> LinuxWorld Reader's Choice Award Winner for best database on Linux.
> http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
> _______________________________________________
> php-blog-cvs mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/php-blog-cvs
> 


-- 
Joseph Tate
Personal e-mail: jtate AT dragonstrider DOT com
Web: http://www.dragonstrider.com

[php-blog-cvs] serendipity/sql db.sql,1.20,1.21

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

Update of /cvsroot/php-blog/serendipity/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29328

Modified Files:
	db.sql 
Log Message:
revert change for mysql postgresql users will have to modify this index according to db_update_0.6.9_0.7.0_postgresql.sql

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- db.sql	30 Oct 2004 22:45:12 -0000	1.20
+++ db.sql	1 Nov 2004 14:11:27 -0000	1.21
@@ -66,7 +66,7 @@
 );
 
 #Creating an index on the body and extended body is a bad idea
-CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title);
+CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
 CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
 CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 

[php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql,1.2,1.3

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

Update of /cvsroot/php-blog/serendipity/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28986

Modified Files:
	db_update_0.6.9_0.7.0_mysql.sql 
Log Message:
revert change for mysql

Index: db_update_0.6.9_0.7.0_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.9_0.7.0_mysql.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.6.9_0.7.0_mysql.sql	30 Oct 2004 23:40:16 -0000	1.2
+++ db_update_0.6.9_0.7.0_mysql.sql	1 Nov 2004 14:09:55 -0000	1.3
@@ -1,3 +1 @@
 
-DROP INDEX entry_idx ON {PREFIX}_entries;
-CREATE INDEX entry_idx ON {PREFIX}_entries(title);

Re: [php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql, NONE,1.1 db_update_0.6.9_0.7.0_postgresql.sql,NONE,1.1 db.sql,1.19, 1.20

[Garvin H. <squ...@su...>]

Hi Joseph!

> I think this introduces our very first irreparable shift.  Unless we
> can figure out a way to keep fulltext searching working on MySQL and to allow
> more than 4000 characters in a blog entry on PostgreSQL we'll need to split the
> SQL into two files, at least for the indices.

Hm, if postgresql really sucks that much that it can't define indexes not
affecting the size of the indexed columns, then that's true. But I somehow can't
believe that there is no workaround? I'll try to look into finding a good way to
make an optional SQLite/MySQL statement which does not affect postgresql.
Something like

/*[CONDITIONAL:MYSQL,MYSQLI,SQLITE] CREATE {FULLTEXT} INDEX on ...*/

and then strip the comment characters if the conditionals are met. But it would
really suck to need to insert that into 0.7 at this stage :(

> BTW, in what way does this "break" full text searching.  It *should*
> only make them slower as there's no index to reference when searching. I guess I
> haven't a clue about how that works.

It breaks it fully, because without fulltext keys, the fulltext search of mysql
does not work. Since I currently am busy, would someone please revert the
change? If users are upgrading to CVS, they are screwed...

Regards,
Garvin.

-- 
Garvin Hicking   | Web-Entwickler | Make me happy:
www.supergarv.de | #ICQ 21392242  | http://wishes.garv.info/

Re: [php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql, NONE,1.1 db_update_0.6.9_0.7.0_postgresql.sql,NONE,1.1 db.sql,1.19, 1.20

[Joseph T. <dra...@gm...>]

On Sun, 31 Oct 2004 12:04:44 +0100 (CET), Garvin Hicking
<squ...@su...> wrote:
> Hi Joseph!
> 
> > -CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
> > +#Creating an index on the body and extended body is a bad idea
> > +CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title);
> > CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
> > CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
> 
> This breaks the fulltext search. Please revert at least for MySQL, don't know
> how fulltext search works for PostgreSQL.
> 
> Can't PostgreSQL create a bigger index? That sucks! :-)
> 
> Regards,
> Garvin.

I think this introduces our very first irreparable shift.  Unless we
can figure out a way to keep fulltext searching working on MySQL and
to allow more than 4000 characters in a blog entry on PostgreSQL we'll
need to split the SQL into two files, at least for the indices.

BTW, in what way does this "break" full text searching.  It *should*
only make them slower as there's no index to reference when searching.
 I guess I haven't a clue about how that works.

-- 
Joseph Tate
Personal e-mail: jtate AT dragonstrider DOT com
Web: http://www.dragonstrider.com

Re: [php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql, NONE,1.1 db_update_0.6.9_0.7.0_postgresql.sql,NONE,1.1 db.sql,1.19, 1.20

[Garvin H. <squ...@su...>]

Hi Joseph!

> -CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
> +#Creating an index on the body and extended body is a bad idea
> +CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title);
> CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
> CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);

This breaks the fulltext search. Please revert at least for MySQL, don't know
how fulltext search works for PostgreSQL.

Can't PostgreSQL create a bigger index? That sucks! :-)

Regards,
Garvin.
-- 
Garvin Hicking   | Web-Entwickler | Make me happy:
www.supergarv.de | #ICQ 21392242  | http://wishes.garv.info/

[php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql,1.1,1.2 db_update_0.6.9_0.7.0_postgresql.sql,1.1,1.2

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

Update of /cvsroot/php-blog/serendipity/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29451

Modified Files:
	db_update_0.6.9_0.7.0_mysql.sql 
	db_update_0.6.9_0.7.0_postgresql.sql 
Log Message:
Fix a bad commit.  If these files won't get caught by the updater, feel free to rename them.

Index: db_update_0.6.9_0.7.0_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.9_0.7.0_mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.9_0.7.0_mysql.sql	30 Oct 2004 22:45:12 -0000	1.1
+++ db_update_0.6.9_0.7.0_mysql.sql	30 Oct 2004 23:40:16 -0000	1.2
@@ -1,3 +1,3 @@
-#This is not really necessary for mysql, but is here for consistency
-DROP INDEX entry_idx;
-CREATE INDEX entry_idx ON serendipity_entries(title);
+
+DROP INDEX entry_idx ON {PREFIX}_entries;
+CREATE INDEX entry_idx ON {PREFIX}_entries(title);

Index: db_update_0.6.9_0.7.0_postgresql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.9_0.7.0_postgresql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.9_0.7.0_postgresql.sql	30 Oct 2004 22:45:12 -0000	1.1
+++ db_update_0.6.9_0.7.0_postgresql.sql	30 Oct 2004 23:40:17 -0000	1.2
@@ -1,2 +1,2 @@
 DROP INDEX entry_idx;
-CREATE INDEX entry_idx ON serendipity_entries(title);
\ No newline at end of file
+CREATE INDEX entry_idx ON {PREFIX}_entries(title);

[php-blog-cvs] serendipity/sql db_update_0.6.9_0.7.0_mysql.sql,NONE,1.1 db_update_0.6.9_0.7.0_postgresql.sql,NONE,1.1 db.sql,1.19,1.20

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

Update of /cvsroot/php-blog/serendipity/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17671

Modified Files:
	db.sql 
Added Files:
	db_update_0.6.9_0.7.0_mysql.sql 
	db_update_0.6.9_0.7.0_postgresql.sql 
Log Message:
Fixed an index that was causing problems on PostgreSQL.  It's a bad idea to have an index on a "TEXT" type column.  One rarely uses body or extended as the WHERE clause of a SQL statement, so an index is unwarranted.

--- NEW FILE: db_update_0.6.9_0.7.0_mysql.sql ---
#This is not really necessary for mysql, but is here for consistency
DROP INDEX entry_idx;
CREATE INDEX entry_idx ON serendipity_entries(title);

--- NEW FILE: db_update_0.6.9_0.7.0_postgresql.sql ---
DROP INDEX entry_idx;
CREATE INDEX entry_idx ON serendipity_entries(title);
Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- db.sql	13 Oct 2004 08:57:52 -0000	1.19
+++ db.sql	30 Oct 2004 22:45:12 -0000	1.20
@@ -65,7 +65,8 @@
   moderate_comments {BOOLEAN}
 );
 
-CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
+#Creating an index on the body and extended body is a bad idea
+CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title);
 CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
 CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.44.2.5,1.44.2.6

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27989

Modified Files:
      Tag: branch-smarty
	serendipity_admin_plugins.inc.php 
Log Message:
- A plugin should not be deemed stackable, not matter which user it is assigned to


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.44.2.5
retrieving revision 1.44.2.6
diff -u -d -r1.44.2.5 -r1.44.2.6
--- serendipity_admin_plugins.inc.php	29 Oct 2004 11:02:32 -0000	1.44.2.5
+++ serendipity_admin_plugins.inc.php	30 Oct 2004 15:39:25 -0000	1.44.2.6
@@ -501,7 +501,7 @@
                                    'class_name'     => get_class($plugin),
                                    'name'           => $bag->get('name'),
                                    'desc'           => $bag->get('description'),
-                                   'installable'    => !($bag->get('stackable') === false && in_array($class_name, $plugins) && ($plugin->serendipity_owner == $serendipity['authorid'] || $plugin->serendipity_owner == 0)),
+                                   'installable'    => !($bag->get('stackable') === false && in_array($class_name, $plugins)),
                                    'author'         => $bag->get('author'),
                                    'version'        => $bag->get('version'),
                                    'website'        => $bag->get('website'));

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.22,1.4.2.23

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32652/plugins/serendipity_event_spamblock

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
allow multiple trackbacks from one article to other ones from our own server on our own server


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.22
retrieving revision 1.4.2.23
diff -u -d -r1.4.2.22 -r1.4.2.23
--- serendipity_event_spamblock.php	29 Oct 2004 11:02:37 -0000	1.4.2.22
+++ serendipity_event_spamblock.php	29 Oct 2004 12:43:29 -0000	1.4.2.23
@@ -266,8 +266,8 @@
                             return false;
                         }
 
-                        // Check for identical comments.
-                        if ( $this->get_config('bodyclone', true) === true ) {
+                        // Check for identical comments. We allow to bypass trackbacks from our server to our own blog.
+                        if ( $this->get_config('bodyclone', true) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
                             $row   = serendipity_db_query($query, true);
                             if (is_array($row) && $row['counter'] > 0) {

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.14.2.8,1.14.2.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18072/plugins/serendipity_event_karma

Modified Files:
      Tag: branch-smarty
	serendipity_event_karma.php 
Log Message:
MFH


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.14.2.8
retrieving revision 1.14.2.9
diff -u -d -r1.14.2.8 -r1.14.2.9
--- serendipity_event_karma.php	29 Oct 2004 11:02:35 -0000	1.14.2.8
+++ serendipity_event_karma.php	29 Oct 2004 11:37:36 -0000	1.14.2.9
@@ -543,7 +543,7 @@
                             if ($addData['extended']) {
                                 $entryid = (int)serendipity_db_escape_string($eventData[0]['id']);
 
-                                if ($track_clicks) {
+                                if ($track_clicks && !$addData['preview']) {
                                     $sql = serendipity_db_query('UPDATE ' . $serendipity['dbPrefix'] . 'karma SET visits = visits + 1 WHERE entryid = ' . $entryid, true);
                                     if (serendipity_db_affected_rows() < 1) {
                                         serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}karma (entryid, points, votes, lastvote, visits) VALUES ('$entryid', 0, 0, 0, 1)");

[php-blog-cvs] serendipity NEWS,1.214.2.41,1.214.2.42

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18072

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.41
retrieving revision 1.214.2.42
diff -u -d -r1.214.2.41 -r1.214.2.42
--- NEWS	28 Oct 2004 20:17:08 -0000	1.214.2.41
+++ NEWS	29 Oct 2004 11:37:36 -0000	1.214.2.42
@@ -56,6 +56,11 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed karma plugin to not track clicks when previewing an entry
+      (garvinhicking)
+
+    * Fixed some counting problems in statistics plugin (garvinhicking)
+
     * Fixed comment counter for deleting non-approved comments
       (tomsommer, griffinn)
 

[php-blog-cvs] serendipity NEWS,1.245,1.246

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18010

Modified Files:
	NEWS 
Log Message:
do not track clicks when in preview mode


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- NEWS	22 Oct 2004 17:31:08 -0000	1.245
+++ NEWS	29 Oct 2004 11:37:23 -0000	1.246
@@ -3,6 +3,11 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed karma plugin to not track clicks when previewing an entry
+      (garvinhicking)
+
+    * Fixed some counting problems in statistics plugin (garvinhicking)
+
     * Fixed comment counter for deleting non-approved comments
       (tomsommer, griffinn)
 

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.19,1.20

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18010/plugins/serendipity_event_karma

Modified Files:
	serendipity_event_karma.php 
Log Message:
do not track clicks when in preview mode


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_event_karma.php	27 Oct 2004 11:03:06 -0000	1.19
+++ serendipity_event_karma.php	29 Oct 2004 11:37:23 -0000	1.20
@@ -520,17 +520,13 @@
                             if ($addData['extended']) {
                                 $entryid = (int)serendipity_db_escape_string($eventData[0]['id']);
 
-                                if ($track_clicks) {
+                                if ($track_clicks && !$addData['preview']) {
                                     $sql = serendipity_db_query('UPDATE ' . $serendipity['dbPrefix'] . 'karma SET visits = visits + 1 WHERE entryid = ' . $entryid, true);
                                     if (serendipity_db_affected_rows() < 1) {
                                         serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}karma (entryid, points, votes, lastvote, visits) VALUES ('$entryid', 0, 0, 0, 1)");
                                     }
                                 }
 
-                                if ($eventData[0]['timestamp'] < ($now - $max_karmatime)) {
-                                    return;
-                                }
-
                                 $q = 'SELECT SUM(votes) AS votes, SUM(points) AS points, SUM(visits) AS visits
                                         FROM ' . $serendipity['dbPrefix'] . 'karma   AS k
                                        WHERE k.entryid = ' . $entryid . ' GROUP BY k.entryid LIMIT 1';

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.11.2.2,1.11.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9382/plugins/serendipity_event_trackexits

Modified Files:
      Tag: branch-smarty
	serendipity_event_trackexits.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- serendipity_event_trackexits.php	24 Sep 2004 09:16:20 -0000	1.11.2.2
+++ serendipity_event_trackexits.php	29 Oct 2004 11:02:39 -0000	1.11.2.3
@@ -33,6 +33,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_TRACKBACK_NAME);
         $propbag->add('description',   PLUGIN_EVENT_TRACKBACK_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',   array('frontend_display' => true));
         $propbag->add('scrambles_true_content', true);
 
@@ -203,4 +206,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file