Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/index.php

-revision 222, Thu Feb  2 14:50:48 2006 UTC
+revision 223, Thu Feb  2 22:13:45 2006 UTC
 Line 296
              if (strpos($url, '?')) $url .= '&mosmsg='.urlencode($message);
              else $url .= '?mosmsg='.urlencode($message);
          }
- //die('Ready to redirect to '.$url);
          if (headers_sent()) echo "<script>document.location.href='$url';</script>\n";
          else {
              @ob_end_clean(); // clear output buffer
-Line 317
+Line 316
                          <?php
          }
          if ($return = mosGetParam( $_REQUEST, 'return', '' )) {
- echo 'About to redirect (return)';
              $this->redirect( $return );
          }
          else {
- echo 'About to redirect (live site)';
              $this->redirect( $this->mosConfig_live_site.'/index.php' );
          }
      }
-     function handleLogin ($session) {
+     function handleLogin () {
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator = mamboAuthenticator::getInstance();
-         $authenticator->loginUser();
+         $loggedin = $authenticator->loginUser();
-         $this->logMessage(_LOGIN_SUCCESS);
+         if ($loggedin) $this->logMessage(_LOGIN_SUCCESS);
+         else mamboCore::redirect('index.php');
      }
-     function handleLogout ($session) {
+     function handleLogout () {
          require_once($this->rootPath().'/includes/authenticator.php');
          $authenticator = mamboAuthenticator::getInstance();
          $authenticator->logoutUser();
-         @session_destroy();
          $this->logMessage(_LOGOUT_SUCCESS);
      }
-Line 1658
+Line 1655
      function getUser() {
          return mamboCore::get('currentUser');
      }
+     /**
+     * Logout the current user - deprecated - use the code here directly
+     */
+     function logout() {
+         require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
+         $authenticator = mamboAuthenticator::getInstance();
+         $authenticator->logoutUser();
+     }
+     /**
+     * Login a user given name and password - deprecated - use the code here directly
+     */
+     function login ($username=null,$passwd=null) {
+         require_once(mamboCore::get('mosConfig_absolute_path').'/includes/authenticator.php');
+         $authenticator = mamboAuthenticator::getInstance();
+         return $authenticator->loginUser($username, $passwd);
+     }
      /**
          * Singleton get instance
-Line 2440
+Line 2453
      $Itemid = $configuration->get('Itemid');
      $mainframe =& new mosMainFrame($database, $option, '.');
-     $session = mosSession::getCurrent();
+     if ($option == 'login') $configuration->handleLogin();
-     if ($option == 'login') $configuration->handleLogin($session);
+     elseif ($option == 'logout') $configuration->handleLogout();
-     elseif ($option == 'logout') $configuration->handleLogout($session);
+     $session = mosSession::getCurrent();
      $my =& new mosUser($database);
      $my->getSessionData();
      mamboCore::set('currentUser',$my);

 Legend:



Removed from v.222
 


changed lines


 
Added in v.223
 Legend:



Removed from v.222
 


changed lines


 
Added in v.223
-Removed from v.222
+Added in v.223

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/index.php