revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 12:52:42 +01:00
Code Issues Releases Wiki Activity

Merge pull request #32 from CodeBlock/420235f9c4e1a25d6afb1e6eed2896307be8d09e

Browse source 
D612
This commit is contained in:
Evan Priestley 2011-07-08 12:27:53 -07:00
commit 61f2ba5c47
18 changed files with 112 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/sql/patches/055.add_author_to_files.sql Normal file
View file

@ -0,0 +1,3 @@
ALTER TABLE phabricator_file.file
ADD COLUMN authorPHID VARCHAR(64) BINARY,
ADD KEY (authorPHID);

3
src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php
View file

@ -76,7 +76,8 @@ class PhabricatorOAuthDefaultRegistrationController
$file = PhabricatorFile::newFromFileData(
$image,
array(
'name' => $provider->getProviderKey().'-profile.jpg'
'name' => $provider->getProviderKey().'-profile.jpg',
'authorPHID' => $user->getPHID(),
));
$user->setProfileImagePHID($file->getPHID());
}

4
src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
View file

@ -45,11 +45,13 @@ class ConduitAPI_file_upload_Method extends ConduitAPIMethod {
$data = $request->getValue('data_base64');
$name = $request->getValue('name');
$data = base64_decode($data, $strict = true);
$user = $request->getUser();
$file = PhabricatorFile::newFromFileData(
$data,
array(
'name' => $name
'name' => $name,
'authorPHID' => $user->getPHID(),
));
return $file->getPHID();
}

2
src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.php
View file

