update globaldir when page-type changes, add spam date field

diff --git a/boot.php b/boot.php
index 9045a9442261e582f77876c2130b2ccf5f4c9587..c3e5c0de02214d27e4948c5927f747948a16e291 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1265' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1128      );
+define ( 'DB_UPDATE_VERSION',      1129      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 349dd2a27b247812ac7459b3e96faedcebcd5f95..8c74ecddfb933e2258212ab227253ac82305c3f9 100755 (executable)
--- a/database.sql
+++ b/database.sql
@@ -844,6 +844,7 @@ CREATE TABLE IF NOT EXISTS `spam` (
 `spam` INT NOT NULL DEFAULT '0',
 `ham` INT NOT NULL DEFAULT '0',
 `term` CHAR(255) NOT NULL,
+`date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
 INDEX ( `uid` ),
 INDEX ( `spam` ),
 INDEX ( `ham` ),

diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index cbc6fe81a91e0bb53df39e0d7e291c6bf87496f7..7702c108b310dc0b2090e6907170d4c0d8a2dbcd 100644 (file)
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -147,58 +147,8 @@ class b8_storage_frndc extends b8_storage_base
        public function connect()
        {
 
-               return TRUE;
-
-               # Are we already connected?
-               if($this->connected === TRUE)
-                       return TRUE;
-
-               # Are we using an existing passed resource?
-               if($this->config['connection'] === FALSE) {
-                       # ... yes we are, but the connection is not a resource, so return an error
-                       $this->connected = FALSE;
-                       return self::DATABASE_CONNECTION_BAD_RESOURCE;
-               }
-
-               elseif($this->config['connection'] === NULL) {
-
-                       # ... no we aren't so we have to connect.
-
-                       if($this->_connection = mysql_connect($this->config['host'], $this->config['user'], $this->config['pass'])) {
-                               if(mysql_select_db($this->config['database'], $this->_connection) === FALSE) {
-                                       $this->connected = FALSE;
-                                       return self::DATABASE_SELECT_ERROR . ": " . mysql_error();
-                               }
-                       }
-                       else {
-                               $this->connected = FALSE;
-                               return self::DATABASE_CONNECTION_ERROR;
-                       }
-
-               }
-
-               else {
-                       # ... yes we are
-                       $this->_connection = $this->config['connection'];
-               }
-
-               # Just in case ...
-               if($this->_connection === NULL) {
-                       $this->connected = FALSE;
-                       return self::DATABASE_CONNECTION_FAIL;
-               }
-
-               # Check to see if the wordlist table exists
-               if(mysql_query('DESCRIBE ' . $this->config['table_name'], $this->_connection) === FALSE) {
-                       $this->connected = FALSE;
-                       return self::DATABASE_TABLE_ACCESS_FAIL . ": " . mysql_error();
-               }
-
-               # Everything is okay and connected
                $this->connected = TRUE;
-
-               # Let's see if this is a b8 database and the version is okay
-               return $this->check_database();
+               return TRUE;
 
        }
 
@@ -235,7 +185,7 @@ class b8_storage_frndc extends b8_storage_base
                # ... and fetch the data
 
                $result = q('
-                       SELECT token, count
+                       SELECT *
                        FROM ' . $this->config['table_name'] . '
                        WHERE ' . $where . ' AND uid = ' . $uid );
 

diff --git a/mod/settings.php b/mod/settings.php
index 90eb9dbd78870b02451d6cd88385a52031e59456..a9d00bc981e767449e0df2e3b3d2d8df50abab6b 100755 (executable)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -50,6 +50,8 @@ function settings_post(&$a) {
                return;
        }
 
+       $old_page_flags = $a->user['page-flags'];
+
        if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
                $key = $_POST['remove'];
                q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
@@ -375,7 +377,7 @@ function settings_post(&$a) {
                );
        }               
 
-       if($old_visibility != $net_publish) {
+       if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
                // Update global directory in background
                $url = $_SESSION['my_url'];
                if($url && strlen(get_config('system','directory_submit_url')))

diff --git a/update.php b/update.php
index 865c6175e94853bea5e0212f96c657aa80ee9c7e..8ca5ef90b09d7983bdfb2913a9116d8e8b737fe5 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1128 );
+define( 'UPDATE_VERSION' , 1129 );
 
 /**
  *
@@ -1109,3 +1109,8 @@ function update_1127() {
   ) ENGINE = MyISAM DEFAULT CHARSET=utf8");
 }
 
+
+function update_1128() {
+       q("alter table spam add `date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `term` ");
+}
+