3.0-dev update 5

Major Changes - New theme engine supporting jQuery UI and Uniform; - New theme: "default". "oxygen" and "dark" themes are no more supported; - New jQuery version; - jQuery plugins replacements; - Many changes in the JavaScript code.
sunhater · Mar 8, 2014 · 1a498b5 · 1a498b5
1 parent 86a721e
commit 1a498b5
Show file tree

Hide file tree

Showing 391 changed files with 3,640 additions and 2,323 deletions.
diff --git a/cache/base.js b/cache/base.js
diff --git a/cache/theme_dark.css b/cache/theme_dark.css
diff --git a/cache/theme_dark.js b/cache/theme_dark.js
diff --git a/cache/theme_default.css b/cache/theme_default.css
diff --git a/cache/theme_default.js b/cache/theme_default.js
@@ -0,0 +1 @@
+new Image().src="themes/default/img/loading.gif";
diff --git a/cache/theme_oxygen.css b/cache/theme_oxygen.css
diff --git a/cache/theme_oxygen.js b/cache/theme_oxygen.js
diff --git a/config.php b/config.php
@@ -22,8 +22,8 @@
 
 // GENERAL SETTINGS
 
-    'disabled' => false,
-    'theme' => "oxygen",
+    'disabled' => true,
+    'theme' => "default",
     'uploadURL' => "upload",
     'uploadDir' => "",
 

diff --git a/core/class/browser.php b/core/class/browser.php
@@ -709,16 +709,28 @@ protected function getFiles($dir) {
         if ($files === false)
             return $return;
 
+        $thumbsFor =  array(
+            IMAGETYPE_GIF,
+            IMAGETYPE_JPEG,
+            IMAGETYPE_PNG
+        );
+
         foreach ($files as $file) {
-            $size = @getimagesize($file);
-            if (is_array($size) && count($size)) {
-                $thumb_file = "$thumbDir/" . basename($file);
-                if (!is_file($thumb_file))
-                    $this->makeThumb($file, false);
-                $smallThumb =
-                    ($size[0] <= $this->config['thumbWidth']) &&
-                    ($size[1] <= $this->config['thumbHeight']) &&
-                    in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
+
+            if (!function_exists("exif_imagetype") ||
+                in_array(@exif_imagetype($file), $thumbsFor)
+            ) {
+                $size = @getimagesize($file);
+                if (is_array($size) && count($size)) {
+                    $thumb_file = "$thumbDir/" . basename($file);
+                    if (!is_file($thumb_file))
+                        $this->makeThumb($file, false);
+                    $smallThumb =
+                        ($size[0] <= $this->config['thumbWidth']) &&
+                        ($size[1] <= $this->config['thumbHeight']) &&
+                        in_array($size[2], $thumbsFor);
+                } else
+                    $smallThumb = false;
             } else
                 $smallThumb = false;