Changeset 1861 for trunk/upload.php

Timestamp:

Feb 27, 2007, 2:56:16 AM (17 years ago)

Author:

rvelices

Message:

• refactoring pagecategory before 1.7 release

pagecategory is not an id anymore, but an associative array of category info
all of pagecat_xxx or pageuppercats merged into one
simplifies calls to make_index_url
give plugins a clean start for page variables for version 1.7

File:

• trunk/upload.php (modified) (5 diffs)

trunk/upload.php

@@ -133 +133 @@
 {
   check_restrictions( $page['category'] );
-  $result = get_cat_info( $page['category'] );
-  $page['cat_dir']        = get_complete_dir( $page['category'] );
-  $page['cat_site_id']    = $result['site_id'];
-  $page['cat_name']       = $result['name'];
-  $page['cat_uploadable'] = $result['uploadable'];
-  
-  if (url_is_remote($page['cat_dir']) or !$page['cat_uploadable'])
+  $category = get_cat_info( $page['category'] );
+  $category['cat_dir'] = get_complete_dir( $page['category'] );
+  
+  if (url_is_remote($category['cat_dir']) or !$category['uploadable'])
   {
     die('Fatal: you take a wrong way, bye bye');
@@ -155 +152 @@
 if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
 {
-  $path = $page['cat_dir'].$_FILES['picture']['name'];
+  $path = $category['cat_dir'].$_FILES['picture']['name'];
   if ( @is_file( $path ) )
   {
@@ -242 +239 @@
   $extension = get_extension( $_FILES['picture']['name'] );
 
-  if (($path = mkget_thumbnail_dir($page['cat_dir'], $error)) != false)
+  if (($path = mkget_thumbnail_dir($category['cat_dir'], $error)) != false)
   {
     $path.= '/'.$conf['prefix_thumbnail'].$file.'.'.$extension;
@@ -286 +283 @@
 {
   $advise_title = l10n('upload_advise');
-  $advise_title.= get_cat_display_name($page['cat_name']);
+  $advise_title.= get_cat_display_name($category['upper_names']);
 }
 
@@ -303 +300 @@
     'F_ACTION' => $u_form,
 
-    'U_RETURN' => make_index_url(array('category' => $page['category'])),
+    'U_RETURN' => make_index_url(array('category' => $category)),
     )
   );