diff --git a/system/modules/secure-accessdata/config/config.php b/system/modules/secure-accessdata/config/config.php index c7eb7ee..fe9cba5 100755 --- a/system/modules/secure-accessdata/config/config.php +++ b/system/modules/secure-accessdata/config/config.php @@ -16,8 +16,8 @@ */ $GLOBALS['BE_MOD']['system']['tl_secure_accessdata'] = array ( - 'tables' => array('tl_secure_accessdata'), - 'icon' => 'system/modules/secure-accessdata/assets/images/protect_.gif' + 'tables' => array('tl_secure_accessdata'), + 'icon' => 'system/modules/secure-accessdata/assets/images/protect_.gif' ); /** @@ -25,11 +25,11 @@ */ $GLOBALS['TL_SADTY'] = array ( - 'weblogin' => 'weblogin', - 'contao_login' => 'contao_login', + 'weblogin' => 'weblogin', + 'contao_login' => 'contao_login', 'encryption_key' => 'encryption_key', - 'mail' => 'mail', - 'project' => 'project', + 'mail' => 'mail', + 'project' => 'project', 'online_project' => 'online_project' ); @@ -38,12 +38,12 @@ */ $GLOBALS['TL_SAD_FTP_PROTOCOL'] = array ( - 'ftp' => 'ftp', - 'sftp' => 'sftp', + 'ftp' => 'ftp', + 'sftp' => 'sftp', 'ftp_ssl_implicit' => 'ftp_ssl_implicit', - 'ftp_tls_ssl' => 'ftp_tls_ssl', - 'webdav' => 'webdav', - 'webdav_https' => 'webdav_https' + 'ftp_tls_ssl' => 'ftp_tls_ssl', + 'webdav' => 'webdav', + 'webdav_https' => 'webdav_https' ); /** diff --git a/system/modules/secure-accessdata/dca/tl_secure_accessdata.php b/system/modules/secure-accessdata/dca/tl_secure_accessdata.php index 2c0aa42..f881ae9 100755 --- a/system/modules/secure-accessdata/dca/tl_secure_accessdata.php +++ b/system/modules/secure-accessdata/dca/tl_secure_accessdata.php @@ -171,7 +171,7 @@ ), 'accessdata' => array ( - 'label' => &$GLOBALS['TL_LANG']['tl_secure_accessdata']['accessdata'] + 'label' => &$GLOBALS['TL_LANG']['tl_secure_accessdata']['accessdata'] ), 'access_title' => array ( @@ -300,7 +300,7 @@ 'sql' => "varchar(255) NOT NULL default ''" ), /* Encryption Key */ - 'encryption_key' => array + 'encryption_key' => array ( 'label' => &$GLOBALS['TL_LANG']['tl_secure_accessdata']['encryption_key'], 'exclude' => true, @@ -849,10 +849,10 @@ public function filterFields($isOnlyIDs = false) // If not author if ($this->User->id != $author) { // If not in user array - if (!(is_array($protect_users) && count($protect_users) < 1 && in_array($this->User->id, $protect_users))) { + if (!(is_array($protect_users) && in_array($this->User->id, $protect_users))) { // If not in group array - if (!(is_array($this->User->groups) && is_array($protect_groups) && count(array_intersect($this->User->groups, - $protect_groups)) > 0) + if (!(is_array($this->User->groups) && is_array($protect_groups) + && count(array_intersect($this->User->groups, $protect_groups)) > 0) ) { if ($isOnlyIDs == true) { $arrClosedEntries[] = $id; @@ -886,7 +886,11 @@ public function labelCallback($row, $label, DataContainer $dc, $args) $image .= '_'; } - $args[0] = sprintf('
 
', TL_SCRIPT_URL, $image); + $args[0] = sprintf( + '
 
', + TL_SCRIPT_URL, + $image + ); // Set User if (is_numeric($args[3])) {