Skip to content

Commit

Permalink
PHPCAS-109 reverting previous commit r24935 since it was a bad idea a…
Browse files Browse the repository at this point in the history
…nd the PHPCAS-109 branch is much better

git-svn-id: https://source.jasig.org/cas-clients/phpcas/trunk@25042 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information
jfritschi committed Sep 17, 2011
1 parent 7ea0da3 commit bf6e9a6
Show file tree
Hide file tree
Showing 4 changed files with 458 additions and 561 deletions.
14 changes: 0 additions & 14 deletions source/CAS.php
Original file line number Diff line number Diff line change
Expand Up @@ -1635,20 +1635,6 @@ public static function setNoClearTicketsFromUrl() {
$PHPCAS_CLIENT->setNoClearTicketsFromUrl();
phpCAS :: traceEnd();
}

/**
*
* Force phpcas to thow Exceptions instead of calling exit()
*/
public static function throwExceptionsInsteadOfExiting(){
global $PHPCAS_CLIENT;
phpCAS :: traceBegin();
if (!is_object($PHPCAS_CLIENT)) {
phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
}
$PHPCAS_CLIENT->throwExceptionsInsteadOfExiting();
phpCAS :: traceEnd();
}

/** @} */

Expand Down
17 changes: 1 addition & 16 deletions source/CAS/AuthenticationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,7 @@ public function __construct($client,$failure,$cas_url,$no_response,$bad_response
phpCAS::trace('CAS response: '.$cas_response);
}
$client->printHTMLFooter();
phpCAS::traceEnd();
}

/**
* Decide what to do with the exception
* @param CAS_Client $client
*/
public function handleException(CAS_Client $client){
phpCAS::traceBegin();
if($client->isThrowingExceptionsEnabled() || php_sapi_name() === 'cli'){
phpCAS::traceEnd();
throw $this;
}else{
phpCAS::traceExit();
exit();
}
phpCAS::traceExit();
}

}
Expand Down
Loading

0 comments on commit bf6e9a6

Please sign in to comment.