diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index d3ef213a7..e07d8e4f2 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5273,19 +5273,19 @@ class G /** */ - public function auditLog($actionToLog, $valueToLog = "") - { + public static function auditLog($actionToLog, $valueToLog = "") + { $oServerConf = & serverConf::getSingleton(); $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); $ipClient = G::getIpAddress(); $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) { - $workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; - $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; + $workspace = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; + $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User'; $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-'; G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log"); - } + } } /** @@ -5347,9 +5347,9 @@ class G } /** - * Verify the InputDoc extension, cheking the file name extension (.pdf, .ppt) and the file content. + * Verify the InputDoc extension, cheking the file name extension (.pdf, .ppt) and the file content. + * * - * * */ public function verifyInputDocExtension($InpDocAllowedFiles, $filesName, $filesTmpName){ @@ -5380,7 +5380,7 @@ class G $finfo = new finfo(FILEINFO_MIME_TYPE); $finfo_ = $finfo->file($filesTmpName); $docType = explode("/", $finfo_); - + foreach ($allowedTypes as $types => $val) { if((preg_match('/^\*\.?[a-z]{2,8}$/', $val)) || ($val == '*.*')){ $allowedDocTypes = substr($val, 2); diff --git a/workflow/engine/classes/class.serverConfiguration.php b/workflow/engine/classes/class.serverConfiguration.php index d70d57123..9c4cf5fb9 100755 --- a/workflow/engine/classes/class.serverConfiguration.php +++ b/workflow/engine/classes/class.serverConfiguration.php @@ -76,7 +76,7 @@ class serverConf * * @return object */ - public function &getSingleton() + public static function &getSingleton() { if (self::$instance == null) { self::$instance = new serverConf(); @@ -518,4 +518,3 @@ class serverConf return in_array($lang, $this->rtlLang); } } - \ No newline at end of file