diff options
| -rw-r--r-- | .htaccess | 7 | ||||
| -rw-r--r-- | INSTALL.txt | 8 | ||||
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | database.sql | 14 | ||||
| -rw-r--r-- | update.php | 23 |
5 files changed, 47 insertions, 9 deletions
@@ -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 1ae41e003..dd4c747e2 100644 --- 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 ##################################################################### @@ -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 7b70cfc64..b33c0cdcb 100644 --- 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 409e5d48e..2e22b9d1c 100644 --- 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"); + +} + + |