mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-09 13:06:14 +00:00
fix indenting of lines
This commit is contained in:
parent
441d8d6c0f
commit
257c23aead
|
@ -17,23 +17,23 @@ require_once("../inc/inc.ClassController.php");
|
||||||
$notifier = new SeedDMS_NotificationService($logger, $settings);
|
$notifier = new SeedDMS_NotificationService($logger, $settings);
|
||||||
|
|
||||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
|
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
|
||||||
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
|
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
|
||||||
if(method_exists($notificationObj, 'preAddService')) {
|
if(method_exists($notificationObj, 'preAddService')) {
|
||||||
$notificationObj->preAddService($dms, $notifier);
|
$notificationObj->preAddService($dms, $notifier);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($settings->_enableEmail) {
|
if($settings->_enableEmail) {
|
||||||
$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
|
$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
|
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
|
||||||
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
|
foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
|
||||||
if(method_exists($notificationObj, 'postAddService')) {
|
if(method_exists($notificationObj, 'postAddService')) {
|
||||||
$notificationObj->postAddService($dms, $notifier);
|
$notificationObj->postAddService($dms, $notifier);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
require "vendor/autoload.php";
|
require "vendor/autoload.php";
|
||||||
|
@ -269,7 +269,7 @@ class RestapiController { /* {{{ */
|
||||||
setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot);
|
setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot);
|
||||||
$dms->setUser($userobj);
|
$dms->setUser($userobj);
|
||||||
|
|
||||||
$logger->log("Login with user name '".$username."' successful", PEAR_LOG_INFO);
|
$logger->log("Login with user name '".$username."' successful", PEAR_LOG_INFO);
|
||||||
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$this->__getUserData($userobj)), 200);
|
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$this->__getUserData($userobj)), 200);
|
||||||
}
|
}
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
@ -507,12 +507,12 @@ class RestapiController { /* {{{ */
|
||||||
$sequence = 1.0;
|
$sequence = 1.0;
|
||||||
}
|
}
|
||||||
$newattrs = array();
|
$newattrs = array();
|
||||||
if(!empty($params['attributes'])) {
|
if(!empty($params['attributes'])) {
|
||||||
foreach($params['attributes'] as $attrname=>$attrvalue) {
|
foreach($params['attributes'] as $attrname=>$attrvalue) {
|
||||||
if((is_int($attrname) || ctype_digit($attrname)) && ((int) $attrname) > 0)
|
if((is_int($attrname) || ctype_digit($attrname)) && ((int) $attrname) > 0)
|
||||||
$attrdef = $dms->getAttributeDefinition((int) $attrname);
|
$attrdef = $dms->getAttributeDefinition((int) $attrname);
|
||||||
else
|
else
|
||||||
$attrdef = $dms->getAttributeDefinitionByName($attrname);
|
$attrdef = $dms->getAttributeDefinitionByName($attrname);
|
||||||
if($attrdef) {
|
if($attrdef) {
|
||||||
$newattrs[$attrdef->getID()] = $attrvalue;
|
$newattrs[$attrdef->getID()] = $attrvalue;
|
||||||
}
|
}
|
||||||
|
@ -527,7 +527,7 @@ class RestapiController { /* {{{ */
|
||||||
if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) {
|
if($folder = $parent->addSubFolder($params['name'], $comment, $userobj, $sequence, $newattrs)) {
|
||||||
|
|
||||||
$rec = $this->__getFolderData($folder);
|
$rec = $this->__getFolderData($folder);
|
||||||
$logger->log("Creating folder '".$folder->getName()."' (".$folder->getId().") successful", PEAR_LOG_INFO);
|
$logger->log("Creating folder '".$folder->getName()."' (".$folder->getId().") successful", PEAR_LOG_INFO);
|
||||||
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$rec), 201);
|
return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$rec), 201);
|
||||||
} else {
|
} else {
|
||||||
return $response->withJson(array('success'=>false, 'message'=>'Could not create folder', 'data'=>''), 500);
|
return $response->withJson(array('success'=>false, 'message'=>'Could not create folder', 'data'=>''), 500);
|
||||||
|
@ -683,10 +683,10 @@ class RestapiController { /* {{{ */
|
||||||
}
|
}
|
||||||
$attributes = isset($params["attributes"]) ? $params["attributes"] : array();
|
$attributes = isset($params["attributes"]) ? $params["attributes"] : array();
|
||||||
foreach($attributes as $attrdefid=>$attribute) {
|
foreach($attributes as $attrdefid=>$attribute) {
|
||||||
if((is_int($attrdefid) || ctype_digit($attrdefid)) && ((int) $attrdefid) > 0)
|
if((is_int($attrdefid) || ctype_digit($attrdefid)) && ((int) $attrdefid) > 0)
|
||||||
$attrdef = $dms->getAttributeDefinition((int) $attrdefid);
|
$attrdef = $dms->getAttributeDefinition((int) $attrdefid);
|
||||||
else
|
else
|
||||||
$attrdef = $dms->getAttributeDefinitionByName($attrdefid);
|
$attrdef = $dms->getAttributeDefinitionByName($attrdefid);
|
||||||
if($attrdef) {
|
if($attrdef) {
|
||||||
if($attribute) {
|
if($attribute) {
|
||||||
if(!$attrdef->validate($attribute)) {
|
if(!$attrdef->validate($attribute)) {
|
||||||
|
@ -768,10 +768,10 @@ class RestapiController { /* {{{ */
|
||||||
$comment = isset($params['comment']) ? $params['comment'] : null;
|
$comment = isset($params['comment']) ? $params['comment'] : null;
|
||||||
$attributes = isset($params["attributes"]) ? $params["attributes"] : array();
|
$attributes = isset($params["attributes"]) ? $params["attributes"] : array();
|
||||||
foreach($attributes as $attrdefid=>$attribute) {
|
foreach($attributes as $attrdefid=>$attribute) {
|
||||||
if((is_int($attrdefid) || ctype_digit($attrdefid)) && ((int) $attrdefid) > 0)
|
if((is_int($attrdefid) || ctype_digit($attrdefid)) && ((int) $attrdefid) > 0)
|
||||||
$attrdef = $dms->getAttributeDefinition((int) $attrdefid);
|
$attrdef = $dms->getAttributeDefinition((int) $attrdefid);
|
||||||
else
|
else
|
||||||
$attrdef = $dms->getAttributeDefinitionByName($attrdefid);
|
$attrdef = $dms->getAttributeDefinitionByName($attrdefid);
|
||||||
if($attrdef) {
|
if($attrdef) {
|
||||||
if($attribute) {
|
if($attribute) {
|
||||||
if(!$attrdef->validate($attribute)) {
|
if(!$attrdef->validate($attribute)) {
|
||||||
|
@ -1678,10 +1678,10 @@ class RestapiController { /* {{{ */
|
||||||
$query = $params['value'];
|
$query = $params['value'];
|
||||||
if(empty($params['limit']) || !$limit = $params['limit'])
|
if(empty($params['limit']) || !$limit = $params['limit'])
|
||||||
$limit = 50;
|
$limit = 50;
|
||||||
if(ctype_digit($attrname) && ((int) $attrname) > 0)
|
if(ctype_digit($attrname) && ((int) $attrname) > 0)
|
||||||
$attrdef = $dms->getAttributeDefinition((int) $attrname);
|
$attrdef = $dms->getAttributeDefinition((int) $attrname);
|
||||||
else
|
else
|
||||||
$attrdef = $dms->getAttributeDefinitionByName($attrname);
|
$attrdef = $dms->getAttributeDefinitionByName($attrname);
|
||||||
$entries = array();
|
$entries = array();
|
||||||
if($attrdef) {
|
if($attrdef) {
|
||||||
$resArr = $attrdef->getObjects($query, $limit);
|
$resArr = $attrdef->getObjects($query, $limit);
|
||||||
|
@ -2455,7 +2455,7 @@ class Auth { /* {{{ */
|
||||||
} else {
|
} else {
|
||||||
return $response->withStatus(403);
|
return $response->withStatus(403);
|
||||||
}
|
}
|
||||||
$logger->log("Login with apikey as '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
|
$logger->log("Login with apikey as '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
|
||||||
} else {
|
} else {
|
||||||
require_once("../inc/inc.ClassSession.php");
|
require_once("../inc/inc.ClassSession.php");
|
||||||
$session = new SeedDMS_Session($dms->getDb());
|
$session = new SeedDMS_Session($dms->getDb());
|
||||||
|
@ -2487,7 +2487,7 @@ class Auth { /* {{{ */
|
||||||
return $response->withStatus(403);
|
return $response->withStatus(403);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// $logger->log("Login with user name '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
|
// $logger->log("Login with user name '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
|
||||||
$dms->setUser($userobj);
|
$dms->setUser($userobj);
|
||||||
} else {
|
} else {
|
||||||
return $response->withStatus(403);
|
return $response->withStatus(403);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user