- Updated library classes

- Stopped using composer for htmlawed
Geeklog-Core · May 3, 2019 · 1b6db37 · 1b6db37
1 parent d863d3a
commit 1b6db37
Show file tree

Hide file tree

Showing 48 changed files with 619 additions and 6,809 deletions.
diff --git a/system/classes/gltext.class.php b/system/classes/gltext.class.php
@@ -2,7 +2,7 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 2.1                                                               |
+// | Geeklog 2.2                                                               |
 // +---------------------------------------------------------------------------+
 // | gltext.class.php                                                          |
 // |                                                                           |
@@ -29,6 +29,8 @@
 // |                                                                           |
 // +---------------------------------------------------------------------------+
 
+require_once __DIR__ . '/htmLawed/htmLawed.php';
+
 /**
  * Constants for GLText
  * Version of GLText engine

diff --git a/system/composer.json b/system/composer.json
@@ -10,7 +10,6 @@
     "pear/net_url2": "~2.2",
     "pear/http_request2": "~2.3.0",
     "splitbrain/php-archive": "1.0.9",
-    "htmlawed/htmlawed": "~1.0",
     "swiftmailer/swiftmailer": "~5",
     "phpclasses/oauth-api": "^1.0",
     "robthree/twofactorauth": "^1.6",

diff --git a/system/composer.lock b/system/composer.lock
diff --git a/system/vendor/bin/minifycss b/system/vendor/bin/minifycss
@@ -2,9 +2,13 @@
 
 dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../matthiasmullie/minify/bin" && pwd)
 
-if [ -d /proc/cygdrive ] && [[ $(which php) == $(readlink -n /proc/cygdrive)/* ]]; then
-   # We are in Cgywin using Windows php, so the path must be translated
-   dir=$(cygpath -m "$dir");
+if [ -d /proc/cygdrive ]; then
+    case $(which php) in
+        $(readlink -n /proc/cygdrive)/*)
+            # We are in Cygwin using Windows php, so the path must be translated
+            dir=$(cygpath -m "$dir");
+            ;;
+    esac
 fi
 
 "${dir}/minifycss" "$@"
diff --git a/system/vendor/bin/minifyjs b/system/vendor/bin/minifyjs
@@ -2,9 +2,13 @@
 
 dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../matthiasmullie/minify/bin" && pwd)
 
-if [ -d /proc/cygdrive ] && [[ $(which php) == $(readlink -n /proc/cygdrive)/* ]]; then
-   # We are in Cgywin using Windows php, so the path must be translated
-   dir=$(cygpath -m "$dir");
+if [ -d /proc/cygdrive ]; then
+    case $(which php) in
+        $(readlink -n /proc/cygdrive)/*)
+            # We are in Cygwin using Windows php, so the path must be translated
+            dir=$(cygpath -m "$dir");
+            ;;
+    esac
 fi
 
 "${dir}/minifyjs" "$@"
diff --git a/system/vendor/composer/ClassLoader.php b/system/vendor/composer/ClassLoader.php
@@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**
@@ -377,11 +377,11 @@ private function findFileWithExtension($class, $ext)
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
+                $search = $subPath . '\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        $length = $this->prefixLengthsPsr4[$first][$search];
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir . $pathEnd)) {
                             return $file;
                         }
                     }