Additional info in registration request

diff --git a/boot.php b/boot.php
index 7e76df87e36c0b2fed34f19e39ea5b31a257fdee..de7343e31a533975c5443506c8792df7b9812ecb 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1208      );
+define ( 'DB_UPDATE_VERSION',      1209      );
 
 /**
  * @brief Constant with a HTML line break.

diff --git a/database.sql b/database.sql
index c5fd49ba011446974ed85da26e4714944be95931..7cbe4858a803061c14127776409672b67c844454 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.1-dev (Asparagus)
--- DB_UPDATE_VERSION 1205
+-- DB_UPDATE_VERSION 1208
 -- ------------------------------------------
 
 
@@ -59,7 +59,8 @@ CREATE TABLE IF NOT EXISTS `cache` (
        `expire_mode` int(11) NOT NULL DEFAULT 0,
        `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY(`k`(191)),
-        INDEX `updated` (`updated`)
+        INDEX `updated` (`updated`),
+        INDEX `expire_mode_updated` (`expire_mode`,`updated`)
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -174,6 +175,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `ffi_keyword_blacklist` mediumtext,
         PRIMARY KEY(`id`),
         INDEX `uid` (`uid`),
+        INDEX `addr_uid` (`addr`,`uid`),
         INDEX `nurl` (`nurl`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -201,7 +203,8 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
        `cmd` varchar(32) NOT NULL DEFAULT '',
        `item` int(11) NOT NULL DEFAULT 0,
        `contact` int(11) NOT NULL DEFAULT 0,
-        PRIMARY KEY(`id`)
+        PRIMARY KEY(`id`),
+        UNIQUE INDEX `cmd_item_contact` (`cmd`,`item`,`contact`)
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -656,7 +659,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
        `verb` varchar(255) NOT NULL DEFAULT '',
        `otype` varchar(16) NOT NULL DEFAULT '',
        `name_cache` tinytext,
-       `msg_name` mediumtext,
+       `msg_cache` mediumtext,
         PRIMARY KEY(`id`),
         INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -739,7 +742,9 @@ CREATE TABLE IF NOT EXISTS `photo` (
        `deny_cid` mediumtext,
        `deny_gid` mediumtext,
         PRIMARY KEY(`id`),
-        INDEX `uid` (`uid`),
+        INDEX `uid_contactid` (`uid`,`contact-id`),
+        INDEX `uid_profile` (`uid`,`profile`),
+        INDEX `uid_album_created` (`uid`,`album`,`created`),
         INDEX `resource-id` (`resource-id`),
         INDEX `guid` (`guid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -894,6 +899,7 @@ CREATE TABLE IF NOT EXISTS `register` (
        `uid` int(11) unsigned NOT NULL DEFAULT 0,
        `password` varchar(255) NOT NULL DEFAULT '',
        `language` varchar(16) NOT NULL DEFAULT '',
+       `note` text,
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -974,6 +980,7 @@ CREATE TABLE IF NOT EXISTS `term` (
         INDEX `type_term` (`type`,`term`),
         INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`),
         INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`),
+        INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`),
         INDEX `guid` (`guid`)
 ) DEFAULT CHARSET=utf8mb4;
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index bd4a07eb56e73a9c63bb4cb468409da66d62ebfc..94e8da4a44fbda632652204ecc4afe53f1acf1bf 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1280,6 +1280,7 @@ function db_definition($charset) {
                                        "uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "password" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "language" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
+                                       "note" => array("type" => "text"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),

diff --git a/mod/admin.php b/mod/admin.php
index 9eb86720dfd04c779914498689a01778429c9640..5443285001a7fb81a09c205604b7cc4ba5b1c380 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1388,6 +1388,7 @@ function admin_page_users(&$a){
                '$h_deleted' => t('User waiting for permanent deletion'),
                '$th_pending' => array(t('Request date'), t('Name'), t('Email')),
                '$no_pending' =>  t('No registrations.'),
+               '$pendingnotetext' => t('Note from the user'),
                '$approve' => t('Approve'),
                '$deny' => t('Deny'),
                '$delete' => t('Delete'),

diff --git a/mod/register.php b/mod/register.php
index 42127ce81c4872ee7afffb1f1f45e1d072ad1af0..f0348ef4e5c6b1d61fd26a5c2f1c6473870adca1 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -113,12 +113,13 @@ function register_post(&$a) {
                }
 
                $hash = random_string();
-               $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
+               $r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
                        dbesc($hash),
                        dbesc(datetime_convert()),
                        intval($user['uid']),
                        dbesc($result['password']),
-                       dbesc($lang)
+                       dbesc($lang),
+                       dbesc($_POST['permonlybox'])
                );
 
                // invite system
@@ -262,6 +263,8 @@ function register_content(&$a) {
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
                '$invitations' => get_config('system','invitation_only'),
+               '$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
+               '$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')),
                '$invite_desc' => t('Membership on this site is by invitation only.'),
                '$invite_label' => t('Your invitation ID: '),
                '$invite_id' => $invite_id,

diff --git a/update.php b/update.php
index fa03ddd1ac5057decff72f64dc26b893b17d1ba1..76007ad3aa0d3ac9860ea68a81c6c49303db2832 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1208);
+define('UPDATE_VERSION' , 1209);
 
 /**
  *

diff --git a/view/global.css b/view/global.css
index bcf7174ea37d8b2559f151e8fed32680d8b58741..e3cbf08c3b252ac9a2598896ea5345191e5496c7 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -464,3 +464,12 @@ td.federation-data {
 #settings-form .pageflags {
     margin: 0 0 20px 30px;
 }
+
+/* admin pending user notes */
+td.pendingnote {
+       padding-left: 20px;
+       padding-right: 20px;
+}
+td.pendingnote > p > span {
+       font-weight: bold;
+}

diff --git a/view/templates/admin_users.tpl b/view/templates/admin_users.tpl
index 33f44472dbd94cf598c072a0c2496d57bc0ad4bb..a842d6e36412a5fd00b2e37bfc7192a13c69b9cc 100644 (file)
--- a/view/templates/admin_users.tpl
+++ b/view/templates/admin_users.tpl
@@ -39,6 +39,9 @@
                                                <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
                                        </td>
                                </tr>
+                               <tr>
+                                       <td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
+                               </tr>
                        {{/foreach}}
                                </tbody>
                        </table>

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index dfc35736161dbe687a490e53e6a1050fadc58db4..5c55dac2027a82eaae37ef5df7eb81a3f2fced7f 100644 (file)
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -57,6 +57,10 @@
        </div>
        <div id="register-nickname-end" ></div>
 
+{{if $permonly}}
+    {{include file="field_textarea.tpl" field=$permonlybox}}
+{{/if}}
+
        {{$publish}}
 
        <div id="register-submit-wrapper">