diff options
| author | git-marijus <mario@mariovavti.com> | 2017-04-13 12:08:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 12:08:17 +0200 |
| commit | 2aa69257a4a56b42004e6c758ded644e85071ad9 (patch) | |
| tree | 107e61f6b8b665f51c8826151b675a34e7f4e4cd /install | |
| parent | 7b173a75e47cfdf9f46b7d635df84b2be286b0e6 (diff) | |
| parent | 9d425b472722e7ca33e93e09bb330763bed2d257 (diff) | |
| download | volse-hubzilla-2aa69257a4a56b42004e6c758ded644e85071ad9.tar.gz volse-hubzilla-2aa69257a4a56b42004e6c758ded644e85071ad9.tar.bz2 volse-hubzilla-2aa69257a4a56b42004e6c758ded644e85071ad9.zip | |
Merge pull request #715 from zotlabs/cpp
backend infrastructure for 'channel protection password'; which will …
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 13 |
3 files changed, 16 insertions, 1 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index be5317722..e075006e1 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -287,6 +287,8 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_removed` tinyint(1) NOT NULL DEFAULT '0', `channel_system` tinyint(1) NOT NULL DEFAULT '0', `channel_moved` char(255) NOT NULL DEFAULT '', + `channel_password` varchar(255) NOT NULL, + `channel_salt` varchar(255) NOT NULL, PRIMARY KEY (`channel_id`), UNIQUE KEY `channel_address_unique` (`channel_address`), KEY `channel_account_id` (`channel_account_id`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index e78425828..be72a85e1 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -280,6 +280,8 @@ CREATE TABLE "channel" ( "channel_removed" smallint NOT NULL DEFAULT '0', "channel_system" smallint NOT NULL DEFAULT '0', "channel_moved" text NOT NULL DEFAULT '', + "channel_password" varchar(255) NOT NULL, + "channel_salt" varchar(255) NOT NULL, PRIMARY KEY ("channel_id"), UNIQUE ("channel_address") ); diff --git a/install/update.php b/install/update.php index dd3a42c78..b37af9cef 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1188 ); +define( 'UPDATE_VERSION' , 1189 ); /** * @@ -2510,3 +2510,14 @@ function update_r1187() { } +function update_r1188() { + + $r1 = q("alter table channel add channel_password varchar(255) not null "); + $r2 = q("alter table channel add channel_salt varchar(255) not null "); + + if($r1 && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +} + |