From d70a6c79b3e1616bd5d90c4e150f9c4259652868 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sun, 27 Oct 2024 06:35:57 +0100 Subject: [PATCH] fix code formating, add license if missing --- inc/inc.ClassAuthenticationMiddleware.php | 71 +++++++++++++----- inc/inc.ConversionInit.php | 59 +++++++++++---- inc/inc.Init.php | 57 +++++++++------ out/out.ReviewSummary.php | 72 +++++++++++-------- out/out.UpdateDocument.php | 88 +++++++++++++---------- 5 files changed, 225 insertions(+), 122 deletions(-) diff --git a/inc/inc.ClassAuthenticationMiddleware.php b/inc/inc.ClassAuthenticationMiddleware.php index 5ddb846d7..fa8d0fdc7 100644 --- a/inc/inc.ClassAuthenticationMiddleware.php +++ b/inc/inc.ClassAuthenticationMiddleware.php @@ -1,4 +1,35 @@ + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @link https://www.seeddms.org Main Site + */ + /* Middleware for authentication based on session */ class SeedDMS_Auth_Middleware_Session { /* {{{ */ @@ -23,24 +54,25 @@ class SeedDMS_Auth_Middleware_Session { /* {{{ */ $settings = $this->container->config; $logger = $this->container->logger; $userobj = null; - if($this->container->has('userobj')) - $userobj = $this->container->userobj; - - if($userobj) { - $response = $next($request, $response); - return $response; + if ($this->container->has('userobj')) { + $userobj = $this->container->userobj; } - $logger->log("Invoke middleware for method ".$request->getMethod()." on '".$request->getUri()->getPath()."'", PEAR_LOG_INFO); + if ($userobj) { + $response = $next($request, $response); + return $response; + } + + $logger->log("Invoke middleware for method " . $request->getMethod() . " on '" . $request->getUri()->getPath() . "'", PEAR_LOG_INFO); require_once("inc/inc.ClassSession.php"); $session = new SeedDMS_Session($dms->getDb()); if (isset($_COOKIE["mydms_session"])) { $dms_session = $_COOKIE["mydms_session"]; - $logger->log("Session key: ".$dms_session, PEAR_LOG_DEBUG); - if(!$resArr = $session->load($dms_session)) { + $logger->log("Session key: " . $dms_session, PEAR_LOG_DEBUG); + if (!$resArr = $session->load($dms_session)) { /* Delete Cookie */ - setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); - $logger->log("Session for id '".$dms_session."' has gone", PEAR_LOG_ERR); + setcookie("mydms_session", $dms_session, time() - 3600, $settings->_httpRoot); + $logger->log("Session for id '" . $dms_session . "' has gone", PEAR_LOG_ERR); return $response->withStatus(403); } @@ -48,17 +80,20 @@ class SeedDMS_Auth_Middleware_Session { /* {{{ */ $userobj = $dms->getUser($resArr["userID"]); if (!is_object($userobj)) { /* Delete Cookie */ - setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); - if($settings->_enableGuestLogin) { - if(!($userobj = $dms->getUser($settings->_guestID))) + setcookie("mydms_session", $dms_session, time() - 3600, $settings->_httpRoot); + if ($settings->_enableGuestLogin) { + if (!($userobj = $dms->getUser($settings->_guestID))) { return $response->withStatus(403); - } else + } + } else { return $response->withStatus(403); + } } - if($userobj->isAdmin()) { - if($resArr["su"]) { - if(!($userobj = $dms->getUser($resArr["su"]))) + if ($userobj->isAdmin()) { + if ($resArr["su"]) { + if (!($userobj = $dms->getUser($resArr["su"]))) { return $response->withStatus(403); + } } } $dms->setUser($userobj); diff --git a/inc/inc.ConversionInit.php b/inc/inc.ConversionInit.php index 67014251a..3e384025b 100644 --- a/inc/inc.ConversionInit.php +++ b/inc/inc.ConversionInit.php @@ -1,40 +1,71 @@ + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @link https://www.seeddms.org Main Site + */ + $conversionmgr = null; -require_once("inc.ClassConversionMgr.php"); +require_once "inc.ClassConversionMgr.php"; $conversionmgr = new SeedDMS_ConversionMgr(); -if(!empty($settings->_converters['preview'])) { - foreach($settings->_converters['preview'] as $mimetype=>$cmd) { +if (!empty($settings->_converters['preview'])) { + foreach ($settings->_converters['preview'] as $mimetype => $cmd) { $conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'image/png', $cmd), $settings->_cmdTimeout)->setLogger($logger); } } -if(!empty($settings->_converters['pdf'])) { - foreach($settings->_converters['pdf'] as $mimetype=>$cmd) { +if (!empty($settings->_converters['pdf'])) { + foreach ($settings->_converters['pdf'] as $mimetype => $cmd) { $conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'application/pdf', $cmd, $settings->_cmdTimeout))->setLogger($logger); } } -if(!empty($settings->_converters['fulltext'])) { - foreach($settings->_converters['fulltext'] as $mimetype=>$cmd) { +if (!empty($settings->_converters['fulltext'])) { + foreach ($settings->_converters['fulltext'] as $mimetype => $cmd) { $conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'text/plain', $cmd, $settings->_cmdTimeout))->setLogger($logger); } } -if(extension_loaded('imagick')) { +if (extension_loaded('imagick')) { $conversionmgr->addService(new SeedDMS_ConversionServicePdfToImage('application/pdf', 'image/png'))->setLogger($logger); $conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/tiff', 'image/png'))->setLogger($logger); $conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/svg+xml', 'image/png'))->setLogger($logger); } -if(extension_loaded('gd') || extension_loaded('imagick')) { +if (extension_loaded('gd') || extension_loaded('imagick')) { $conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/jpeg', 'image/png'))->setLogger($logger); $conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/png', 'image/png'))->setLogger($logger); $conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/jpg', 'image/png'))->setLogger($logger); $conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/gif', 'image/png'))->setLogger($logger); } -if(extension_loaded('imagick')) { +if (extension_loaded('imagick')) { $conversionmgr->addService(new SeedDMS_ConversionServiceTextToImage('text/plain', 'image/png'))->setLogger($logger); } @@ -47,11 +78,11 @@ $conversionmgr->addService(new SeedDMS_ConversionServiceTextToText('text/x-rst', $conversionmgr->addService(new SeedDMS_ConversionServiceHtmlToText('text/html', 'text/plain'))->setLogger($logger); -if(isset($GLOBALS['SEEDDMS_HOOKS']['initConversion'])) { - foreach($GLOBALS['SEEDDMS_HOOKS']['initConversion'] as $hookObj) { +if (isset($GLOBALS['SEEDDMS_HOOKS']['initConversion'])) { + foreach ($GLOBALS['SEEDDMS_HOOKS']['initConversion'] as $hookObj) { if (method_exists($hookObj, 'getConversionServices')) { - if($services = $hookObj->getConversionServices(array('dms'=>$dms, 'settings'=>$settings, 'logger'=>$logger))) { - foreach($services as $service) { + if ($services = $hookObj->getConversionServices(array('dms' => $dms, 'settings' => $settings, 'logger' => $logger))) { + foreach ($services as $service) { $conversionmgr->addService($service)->setLogger($logger); } } diff --git a/inc/inc.Init.php b/inc/inc.Init.php index 1b4aaba5a..4df107c9d 100644 --- a/inc/inc.Init.php +++ b/inc/inc.Init.php @@ -1,28 +1,41 @@ + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @link https://www.seeddms.org Main Site + */ use Symfony\Component\HttpFoundation\Request; -if(!empty($settings->_coreDir)) - require_once($settings->_coreDir.'/Core.php'); -else - require_once('vendor/seeddms/core/Core.php'); +if (!empty($settings->_coreDir)) { + require_once $settings->_coreDir . '/Core.php'; +} else { + require_once 'vendor/seeddms/core/Core.php'; +} $request = Request::createFromGlobals(); diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 0fe37b405..03db7df3b 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -1,34 +1,46 @@ + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @link https://www.seeddms.org Main Site + */ + +if(!isset($settings)) { + require_once "../inc/inc.Settings.php"); +} +require_once "inc/inc.Utils.php"; +require_once "inc/inc.LogInit.php"; +require_once "inc/inc.Language.php"; +require_once "inc/inc.Init.php"; +require_once "inc/inc.Extension.php"; +require_once "inc/inc.DBInit.php"; +require_once "inc/inc.ClassUI.php"; +require_once "inc/inc.Authentication.php"; $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); @@ -37,7 +49,7 @@ if ($user->isGuest()) { UI::exitError(getMLText("my_documents"), getMLText("access_denied")); } -if($view) { +if ($view) { $view->setParam('showtree', showtree()); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php index 579984109..cd2aa55e6 100644 --- a/out/out.UpdateDocument.php +++ b/out/out.UpdateDocument.php @@ -1,71 +1,83 @@ + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License + * @link https://www.seeddms.org Main Site + */ + +if (!isset($settings)) { + require_once "../inc/inc.Settings.php"; +} +require_once "inc/inc.Utils.php"; +require_once "inc/inc.LogInit.php"; +require_once "inc/inc.Language.php"; +require_once "inc/inc.Init.php"; +require_once "inc/inc.Extension.php"; +require_once "inc/inc.DBInit.php"; +require_once "inc/inc.ClassUI.php"; +require_once "inc/inc.ClassAccessOperation.php"; +require_once "inc/inc.Authentication.php"; $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { - UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); + UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))), getMLText("invalid_doc_id")); } $document = $dms->getDocument($_GET["documentid"]); if (!is_object($document)) { - UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); + UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))), getMLText("invalid_doc_id")); } $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings); if ($document->getAccessMode($user) < M_READWRITE) { - UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied")); + UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))), getMLText("access_denied")); } -if($document->isLocked()) { +if ($document->isLocked()) { $lockingUser = $document->getLockingUser(); if (($lockingUser->getID() != $user->getID()) && ($document->getAccessMode($user) != M_ALL)) { - UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())))); + UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))), getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())))); } } -if($settings->_quota > 0) { +if ($settings->_quota > 0) { $remain = checkQuota($user); if ($remain < 0) { - UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("quota_exceeded", array('bytes'=>SeedDMS_Core_File::format_filesize(abs($remain))))); + UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))), getMLText("quota_exceeded", array('bytes'=>SeedDMS_Core_File::format_filesize(abs($remain))))); } } $folder = $document->getFolder(); -if($view) { +if ($view) { $view->setParam('folder', $folder); $view->setParam('document', $document); $view->setParam('strictformcheck', $settings->_strictFormCheck);