From c6ee5f7ebdc7485f8b4e96aca9f6e4e70b4c455e Mon Sep 17 00:00:00 2001 From: nbm Date: Mon, 12 Dec 2005 15:23:16 +0000 Subject: [PATCH] Move add document action into a separate file, and move control over UI to a document addition observer. --- plugins/ktcore/KTFolderActions.php | 102 +----------------------------------------------------------------------------------------------------- plugins/ktcore/folder/addDocument.php | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 101 deletions(-) create mode 100644 plugins/ktcore/folder/addDocument.php diff --git a/plugins/ktcore/KTFolderActions.php b/plugins/ktcore/KTFolderActions.php index f1c5a9d..2fd15fb 100644 --- a/plugins/ktcore/KTFolderActions.php +++ b/plugins/ktcore/KTFolderActions.php @@ -14,107 +14,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php'); $oRegistry =& KTPluginRegistry::getSingleton(); $oPlugin =& $oRegistry->getPlugin('ktcore.plugin'); -class KTFolderAddDocumentAction extends KTFolderAction { - var $sDisplayName = 'Add Document'; - var $sName = 'ktcore.actions.folder.addDocument'; - - var $_sShowPermission = "ktcore.permissions.write"; - - function do_main() { - $this->oPage->setBreadcrumbDetails(_("add document")); - $this->oPage->setTitle(_('Add a document')); - $oTemplate =& $this->oValidator->validateTemplate('ktcore/document/add'); - $add_fields = array(); - $add_fields[] = new KTFileUploadWidget(_('File'), _('The contents of the document to be added to the document management system.'), 'file', "", $this->oPage, true); - $add_fields[] = new KTStringWidget(_('Title'), _('Describe the changes made to the document.'), 'title', "", $this->oPage, true); - - - - $aVocab = array(); - foreach (DocumentType::getList() as $oDocumentType) { - $aVocab[$oDocumentType->getId()] = $oDocumentType->getName(); - } - $fieldOptions = array("vocab" => $aVocab); - $add_fields[] = new KTLookupWidget(_('Document Type'), 'FIXME', 'fDocumentTypeId', null, $this->oPage, true, "add-document-type", $fieldErrors, $fieldOptions); - - $fieldsets = array(); - $fieldsetDisplayReg =& KTFieldsetDisplayRegistry::getSingleton(); - $activesets = KTFieldset::getGenericFieldsets(); - foreach ($activesets as $oFieldset) { - $displayClass = $fieldsetDisplayReg->getHandler($oFieldset->getNamespace()); - array_push($fieldsets, new $displayClass($oFieldset)); - } - - $oTemplate->setData(array( - 'context' => &$this, - 'add_fields' => $add_fields, - 'generic_fieldsets' => $fieldsets, - )); - return $oTemplate->render(); - } - - function do_upload() { - require_once(KT_LIB_DIR . '/storage/storagemanager.inc.php'); - require_once(KT_LIB_DIR . '/filelike/fsfilelike.inc.php'); - require_once(KT_LIB_DIR . '/documentmanagement/DocumentType.inc'); - require_once(KT_LIB_DIR . '/metadata/fieldset.inc.php'); - require_once(KT_LIB_DIR . '/documentmanagement/documentutil.inc.php'); - - // make sure the user actually selected a file first - // and that something was uploaded - if (!((strlen($_FILES['file']['name']) > 0) && $_FILES['file']['size'] > 0)) { - // no uploaded file - $message = _("You did not select a valid document to upload"); - - $errors = array( - 1 => _("The uploaded file is larger than the PHP upload_max_filesize setting"), - 2 => _("The uploaded file is larger than the MAX_FILE_SIZE directive that was specified in the HTML form"), - 3 => _("The uploaded file was not fully uploaded to KnowledgeTree"), - 4 => _("No file was selected to be uploaded to KnowledgeTree"), - 6 => _("An internal error occurred receiving the uploaded document"), - ); - $message = KTUtil::arrayGet($errors, $_FILES['file']['error'], $message); - - if (@ini_get("file_uploads") == false) { - $message = _("File uploads are disabled in your PHP configuration"); - } - - $this->errorRedirectToMain($message, 'fFolderId=' . $this->oFolder->getId()); - exit(0); - } - - $matches = array(); - $aFields = array(); - foreach ($_REQUEST as $k => $v) { - if (preg_match('/^metadata_(\d+)$/', $k, $matches)) { - $aFields[] = array(DocumentField::get($matches[1]), $v); - } - } - - $this->oValidator->validateDocumentType($_REQUEST['fDocumentTypeId']); - - $aOptions = array( - 'contents' => new KTFSFileLike($_FILES['file']['tmp_name']), - 'documenttype' => $this->oDocumentType, - 'metadata' => $aFields, - 'description' => $_REQUEST['fName'], - ); - - $this->startTransaction(); - $oDocument =& KTDocumentUtil::add($this->oFolder, basename($_FILES['file']['name']), $this->oUser, $aOptions); - if (PEAR::isError($oDocument)) { - $message = $oDocument->getMessage(); - $this->errorRedirectToMain($message, 'fFolderId=' . $this->oFolder->getId()); - exit(0); - } - - $this->commitTransaction(); - //redirect to the document details page - controllerRedirect("viewDocument", "fDocumentId=" . $oDocument->getID()); - } - -} -$oPlugin->registerAction('folderaction', 'KTFolderAddDocumentAction', 'ktcore.actions.folder.addDocument'); +$oPlugin->registerAction('folderaction', 'KTFolderAddDocumentAction', 'ktcore.actions.folder.addDocument', 'folder/addDocument.php'); class KTFolderAddFolderAction extends KTFolderAction { var $sDisplayName = 'Add a Folder'; diff --git a/plugins/ktcore/folder/addDocument.php b/plugins/ktcore/folder/addDocument.php new file mode 100644 index 0000000..ce08291 --- /dev/null +++ b/plugins/ktcore/folder/addDocument.php @@ -0,0 +1,117 @@ +oPage->setBreadcrumbDetails(_("add document")); + $this->oPage->setTitle(_('Add a document')); + $oTemplate =& $this->oValidator->validateTemplate('ktcore/document/add'); + $add_fields = array(); + $add_fields[] = new KTFileUploadWidget(_('File'), _('The contents of the document to be added to the document management system.'), 'file', "", $this->oPage, true); + $add_fields[] = new KTStringWidget(_('Title'), _('Describe the changes made to the document.'), 'title', "", $this->oPage, true); + + $aVocab = array(); + foreach (DocumentType::getList() as $oDocumentType) { + $aVocab[$oDocumentType->getId()] = $oDocumentType->getName(); + } + $fieldOptions = array("vocab" => $aVocab); + $add_fields[] = new KTLookupWidget(_('Document Type'), 'FIXME', 'fDocumentTypeId', null, $this->oPage, true, "add-document-type", $fieldErrors, $fieldOptions); + + $fieldsets = array(); + $fieldsetDisplayReg =& KTFieldsetDisplayRegistry::getSingleton(); + $activesets = KTFieldset::getGenericFieldsets(); + foreach ($activesets as $oFieldset) { + $displayClass = $fieldsetDisplayReg->getHandler($oFieldset->getNamespace()); + array_push($fieldsets, new $displayClass($oFieldset)); + } + + $oTemplate->setData(array( + 'context' => &$this, + 'add_fields' => $add_fields, + 'generic_fieldsets' => $fieldsets, + )); + return $oTemplate->render(); + } + + function do_upload() { + $this->oPage->setBreadcrumbDetails(_("add document")); + $this->oPage->setTitle(_('Add a document')); + $mpo =& new JavascriptObserver(&$this); + // $mpo =& new KTSinglePageObserver(&$this); + $oUploadChannel =& KTUploadChannel::getSingleton(); + $oUploadChannel->addObserver($mpo); + + require_once(KT_LIB_DIR . '/storage/storagemanager.inc.php'); + require_once(KT_LIB_DIR . '/filelike/fsfilelike.inc.php'); + require_once(KT_LIB_DIR . '/documentmanagement/DocumentType.inc'); + require_once(KT_LIB_DIR . '/metadata/fieldset.inc.php'); + require_once(KT_LIB_DIR . '/documentmanagement/documentutil.inc.php'); + + // make sure the user actually selected a file first + // and that something was uploaded + if (!((strlen($_FILES['file']['name']) > 0) && $_FILES['file']['size'] > 0)) { + // no uploaded file + $message = _("You did not select a valid document to upload"); + + $errors = array( + 1 => _("The uploaded file is larger than the PHP upload_max_filesize setting"), + 2 => _("The uploaded file is larger than the MAX_FILE_SIZE directive that was specified in the HTML form"), + 3 => _("The uploaded file was not fully uploaded to KnowledgeTree"), + 4 => _("No file was selected to be uploaded to KnowledgeTree"), + 6 => _("An internal error occurred receiving the uploaded document"), + ); + $message = KTUtil::arrayGet($errors, $_FILES['file']['error'], $message); + + if (@ini_get("file_uploads") == false) { + $message = _("File uploads are disabled in your PHP configuration"); + } + + $this->errorRedirectToMain($message, 'fFolderId=' . $this->oFolder->getId()); + exit(0); + } + + $matches = array(); + $aFields = array(); + foreach ($_REQUEST as $k => $v) { + if (preg_match('/^metadata_(\d+)$/', $k, $matches)) { + $aFields[] = array(DocumentField::get($matches[1]), $v); + } + } + + $this->oValidator->validateDocumentType($_REQUEST['fDocumentTypeId']); + + $aOptions = array( + 'contents' => new KTFSFileLike($_FILES['file']['tmp_name']), + 'documenttype' => $this->oDocumentType, + 'metadata' => $aFields, + 'description' => $_REQUEST['fName'], + ); + + $mpo->start(); + $this->startTransaction(); + $oDocument =& KTDocumentUtil::add($this->oFolder, basename($_FILES['file']['name']), $this->oUser, $aOptions); + if (PEAR::isError($oDocument)) { + $message = $oDocument->getMessage(); + $this->errorRedirectToMain($message, 'fFolderId=' . $this->oFolder->getId()); + exit(0); + } + + $mpo->redirectToDocument($oDocument->getId()); + $this->commitTransaction(); + exit(0); + } + +} + +?> -- libgit2 0.21.4