Changeset 3915:a57821ba9ef1 for inc/admin

Timestamp:

11/05/18 16:40:40 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. A step ahead…

File:

• inc/admin/lib.dc.page.php (modified) (23 diffs)

inc/admin/lib.dc.page.php

@@ -24 +24 @@
         "static"  => "static-msg"];
 
+    private static function getCore()
+    {
+        return $GLOBALS['core'];
+    }
+
     # Auth check
     public static function check($permissions)
     {
-        global $core;
+        $core = self::getCore();
 
         if ($core->blog && $core->auth->check($permissions, $core->blog->id)) {
@@ -42 +47 @@
     public static function checkSuper()
     {
-        global $core;
+        $core = self::getCore();
 
         if (!$core->auth->isSuperAdmin()) {
@@ -55 +60 @@
     public static function open($title = '', $head = '', $breadcrumb = '', $options = [])
     {
-        global $core;
+        $core = self::getCore();
+        $js = [];
 
         # List of user's blogs
@@ -170 +176 @@
 
         if ($core->auth->user_prefs->interface->darkmode) {
-            echo self::jsVars(['dotclear_darkMode' => 1]);
+            $js['darkMode'] = 1;
             echo self::cssLoad('style/default-dark.css');
         } else {
-            echo self::jsVars(['dotclear_darkMode' => 0]);
+            $js['darkMode'] = 0;
             echo self::cssLoad('style/default.css');
         }
@@ -186 +192 @@
                 '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />' . "\n";
         }
-
         if ($core->auth->user_prefs->interface->htmlfontsize) {
-            echo
-            '<script type="text/javascript">' . "\n" .
-            self::jsVar('dotclear_htmlFontSize', $core->auth->user_prefs->interface->htmlfontsize) . "\n" .
-                "</script>\n";
-        }
+            $js['htmlFontSize'] = $core->auth->user_prefs->interface->htmlfontsize;
+        }
+        $js['hideMoreInfo'] = (boolean) $core->auth->user_prefs->interface->hidemoreinfo;
+        $js['showAjaxLoader'] = (boolean) $core->auth->user_prefs->interface->showajaxloader;
+
+        $core->auth->user_prefs->addWorkspace('accessibility');
+        $js['noDragDrop'] = (boolean) $core->auth->user_prefs->accessibility->nodragdrop;
+
+        // Set some JSON data
+        echo dcUtils::jsJson('dotclear_init', $js);
 
         echo
@@ -198 +208 @@
         self::jsToggles() .
             $head;
-
-        $core->auth->user_prefs->addWorkspace('accessibility');
-        echo
-            '<script type="text/javascript">' . "\n" .
-            'dotclear.noDragDrop = '.($core->auth->user_prefs->accessibility->nodragdrop ? 'true' : 'false').';' . "\n" .
-            "</script>\n";
-
-        if ($core->auth->user_prefs->interface->hidemoreinfo) {
-            echo
-                '<script type="text/javascript">' . "\n" .
-                'dotclear.hideMoreInfo = true;' . "\n" .
-                "</script>\n";
-        }
-        if ($core->auth->user_prefs->interface->showajaxloader) {
-            echo
-                '<script type="text/javascript">' . "\n" .
-                'dotclear.showAjaxLoader = true;' . "\n" .
-                "</script>\n";
-        }
 
         # --BEHAVIOR-- adminPageHTMLHead
@@ -276 +267 @@
     public static function notices()
     {
-        global $core;
+        $core = self::getCore();
         static $error_displayed = false;
 
@@ -350 +341 @@
     protected static function getNotification($n)
     {
-        global $core;
+        $core = self::getCore();
 
         $tag = (isset($n['divtag']) && $n['divtag']) ? 'div' : 'p';
@@ -363 +354 @@
     public static function close()
     {
-        global $core;
+        $core = self::getCore();
 
         if (!$GLOBALS['__resources']['ctxhelp']) {
@@ -436 +427 @@
     public static function openPopup($title = '', $head = '', $breadcrumb = '')
     {
-        global $core;
+        $core = self::getCore();
+        $js = [];
 
         # Display
@@ -460 +452 @@
 
         if ($core->auth->user_prefs->interface->darkmode) {
-            echo self::jsVars(['dotclear_darkMode' => 1]);
+            $js['darkMode'] = 1;
             echo self::cssLoad('style/default-dark.css');
         } else {
-            echo self::jsVars(['dotclear_darkMode' => 0]);
+            $js['darkMode'] = 0;
             echo self::cssLoad('style/default.css');
         }
@@ -472 +464 @@
         $core->auth->user_prefs->addWorkspace('interface');
         if ($core->auth->user_prefs->interface->htmlfontsize) {
-            echo
-            '<script type="text/javascript">' . "\n" .
-            self::jsVar('dotclear_htmlFontSize', $core->auth->user_prefs->interface->htmlfontsize) . "\n" .
-                "</script>\n";
-        }
+            $js['htmlFontSize'] = $core->auth->user_prefs->interface->htmlfontsize;
+        }
+        $js['hideMoreInfo'] = (boolean) $core->auth->user_prefs->interface->hidemoreinfo;
+        $js['showAjaxLoader'] = (boolean) $core->auth->user_prefs->interface->showajaxloader;
+
+        $core->auth->user_prefs->addWorkspace('accessibility');
+        $js['noDragDrop'] = (boolean) $core->auth->user_prefs->accessibility->nodragdrop;
+
+        // Set JSON data
+        echo dcUtils::jsJson('dotclear_init', $js);
 
         echo
@@ -483 +480 @@
             $head;
 
-        $core->auth->user_prefs->addWorkspace('accessibility');
-        echo
-            '<script type="text/javascript">' . "\n" .
-            'dotclear.noDragDrop = '.($core->auth->user_prefs->accessibility->nodragdrop ? 'true' : 'false').';' . "\n" .
-            "</script>\n";
-
-        if ($core->auth->user_prefs->interface->hidemoreinfo) {
-            echo
-                '<script type="text/javascript">' . "\n" .
-                'dotclear.hideMoreInfo = true;' . "\n" .
-                "</script>\n";
-        }
-        if ($core->auth->user_prefs->interface->showajaxloader) {
-            echo
-                '<script type="text/javascript">' . "\n" .
-                'dotclear.showAjaxLoader = true;' . "\n" .
-                "</script>\n";
-        }
-
         # --BEHAVIOR-- adminPageHTMLHead
         $core->callBehavior('adminPageHTMLHead');
@@ -539 +517 @@
     public static function breadcrumb($elements = null, $options = [])
     {
-        global $core;
+        $core = self::getCore();
 
         $with_home_link = isset($options['home_link']) ? $options['home_link'] : true;
@@ -566 +544 @@
     public static function message($msg, $timestamp = true, $div = false, $echo = true, $class = 'message')
     {
-        global $core;
+        $core = self::getCore();
 
         $res = '';
@@ -639 +617 @@
     public static function helpBlock(...$params)
     {
-        global $core;
+        $core = self::getCore();
 
         if ($core->auth->user_prefs->interface->hidehelpbutton) {
@@ -648 +626 @@
 
         # --BEHAVIOR-- adminPageHelpBlock
-        $GLOBALS['core']->callBehavior('adminPageHelpBlock', $args);
+        $core->callBehavior('adminPageHelpBlock', $args);
 
         if (empty($args)) {
@@ -750 +728 @@
     public static function jsUtil()
     {
-        return self::jsLoad($GLOBALS['core']->blog->getPF('util.js'));
+        $core = self::getCore();
+        return self::jsLoad($core->blog->getPF('util.js'));
     }
 
     public static function jsToggles()
     {
-        if ($GLOBALS['core']->auth->user_prefs->toggles) {
-            $unfolded_sections = explode(',', $GLOBALS['core']->auth->user_prefs->toggles->unfolded_sections);
+        $core = self::getCore();
+
+        if ($core->auth->user_prefs->toggles) {
+            $unfolded_sections = explode(',', $core->auth->user_prefs->toggles->unfolded_sections);
             foreach ($unfolded_sections as $k => &$v) {
                 if ($v == '') {
@@ -774 +755 @@
     public static function jsCommon()
     {
+        $core = self::getCore();
+
         $mute_or_no = '';
-        if (empty($GLOBALS['core']->blog) || $GLOBALS['core']->blog->settings->system->jquery_migrate_mute) {
+        if (empty($core->blog) || $core->blog->settings->system->jquery_migrate_mute) {
             $mute_or_no .=
                 '<script type="text/javascript">' . "\n" .
@@ -794 +777 @@
         'jsToolBar = {}, jsToolBar.prototype = { elements : {} };' . "\n" .
 
-        self::jsVar('dotclear.nonce', $GLOBALS['core']->getNonce()) .
+        self::jsVar('dotclear.nonce', $core->getNonce()) .
 
         self::jsVar('dotclear.img_plus_src', 'images/expand.png') .
@@ -1029 +1012 @@
     public static function jsUpload($params = [], $base_url = null)
     {
+        $core = self::getCore();
+
         if (!$base_url) {
             $base_url = path::clean(dirname(preg_replace('/(\?.*$)?/', '', $_SERVER['REQUEST_URI']))) . '/';
@@ -1036 +1021 @@
             'sess_id=' . session_id(),
             'sess_uid=' . $_SESSION['sess_browser_uid'],
-            'xd_check=' . $GLOBALS['core']->getNonce()
+            'xd_check=' . $core->getNonce()
         ]);
 
@@ -1156 +1141 @@
     public static function getPF($file)
     {
-        return $GLOBALS['core']->adminurl->get('load.plugin.file', ['pf' => $file]);
+        $core = self::getCore();
+        return $core->adminurl->get('load.plugin.file', ['pf' => $file]);
     }
 
     public static function getVF($file)
     {
-        return $GLOBALS['core']->adminurl->get('load.var.file', ['vf' => $file]);
+        $core = self::getCore();
+        return $core->adminurl->get('load.var.file', ['vf' => $file]);
     }