feat(user): added new flag if user data should be visible (#1696)

thorsten · Mar 27, 2020 · 3410ab4 · 3410ab4
1 parent fc26eef
commit 3410ab4
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,11 +1,11 @@
-phpMyFAQ 3.1.0-dev
+phpMyFAQ 3.1.0-alpha
 Codename "Poseidon"
 
 CHANGELOG
 
 This is a log of major user-visible changes in each phpMyFAQ release.
 
-Version 3.1.0-dev
+Version 3.1.0-alpha
 - changed PHP requirement to PHP 7.3+ (Thorsten)
 - added support for Elasticsearch v6+ (Thorsten)
 - removed REST API v1 (Thorsten)

diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
@@ -432,6 +432,8 @@
 //
 if (($action === 'faq') || ($action === 'show') || ($action === 'main')) {
     $sidebarTemplate = 'sidebar-tagcloud.html';
+} else {
+    $sidebarTemplate = '';
 }
 
 //

diff --git a/phpmyfaq/setup/update.php b/phpmyfaq/setup/update.php
@@ -689,6 +689,15 @@
     // UPDATES FROM 3.1.0-alpha
     //
 
+    if (version_compare($version, '3.1.0-alpha', '<=')) {
+        // Add isVisible flag for user data
+        if ('sqlite3' === $DB['type']) {
+            $query[] = 'ALTER TABLE ' . $prefix . 'faquserdata ADD COLUMN is_visible INT(1) DEFAULT 0';
+        } else {
+            $query[] = 'ALTER TABLE '.$prefix.'faquserdata ADD is_visible INTEGER DEFAULT 0';
+        }
+    }
+
     // Always the last step: Update version number
     if (version_compare($version, System::getVersion(), '<')) {
         $faqConfig->update(['main.currentApiVersion' => System::getApiVersion()]);

diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Mysqli.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Mysqli.php
@@ -336,7 +336,8 @@ class Mysqli extends Database implements Driver
             user_id INT(11) NOT NULL,
             last_modified VARCHAR(14) NULL,
             display_name VARCHAR(128) NULL,
-            email VARCHAR(128) NULL)',
+            email VARCHAR(128) NULL,
+            is_visible INT(1) NULL DEFAULT 0)',
 
         'faquserlogin' => 'CREATE TABLE %sfaquserlogin (
             login VARCHAR(128) NOT NULL,

diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Pgsql.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Pgsql.php
@@ -338,7 +338,8 @@ class Pgsql extends Database implements Driver
             user_id SERIAL NOT NULL,
             last_modified VARCHAR(14) NULL,
             display_name VARCHAR(128) NULL,
-            email VARCHAR(128) NULL)',
+            email VARCHAR(128) NULL,
+            is_visible SMALLINT NULL DEFAULT 0)',
 
         'faquserlogin' => 'CREATE TABLE %sfaquserlogin (
             login VARCHAR(128) NOT NULL,

diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlite3.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlite3.php
@@ -337,7 +337,8 @@ class Sqlite3 extends Database implements Driver
             user_id INTEGER NOT NULL,
             last_modified VARCHAR(14) NULL,
             display_name VARCHAR(128) NULL,
-            email VARCHAR(128) NULL)',
+            email VARCHAR(128) NULL,
+            is_visible INT(1) NULL DEFAULT 0)',
 
         'faquserlogin' => 'CREATE TABLE %sfaquserlogin (
             login VARCHAR(128) NOT NULL,

diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlsrv.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlsrv.php
@@ -337,7 +337,8 @@ class Sqlsrv extends Database implements Driver
             user_id INTEGER NOT NULL,
             last_modified VARCHAR(14) NULL,
             display_name VARCHAR(128) NULL,
-            email VARCHAR(128) NULL)',
+            email VARCHAR(128) NULL,
+            is_visible INTEGER NULL DEFAULT 0)',
 
         'faquserlogin' => 'CREATE TABLE %sfaquserlogin (
             login VARCHAR(128) NOT NULL,

diff --git a/phpmyfaq/src/phpMyFAQ/System.php b/phpmyfaq/src/phpMyFAQ/System.php
@@ -49,7 +49,7 @@ class System
     /**
      * Pre-release version.
      */
-    private const VERSION_PRE_RELEASE = 'dev';
+    private const VERSION_PRE_RELEASE = 'alpha';
 
     /**
      * API version.

diff --git a/phpmyfaq/src/phpMyFAQ/User/UserData.php b/phpmyfaq/src/phpMyFAQ/User/UserData.php
@@ -188,7 +188,8 @@ public function load($userId)
             SELECT
                 last_modified, 
                 display_name, 
-                email
+                email,
+                is_visible
             FROM
                 %sfaquserdata
             WHERE
@@ -221,13 +222,15 @@ public function save()
             SET
                 last_modified = '%s',
                 display_name  = '%s',
-                email         = '%s'
+                email         = '%s',
+                is_visible    = %d
             WHERE
                 user_id = %d",
             Database::getTablePrefix(),
             date('YmdHis', $_SERVER['REQUEST_TIME']),
             $this->config->getDb()->escape($this->data['display_name']),
             $this->config->getDb()->escape($this->data['email']),
+            $this->data['is_visible'],
             $this->userId
         );
 
@@ -259,9 +262,9 @@ public function add($userId)
             "
             INSERT INTO
                 %sfaquserdata
-            (user_id, last_modified)
+            (user_id, last_modified, is_visible)
                 VALUES
-            (%d, '%s')",
+            (%d, '%s', 1)",
             Database::getTablePrefix(),
             $this->userId,
             date('YmdHis', $_SERVER['REQUEST_TIME'])

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 if [ "x${PMF_VERSION}" = "x" ]; then
-    PMF_VERSION="3.0.2"
+    PMF_VERSION="3.1.0-alpha"
 fi