mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-11-28 02:20:41 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
055415f378
|
|
@ -18,6 +18,12 @@
|
||||||
"wikimedia/composer-merge-plugin": true
|
"wikimedia/composer-merge-plugin": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"SeedDMS\\Console\\": "seeddms/utils"
|
||||||
|
},
|
||||||
|
"classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php"]
|
||||||
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"pear/http_request2": "^2",
|
"pear/http_request2": "^2",
|
||||||
"robthree/twofactorauth": "^3.0",
|
"robthree/twofactorauth": "^3.0",
|
||||||
|
|
@ -51,7 +57,8 @@
|
||||||
"seeddms/sqlitefts": "dev-master",
|
"seeddms/sqlitefts": "dev-master",
|
||||||
"seeddms/http_webdav_server": "dev-master",
|
"seeddms/http_webdav_server": "dev-master",
|
||||||
"wikimedia/composer-merge-plugin": "dev-master",
|
"wikimedia/composer-merge-plugin": "dev-master",
|
||||||
"cache/memcached-adapter": "^1.2"
|
"cache/memcached-adapter": "^1.2",
|
||||||
|
"symfony/console": "^7.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"composer/composer": "dev-main"
|
"composer/composer": "dev-main"
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,12 @@
|
||||||
"wikimedia/composer-merge-plugin": true
|
"wikimedia/composer-merge-plugin": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Seeddms\\Console\\": "utils"
|
||||||
|
},
|
||||||
|
"classmap": ["inc/inc.ClassTranslator.php", "inc/inc.ClassSettings.php", "inc/inc.Version.php"]
|
||||||
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.2.0",
|
"php": ">=8.2.0",
|
||||||
"phing/phing": "3.*",
|
"phing/phing": "3.*",
|
||||||
|
|
@ -54,7 +60,8 @@
|
||||||
"seeddms/sqlitefts": "dev-master",
|
"seeddms/sqlitefts": "dev-master",
|
||||||
"seeddms/http_webdav_server": "dev-master",
|
"seeddms/http_webdav_server": "dev-master",
|
||||||
"wikimedia/composer-merge-plugin": "dev-master",
|
"wikimedia/composer-merge-plugin": "dev-master",
|
||||||
"cache/memcached-adapter": "^1.2"
|
"cache/memcached-adapter": "^1.2",
|
||||||
|
"symfony/console": "^7.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"composer/composer": "dev-main",
|
"composer/composer": "dev-main",
|
||||||
|
|
@ -72,35 +79,35 @@
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"url": "../core",
|
"url": "../core",
|
||||||
"options": {
|
"options": {
|
||||||
"symlink": false
|
"symlink": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"url": "../lucene",
|
"url": "../lucene",
|
||||||
"options": {
|
"options": {
|
||||||
"symlink": false
|
"symlink": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"url": "../preview",
|
"url": "../preview",
|
||||||
"options": {
|
"options": {
|
||||||
"symlink": false
|
"symlink": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"url": "../sqlitefts",
|
"url": "../sqlitefts",
|
||||||
"options": {
|
"options": {
|
||||||
"symlink": false
|
"symlink": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"url": "../http_webdav_server",
|
"url": "../http_webdav_server",
|
||||||
"options": {
|
"options": {
|
||||||
"symlink": false
|
"symlink": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,8 @@ if (!isset($_COOKIE["mydms_session"])) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$translator->setDefaultLanguage($session->getLanguage());
|
||||||
|
|
||||||
/* Update last access time */
|
/* Update last access time */
|
||||||
if((int)$resArr['lastAccess']+60 < time())
|
if((int)$resArr['lastAccess']+60 < time())
|
||||||
$session->updateAccess($dms_session);
|
$session->updateAccess($dms_session);
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ require_once('inc.ClassAuthenticationService.php');
|
||||||
require_once('inc.ClassDbAuthentication.php');
|
require_once('inc.ClassDbAuthentication.php');
|
||||||
require_once('inc.ClassLdapAuthentication.php');
|
require_once('inc.ClassLdapAuthentication.php');
|
||||||
|
|
||||||
global $logger;
|
|
||||||
$authenticator = new SeedDMS_AuthenticationService($logger, $settings);
|
$authenticator = new SeedDMS_AuthenticationService($logger, $settings);
|
||||||
|
|
||||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) {
|
if(isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) {
|
||||||
|
|
|
||||||
|
|
@ -30,14 +30,19 @@ class Controller {
|
||||||
* @return object an object of a class implementing the view
|
* @return object an object of a class implementing the view
|
||||||
*/
|
*/
|
||||||
static function factory($class, $params=array()) { /* {{{ */
|
static function factory($class, $params=array()) { /* {{{ */
|
||||||
global $settings, $session, $extMgr, $request, $logger, $notifier;
|
foreach(['settings', 'session', 'extmgr', 'request', 'logger', 'notifier', 'fulltextservice', 'translator'] as $vn) {
|
||||||
|
if(isset($params[$vn]))
|
||||||
|
${$vn} = $params[$vn];
|
||||||
|
else
|
||||||
|
${$vn} = $GLOBALS[$vn] ?? null;
|
||||||
|
}
|
||||||
if(!$class) {
|
if(!$class) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$classname = "SeedDMS_Controller_".$class;
|
$classname = "SeedDMS_Controller_".$class;
|
||||||
$filename = '';
|
$filename = '';
|
||||||
foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
|
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
|
||||||
$filename = $settings->_rootDir.'ext/'.$extname.'/controllers/class.'.$class.".php";
|
$filename = $settings->_rootDir.'ext/'.$extname.'/controllers/class.'.$class.".php";
|
||||||
if(file_exists($filename)) {
|
if(file_exists($filename)) {
|
||||||
break;
|
break;
|
||||||
|
|
@ -61,6 +66,8 @@ class Controller {
|
||||||
$controller->setParam('settings', $settings);
|
$controller->setParam('settings', $settings);
|
||||||
$controller->setParam('logger', $logger);
|
$controller->setParam('logger', $logger);
|
||||||
$controller->setParam('notifier', $notifier);
|
$controller->setParam('notifier', $notifier);
|
||||||
|
$controller->setParam('fulltextservice', $fulltextservice);
|
||||||
|
$controller->setParam('translator', $translator);
|
||||||
return $controller;
|
return $controller;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,12 @@
|
||||||
* @version Release: @package_version@
|
* @version Release: @package_version@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
namespace Seeddms\Seeddms;
|
||||||
|
|
||||||
|
use SeedDMS_Core_File;
|
||||||
|
use SeedDMS_Core_DMS;
|
||||||
|
use SeedDMS_Core_DatabaseAccess;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class for reading and writing the configuration file
|
* Class for reading and writing the configuration file
|
||||||
*
|
*
|
||||||
|
|
@ -1691,39 +1697,14 @@ class Settings { /* {{{ */
|
||||||
}
|
}
|
||||||
if($dsn) {
|
if($dsn) {
|
||||||
$connTmp = new PDO($dsn, $this->_dbUser, $this->_dbPass);
|
$connTmp = new PDO($dsn, $this->_dbUser, $this->_dbPass);
|
||||||
/* Check if there wasn't a previous error while searching for
|
$db = new SeedDMS_Core_DatabaseAccess($this->_dbDriver, $this->_dbHostname, $this->_dbUser, $this->_dbPass, $this->_dbDatabase);
|
||||||
* SeedDMS_Core.
|
if(!$db->connect()) {
|
||||||
*/
|
$result["dbDatabase"] = array(
|
||||||
if(!isset($result["coreDir"])) {
|
"status" => "error",
|
||||||
/* Instanciate SeedDMS_Core to check version */
|
"type" => "error",
|
||||||
if(!empty($this->_coreDir))
|
"currentvalue" => '[host, user, database] -> [' . $this->_dbHostname . ',' . $this->_dbUser . ',' . $this->_dbDatabase .']',
|
||||||
require_once($this->_coreDir.'/Core.php');
|
"systemerror" => $connTmp->ErrorMsg()
|
||||||
else
|
);
|
||||||
require_once($this->_rootDir.'../vendor/seeddms/core/Core.php');
|
|
||||||
$tmpcore = new SeedDMS_Core_DMS(null, $this->_contentDir);
|
|
||||||
$db = new SeedDMS_Core_DatabaseAccess($this->_dbDriver, $this->_dbHostname, $this->_dbUser, $this->_dbPass, $this->_dbDatabase);
|
|
||||||
if(!$db->connect()) {
|
|
||||||
$result["dbDatabase"] = array(
|
|
||||||
"status" => "error",
|
|
||||||
"type" => "error",
|
|
||||||
"currentvalue" => '[host, user, database] -> [' . $this->_dbHostname . ',' . $this->_dbUser . ',' . $this->_dbDatabase .']',
|
|
||||||
"systemerror" => $connTmp->ErrorMsg()
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
$dms = new SeedDMS_Core_DMS($db, $this->_contentDir.$this->_contentOffsetDir);
|
|
||||||
|
|
||||||
if(!$dms->checkVersion()) {
|
|
||||||
$result["dbVersion"] = array(
|
|
||||||
"status" => "error",
|
|
||||||
"type" => "error",
|
|
||||||
"currentvalue" => $dms->version,
|
|
||||||
"suggestion" => 'updateDatabase'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
$connTmp = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch(Exception $e) {
|
} catch(Exception $e) {
|
||||||
|
|
@ -1935,5 +1916,37 @@ class Settings { /* {{{ */
|
||||||
return min($mus);
|
return min($mus);
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get base url
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getBaseUrl() { /* {{{ */
|
||||||
|
global $_SERVER;
|
||||||
|
|
||||||
|
if(!empty($this->_baseUrl))
|
||||||
|
return $this->_baseUrl;
|
||||||
|
|
||||||
|
if(isset($_SERVER['HTTP_X_FORWARDED_HOST']))
|
||||||
|
$host = $_SERVER['HTTP_X_FORWARDED_HOST'];
|
||||||
|
else
|
||||||
|
$host = $_SERVER['HTTP_HOST'];
|
||||||
|
if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']))
|
||||||
|
$ssl = $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
|
||||||
|
else
|
||||||
|
$ssl = (isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0));
|
||||||
|
|
||||||
|
return "http".($ssl ? "s" : "")."://".$host;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get base url with http root folder
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getBaseUrlWithRoot() { /* {{{ */
|
||||||
|
return $this->getBaseUrl().$this->_httpRoot;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
|
|
|
||||||
418
inc/inc.ClassTranslator.php
Normal file
418
inc/inc.ClassTranslator.php
Normal file
|
|
@ -0,0 +1,418 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Translate phrase and do all language handling
|
||||||
|
*
|
||||||
|
* @category DMS
|
||||||
|
* @package SeedDMS
|
||||||
|
* @license GPL 2
|
||||||
|
* @version @version@
|
||||||
|
* @author Uwe Steinmann <uwe@steinmann.cx>
|
||||||
|
* @copyright Copyright (C) 2025 Uwe Steinmann
|
||||||
|
* @version Release: @package_version@
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Seeddms\Seeddms;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class for translation and language handling
|
||||||
|
*
|
||||||
|
* @category DMS
|
||||||
|
* @package SeedDMS
|
||||||
|
* @author Uwe Steinmann <uwe@steinmann.cx>
|
||||||
|
* @copyright Copyright (C) 2011 Uwe Steinmann
|
||||||
|
* @version Release: @package_version@
|
||||||
|
*/
|
||||||
|
class Translator { /* {{{ */
|
||||||
|
|
||||||
|
protected $settings;
|
||||||
|
|
||||||
|
protected $defaultlang;
|
||||||
|
|
||||||
|
protected $lang;
|
||||||
|
|
||||||
|
protected $missinglang;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param string $settings SeedDMS configuration
|
||||||
|
*/
|
||||||
|
function __construct($settings=null) { /* {{{ */
|
||||||
|
$this->settings = $settings;
|
||||||
|
$this->defaultlang = '';
|
||||||
|
|
||||||
|
$this->lang = array();
|
||||||
|
$this->missinglang = array();
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function setDefaultLanguage($lang) { /* {{{ */
|
||||||
|
$this->defaultlang = $lang;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
public function init() { /* {{{ */
|
||||||
|
$__languages = $this->getLanguages();
|
||||||
|
if(!in_array($this->settings->_language, $__languages))
|
||||||
|
$__languages[] = $this->settings->_language;
|
||||||
|
foreach($__languages as $_lang) {
|
||||||
|
if(file_exists($this->settings->_rootDir . "languages/" . $_lang . "/lang.inc")) {
|
||||||
|
include $this->settings->_rootDir . "languages/" . $_lang . "/lang.inc";
|
||||||
|
$this->lang[$_lang] = $text;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function addPhrases($lang, &$data) { /* {{{ */
|
||||||
|
if(isset($this->lang[$lang]))
|
||||||
|
$this->lang[$lang] = array_merge($this->lang[$lang], $data);
|
||||||
|
else
|
||||||
|
$this->lang[$lang] = $data;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getAvailableLanguages() { /* {{{ */
|
||||||
|
$languages = array();
|
||||||
|
|
||||||
|
$path = $this->settings->_rootDir . "languages/";
|
||||||
|
$handle = opendir($path);
|
||||||
|
|
||||||
|
while ($entry = readdir($handle) )
|
||||||
|
{
|
||||||
|
if ($entry == ".." || $entry == ".") {
|
||||||
|
continue;
|
||||||
|
} elseif (is_dir($path . $entry)) {
|
||||||
|
array_push($languages, $entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
closedir($handle);
|
||||||
|
|
||||||
|
asort($languages);
|
||||||
|
return $languages;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getLanguages() { /* {{{ */
|
||||||
|
if($this->settings->_availablelanguages) {
|
||||||
|
return $this->settings->_availablelanguages;
|
||||||
|
}
|
||||||
|
|
||||||
|
return getAvailableLanguages();
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get translation
|
||||||
|
*
|
||||||
|
* Returns the translation for a given key. It will replace markers
|
||||||
|
* in the form [xxx] with those elements from the array $replace.
|
||||||
|
* A default text can be gіven for the case, that there is no translation
|
||||||
|
* available. The fourth parameter can override the currently set language
|
||||||
|
* in the session or the default language from the configuration.
|
||||||
|
*
|
||||||
|
* @param string $key key of translation text
|
||||||
|
* @param array $replace list of values that replace markers in the text
|
||||||
|
* @param string $defaulttext text used if no translation can be found
|
||||||
|
* @param string $lang use this language instead of the currently set lang
|
||||||
|
*/
|
||||||
|
function translate($key, $replace = array(), $defaulttext = null, $lang="") { /* {{{ */
|
||||||
|
$trantext = '';
|
||||||
|
if(!$lang) {
|
||||||
|
if($this->defaultlang)
|
||||||
|
$lang = $this->defaultlang;
|
||||||
|
else
|
||||||
|
$lang = $this->settings->_language;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!isset($this->lang[$lang][$key]) || !$this->lang[$lang][$key]) {
|
||||||
|
if ($defaulttext === null) {
|
||||||
|
$this->missinglang[$key] = $lang; //$_SERVER['SCRIPT_NAME'];
|
||||||
|
if(!empty($this->lang[$this->settings->_language][$key])) {
|
||||||
|
$tmpText = $this->lang[$this->settings->_language][$key];
|
||||||
|
} else {
|
||||||
|
$tmpText = '**'.$key.'**';
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
$tmpText = $defaulttext;
|
||||||
|
} else
|
||||||
|
$tmpText = $this->lang[$lang][$key];
|
||||||
|
|
||||||
|
if (count($replace) == 0)
|
||||||
|
return $tmpText.$trantext;
|
||||||
|
|
||||||
|
$keys = array_keys($replace);
|
||||||
|
foreach ($keys as $key)
|
||||||
|
$tmpText = str_replace("[".$key."]", $replace[$key], $tmpText);
|
||||||
|
|
||||||
|
return $tmpText;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function print($key, $replace = array(), $defaulttext = null, $lang="") { /* {{{ */
|
||||||
|
print $this->translate($key, $replace, $defaulttext, $lang);
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function printReviewStatusText($status, $date=0) { /* {{{ */
|
||||||
|
if (is_null($status)) {
|
||||||
|
print $this->translate("status_unknown");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
switch ($status) {
|
||||||
|
case -2:
|
||||||
|
print $this->translate("status_reviewer_removed");
|
||||||
|
break;
|
||||||
|
case -1:
|
||||||
|
print $this->translate("status_reviewer_rejected").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
case 0:
|
||||||
|
print $this->translate("status_not_reviewed");
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
print $this->translate("status_reviewed").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
print $this->translate("status_unknown");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getReviewStatusText($status, $date=0) { /* {{{ */
|
||||||
|
if (is_null($status)) {
|
||||||
|
return $this->translate("status_unknown");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
switch ($status) {
|
||||||
|
case -2:
|
||||||
|
return $this->translate("status_reviewer_removed");
|
||||||
|
break;
|
||||||
|
case -1:
|
||||||
|
return $this->translate("status_reviewer_rejected").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
case 0:
|
||||||
|
return $this->translate("status_not_reviewed");
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
return $this->translate("status_reviewed").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return $this->translate("status_unknown");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function printApprovalStatusText($status, $date=0) { /* {{{ */
|
||||||
|
if (is_null($status)) {
|
||||||
|
print $this->translate("status_unknown");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
switch ($status) {
|
||||||
|
case -2:
|
||||||
|
print $this->translate("status_approver_removed");
|
||||||
|
break;
|
||||||
|
case -1:
|
||||||
|
print $this->translate("status_approval_rejected").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
case 0:
|
||||||
|
print $this->translate("status_not_approved");
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
print $this->translate("status_approved").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
print $this->translate("status_unknown");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getApprovalStatusText($status, $date=0) { /* {{{ */
|
||||||
|
if (is_null($status)) {
|
||||||
|
return $this->translate("status_unknown");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
switch ($status) {
|
||||||
|
case -2:
|
||||||
|
return $this->translate("status_approver_removed");
|
||||||
|
break;
|
||||||
|
case -1:
|
||||||
|
return $this->translate("status_approval_rejected").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
case 0:
|
||||||
|
return $this->translate("status_not_approved");
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
return $this->translate("status_approved").($date !=0 ? " ".$date : "");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return $this->translate("status_unknown");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function printOverallStatusText($status) { /* {{{ */
|
||||||
|
print getOverallStatusText($status);
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getOverallStatusText($status) { /* {{{ */
|
||||||
|
if (is_null($status)) {
|
||||||
|
return $this->translate("assumed_released");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
switch($status) {
|
||||||
|
case S_IN_WORKFLOW:
|
||||||
|
return $this->translate("in_workflow");
|
||||||
|
break;
|
||||||
|
case S_DRAFT_REV:
|
||||||
|
return $this->translate("draft_pending_review");
|
||||||
|
break;
|
||||||
|
case S_DRAFT_APP:
|
||||||
|
return $this->translate("draft_pending_approval");
|
||||||
|
break;
|
||||||
|
case S_RELEASED:
|
||||||
|
return $this->translate("released");
|
||||||
|
break;
|
||||||
|
case S_REJECTED:
|
||||||
|
return $this->translate("rejected");
|
||||||
|
break;
|
||||||
|
case S_OBSOLETE:
|
||||||
|
return $this->translate("obsolete");
|
||||||
|
break;
|
||||||
|
case S_EXPIRED:
|
||||||
|
return $this->translate("expired");
|
||||||
|
break;
|
||||||
|
case S_IN_REVISION:
|
||||||
|
return getMLText("in_revision");
|
||||||
|
break;
|
||||||
|
case S_DRAFT:
|
||||||
|
return getMLText("draft");
|
||||||
|
break;
|
||||||
|
case S_NEEDS_CORRECTION:
|
||||||
|
return getMLText("needs_correction");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return $this->translate("status_unknown");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getAttributeTypeText($attrdef) { /* {{{ */
|
||||||
|
$t = '';
|
||||||
|
switch($attrdef->getType()) {
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_int:
|
||||||
|
$t = $this->translate("attrdef_type_int");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_float:
|
||||||
|
$t = $this->translate("attrdef_type_float");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_string:
|
||||||
|
$t = $this->translate("attrdef_type_string");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_boolean:
|
||||||
|
$t = $this->translate("attrdef_type_boolean");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_date:
|
||||||
|
$t = $this->translate("attrdef_type_date");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_email:
|
||||||
|
$t = $this->translate("attrdef_type_email");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_url:
|
||||||
|
$t = $this->translate("attrdef_type_url");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_boolean:
|
||||||
|
$t = $this->translate("attrdef_type_boolean");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_folder:
|
||||||
|
$t = $this->translate("attrdef_type_folder");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_document:
|
||||||
|
$t = $this->translate("attrdef_type_document");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_user:
|
||||||
|
$t = $this->translate("attrdef_type_user");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::type_group:
|
||||||
|
$t = $this->translate("attrdef_type_group");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $t;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getAttributeObjectTypeText($attrdef) { /* {{{ */
|
||||||
|
$ot = '';
|
||||||
|
switch($attrdef->getObjType()) {
|
||||||
|
case SeedDMS_Core_AttributeDefinition::objtype_all:
|
||||||
|
$ot = $this->translate("all");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::objtype_folder:
|
||||||
|
$ot = $this->translate("folder");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::objtype_document:
|
||||||
|
$ot = $this->translate("document");
|
||||||
|
break;
|
||||||
|
case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
|
||||||
|
$ot = $this->translate("documentcontent");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
$ot = $this->translate('objtype_unknown');
|
||||||
|
}
|
||||||
|
return $ot;
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
|
||||||
|
$arr = getAttributeValidationError($error, $attrname, $attrvalue, $regex);
|
||||||
|
|
||||||
|
return $this->translate($arr[0], $arr[1]);
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
function getAttributeValidationError($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
|
||||||
|
if(is_object($attrvalue))
|
||||||
|
$attrvalue = $attrvalue->getId();
|
||||||
|
switch($error) {
|
||||||
|
case 14:
|
||||||
|
return array("attr_not_in_valueset", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 13:
|
||||||
|
return array("attr_not_a_group", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 12:
|
||||||
|
return array("attr_not_a_user", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 11:
|
||||||
|
return array("attr_not_a_folder", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 10:
|
||||||
|
return array("attr_not_a_document", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 9:
|
||||||
|
return array("attr_malformed_date", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 8:
|
||||||
|
return array("attr_malformed_boolean", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 7:
|
||||||
|
return array("attr_malformed_float", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
return array("attr_malformed_int", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
return array("attr_malformed_email", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
return array("attr_malformed_url", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
return array("attr_no_regex_match", array('attrname'=>$attrname, 'value'=>$attrvalue, 'regex'=>$regex));
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
return array("attr_max_values", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
return array("attr_min_values", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return array("attr_validation_error", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} /* }}} */
|
||||||
|
|
||||||
|
} /* }}} */
|
||||||
|
|
@ -46,7 +46,12 @@ class UI extends UI_Default {
|
||||||
* @return object an object of a class implementing the view
|
* @return object an object of a class implementing the view
|
||||||
*/
|
*/
|
||||||
static public function factory($theme, $class='', $params=array()) { /* {{{ */
|
static public function factory($theme, $class='', $params=array()) { /* {{{ */
|
||||||
global $settings, $dms, $user, $session, $extMgr, $request, $logger, $notifier, $fulltextservice;
|
foreach(['settings', 'dms', 'user', 'session', 'extmgr', 'request', 'logger', 'notifier', 'fulltextservice', 'translator'] as $vn) {
|
||||||
|
if(isset($params[$vn]))
|
||||||
|
${$vn} = $params[$vn];
|
||||||
|
else
|
||||||
|
${$vn} = $GLOBALS[$vn] ?? null;
|
||||||
|
}
|
||||||
if(!$class) {
|
if(!$class) {
|
||||||
$class = 'Bootstrap';
|
$class = 'Bootstrap';
|
||||||
$class = 'Style';
|
$class = 'Style';
|
||||||
|
|
@ -56,9 +61,9 @@ class UI extends UI_Default {
|
||||||
}
|
}
|
||||||
/* Collect all decorators */
|
/* Collect all decorators */
|
||||||
$decorators = array();
|
$decorators = array();
|
||||||
foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
|
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
|
||||||
if(!$settings->extensionIsDisabled($extname)) {
|
if(!$settings->extensionIsDisabled($extname)) {
|
||||||
if($extMgr->checkExtensionByName($extname, $extconf)) {
|
if($extmgr->checkExtensionByName($extname, $extconf)) {
|
||||||
if(isset($extconf['decorators'][$class])) {
|
if(isset($extconf['decorators'][$class])) {
|
||||||
$filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file'];
|
$filename = $settings->_rootDir.'ext/'.$extname.'/decorators/'.$theme."/".$extconf['decorators'][$class]['file'];
|
||||||
if(file_exists($filename)) {
|
if(file_exists($filename)) {
|
||||||
|
|
@ -73,9 +78,9 @@ class UI extends UI_Default {
|
||||||
*/
|
*/
|
||||||
$filename = '';
|
$filename = '';
|
||||||
$httpbasedir = '';
|
$httpbasedir = '';
|
||||||
foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
|
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
|
||||||
if(!$settings->extensionIsDisabled($extname)) {
|
if(!$settings->extensionIsDisabled($extname)) {
|
||||||
if($extMgr->checkExtensionByName($extname, $extconf)) {
|
if($extmgr->checkExtensionByName($extname, $extconf)) {
|
||||||
/* Setting the 'views' element in the configuration can be used to
|
/* Setting the 'views' element in the configuration can be used to
|
||||||
* replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php
|
* replace an existing view in views/bootstrap/, e.g. class.ViewFolder.php
|
||||||
* without providing an out/out.ViewFolder.php. In that case $httpbasedir
|
* without providing an out/out.ViewFolder.php. In that case $httpbasedir
|
||||||
|
|
@ -139,6 +144,7 @@ class UI extends UI_Default {
|
||||||
$view->setParam('logger', $logger);
|
$view->setParam('logger', $logger);
|
||||||
$view->setParam('notifier', $notifier);
|
$view->setParam('notifier', $notifier);
|
||||||
$view->setParam('fulltextservice', $fulltextservice);
|
$view->setParam('fulltextservice', $fulltextservice);
|
||||||
|
$view->setParam('translator', $translator);
|
||||||
// $view->setParam('settings', $settings);
|
// $view->setParam('settings', $settings);
|
||||||
$view->setParam('sitename', $settings->_siteName);
|
$view->setParam('sitename', $settings->_siteName);
|
||||||
$view->setParam('rootfolderid', $settings->_rootFolderID);
|
$view->setParam('rootfolderid', $settings->_rootFolderID);
|
||||||
|
|
|
||||||
|
|
@ -17,35 +17,23 @@ require "inc.ClassExtensionMgr.php";
|
||||||
require_once "inc.ClassSchedulerTaskBase.php";
|
require_once "inc.ClassSchedulerTaskBase.php";
|
||||||
require_once "inc.ClassExtBase.php";
|
require_once "inc.ClassExtBase.php";
|
||||||
|
|
||||||
$extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl, $settings->_proxyUrl, $settings->_proxyUser, $settings->_proxyPassword);
|
$extmgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir, $settings->_repositoryUrl, $settings->_proxyUrl, $settings->_proxyUser, $settings->_proxyPassword);
|
||||||
|
|
||||||
$version = new SeedDMS_Version;
|
foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
|
||||||
|
|
||||||
foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
|
|
||||||
if($extconf['disable']) {
|
if($extconf['disable']) {
|
||||||
$settings->disableExtension($extname);
|
$settings->disableExtension($extname);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(!$settings->extensionIsDisabled($extname)) {
|
if(!$settings->extensionIsDisabled($extname)) {
|
||||||
$disabled = false;
|
$disabled = false;
|
||||||
if($extMgr->checkExtensionByName($extname, $extconf)) {
|
if($extmgr->checkExtensionByName($extname, $extconf)) {
|
||||||
$disabled = false;
|
$disabled = false;
|
||||||
$settings->enableExtension($extname);
|
$settings->enableExtension($extname);
|
||||||
} else {
|
} else {
|
||||||
$disabled = true;
|
$disabled = true;
|
||||||
$settings->disableExtension($extname);
|
$settings->disableExtension($extname);
|
||||||
// echo $extMgr->getErrorMsg();
|
// echo $extmgr->getErrorMsg();
|
||||||
}
|
}
|
||||||
/* check for requirements */
|
|
||||||
/*
|
|
||||||
if(!empty($extconf['constraints']['depends']['seeddms'])) {
|
|
||||||
$t = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
|
|
||||||
if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0))
|
|
||||||
$disabled = true;
|
|
||||||
else
|
|
||||||
$disabled = false;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
if(!$disabled) {
|
if(!$disabled) {
|
||||||
if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) {
|
if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) {
|
||||||
$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
|
$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
|
||||||
|
|
@ -53,7 +41,7 @@ foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
|
||||||
include($classfile);
|
include($classfile);
|
||||||
$obj = new $extconf['class']['name']($settings, null, $logger);
|
$obj = new $extconf['class']['name']($settings, null, $logger);
|
||||||
if(method_exists($obj, 'init'))
|
if(method_exists($obj, 'init'))
|
||||||
$obj->init($extMgr);
|
$obj->init($extmgr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(isset($extconf['language']['file'])) {
|
if(isset($extconf['language']['file'])) {
|
||||||
|
|
@ -63,10 +51,7 @@ foreach($extMgr->getExtensionConfiguration() as $extname=>$extconf) {
|
||||||
include($langfile);
|
include($langfile);
|
||||||
if(isset($__lang) && $__lang) {
|
if(isset($__lang) && $__lang) {
|
||||||
foreach($__lang as $lang=>&$data) {
|
foreach($__lang as $lang=>&$data) {
|
||||||
if(isset($GLOBALS['LANG'][$lang]))
|
$translator->addPhrases($lang, $data);
|
||||||
$GLOBALS['LANG'][$lang] = array_merge($GLOBALS['LANG'][$lang], $data);
|
|
||||||
else
|
|
||||||
$GLOBALS['LANG'][$lang] = $data;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,48 +18,19 @@
|
||||||
// along with this program; if not, write to the Free Software
|
// along with this program; if not, write to the Free Software
|
||||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
$LANG = array();
|
use Seeddms\Seeddms\Translator;
|
||||||
$MISSING_LANG = array();
|
|
||||||
$__languages = getLanguages();
|
$translator = new Translator($settings);
|
||||||
if(!in_array($settings->_language, $__languages))
|
$translator->init();
|
||||||
$__languages[] = $settings->_language;
|
|
||||||
foreach($__languages as $_lang) {
|
|
||||||
if(file_exists($settings->_rootDir . "languages/" . $_lang . "/lang.inc")) {
|
|
||||||
include $settings->_rootDir . "languages/" . $_lang . "/lang.inc";
|
|
||||||
$LANG[$_lang] = $text;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($text);
|
|
||||||
|
|
||||||
function getAvailableLanguages() { /* {{{ */
|
function getAvailableLanguages() { /* {{{ */
|
||||||
global $settings;
|
error_log('getAvailableLanguages() is deprecated');
|
||||||
|
|
||||||
$languages = array();
|
return $GLOBALS['translator']->getAvailableLanguages();
|
||||||
|
|
||||||
$path = $settings->_rootDir . "languages/";
|
|
||||||
$handle = opendir($path);
|
|
||||||
|
|
||||||
while ($entry = readdir($handle) )
|
|
||||||
{
|
|
||||||
if ($entry == ".." || $entry == ".")
|
|
||||||
continue;
|
|
||||||
else if (is_dir($path . $entry))
|
|
||||||
array_push($languages, $entry);
|
|
||||||
}
|
|
||||||
closedir($handle);
|
|
||||||
|
|
||||||
asort($languages);
|
|
||||||
return $languages;
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getLanguages() { /* {{{ */
|
function getLanguages() { /* {{{ */
|
||||||
global $settings;
|
return $GLOBALS['translator']->getLanguages();
|
||||||
|
|
||||||
if($settings->_availablelanguages) {
|
|
||||||
return $settings->_availablelanguages;
|
|
||||||
}
|
|
||||||
|
|
||||||
return getAvailableLanguages();
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -77,101 +48,25 @@ function getLanguages() { /* {{{ */
|
||||||
* @param string $lang use this language instead of the currently set lang
|
* @param string $lang use this language instead of the currently set lang
|
||||||
*/
|
*/
|
||||||
function getMLText($key, $replace = array(), $defaulttext = null, $lang="") { /* {{{ */
|
function getMLText($key, $replace = array(), $defaulttext = null, $lang="") { /* {{{ */
|
||||||
GLOBAL $settings, $LANG, $session, $MISSING_LANG;
|
trigger_error("getMLText() is deprecated.", E_USER_DEPRECATED);
|
||||||
|
foreach(debug_backtrace() as $n) {
|
||||||
$trantext = '';
|
trigger_error($n['file'].": Line ".$n['line'], E_USER_DEPRECATED);
|
||||||
if(0 && $settings->_otrance) {
|
|
||||||
$trantext = '<form style="display: inline-block;" accept-charset="UTF-8" action="http://translate.seeddms.org/connector/index" target="_blank" method="post"><input type="hidden" value="" name="oTranceKeys['.$key.']"><input type="submit" value="submit" class="btn btn-mini"/></form>';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$lang) {
|
return $GLOBALS['translator']->translate($key, $replace, $defaulttext, $lang);
|
||||||
if($session)
|
|
||||||
$lang = $session->getLanguage();
|
|
||||||
else
|
|
||||||
$lang = $settings->_language;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!isset($LANG[$lang][$key]) || !$LANG[$lang][$key]) {
|
|
||||||
if ($defaulttext === null) {
|
|
||||||
$MISSING_LANG[$key] = $lang; //$_SERVER['SCRIPT_NAME'];
|
|
||||||
if(!empty($LANG[$settings->_language][$key])) {
|
|
||||||
$tmpText = $LANG[$settings->_language][$key];
|
|
||||||
} else {
|
|
||||||
$tmpText = '**'.$key.'**';
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
$tmpText = $defaulttext;
|
|
||||||
} else
|
|
||||||
$tmpText = $LANG[$lang][$key];
|
|
||||||
|
|
||||||
if(0 && $settings->_otrance) {
|
|
||||||
$_GLOBALS['used_langs'][$key] = $tmpText;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count($replace) == 0)
|
|
||||||
return $tmpText.$trantext;
|
|
||||||
|
|
||||||
$keys = array_keys($replace);
|
|
||||||
foreach ($keys as $key)
|
|
||||||
$tmpText = str_replace("[".$key."]", $replace[$key], $tmpText);
|
|
||||||
|
|
||||||
return $tmpText;
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function printMLText($key, $replace = array(), $defaulttext = null, $lang="") /* {{{ */
|
function printMLText($key, $replace = array(), $defaulttext = null, $lang="") { /* {{{ */
|
||||||
{
|
$GLOBALS['translator']->print($key, $replace, $defaulttext, $lang);
|
||||||
print getMLText($key, $replace, $defaulttext, $lang);
|
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
function printReviewStatusText($status, $date=0) { /* {{{ */
|
function printReviewStatusText($status, $date=0) { /* {{{ */
|
||||||
if (is_null($status)) {
|
$GLOBALS['translator']->printReviewStatusText($status, $date);
|
||||||
print getMLText("status_unknown");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
switch ($status) {
|
|
||||||
case -2:
|
|
||||||
print getMLText("status_reviewer_removed");
|
|
||||||
break;
|
|
||||||
case -1:
|
|
||||||
print getMLText("status_reviewer_rejected").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
print getMLText("status_not_reviewed");
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
print getMLText("status_reviewed").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
print getMLText("status_unknown");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getReviewStatusText($status, $date=0) { /* {{{ */
|
function getReviewStatusText($status, $date=0) { /* {{{ */
|
||||||
if (is_null($status)) {
|
return $GLOBALS['translator']->getReviewStatusText($status, $date);
|
||||||
return getMLText("status_unknown");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
switch ($status) {
|
|
||||||
case -2:
|
|
||||||
return getMLText("status_reviewer_removed");
|
|
||||||
break;
|
|
||||||
case -1:
|
|
||||||
return getMLText("status_reviewer_rejected").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
return getMLText("status_not_reviewed");
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
return getMLText("status_reviewed").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return getMLText("status_unknown");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function printReceiptStatusText($status, $date=0) { /* {{{ */
|
function printReceiptStatusText($status, $date=0) { /* {{{ */
|
||||||
|
|
@ -237,221 +132,34 @@ function getRevisionStatusText($status, $date=0) { /* {{{ */
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function printApprovalStatusText($status, $date=0) { /* {{{ */
|
function printApprovalStatusText($status, $date=0) { /* {{{ */
|
||||||
if (is_null($status)) {
|
$GLOBALS['translator']->printApprovalStatusText($status, $date);
|
||||||
print getMLText("status_unknown");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
switch ($status) {
|
|
||||||
case -2:
|
|
||||||
print getMLText("status_approver_removed");
|
|
||||||
break;
|
|
||||||
case -1:
|
|
||||||
print getMLText("status_approval_rejected").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
print getMLText("status_not_approved");
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
print getMLText("status_approved").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
print getMLText("status_unknown");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getApprovalStatusText($status, $date=0) { /* {{{ */
|
function getApprovalStatusText($status, $date=0) { /* {{{ */
|
||||||
if (is_null($status)) {
|
return $GLOBALS['translator']->getApprovalStatusText($status, $date);
|
||||||
return getMLText("status_unknown");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
switch ($status) {
|
|
||||||
case -2:
|
|
||||||
return getMLText("status_approver_removed");
|
|
||||||
break;
|
|
||||||
case -1:
|
|
||||||
return getMLText("status_approval_rejected").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
return getMLText("status_not_approved");
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
return getMLText("status_approved").($date !=0 ? " ".$date : "");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return getMLText("status_unknown");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function printOverallStatusText($status) { /* {{{ */
|
function printOverallStatusText($status) { /* {{{ */
|
||||||
print getOverallStatusText($status);
|
$GLOBALS['translator']->printOverallStatusText($status);
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getOverallStatusText($status) { /* {{{ */
|
function getOverallStatusText($status) { /* {{{ */
|
||||||
if (is_null($status)) {
|
return $GLOBALS['translator']->getOverallStatusText($status);
|
||||||
return getMLText("assumed_released");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
switch($status) {
|
|
||||||
case S_IN_WORKFLOW:
|
|
||||||
return getMLText("in_workflow");
|
|
||||||
break;
|
|
||||||
case S_DRAFT_REV:
|
|
||||||
return getMLText("draft_pending_review");
|
|
||||||
break;
|
|
||||||
case S_DRAFT_APP:
|
|
||||||
return getMLText("draft_pending_approval");
|
|
||||||
break;
|
|
||||||
case S_RELEASED:
|
|
||||||
return getMLText("released");
|
|
||||||
break;
|
|
||||||
case S_REJECTED:
|
|
||||||
return getMLText("rejected");
|
|
||||||
break;
|
|
||||||
case S_OBSOLETE:
|
|
||||||
return getMLText("obsolete");
|
|
||||||
break;
|
|
||||||
case S_EXPIRED:
|
|
||||||
return getMLText("expired");
|
|
||||||
break;
|
|
||||||
case S_IN_REVISION:
|
|
||||||
return getMLText("in_revision");
|
|
||||||
break;
|
|
||||||
case S_DRAFT:
|
|
||||||
return getMLText("draft");
|
|
||||||
break;
|
|
||||||
case S_NEEDS_CORRECTION:
|
|
||||||
return getMLText("needs_correction");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return getMLText("status_unknown");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getAttributeTypeText($attrdef) { /* {{{ */
|
function getAttributeTypeText($attrdef) { /* {{{ */
|
||||||
$t = '';
|
return $GLOBALS['translator']->getAttributeTypeText($attrdef);
|
||||||
switch($attrdef->getType()) {
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_int:
|
|
||||||
$t = getMLText("attrdef_type_int");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_float:
|
|
||||||
$t = getMLText("attrdef_type_float");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_string:
|
|
||||||
$t = getMLText("attrdef_type_string");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_boolean:
|
|
||||||
$t = getMLText("attrdef_type_boolean");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_date:
|
|
||||||
$t = getMLText("attrdef_type_date");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_email:
|
|
||||||
$t = getMLText("attrdef_type_email");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_url:
|
|
||||||
$t = getMLText("attrdef_type_url");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_boolean:
|
|
||||||
$t = getMLText("attrdef_type_boolean");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_folder:
|
|
||||||
$t = getMLText("attrdef_type_folder");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_document:
|
|
||||||
$t = getMLText("attrdef_type_document");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_user:
|
|
||||||
$t = getMLText("attrdef_type_user");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::type_group:
|
|
||||||
$t = getMLText("attrdef_type_group");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return $t;
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getAttributeObjectTypeText($attrdef) { /* {{{ */
|
function getAttributeObjectTypeText($attrdef) { /* {{{ */
|
||||||
$ot = '';
|
return $GLOBALS['translator']->getAttributeObjectTypeText($attrdef);
|
||||||
switch($attrdef->getObjType()) {
|
|
||||||
case SeedDMS_Core_AttributeDefinition::objtype_all:
|
|
||||||
$ot = getMLText("all");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::objtype_folder:
|
|
||||||
$ot = getMLText("folder");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::objtype_document:
|
|
||||||
$ot = getMLText("document");
|
|
||||||
break;
|
|
||||||
case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
|
|
||||||
$ot = getMLText("documentcontent");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$ot = getMLText('objtype_unknown');
|
|
||||||
}
|
|
||||||
return $ot;
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
|
function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
|
||||||
$arr = getAttributeValidationError($error, $attrname, $attrvalue, $regex);
|
return $GLOBALS['translator']->getAttributeValidationText($error, $attrname, $attrvalue, $regex);
|
||||||
|
|
||||||
return getMLText($arr[0], $arr[1]);
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getAttributeValidationError($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
|
function getAttributeValidationError($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
|
||||||
if(is_object($attrvalue))
|
return $GLOBALS['translator']->getAttributeValidationText($error, $attrname, $attrvalue, $regex);
|
||||||
$attrvalue = $attrvalue->getId();
|
|
||||||
switch($error) {
|
|
||||||
case 14:
|
|
||||||
return array("attr_not_in_valueset", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 13:
|
|
||||||
return array("attr_not_a_group", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 12:
|
|
||||||
return array("attr_not_a_user", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 11:
|
|
||||||
return array("attr_not_a_folder", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 10:
|
|
||||||
return array("attr_not_a_document", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 9:
|
|
||||||
return array("attr_malformed_date", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 8:
|
|
||||||
return array("attr_malformed_boolean", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 7:
|
|
||||||
return array("attr_malformed_float", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 6:
|
|
||||||
return array("attr_malformed_int", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 5:
|
|
||||||
return array("attr_malformed_email", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
return array("attr_malformed_url", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
return array("attr_no_regex_match", array('attrname'=>$attrname, 'value'=>$attrvalue, 'regex'=>$regex));
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
return array("attr_max_values", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
return array("attr_min_values", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return array("attr_validation_error", array('attrname'=>$attrname, 'value'=>$attrvalue));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,7 @@
|
||||||
// along with this program; if not, write to the Free Software
|
// along with this program; if not, write to the Free Software
|
||||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
require_once("Log.php");
|
|
||||||
require_once("inc/inc.Utils.php");
|
require_once("inc/inc.Utils.php");
|
||||||
|
|
||||||
$logger = getLogger('', (int) $settings->_logFileMaxLevel);
|
$logger = getLogger($settings, '', (int) $settings->_logFileMaxLevel);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
* @version Release: @package_version@
|
* @version Release: @package_version@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
global $logger;
|
|
||||||
$notifier = new SeedDMS_NotificationService($logger, $settings);
|
$notifier = new SeedDMS_NotificationService($logger, $settings);
|
||||||
|
|
||||||
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
|
if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,8 @@
|
||||||
// along with this program; if not, write to the Free Software
|
// along with this program; if not, write to the Free Software
|
||||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
|
use Seeddms\Seeddms\Settings;
|
||||||
|
|
||||||
require_once('inc.ClassSettings.php');
|
require_once('inc.ClassSettings.php');
|
||||||
if(defined("SEEDDMS_CONFIG_FILE"))
|
if(defined("SEEDDMS_CONFIG_FILE"))
|
||||||
$settings = new Settings(SEEDDMS_CONFIG_FILE);
|
$settings = new Settings(SEEDDMS_CONFIG_FILE);
|
||||||
|
|
|
||||||
|
|
@ -493,10 +493,8 @@ function getStreamContext($proxyurl, $proxyuser, $proxypass) { /* {{{ */
|
||||||
return $context;
|
return $context;
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
function getLogger($prefix='', $mask=PEAR_LOG_INFO) { /* {{{ */
|
function getLogger($settings, $prefix='', $mask=PEAR_LOG_INFO) { /* {{{ */
|
||||||
global $settings;
|
if(!empty($settings->_logFileEnable)) {
|
||||||
|
|
||||||
if($settings->_logFileEnable) {
|
|
||||||
if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
|
if ($settings->_logFileRotation=="h") $logname=date("YmdH", time());
|
||||||
else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
|
else if ($settings->_logFileRotation=="d") $logname=date("Ymd", time());
|
||||||
else $logname=date("Ym", time());
|
else $logname=date("Ym", time());
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ define("SEEDDMS_INSTALL", "on");
|
||||||
define("SEEDDMS_VERSION", $ver->version());
|
define("SEEDDMS_VERSION", $ver->version());
|
||||||
|
|
||||||
include("../inc/inc.Settings.php");
|
include("../inc/inc.Settings.php");
|
||||||
$settings = new Settings();
|
$settings = new Seeddms\Seeddms\Settings();
|
||||||
$rootDir = realpath ("..");
|
$rootDir = realpath ("..");
|
||||||
if(file_exists($rootDir.'/../www'))
|
if(file_exists($rootDir.'/../www'))
|
||||||
$rootDir = realpath($rootDir.'/..').'/www';
|
$rootDir = realpath($rootDir.'/..').'/www';
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ define("SEEDDMS_VERSION", $ver->version());
|
||||||
|
|
||||||
require_once('../inc/inc.ClassSettings.php');
|
require_once('../inc/inc.ClassSettings.php');
|
||||||
|
|
||||||
$configDir = Settings::getConfigDir();
|
$configDir = Seeddms\Seeddms\Settings::getConfigDir();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if ENABLE_INSTALL_TOOL exists in config dir
|
* Check if ENABLE_INSTALL_TOOL exists in config dir
|
||||||
|
|
@ -92,8 +92,7 @@ if (!file_exists($configDir."/settings.xml")) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set folders settings
|
// Set folders settings
|
||||||
$settings = new Settings();
|
$settings = new Seeddms\Seeddms\Settings($configDir."/settings.xml");
|
||||||
$settings->load($configDir."/settings.xml");
|
|
||||||
|
|
||||||
$rootDir = realpath ("..");
|
$rootDir = realpath ("..");
|
||||||
$installPath = realpath ("install.php");
|
$installPath = realpath ("install.php");
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
include("../inc/inc.Settings.php");
|
include("../inc/inc.Settings.php");
|
||||||
|
|
||||||
|
require "vendor/autoload.php";
|
||||||
|
|
||||||
require_once("Log.php");
|
require_once("Log.php");
|
||||||
require_once("../inc/inc.Language.php");
|
require_once("../inc/inc.Language.php");
|
||||||
require_once("../inc/inc.Utils.php");
|
require_once("../inc/inc.Utils.php");
|
||||||
|
|
||||||
$logger = getLogger('restapi-', (int) $settings->_logFileRestApiMaxLevel);
|
$logger = getLogger($settings, 'restapi-', (int) $settings->_logFileRestApiMaxLevel);
|
||||||
|
|
||||||
require_once("../inc/inc.Init.php");
|
require_once("../inc/inc.Init.php");
|
||||||
require_once("../inc/inc.Extension.php");
|
require_once("../inc/inc.Extension.php");
|
||||||
|
|
@ -15,8 +17,6 @@ require_once("../inc/inc.ClassEmailNotify.php");
|
||||||
require_once("../inc/inc.Notification.php");
|
require_once("../inc/inc.Notification.php");
|
||||||
require_once("../inc/inc.ClassController.php");
|
require_once("../inc/inc.ClassController.php");
|
||||||
|
|
||||||
require "vendor/autoload.php";
|
|
||||||
|
|
||||||
use Psr\Container\ContainerInterface;
|
use Psr\Container\ContainerInterface;
|
||||||
use Psr\Http\Message\ResponseInterface;
|
use Psr\Http\Message\ResponseInterface;
|
||||||
use Psr\Http\Message\ServerRequestInterface;
|
use Psr\Http\Message\ServerRequestInterface;
|
||||||
|
|
|
||||||
|
|
@ -745,7 +745,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
||||||
';
|
';
|
||||||
foreach($button['menuitems'] as $menuitem) {
|
foreach($button['menuitems'] as $menuitem) {
|
||||||
$content .= '
|
$content .= '
|
||||||
<li><a href="'.$menuitem['link'].'">'.$menuitem['label'].'</a><li>
|
<li><a';
|
||||||
|
if(!empty($menuitem['link']))
|
||||||
|
$content .= ' href="'.$menuitem['link'].'"';
|
||||||
|
if(!empty($menuitem['onclick']))
|
||||||
|
$content .= ' onclick="'.$menuitem['onclick'].'"';
|
||||||
|
$content .= '>'.$menuitem['label'].'</a><li>
|
||||||
';
|
';
|
||||||
}
|
}
|
||||||
$content .= '
|
$content .= '
|
||||||
|
|
|
||||||
|
|
@ -678,7 +678,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
||||||
';
|
';
|
||||||
foreach($button['menuitems'] as $menuitem) {
|
foreach($button['menuitems'] as $menuitem) {
|
||||||
$content .= '
|
$content .= '
|
||||||
<a class="dropdown-item" href="'.$menuitem['link'].'">'.$menuitem['label'].'</a>
|
<a class="dropdown-item"';
|
||||||
|
if(!empty($menuitem['link']))
|
||||||
|
$content .= ' href="'.$menuitem['link'].'"';
|
||||||
|
if(!empty($menuitem['onclick']))
|
||||||
|
$content .= ' onclick="'.$menuitem['onclick'].'"';
|
||||||
|
$content .= '>'.$menuitem['label'].'</a>
|
||||||
';
|
';
|
||||||
}
|
}
|
||||||
$content .= '
|
$content .= '
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
include("../inc/inc.Settings.php");
|
include("../inc/inc.Settings.php");
|
||||||
|
|
||||||
|
require "vendor/autoload.php";
|
||||||
|
|
||||||
require_once("Log.php");
|
require_once("Log.php");
|
||||||
require_once("../inc/inc.Language.php");
|
require_once("../inc/inc.Language.php");
|
||||||
require_once("../inc/inc.Utils.php");
|
require_once("../inc/inc.Utils.php");
|
||||||
|
|
||||||
$logger = getLogger('webdav-');
|
$logger = getLogger($settings, 'webdav-');
|
||||||
|
|
||||||
require_once("../inc/inc.Init.php");
|
require_once("../inc/inc.Init.php");
|
||||||
require_once("../inc/inc.Extension.php");
|
require_once("../inc/inc.Extension.php");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user