Extract HTML from user settings page header

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 7, 2020 · 3a9b762 · 3a9b762
1 parent 6152315
commit 3a9b762
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 296 deletions.
diff --git a/libraries/classes/Controllers/Preferences/ExportController.php b/libraries/classes/Controllers/Preferences/ExportController.php
@@ -47,7 +47,7 @@ public function __construct(
     public function index(): void
     {
         global $cfg, $cf, $error, $tabHash, $hash;
-        global $server, $PMA_Config;
+        global $server, $PMA_Config, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -90,7 +90,13 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        $this->response->addHTML(UserPreferencesHeader::getContent($this->template, $this->relation));
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        $this->response->addHTML($this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]));
 
         if ($formDisplay->hasErrors()) {
             $formErrors = $formDisplay->displayErrors();

diff --git a/libraries/classes/Controllers/Preferences/FeaturesController.php b/libraries/classes/Controllers/Preferences/FeaturesController.php
@@ -47,7 +47,7 @@ public function __construct(
     public function index(): void
     {
         global $cfg, $cf, $error, $tabHash, $hash;
-        global $server, $PMA_Config;
+        global $server, $PMA_Config, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -90,7 +90,13 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        $this->response->addHTML(UserPreferencesHeader::getContent($this->template, $this->relation));
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        $this->response->addHTML($this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]));
 
         if ($formDisplay->hasErrors()) {
             $formErrors = $formDisplay->displayErrors();

diff --git a/libraries/classes/Controllers/Preferences/ImportController.php b/libraries/classes/Controllers/Preferences/ImportController.php
@@ -47,7 +47,7 @@ public function __construct(
     public function index(): void
     {
         global $cfg, $cf, $error, $tabHash, $hash;
-        global $server, $PMA_Config;
+        global $server, $PMA_Config, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -90,7 +90,13 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        $this->response->addHTML(UserPreferencesHeader::getContent($this->template, $this->relation));
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        $this->response->addHTML($this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]));
 
         if ($formDisplay->hasErrors()) {
             $formErrors = $formDisplay->displayErrors();

diff --git a/libraries/classes/Controllers/Preferences/MainPanelController.php b/libraries/classes/Controllers/Preferences/MainPanelController.php
@@ -47,7 +47,7 @@ public function __construct(
     public function index(): void
     {
         global $cfg, $cf, $error, $tabHash, $hash;
-        global $server, $PMA_Config;
+        global $server, $PMA_Config, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -90,7 +90,13 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        $this->response->addHTML(UserPreferencesHeader::getContent($this->template, $this->relation));
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        $this->response->addHTML($this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]));
 
         if ($formDisplay->hasErrors()) {
             $formErrors = $formDisplay->displayErrors();

diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php
@@ -67,7 +67,7 @@ public function __construct(
     public function index(): void
     {
         global $cf, $error, $filename, $import_handle, $json, $PMA_Config, $lang, $max_upload_size;
-        global $new_config, $config, $return_url, $form_display, $all_ok, $params, $query;
+        global $new_config, $config, $return_url, $form_display, $all_ok, $params, $query, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -153,7 +153,13 @@ public function index(): void
                 }
                 if (! $all_ok) {
                     // mimic original form and post json in a hidden field
-                    echo UserPreferencesHeader::getContent($this->template, $this->relation);
+                    $cfgRelation = $this->relation->getRelationsParam();
+
+                    echo $this->template->render('preferences/header', [
+                        'route' => $route,
+                        'is_saved' => ! empty($_GET['saved']),
+                        'has_config_storage' => $cfgRelation['userconfigwork'],
+                    ]);
 
                     echo $this->template->render('preferences/manage/error', [
                         'form_errors' => $form_display->displayErrors(),
@@ -224,7 +230,14 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        echo UserPreferencesHeader::getContent($this->template, $this->relation);
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        echo $this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]);
+
         if ($error) {
             if (! $error instanceof Message) {
                 $error = Message::error($error);

diff --git a/libraries/classes/Controllers/Preferences/NavigationController.php b/libraries/classes/Controllers/Preferences/NavigationController.php
@@ -47,7 +47,7 @@ public function __construct(
     public function index(): void
     {
         global $cfg, $cf, $error, $tabHash, $hash;
-        global $server, $PMA_Config;
+        global $server, $PMA_Config, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -90,7 +90,13 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        $this->response->addHTML(UserPreferencesHeader::getContent($this->template, $this->relation));
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        $this->response->addHTML($this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]));
 
         if ($formDisplay->hasErrors()) {
             $formErrors = $formDisplay->displayErrors();

diff --git a/libraries/classes/Controllers/Preferences/SqlController.php b/libraries/classes/Controllers/Preferences/SqlController.php
@@ -47,7 +47,7 @@ public function __construct(
     public function index(): void
     {
         global $cfg, $cf, $error, $tabHash, $hash;
-        global $server, $PMA_Config;
+        global $server, $PMA_Config, $route;
 
         $cf = new ConfigFile($PMA_Config->base_settings);
         $this->userPreferences->pageInit($cf);
@@ -90,7 +90,13 @@ public function index(): void
         $scripts = $header->getScripts();
         $scripts->addFile('config.js');
 
-        $this->response->addHTML(UserPreferencesHeader::getContent($this->template, $this->relation));
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        $this->response->addHTML($this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]));
 
         if ($formDisplay->hasErrors()) {
             $formErrors = $formDisplay->displayErrors();

diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php
@@ -32,9 +32,15 @@ public function __construct($response, $dbi, Template $template, Relation $relat
 
     public function index(): void
     {
-        global $cfg;
+        global $cfg, $route;
 
-        echo UserPreferencesHeader::getContent($this->template, $this->relation);
+        $cfgRelation = $this->relation->getRelationsParam();
+
+        echo $this->template->render('preferences/header', [
+            'route' => $route,
+            'is_saved' => ! empty($_GET['saved']),
+            'has_config_storage' => $cfgRelation['userconfigwork'],
+        ]);
 
         $twoFactor = new TwoFactor($cfg['Server']['user']);
 

diff --git a/libraries/classes/UserPreferencesHeader.php b/libraries/classes/UserPreferencesHeader.php