[phpwiki-checkins] SF.net SVN: phpwiki:[10606] trunk

[<var...@us...>]

Revision: 10606
          http://sourceforge.net/p/phpwiki/code/10606
Author:   vargenau
Date:     2021-09-30 13:36:50 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
Get rid of old Windows backslash

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/ErrorManager.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-09-30 13:32:04 UTC (rev 10605)
+++ trunk/configurator.php	2021-09-30 13:36:50 UTC (rev 10606)
@@ -74,8 +74,8 @@
         $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
 }
 
-$config_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
-$fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file;
+$config_file = 'config/config.ini';
+$fs_config_file = dirname(__FILE__) . '/' . $config_file;
 if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create');
 
 if (!function_exists('dba_handlers')) {
@@ -162,8 +162,8 @@
         include_once 'lib/prepend.php';
         include_once 'lib/IniConfig.php';
     }
-    $def_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
-    $fs_def_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $def_file;
+    $def_file = 'config/config-default.ini';
+    $fs_def_file = dirname(__FILE__) . '/' . $def_file;
     IniConfig($fs_def_file);
 }
 
@@ -2296,8 +2296,7 @@
     static $f;
 
     if (!$distfile) {
-        $sep = (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/');
-        $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
+        $distfile = dirname(__FILE__) . "/config/config-dist.ini";
         $f = fopen($distfile, "r");
     }
     if ($var == '_MAGIC_CLOSE_FILE') {

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2021-09-30 13:32:04 UTC (rev 10605)
+++ trunk/lib/ErrorManager.php	2021-09-30 13:36:50 UTC (rev 10606)
@@ -488,12 +488,7 @@
     function _getDetail()
     {
         $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__), 0, -4);
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            $dir = str_replace('/', '\\', $dir);
-            $this->errfile = str_replace('/', '\\', $this->errfile);
-            $dir .= "\\";
-        } else
-            $dir .= '/';
+        $dir .= '/';
         $errfile = preg_replace('|^' . preg_quote($dir, '|') . '|', '', $this->errfile);
         $lines = explode("\n", $this->errstr);
         if (DEBUG & _DEBUG_VERBOSE) {
@@ -631,12 +626,7 @@
     {
         if (!$count) $count = $this->_count;
         $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__), 0, -4);
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            $dir = str_replace('/', '\\', $dir);
-            $this->errfile = str_replace('/', '\\', $this->errfile);
-            $dir .= "\\";
-        } else
-            $dir .= '/';
+        $dir .= '/';
         $errfile = preg_replace('|^' . preg_quote($dir, '|') . '|', '', $this->errfile);
         if (is_string($this->errstr))
             $lines = explode("\n", $this->errstr);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.