Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

inc/inc.ClassExtensionMgr.php

@@ -38,6 +38,24 @@ class SeedDMS_Extension_Mgr {
 	 */
 	protected $reposurl;
 
+	/**
+	 * @var string $proxyurl url of proxy
+	 * @access protected
+	 */
+	protected $proxyurl;
+
+	/**
+	 * @var string $proxyuser user to auth with proxy
+	 * @access protected
+	 */
+	protected  $proxyuser;
+
+	/**
+	 * @var string $proxypass password to auth with proxy
+	 * @access protected
+	 */
+	protected  $proxypass;
+
 	/**
 	 * @var array[] $extconf configuration of all extensions
 	 * @access protected

inc/inc.ClassFulltextService.php

@@ -51,6 +51,11 @@ class SeedDMS_FulltextService {
 	 */
 	protected $logger;
 
+	/**
+	 * @var previewer
+	 */
+	protected $previewer;
+
 	/**
 	 * Max file size for imediate indexing
 	 */
@@ -60,6 +65,8 @@ class SeedDMS_FulltextService {
 
 	private $search;
 
+	private int $cmdtimeout;
+
 	public function __construct() {
 		$this->services = array();
 		$this->converters = array();

inc/inc.ClassLdapAuthentication.php

@@ -29,7 +29,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 	var $settings;
 
 	protected function addUser($username, $info) {
-		return $this->dms->addUser($username, null, $info['cn'][0], $info['mail'][0], $settings->_language, $settings->_theme, "", 0);
+		return $this->dms->addUser($username, null, $info['cn'][0], isset($info['mail']) ? $info['mail'][0] : '', $this->settings->_language, $this->settings->_theme, "");
 	}
 
 	protected function updateUser($user, $info) {
@@ -135,13 +135,20 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 			// If it succeeds, get the DN for the user and use it for an authentication
 			// with the users password.
 			$bind = false;
-			if (isset($settings->_ldapBindDN)) {
+			if (!empty($settings->_ldapBindDN)) {
 				$bind = @ldap_bind($ds, $settings->_ldapBindDN, $settings->_ldapBindPw);
 			} else {
 				$bind = @ldap_bind($ds);
 			}
 			$dn = false;
-			/* If bind succeed, then get the dn of the user */
+			/* If bind succeed, then get the dn of the user. If a filter
+			 * is set, it will be used to allow only those users to log in
+			 * matching the filter criteria. Depending on the type of server, 
+			 * (AD or regular LDAP), the search attribute is already set to
+			 * 'sAMAccountName=' or 'uid='. All other filters are ANDed.
+			 * A common filter is '(mail=*)' to ensure a user has an email
+			 * address.
+			 */
 			if ($bind) {
 				if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
 					$search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$username.")".$settings->_ldapFilter.")");

inc/inc.ClassSettings.php

@@ -382,6 +382,7 @@ class Settings { /* {{{ */
 	// below basedn and the search term 'uid=<username>' or 'sAMAccountName=<username>'
 	// if set the search will be (&(cn=<username>)<filter>)
 	var $_ldapFilter = "";
+	var $_usersConnectors = array();
 	var $_converters = array(); // list of commands used to convert files to text for Indexer
 	var $_extensions = array(); // configuration for extensions
 

views/bootstrap/class.Bootstrap.php

@@ -29,6 +29,20 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 	 */
 	protected $extraheader;
 
+	/**
+	 * @var array $nonces list of nonces
+	 *
+	 * @access protected
+	 */
+	protected $nonces;
+
+	/**
+	 * @var string $footerjs js placed in footer of html page
+	 *
+	 * @access protected
+	 */
+	protected $footerjs;
+
 	function __construct($params, $theme='bootstrap') {
 		parent::__construct($params, $theme);
 		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'', 'logo'=>'', 'logolink'=>'');

views/bootstrap4/class.Bootstrap4.php

@@ -29,6 +29,20 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 	 */
 	protected $extraheader;
 
+	/**
+	 * @var array $nonces list of nonces
+	 *
+	 * @access protected
+	 */
+	protected $nonces;
+
+	/**
+	 * @var string $footerjs js placed in footer of html page
+	 *
+	 * @access protected
+	 */
+	protected $footerjs;
+
 	function __construct($params, $theme='bootstrap') {
 		parent::__construct($params, $theme);
 		$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'', 'logo'=>'', 'logolink'=>'');