Changeset 1064 for trunk/admin/site_reader_local.php

Timestamp:

Mar 5, 2006, 12:31:46 AM (18 years ago)

Author:

plg

Message:

new feature: source/destination links between categories. Will we keep this
feature? Code is complicated and very few people will understand how it
works...

modification: #images.storage_category_id replaced by
#image_category.is_storage

improvement: many code refactoring to improve readibility

improvement: virtual category creation code was moved to a dedicated
function in order to be called from admin/cat_list.php and
admin/cat_modify.php (create a new destination category)

File:

• trunk/admin/site_reader_local.php (modified) (9 diffs)

trunk/admin/site_reader_local.php

@@ -45 +45 @@
 {
   global $errors;
+  
   if (!is_dir($this->site_url))
   {
-    array_push($errors, array('path' => $this->site_url, 'type' => 'PWG-ERROR-NO-FS'));
+    array_push(
+      $errors,
+      array(
+        'path' => $this->site_url,
+        'type' => 'PWG-ERROR-NO-FS'
+        )
+      );
+    
     return false;
   }
+  
   return true;
 }
@@ -136 +145 @@
 {
   global $conf;
-  $update_fields = array( 'has_high', 'representative_ext',
-      'filesize', 'width', 'height' );
+  
+  $update_fields = array(
+    'has_high', 'representative_ext', 'filesize', 'width', 'height'
+    );
+  
   if ($conf['use_exif'])
   {
@@ -155 +167 @@
         );
   }
+  
   return $update_fields;
 }
@@ -170 +183 @@
 
   $filename = basename($file);
-  $data['has_high'] = $this->get_has_high( dirname($file), $filename );
-  $data['representative_ext'] = $this->get_representative_ext( dirname($file),
-                                        get_filename_wo_extension($filename) );
+  
+  $data['has_high'] = $this->get_has_high(dirname($file), $filename);
+  
+  $data['representative_ext'] = $this->get_representative_ext(
+    dirname($file),
+    get_filename_wo_extension($filename)
+    );
 
   $data['filesize'] = floor(filesize($file)/1024);
@@ -205 +222 @@
     }
   }
+  
   return $data;
 }
@@ -213 +231 @@
 {
   global $conf;
-  $base_test = $path.'/pwg_representative/';
-  $base_test.= $filename_wo_ext.'.';
+  $base_test = $path.'/pwg_representative/'.$filename_wo_ext.'.';
   foreach ($conf['picture_ext'] as $ext)
   {
@@ -229 +246 @@
 {
   global $conf;
-  $base_test = $path.'/thumbnail/';
-  $base_test.= $conf['prefix_thumbnail'].$filename_wo_ext.'.';
+  
+  $base_test =
+    $path.'/thumbnail/'.$conf['prefix_thumbnail'].$filename_wo_ext.'.';
+  
   foreach ($conf['picture_ext'] as $ext)
   {
@@ -239 +258 @@
     }
   }
+  
   return null;
 }
@@ -248 +268 @@
     return 'true';
   }
+  
   return null;
 }