added user additional data field + fixes

Author: degami

app/base/tools/Plates/SiteBase.php

@@ -197,9 +197,9 @@ public function drawIcon($icon_name)
      * @param  string $variable
      * @return mixed
      */
-    public function env($variable)
+    public function env($variable, $default = null)
     {
-        return $this->container->get('utils')->getEnv($variable);
+        return $this->container->get('utils')->getEnv($variable, $default);
     }
 
     /**

app/base/tools/Utils/HtmlPartsRenderer.php

@@ -617,12 +617,14 @@ public function renderAdminTable($elements, $header = null, BasePage $current_pa
             //$style="max-width:100%;font-size: 9px;line-height: 11px;min-width: 100%;padding: 3px 1px;margin: 0;border: 1px solid #555;border-radius: 2px;";
             foreach ($header as $k => $v) {
                 if (is_array($v) && isset($v['search']) && boolval($v['search']) == true) {
+                    $searchqueryparam = (is_array($current_page->getRequest()->query->get('search')) && isset($current_page->getRequest()->query->get('search')[$v['search']])) ? $current_page->getRequest()->query->get('search')[$v['search']] : '';
+
                     $td = $this->getContainer()->make(
                         TagElement::class,
                         ['options' => [
                         'tag' => 'td',
                         'attributes' => ['class' => 'small'],
-                        'text' => '<input class="form-control" name="search['.$v['search'].']" value="'.$current_page->getRequest()->query->get('search')[$v['search']].'"/>',
+                        'text' => '<input class="form-control" name="search['.$v['search'].']" value="'.$searchqueryparam.'"/>',
                         ]]
                     );
                     $add_searchrow = true;

app/site/migrations/CreateUsersTableMigration.php

@@ -52,6 +52,7 @@ public function addDBTableDefinition(Table $table)
             ->addColumn('nickname', 'VARCHAR', [255])
             ->addColumn('locale', 'VARCHAR', [10])
             ->addColumn('confirmation_code', 'VARCHAR', [20], [], true, null)
+            ->addColumn('additional_data', 'TEXT', null)
             ->addColumn('created_at', 'TIMESTAMP', null, [], false, 'CURRENT_TIMESTAMP()')
             ->addColumn('updated_at', 'TIMESTAMP', null, [], false, 'CURRENT_TIMESTAMP()')
             ->addIndex(null, 'id', Index::TYPE_PRIMARY)

app/site/models/User.php

@@ -23,6 +23,9 @@
  * @method int getRoleId()
  * @method string getEmail()
  * @method string getNickname()
+ * @method string getLocale()
+ * @method string getConfirmationCode()
+ * @method string getAdditionalData()
  * @method \DateTime getCreatedAt()
  * @method \DateTime getUpdatedAt()
  */
@@ -93,7 +96,6 @@ public function getRegisteredSince()
         return "";
     }
 
-
     /**
      * calculates JWT token id
      *
@@ -115,7 +117,7 @@ public function getJWT()
     {
         $this->checkLoaded();
 
-        return $this->getContainer()->get('jwt:builder')
+        $token = $this->getContainer()->get('jwt:builder')
         ->setIssuer($this->getContainer()->get('jwt_issuer'))
         ->setAudience($this->getContainer()->get('jwt_audience'))
         ->setId($this->calcTokenId(), true)
@@ -142,5 +144,7 @@ function ($el) {
             )
         ])
         ->getToken(); // Retrieves the generated token
+
+        return $token;
     }
 }