revisit friend suggestion structures

diff --git a/.htaccess b/.htaccess
index 9cd6fa34c7ba52703a9eb023642a0484b95c02c1..73031b962e02e02be9d8c7dd342cbb05bd727a06 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -9,12 +9,13 @@ Deny from all
 <IfModule mod_rewrite.c>
   RewriteEngine on
 
-#  RewriteRule api.* - [E=REMOTE_USER:%{HTTP:Authorization},L]
-
-  # Protect repo directory from browsing
+  # Protect repository directory from browsing
   RewriteRule "(^|/)\.git" - [F]
 
   # Rewrite current-style URLs of the form 'index.php?q=x'.
+  # Also place auth information into REMOTE_USER for sites running
+  # in CGI mode.
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]

diff --git a/INSTALL.txt b/INSTALL.txt
index 1ae41e003936e2e8dac8aa5d062e8b0bd425936e..dd4c747e2ae4be2068ae791a37153d8144808e37 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -128,7 +128,8 @@ and save your changes.
 #####################################################################
        
        Check your database settings. It usually means your database could not 
-be opened or accessed.
+be opened or accessed. If the database resides on the same machine, check that
+the database server name is "localhost". 
 
 #####################################################################
 - 500 Internal Error
@@ -141,6 +142,11 @@ you are using a Windows server as this has been known to cause problems.
 Also check your file permissions. Your website and all contents must generally 
 be world-readable.
 
+       It is likely that your web server reported the source of the problem in
+its error log files. Please review these system error logs to determine what 
+caused the problem. Often this will need to be resolved with your hosting
+provider or (if self-hosted) your web server configuration. 
+
 #####################################################################
 - 400 and 4xx "File not found" errors
 #####################################################################

diff --git a/boot.php b/boot.php
index 5a7af9725b5c0540a9eae84afc463cc3b6bbcf80..f2c9474011594dcce38cc76ccd57e5be16c7ebae 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,9 +4,9 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1022' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1023' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1068      );
+define ( 'DB_UPDATE_VERSION',      1069      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 7b70cfc644908b83191a5d8f9ef109d938d53c66..b33c0cdcb6b69ecf192bb2935bbf4be45fa73549 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -514,14 +514,24 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 
 CREATE TABLE IF NOT EXISTS `ffinder` (
 `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-`type` CHAR( 16 ) NOT NULL,
-`note` TEXT NOT NULL,
 `uid` INT UNSIGNED NOT NULL ,
 `cid` INT UNSIGNED NOT NULL ,
 `fid` INT UNSIGNED NOT NULL
 ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
 
 
+CREATE TABLE IF NOT EXISTS `fsuggest` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`uid` INT NOT NULL ,
+`cid` INT NOT NULL ,
+`name` CHAR( 255 ) NOT NULL ,
+`url` CHAR( 255 ) NOT NULL ,
+`photo` CHAR( 255 ) NOT NULL ,
+`note` TEXT NOT NULL ,
+`created` DATETIME NOT NULL
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+ 
+
 CREATE TABLE IF NOT EXISTS `mailacct` (
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `uid` INT NOT NULL,

diff --git a/update.php b/update.php
index 409e5d48efd8ff31308e2fc15f17e157509ad7e4..2e22b9d1cc85858b74a7e920acad9588574a183e 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1068 );
+define( 'UPDATE_VERSION' , 1069 );
 
 /**
  *
@@ -541,3 +541,24 @@ function update_1067() {
        q("ALTER TABLE `ffinder` ADD `type` CHAR( 16 ) NOT NULL AFTER `id` ,
        ADD `note` TEXT NOT NULL AFTER `type` ");
 }
+
+function update_1068() {
+       // 1067 was short-sighted. Undo it.
+       q("ALTER TABLE `ffinder` DROP `type` , DROP `note` ");
+
+       // and do this instead.
+
+       q("CREATE TABLE IF NOT EXISTS `fsuggest` (
+       `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+       `uid` INT NOT NULL ,
+       `cid` INT NOT NULL ,
+       `name` CHAR( 255 ) NOT NULL ,
+       `url` CHAR( 255 ) NOT NULL ,
+       `photo` CHAR( 255 ) NOT NULL ,
+       `note` TEXT NOT NULL ,
+       `created` DATETIME NOT NULL 
+       ) ENGINE = MYISAM DEFAULT CHARSET=utf8");
+
+}
+
+