Knah-Tsaeb/Minigalnano
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #72 from bifek/functions

Browse source 
use built-in is_dir() function
This commit is contained in:
Tom.C. 2014-11-25 18:30:29 +01:00
commit 2eed3aec3f
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
index.php
View file

@ -66,15 +66,6 @@ if (!function_exists('exif_read_data') && $display_exif == 1) {
//----------------------- //-----------------------
// FUNCTIONS // FUNCTIONS
//----------------------- //-----------------------
function is_directory($filepath) {
// $filepath must be the entire system path to the file
if (!@opendir($filepath)) return FALSE;
else {
return TRUE;
closedir($filepath);
}
}
function padstring($name, $length) { function padstring($name, $length) {
global $label_max_length; global $label_max_length;
if (!isset($length)) $length = $label_max_length; if (!isset($length)) $length = $label_max_length;
@ -151,12 +142,12 @@ $currentdir = GALLERY_ROOT . $thumbdir;
//----------------------- //-----------------------
$files = array(); $files = array();
$dirs = array(); $dirs = array();
if (is_directory($currentdir) && $handle = opendir($currentdir)) if (is_dir($currentdir) && $handle = opendir($currentdir))
{ {
while (false !== ($file = readdir($handle)) && !in_array($file, $SkipObjects)) while (false !== ($file = readdir($handle)) && !in_array($file, $SkipObjects))
{ {
// 1. LOAD FOLDERS // 1. LOAD FOLDERS
if (is_directory($currentdir . "/" . $file)) if (is_dir($currentdir . "/" . $file))
{ {
if ($file != "." && $file != ".." ) if ($file != "." && $file != ".." )
{ {