mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3164 from SimSync/issue_3152_public_upload

Browse Source 
Fixes #3152 Download / Upload categories problem
This commit is contained in:
Cameron
2018-06-02 12:47:45 -07:00
committed by GitHub
parent ad3e416254 8d41cd6956
commit 33f8b885fe
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_admin/upload.php
View File

@@ -204,7 +204,15 @@ class upload_ui extends e_admin_ui
$this->getModel()->addValidationError(UPLLAN_62); $this->getModel()->addValidationError(UPLLAN_62);
$new_data['upload_active'] = 0; $new_data['upload_active'] = 0;
return $new_data; return $new_data;
} }
// Make sure the upload_category contains only integers
// Make sure the owner correspondents to the category id
list($catOwner, $catID) = explode("__", $new_data['upload_category'], 2);
$new_data['upload_category'] = intval($catID);
$new_data['upload_owner'] = $catOwner;
return $new_data;
} }
/** /**
@@ -262,7 +270,8 @@ class upload_ui extends e_admin_ui
return 0; return 0;
} }
$owner = varset($upload['upload_owner'], 'download'); // Make sure the owner is not empty
$owner = vartrue($upload['upload_owner'], 'download');
$uploadObj = e107::getAddon($owner,'e_upload'); $uploadObj = e107::getAddon($owner,'e_upload');
@@ -371,7 +380,9 @@ class upload_form_ui extends e_admin_form_ui
case 'write': case 'write':
$owner = $this->getController()->getModel()->get('upload_owner'); $owner = $this->getController()->getModel()->get('upload_owner');
return $value."-- ".$owner; // $this->radio_switch('upload_active', $value, LAN_ACCEPT, LAN_PENDING, $options); //return $value."-- ".$owner; // $this->radio_switch('upload_active', $value, LAN_ACCEPT, LAN_PENDING, $options);
// make category editable instead of just displaying data
return e107::getForm()->select('upload_category', $opts, $value);
break; break;
case 'batch': case 'batch':

2
upload.php
View File

@@ -107,7 +107,7 @@ class userUpload
$catID = null; $catID = null;
$catOwner = null; $catOwner = null;
$file = null; $file = null;
$image = null; $image = '';
$filesize = 0; $filesize = 0;