Changeset 2314

Timestamp:

12/18/10 21:03:07 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Code care on functions directory files.

Location:

branches/1.5/functions

Files:

• funcs.arrays.php (modified) (1 diff)
• funcs.files.php (modified) (5 diffs)
• funcs.strings.php (modified) (1 diff)
• funcs.times.php (modified) (3 diffs)

branches/1.5/functions/funcs.arrays.php

@@ -218 +218 @@
         return $ret;
 }
-
-?>

branches/1.5/functions/funcs.files.php

@@ -36 +36 @@
 {
         $filenames = array();
-        $directory = new DirectoryIterator($folder);
-        foreach( $directory as $file ) {
+        foreach( new DirectoryIterator($folder) as $file ) {
                 if( !$file->isDot() && ($file->getFilename() != '.svn') ) {
-                        $filename = ($type === 'full') ? $folder.($file->getFilename()) : $file->getFilename();
-                        array_push($filenames, $file->getFilename());
+                        $filenames[] = (($type === 'full') ? $folder : '').$file->getFilename();
                 }
         }
@@ -56 +54 @@
 {
         $stripped = array();
-
         foreach( $fileNames as $fileName ) {
-                array_push($stripped, stripFileExtension($fileName));
+                $stripped[] = stripFileExtension($fileName);
         }
         return $stripped;
@@ -85 +82 @@
 {
         if( is_numeric($filesize) ) {
-                $decr = 1024;
                 $step = 0;
                 $prefix = array('Byte', 'KB', 'MB', 'GB', 'TB', 'PB');
 
-                while( ($filesize / $decr) > 0.9 ) {
-                        $filesize = $filesize / $decr;
+                while( ($filesize / 1024) > 0.9 ) {
+                        $filesize = $filesize / 1024;
                         $step++;
                 }
@@ -96 +92 @@
                 return round($filesize, 2).' '.$prefix[$step];
         }
-        return 'Error displaying filesize';
+        trigger_error('Error displaying filesize', E_USER_NOTICE);
 }
 
@@ -118 +114 @@
         return $h;
 }
-?>

branches/1.5/functions/funcs.strings.php

@@ -169 +169 @@
         //From Wordpress and http://www.bernzilla.com/item.php?id=1007
         $output = sanitize_title_with_dashes($output);
-        $output = urldecode($output);
 
         if ($output) {

branches/1.5/functions/funcs.times.php

@@ -39 +39 @@
         $timestart = microtime(TRUE);
         return TRUE;
-
 }
 
@@ -143 +142 @@
 {
         $block = ($block * 60) * 60; // change into seconds
-        $time_now = time();
-        $start_of_current_block = floor($time_now / $block);
+        $start_of_current_block = floor(time() / $block);
         $start_of_current_block *= $block;
 
@@ -152 +150 @@
 
 }
-?>