From 11c1414f199c79c97adc51965c7caa05ccd67f5d Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 20 Jun 2017 17:56:16 -0500
Subject: [PATCH] Move and rename local function get_settings() to
 settings.lib.php::getCategorySettings() to allow re-use

---
 main/admin/settings.lib.php | 57 +++++++++++++++++++++++++++++++++++
 main/admin/settings.php     | 59 ++-----------------------------------
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index a3a603fe04..a66241e796 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -1754,3 +1754,60 @@ function isStyleChangeable()
     }
     return $changeable;
 }
+
+/**
+ * Get all settings of one category prepared for display in admin/settings.php
+ * @param string $category
+ * @return array
+ */
+function getCategorySettings($category = '')
+{
+    $url_id = api_get_current_access_url_id();
+    $settings_by_access_list = array();
+
+    if ($url_id == 1) {
+        $settings = api_get_settings($category, 'group', $url_id);
+    } else {
+        $url_info = api_get_access_url($url_id);
+        if ($url_info['active'] == 1) {
+            $categoryToSearch = $category;
+            if ($category == 'search_setting') {
+                $categoryToSearch = '';
+            }
+            // The default settings of Chamilo
+            $settings = api_get_settings($categoryToSearch, 'group', 1, 0);
+            // The settings that are changeable from a particular site.
+            $settings_by_access = api_get_settings($categoryToSearch, 'group', $url_id, 1);
+
+            foreach ($settings_by_access as $row) {
+                if (empty($row['variable'])) {
+                    $row['variable'] = 0;
+                }
+                if (empty($row['subkey'])) {
+                    $row['subkey'] = 0;
+                }
+                if (empty($row['category'])) {
+                    $row['category'] = 0;
+                }
+
+                // One more validation if is changeable.
+                if ($row['access_url_changeable'] == 1) {
+                    $settings_by_access_list[$row['variable']][$row['subkey']][$row['category']] = $row;
+                } else {
+                    $settings_by_access_list[$row['variable']][$row['subkey']][$row['category']] = array();
+                }
+            }
+        }
+    }
+
+    if (isset($category) && $category == 'search_setting') {
+        if (!empty($_REQUEST['search_field'])) {
+            $settings = searchSetting($_REQUEST['search_field']);
+        }
+    }
+
+    return array(
+        'settings' => $settings,
+        'settings_by_access_list' => $settings_by_access_list
+    );
+}
\ No newline at end of file
diff --git a/main/admin/settings.php b/main/admin/settings.php
index a4cdc629a4..4070a85453 100755
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
@@ -95,68 +95,13 @@ $form_search_html = $form_search->returnForm();
 $url_id = api_get_current_access_url_id();
 
 $settings = null;
-/**
- * @param string $category
- * @return array
- */
-function get_settings($category = '')
-{
-    $url_id = api_get_current_access_url_id();
-    $settings_by_access_list = array();
-
-    if ($url_id == 1) {
-        $settings = api_get_settings($category, 'group', $url_id);
-    } else {
-        $url_info = api_get_access_url($url_id);
-        if ($url_info['active'] == 1) {
-            $categoryToSearch = $category;
-            if ($category == 'search_setting') {
-                $categoryToSearch = '';
-            }
-            // The default settings of Chamilo
-            $settings = api_get_settings($categoryToSearch, 'group', 1, 0);
-            // The settings that are changeable from a particular site.
-            $settings_by_access = api_get_settings($categoryToSearch, 'group', $url_id, 1);
-
-            foreach ($settings_by_access as $row) {
-                if (empty($row['variable'])) {
-                    $row['variable'] = 0;
-                }
-                if (empty($row['subkey'])) {
-                    $row['subkey'] = 0;
-                }
-                if (empty($row['category'])) {
-                    $row['category'] = 0;
-                }
-
-                // One more validation if is changeable.
-                if ($row['access_url_changeable'] == 1) {
-                    $settings_by_access_list[$row['variable']][$row['subkey']][$row['category']] = $row;
-                } else {
-                    $settings_by_access_list[$row['variable']][$row['subkey']][$row['category']] = array();
-                }
-            }
-        }
-    }
-
-    if (isset($category) && $category == 'search_setting') {
-        if (!empty($_REQUEST['search_field'])) {
-            $settings = searchSetting($_REQUEST['search_field']);
-        }
-    }
-
-    return array(
-        'settings' => $settings,
-        'settings_by_access_list' => $settings_by_access_list
-    );
-}
 
 // Build the form.
 if (!empty($_GET['category']) &&
     !in_array($_GET['category'], array('Plugins', 'stylesheets', 'Search'))
 ) {
     $my_category = isset($_GET['category']) ? $_GET['category'] : null;
-    $settings_array = get_settings($my_category);
+    $settings_array = getCategorySettings($my_category);
     $settings = $settings_array['settings'];
     $settings_by_access_list = $settings_array['settings_by_access_list'];
     $form = generateSettingsForm($settings, $settings_by_access_list);
@@ -206,7 +151,7 @@ if (!empty($_GET['category']) &&
                     }
                 }
                 //Reload settings
-                $settings_array = get_settings($my_category);
+                $settings_array = getCategorySettings($my_category);
                 $settings = $settings_array['settings'];
                 $settings_by_access_list = $settings_array['settings_by_access_list'];
                 $form = generateSettingsForm(