From bc6a3bea7aca89d19ba3b7e6f2029614b169f17f Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 30 Jun 2009 19:25:54 +1000 Subject: [PATCH] RELEASE 0.9.6c --- VERSION | 2 +- functions.php | 8 ++-- hooks.php | 18 ++++----- login.php | 6 +-- logout.php | 4 +- syslog.php | 64 +++++++++++++++++++++++++++++- templates/modification/default.php | 8 +++- timeout_functions.php | 2 +- 8 files changed, 87 insertions(+), 25 deletions(-) diff --git a/VERSION b/VERSION index af6459f..a965a6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.6b +0.9.6c diff --git a/functions.php b/functions.php index dd38667..38ce7b2 100644 --- a/functions.php +++ b/functions.php @@ -1,5 +1,5 @@
@@ -3789,7 +3789,7 @@ function debug_log($msg,$level=0) { $debug_level = -1; if ($level <= $debug_level) - return syslog_msg( LOG_NOTICE,sprintf('%s(%s): %s',$caller,$level,$msg) ); + return syslog_notice( sprintf('%s(%s): %s',$caller,$level,$msg) ); } function enc_type_select_list($enc_type) { diff --git a/hooks.php b/hooks.php index 14fdf56..43e93f4 100644 --- a/hooks.php +++ b/hooks.php @@ -1,5 +1,5 @@ auth_type = $save_auth_type; @@ -132,7 +132,7 @@ $_SESSION['tree'][$ldapserver->server_id] = array(); $_SESSION['tree_icons'][$ldapserver->server_id] = array(); if( ! $anon_bind ) { - syslog_msg ( LOG_NOTICE,"Authentification successful for $dn" ); + syslog_notice ( "Authentification successful for $dn" ); } session_write_close(); diff --git a/logout.php b/logout.php index 82a3dd2..77e70c5 100644 --- a/logout.php +++ b/logout.php @@ -1,5 +1,5 @@ haveAuthInfo()) pla_error( $lang['no_one_logged_in'] ); if( in_array($ldapserver->auth_type, array('cookie','session')) ) { - syslog_msg ( LOG_NOTICE,"Logout for " . get_logged_in_dn( $ldapserver ) ); + syslog_notice ( "Logout for " . get_logged_in_dn( $ldapserver ) ); unset_login_dn( $ldapserver ) or pla_error( $lang['could_not_logout'] ); unset_lastactivity( $ldapserver ); } else diff --git a/syslog.php b/syslog.php index 4b16dd2..2379d18 100644 --- a/syslog.php +++ b/syslog.php @@ -1,5 +1,5 @@ diff --git a/templates/modification/default.php b/templates/modification/default.php index 1b3d11d..5b54843 100644 --- a/templates/modification/default.php +++ b/templates/modification/default.php @@ -1,5 +1,5 @@ $vals ) { } // is this attribute required because its the RDN - if (preg_match("/^${attr}=/",$rdn)) + if (preg_match("/^${attr}=/",$rdn)) { + if( trim( $attr_note ) ) + $attr_note .= ', '; + $attr_note .= " " . 'rdn' . " "; + } ?> ( $session_timeout*60 ) ) { if( in_array($ldapserver->auth_type, array('cookie','session')) ) { - syslog_msg ( LOG_NOTICE,"Logout for " . get_logged_in_dn( $ldapserver ) ); + syslog_notice ( "Logout for " . get_logged_in_dn( $ldapserver ) ); unset_login_dn( $ldapserver ) or pla_error( $lang['could_not_logout'] ); }