Changeset 23564
- Timestamp:
- 10/08/09 15:09:48 (5 months ago)
- Files:
-
- trunk/midcom/midcom_core/services/authentication.php (modified) (1 diff)
- trunk/midcom/midcom_core/services/authentication/basic.php (modified) (2 diffs)
- trunk/midcom/midcom_core/services/authentication/sessionauth.php (modified) (2 diffs)
- trunk/midcom/midcom_core/static/.DS_Store (deleted)
- trunk/midcom/midcom_core/static/midgard/.DS_Store (deleted)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom_core/services/authentication.php
r19533 r23564 14 14 interface midcom_core_services_authentication 15 15 { 16 public function on_auth_changed(); 17 16 18 public function get_person(); 17 19 trunk/midcom/midcom_core/services/authentication/basic.php
r23439 r23564 20 20 public function __construct() 21 21 { 22 // Connect to the Midgard "auth-changed" signal so we can get information from external authentication handlers 23 midcom_core_midcom::get_instance()->dispatcher->get_midgard_connection()->connect('auth-changed', array($this, 'on_auth_changed_callback'), array()); 24 22 25 if (isset($_SERVER['PHP_AUTH_USER'])) 23 26 { … … 25 28 } 26 29 } 27 30 31 /** 32 * Signal callback for authentication state change 33 */ 34 public function on_auth_changed_callback() 35 { 36 midcom_core_midcom::get_instance()->authentication->on_auth_changed(); 37 } 38 39 /** 40 * Refresh MidCOM internal authentication change information based on authentication state of Midgard Connection 41 */ 42 public function on_auth_changed() 43 { 44 $this->user = midcom_core_midcom::get_instance()->dispatcher->get_midgard_connection()->get_user(); 45 } 46 28 47 public function is_user() 29 48 { trunk/midcom/midcom_core/services/authentication/sessionauth.php
r23439 r23564 38 38 } 39 39 40 // Connect to the Midgard "auth-changed" signal so we can get information from external authentication handlers 41 midcom_core_midcom::get_instance()->dispatcher->get_midgard_connection()->connect('auth-changed', array($this, 'on_auth_changed_callback'), array()); 42 40 43 if ($_MIDCOM->timer) 41 44 { … … 43 46 } 44 47 } 45 48 49 /** 50 * Signal callback for authentication state change 51 */ 52 public function on_auth_changed_callback() 53 { 54 midcom_core_midcom::get_instance()->authentication->on_auth_changed(); 55 } 56 57 /** 58 * Refresh MidCOM internal authentication change information based on authentication state of Midgard Connection 59 */ 60 public function on_auth_changed() 61 { 62 $this->user = midcom_core_midcom::get_instance()->dispatcher->get_midgard_connection()->get_user(); 63 } 64 46 65 public function login($username, $password, $read_session = true) 47 66 {
