Merge remote-tracking branch 'origin/master'

slims · Apr 4, 2018 · b6a6d8b · b6a6d8b
2 parents 411a5ab + 097dffc
commit b6a6d8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/ip_based_access.inc.php b/lib/ip_based_access.inc.php
@@ -50,7 +50,7 @@ function do_checkIP ($module = 'general')
             $is_allowed = false;
         }
         if (!$is_allowed) {
-            echo 'Stop here! Access now allowed.';
+            echo 'Stop here! Access not allowed.';
             exit();
         }
     }

diff --git a/sysconfig.inc.php b/sysconfig.inc.php
@@ -114,7 +114,7 @@ function stripslashes_deep($value)
 // senayan web doc root dir
 /* Custom base URL */
 $sysconf['baseurl'] = '';
-$temp_senayan_web_root_dir = preg_replace('@admin.*@i', '', dirname(@$_SERVER['PHP_SELF']));
+$temp_senayan_web_root_dir = preg_replace('@admin.*@i', '', str_replace('\\', '/', dirname(@$_SERVER['PHP_SELF'])));
 define('SWB', $sysconf['baseurl'].$temp_senayan_web_root_dir.(preg_match('@\/$@i', $temp_senayan_web_root_dir)?'':'/'));
 
 // admin section web root dir
@@ -654,4 +654,4 @@ function stripslashes_deep($value)
 $sysconf['log']['biblio'] = TRUE;
 
 // REST Api
-$sysconf['api']['version'] = 1;
+$sysconf['api']['version'] = 1;