@ -20,6 +20,7 @@ class PhabricatorFileDropUploadController extends PhabricatorFileController {
public function processRequest() {
$request = $this->getRequest();
$user = $request->getUser();
$data = file_get_contents('php://input');
$name = $request->getStr('name');
@ -28,6 +29,7 @@ class PhabricatorFileDropUploadController extends PhabricatorFileController {
$data,
array(
'name' => $request->getStr('name'),
'authorPHID' => $user->getPHID(),
));
$view = new AphrontAttachedFileView();

27
src/applications/files/controller/list/PhabricatorFileListController.php
View file

@ -22,13 +22,32 @@ class PhabricatorFileListController extends PhabricatorFileController {
$request = $this->getRequest();
$author_username = $request->getStr('author');
if ($author_username) {
$author = id(new PhabricatorUser())->loadOneWhere(
'userName = %s',
$author_username);
if (!$author) {
return id(new Aphront404Response());
}
}
$pager = new AphrontPagerView();
$pager->setOffset($request->getInt('page'));
$files = id(new PhabricatorFile())->loadAllWhere(
'1 = 1 ORDER BY id DESC LIMIT %d, %d',
$pager->getOffset(),
$pager->getPageSize() + 1);
if ($author) {
$files = id(new PhabricatorFile())->loadAllWhere(
'authorPHID = %s ORDER BY id DESC LIMIT %d, %d',
$author->getPHID(),
$pager->getOffset(),
$pager->getPageSize() + 1);
} else {
$files = id(new PhabricatorFile())->loadAllWhere(
'1 = 1 ORDER BY id DESC LIMIT %d, %d',
$pager->getOffset(),
$pager->getPageSize() + 1);
}
$files = $pager->sliceResults($files);
$pager->setURI($request->getRequestURI(), 'page');

2
src/applications/files/controller/list/__init__.php
View file

@ -6,8 +6,10 @@
phutil_require_module('phabricator', 'aphront/response/404');
phutil_require_module('phabricator', 'applications/files/controller/base');
phutil_require_module('phabricator', 'applications/files/storage/file');
phutil_require_module('phabricator', 'applications/people/storage/user');
phutil_require_module('phabricator', 'view/control/pager');
phutil_require_module('phabricator', 'view/control/table');
phutil_require_module('phabricator', 'view/layout/panel');

2
src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.php
View file

@ -39,6 +39,7 @@ class PhabricatorFileMacroEditController extends PhabricatorFileController {
$e_name = true;
$request = $this->getRequest();
$user = $request->getUser();
if ($request->isFormPost()) {
$macro->setName($request->getStr('name'));
@ -60,6 +61,7 @@ class PhabricatorFileMacroEditController extends PhabricatorFileController {
idx($_FILES, 'file'),
array(
'name' => $request->getStr('name'),
'authorPHID' => $user->getPHID(),
));
$macro->setFilePHID($file->getPHID());

42
src/applications/files/controller/upload/PhabricatorFileUploadController.php
View file

@ -21,43 +21,47 @@ class PhabricatorFileUploadController extends PhabricatorFileController {
public function processRequest() {
$request = $this->getRequest();
if ($request->isFormPost()) {
$file = PhabricatorFile::newFromPHPUpload(
idx($_FILES, 'file'),
array(
'name' => $request->getStr('name'),
));
$user = $request->getUser();
return id(new AphrontRedirectResponse())
->setURI('/file/info/'.phutil_escape_uri($file->getPHID()).'/');
if ($request->isFormPost()) {
$files = $request->getArr('file');
if (count($files) > 1) {
return id(new AphrontRedirectResponse())
->setURI('/file/?author='.phutil_escape_uri($user->getUserName()));
} else {
return id(new AphrontRedirectResponse())
->setURI('/file/info/'.end($files).'/');
}
}
$panel_id = celerity_generate_unique_node_id();
$form = new AphrontFormView();
$form->setAction('/file/upload/');
$form->setUser($request->getUser());
$form
->setEncType('multipart/form-data')
->appendChild(
id(new AphrontFormFileControl())
->setLabel('File')
->setName('file')
->setError(true))
->appendChild(
id(new AphrontFormTextControl())
->setLabel('Name')
->setName('name')
->setCaption('Optional file display name.'))
id(new AphrontFormDragAndDropUploadControl())
->setLabel('Files')
->setName('file')
->setError(true)
->setDragAndDropTarget($panel_id)
->setActivatedClass('aphront-panel-view-drag-and-drop'))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Upload')
->addCancelButton('/file/'));
->setValue('Done here!'));
$panel = new AphrontPanelView();
$panel->setHeader('Upload File');
$panel->appendChild($form);
$panel->setWidth(AphrontPanelView::WIDTH_FORM);
$panel->setID($panel_id);
return $this->buildStandardPageResponse(
array($panel),

5
src/applications/files/controller/upload/__init__.php
View file

@ -8,11 +8,10 @@
phutil_require_module('phabricator', 'aphront/response/redirect');
phutil_require_module('phabricator', 'applications/files/controller/base');
phutil_require_module('phabricator', 'applications/files/storage/file');
phutil_require_module('phabricator', 'infrastructure/celerity/api');
phutil_require_module('phabricator', 'view/form/base');
phutil_require_module('phabricator', 'view/form/control/file');
phutil_require_module('phabricator', 'view/form/control/draganddropupload');
phutil_require_module('phabricator', 'view/form/control/submit');
phutil_require_module('phabricator', 'view/form/control/text');
phutil_require_module('phabricator', 'view/layout/panel');
phutil_require_module('phutil', 'markup');

17
src/applications/files/controller/view/PhabricatorFileViewController.php
View file

@ -71,6 +71,20 @@ class PhabricatorFileViewController extends PhabricatorFileController {
break;
}
$author_child = null;
if ($file->getAuthorPHID()) {
$author = id(new PhabricatorUser())->loadOneWhere(
'phid = %s',
$file->getAuthorPHID());
if ($author) {
$author_child = id(new AphrontFormStaticControl())
->setLabel('Author')
->setName('author')
->setValue($author->getUserName());
}
}
$form = new AphrontFormView();
if ($file->isViewableInBrowser()) {
@ -80,7 +94,7 @@ class PhabricatorFileViewController extends PhabricatorFileController {
$form->setAction('/file/download/'.$file->getPHID().'/');
$button_name = 'Download File';
}
$form->setUser($this->getRequest()->getUser());
$form->setUser($user);
$form
->appendChild(
id(new AphrontFormStaticControl())
@ -92,6 +106,7 @@ class PhabricatorFileViewController extends PhabricatorFileController {
->setLabel('PHID')
->setName('phid')
->setValue($file->getPHID()))
->appendChild($author_child)
->appendChild(
id(new AphrontFormStaticControl())
->setLabel('Created')

1
src/applications/files/controller/view/__init__.php
View file

@ -13,6 +13,7 @@ phutil_require_module('phabricator', 'applications/files/controller/base');
phutil_require_module('phabricator', 'applications/files/storage/file');
phutil_require_module('phabricator', 'applications/files/storage/transformed');
phutil_require_module('phabricator', 'applications/files/uri');
phutil_require_module('phabricator', 'applications/people/storage/user');
phutil_require_module('phabricator', 'view/control/table');
phutil_require_module('phabricator', 'view/form/base');
phutil_require_module('phabricator', 'view/form/control/static');

6
src/applications/files/storage/file/PhabricatorFile.php
View file

@ -29,6 +29,7 @@ class PhabricatorFile extends PhabricatorFileDAO {
protected $name;
protected $mimeType;
protected $byteSize;
protected $authorPHID;
protected $storageEngine;
protected $storageFormat;
@ -88,9 +89,14 @@ class PhabricatorFile extends PhabricatorFileDAO {
$file_name = idx($params, 'name');
$file_name = self::normalizeFileName($file_name);
// If for whatever reason, authorPHID isn't passed as a param
// (always the case with newFromFileDownload()), store a ''
$authorPHID = idx($params, 'authorPHID');
$file = new PhabricatorFile();
$file->setName($file_name);
$file->setByteSize(strlen($data));
$file->setAuthorPHID($authorPHID);
$blob = new PhabricatorFileStorageBlob();
$blob->setData($data);

6
src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php
View file

@ -53,7 +53,11 @@ class ManiphestTransactionSaveController extends ManiphestController {
if (!empty($_FILES['file'])) {
$err = idx($_FILES['file'], 'error');
if ($err != UPLOAD_ERR_NO_FILE) {
$file = PhabricatorFile::newFromPHPUpload($_FILES['file']);
$file = PhabricatorFile::newFromPHPUpload(
$_FILES['file'],
array(
'authorPHID' => $user->getPHID(),
));
$files[] = $file;
}
}

7
src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php
View file

@ -26,6 +26,7 @@ class PhabricatorMetaMTASendGridReceiveController
public function processRequest() {
$request = $this->getRequest();
$user = $request->getUser();
$raw_headers = $request->getStr('headers');
$raw_headers = explode("\n", rtrim($raw_headers));
@ -51,7 +52,11 @@ class PhabricatorMetaMTASendGridReceiveController
$file_phids = array();
foreach ($_FILES as $file_raw) {
try {
$file = PhabricatorFile::newFromPHPUpload($file_raw);
$file = PhabricatorFile::newFromPHPUpload(
$file_raw,
array(
'authorPHID' => $user->getPHID(),
));
$file_phids[] = $file->getPHID();
} catch (Exception $ex) {
phlog($ex);

1
src/applications/paste/controller/create/PhabricatorPasteCreateController.php
View file

@ -59,6 +59,7 @@ class PhabricatorPasteCreateController extends PhabricatorPasteController {
array(
'name' => $title,
'mime-type' => 'text/plain; charset=utf-8',
'authorPHID' => $user->getPHID(),
));
$paste->setFilePHID($paste_file->getPHID());
$paste->setAuthorPHID($user->getPHID());

6
src/applications/people/controller/profileedit/PhabricatorPeopleProfileEditController.php
View file

@ -40,7 +40,11 @@ class PhabricatorPeopleProfileEditController
if (!empty($_FILES['image'])) {
$err = idx($_FILES['image'], 'error');
if ($err != UPLOAD_ERR_NO_FILE) {
$file = PhabricatorFile::newFromPHPUpload($_FILES['image']);
$file = PhabricatorFile::newFromPHPUpload(
$_FILES['image'],
array(
'authorPHID' => $user->getPHID(),
));
$okay = $file->isTransformableImage();
if ($okay) {
$xformer = new PhabricatorImageTransformer();

6
src/applications/people/controller/settings/PhabricatorUserSettingsController.php
View file

@ -117,7 +117,11 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
if (!empty($_FILES['profile'])) {
$err = idx($_FILES['profile'], 'error');
if ($err != UPLOAD_ERR_NO_FILE) {
$file = PhabricatorFile::newFromPHPUpload($_FILES['profile']);
$file = PhabricatorFile::newFromPHPUpload(
$_FILES['profile'],
array(
'authorPHID' => $user->getPHID(),
));
$okay = $file->isTransformableImage();
if ($okay) {
$xformer = new PhabricatorImageTransformer();

6
src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php
View file

@ -57,7 +57,11 @@ class PhabricatorProjectProfileEditController
if (!empty($_FILES['image'])) {
$err = idx($_FILES['image'], 'error');
if ($err != UPLOAD_ERR_NO_FILE) {
$file = PhabricatorFile::newFromPHPUpload($_FILES['image']);
$file = PhabricatorFile::newFromPHPUpload(
$_FILES['image'],
array(
'authorPHID' => $user->getPHID(),
));
$okay = $file->isTransformableImage();
if ($okay) {
$xformer = new PhabricatorImageTransformer();