Added COM_isDemoMode()

Geeklog-Core · Aug 26, 2019 · c8ecfb8 · c8ecfb8
1 parent 0ac32ab
commit c8ecfb8
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 12 deletions.
diff --git a/plugins/recaptcha/autoinstall.php b/plugins/recaptcha/autoinstall.php
@@ -45,7 +45,7 @@ function plugin_autoinstall_recaptcha($pi_name)
     global $_CONF, $_RECAPTCHA_CONF;
 
     // IF demo mode (since GL 2.2.0) is in effect, return no valid information
-    if (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+    if (COM_isDemoMode()) {
         return [];
     }
 

diff --git a/plugins/staticpages/services.inc.php b/plugins/staticpages/services.inc.php
@@ -75,7 +75,7 @@ function service_submit_staticpages($args, &$output, &$svc_msg)
         return PLG_RET_AUTH_FAILED;
     }
 
-    if (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+    if (COM_isDemoMode()) {
         $output .= COM_showMessageText($LANG_ACCESS['demo_mode_denied_msg'], $LANG_ACCESS['accessdenied']);
         $output = COM_createHTMLDocument($output, array('pagetitle' => $LANG_ACCESS['accessdenied']));
 

diff --git a/plugins/xmlsitemap/functions.inc b/plugins/xmlsitemap/functions.inc
@@ -333,7 +333,7 @@ function XMLSMAP_update($type = null, $include = null, $exclude = null)
         $pingTargets[] = 'bing';
     }
 
-    if ((isset($_CONF['demo_mode']) && !$_CONF['demo_mode']) || !isset($_CONF['demo_mode'])) {
+    if (!COM_isDemoMode()) {
         if (count($pingTargets) > 0) {
             $sitemap->sendPing($pingTargets);
         }

diff --git a/public_html/admin/envcheck.php b/public_html/admin/envcheck.php
@@ -659,7 +659,7 @@ function _checkEnvironment()
         'lang_showhide_phpinfo'     => $LANG_ENVCHECK['showhide_phpinfo'],
     ));
 
-   if (!(isset($_CONF['demo_mode']) && $_CONF['demo_mode'])) {
+   if (!COM_isDemoMode()) {
         _phpinfo($T);
     }
 

diff --git a/public_html/admin/mail.php b/public_html/admin/mail.php
@@ -262,7 +262,7 @@ function send_messages(array $vars)
 
         $tempTo = is_array($to) ? implode('', array_keys($to)) : $to;
 
-        if (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+        if (COM_isDemoMode()) {
             $successes[] = htmlspecialchars ($tempTo);
         } else {
             if (! COM_mail($to, $subject, $message, $from, $html, $priority)) {

diff --git a/public_html/admin/plugins.php b/public_html/admin/plugins.php
@@ -599,7 +599,7 @@ function plugin_upload_enabled()
     // and the plugin directories are writable by the web server.
     $errors = array();
 
-    if (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+    if (COM_isDemoMode()) {
         $errors[] = $LANG32[69];
     }
     if (!ini_get('file_uploads')) {

diff --git a/public_html/filemanager/connectors/php/filemanager.php b/public_html/filemanager/connectors/php/filemanager.php
@@ -40,7 +40,7 @@ function fm_authenticate()
 {
     global $_CONF;
 
-    if (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+    if (COM_isDemoMode()) {
         return false;
     } else {
         return SEC_inGroup('Root') || (!$_CONF['filemanager_disabled'] && (SEC_inGroup('Filemanager Admin') || SEC_hasRights('filemanager.admin')));

diff --git a/public_html/filemanager/index.php b/public_html/filemanager/index.php
@@ -44,7 +44,7 @@
     COM_accessLog("User {$_USER['username']} tried to illegally access the Filemanager.");
     COM_output($display);
     exit;
-} elseif (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+} elseif (COM_isDemoMode()) {
     $content = COM_showMessageText($LANG_ACCESS['demo_mode_denied_msg'], $LANG_ACCESS['accessdenied']);
     $display = COM_createHTMLDocument($content, ['pagetitle' => $LANG_ACCESS['accessdenied']]);
     COM_output($display);

diff --git a/public_html/lib-common.php b/public_html/lib-common.php
@@ -8583,7 +8583,7 @@ function COM_setupAdvancedEditor($custom, $permissions = 'story.edit', $myEditor
     // Check if the current user has access to Filemanager
     $geeklogFileManager = "false";
     if (!$_CONF['filemanager_disabled'] && (SEC_inGroup('Root') || (SEC_inGroup('Filemanager Admin') || SEC_hasRights('filemanager.admin')))) {
-        if ((isset($_CONF['demo_mode']) && !$_CONF['demo_mode']) || !isset($_CONF['demo_mode'])) {
+        if (!COM_isDemoMode()) {
             $geeklogFileManager = "true";
         }
     }
@@ -8705,6 +8705,19 @@ function COM_isEnableDeveloperModeLog($type)
     return $retval;
 }
 
+/**
+ * Return if we are in demo mode
+ *
+ * @return bool  true if we are in demo mode, false otherwise
+ * @since  Geeklog 2.2.1
+ */
+function COM_isDemoMode()
+{
+    global $_CONF;
+
+    return isset($_CONF['demo_mode']) && $_CONF['demo_mode'];
+}
+
 // Now include all plugin functions
 foreach ($_PLUGINS as $pi_name) {
     require_once $_CONF['path'] . 'plugins/' . $pi_name . '/functions.inc';

diff --git a/system/classes/config.class.php b/system/classes/config.class.php
@@ -998,7 +998,7 @@ public function get_ui($grp, $sg = '0', $change_result = null)
             $table_flag = false;
             //print_r($params);
             foreach ($params as $name => $e) {
-                if (isset($_CONF['demo_mode']) && $_CONF['demo_mode']) {
+                if (COM_isDemoMode()) {
                     if ( in_array($name,array(
                     'site_url','site_admin_url'
                     ,'url_routing'

diff --git a/system/lib-security.php b/system/lib-security.php
@@ -1435,7 +1435,7 @@ function SEC_createToken($ttl = 1200)
     DB_query($sql);
 
     /* Destroy tokens for this user/url combination. Since anonymous user share same id do not delete */
-    if (!(isset($_CONF['demo_mode']) && $_CONF['demo_mode'])) {
+    if (!COM_isDemoMode()) {
         if ($uid != 1) {
             $sql = "DELETE FROM {$_TABLES['tokens']} WHERE owner_id = '{$uid}' AND urlfor= '$pageURL'";
             DB_query($sql);

diff --git a/system/lib-sessions.php b/system/lib-sessions.php
@@ -336,7 +336,7 @@ function SESS_endUserSession($userId)
 
     $userId = (int) $userId;
 
-    if (!(isset($_CONF['demo_mode']) && $_CONF['demo_mode'])) {
+    if (!COM_isDemoMode()) {
         DB_delete($_TABLES['sessions'], 'uid', $userId);
         Session::setUid(Session::ANON_USER_ID);
     }