Fixed few bugs.

shvetsgroup · Oct 26, 2018 · e03e7b5 · e03e7b5
1 parent afb4758
commit e03e7b5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/src/Builders/BaseBuilder.php b/src/Builders/BaseBuilder.php
@@ -243,7 +243,7 @@ protected function reScan(Page $page)
         $filepath = dirname($filename);
         foreach ($this->scanners as $scanner_pair) {
             foreach ($scanner_pair['paths'] as $path) {
-                if (strpos($filepath, rtrim($path, '/') . '/') !== false) {
+                if (mb_strpos($filepath, rtrim($path, '/') . '/') !== false) {
                     $scanner = $this->makeScanner($scanner_pair);
                     return $scanner->scanFile($filename, $path);
                 }

diff --git a/src/Builders/StaticCache.php b/src/Builders/StaticCache.php
@@ -63,7 +63,7 @@ public function write($path, $content, $is_html = true) {
 
         // Do not create file cache for very long filenames.
         foreach (explode('/', $cache_path) as $part) {
-            if (strlen($part) >= 255) {
+            if (mb_strlen($part) >= 255) {
                 return;
             }
         }

diff --git a/src/Controllers/PageController.php b/src/Controllers/PageController.php
@@ -79,7 +79,7 @@ public function getContentTimestamp()
         return response()->json([
             'timestamp' => $date ? strtotime($date) : 0
         ], 200, [], JSON_NUMERIC_CHECK)
-            ->header('Cache-Control', 'no-cache, private')
+            ->header('Cache-Control', 'no-cache')
             ->header('Content-Type', 'application/json');
     }
 }
diff --git a/src/Page/Page.php b/src/Page/Page.php
@@ -158,7 +158,7 @@ static function extractLocale($uri, $localeInUrl = null)
     {
         $defaultLocale = config('app.default_locale', '');
         $defaultLocaleIsInUrl = $localeInUrl === null ? config('jetpages.default_locale_in_url', false) : $localeInUrl;
-        $uri_has_parts = strpos($uri, '/') !== false;
+        $uri_has_parts = mb_strpos($uri, '/') !== false;
 
         if ($uri_has_parts) {
             list($locale, $path) = explode('/', $uri, 2);
@@ -192,7 +192,7 @@ static function extractLocale($uri, $localeInUrl = null)
      */
     static function isValidLocale($string)
     {
-        if (strlen($string) != 2) {
+        if (mb_strlen($string) != 2) {
             return false;
         }
 

diff --git a/src/Page/PageRegistry.php b/src/Page/PageRegistry.php
@@ -155,7 +155,7 @@ public function hasSearchIndex($columns);
      * @param $columns
      * @param $caseSensitive
      */
-    public function makeSearchIndex($columns, $caseSensitive = true);
+    public function makeSearchIndex($columns);
 
     /**
      * Find page in search index.

diff --git a/src/Page/SimplePageRegistry.php b/src/Page/SimplePageRegistry.php
@@ -265,10 +265,10 @@ public function hasSearchIndex($columns) {
      * @param $columns
      * @param $caseSensitive
      */
-    public function makeSearchIndex($columns, $caseSensitive = true) {
+    public function makeSearchIndex($columns) {
         $name = join('__', $columns);
         foreach ($this->getAll() as $page) {
-            $key = $this->makeSearchIndexKey($columns, $page, $caseSensitive);
+            $key = $this->makeSearchIndexKey($columns, $page);
             $this->searchIndexes[$name][$key] = $page;
         }
     }
@@ -281,11 +281,11 @@ public function makeSearchIndex($columns, $caseSensitive = true) {
      * @param $caseSensitive
      * @return string
      */
-    protected function makeSearchIndexKey($columns, Page $page, $caseSensitive = true) {
+    protected function makeSearchIndexKey($columns, Page $page) {
         $parts = [];
         foreach ($columns as $column) {
             $part = $page->getAttribute($column);
-            $parts[] = $caseSensitive ? $part : strtolower($part);
+            $parts[] = mb_strtolower(trim($part));
         }
         return join('__', $parts);
     }
@@ -297,8 +297,9 @@ protected function makeSearchIndexKey($columns, Page $page, $caseSensitive = tru
      * @param $key
      * @return Page|null
      */
-    public function findInSearchIndex($name, $key) {
-        return $this->searchIndexes[$name][$key] ?? $this->searchIndexes[$name][strtolower($key)] ?? null;
+    public function findInSearchIndex($name, $key, $caseSensitive = false) {
+        $key = mb_strtolower(trim($key));
+        return $this->searchIndexes[$name][$key] ?? null;
     }
 
     /**