chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed all.test2 function with the function redirect DT#3553

Browse Source
skala
Arthur Portugal 16 years ago
parent bf851a2bc7
commit a6a092d8e1
3 changed files with 24 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      main/auth/openid/openid.lib.php
  2. 11
      tests/all.test2.php
  3. 21
      tests/main/auth/openid/openid.lib.test.php

9
main/auth/openid/openid.lib.php
Unescape View File

@ -23,20 +23,21 @@ define('OPENID_NS_1_0', 'http://openid.net/signon/1.0');
/**
* Performs an HTTP 302 redirect (for the 1.x protocol).
* This function should be deprecated for 1.8.6.2 needs documentation
*/
function openid_redirect_http($url, $message) {
$query = array();
foreach ($message as $key => $val) {
$query[] = $key .'='. urlencode($val);
}
$sep = (strpos($url, '?') === FALSE) ? '?' : '&';
header('Location: '. $url . $sep . implode('&', $query), TRUE, 302);
exit;
//exit;
}
/**
* Creates a js auto-submit redirect for (for the 2.x protocol)
* This function should be deprecated for 1.8.6.2 needs documentation
*/
function openid_redirect($url, $message) {
$output = '<html><head><title>'.get_lang('OpenIDRedirect'). "</title></head>\n<body>";
@ -51,10 +52,12 @@ function openid_redirect($url, $message) {
$output .= '</form>';
$output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
$output .= "</body></html>\n";
print $output;
//print $output;
return $output;
exit;
}
/**
* Determine if the given identifier is an XRI ID.
*/

11
tests/all.test2.php
Unescape View File

@ -1,11 +1,14 @@
<?php
//Set the time limit for the tests
ini_set('memory_limit','128M');
//List of files than need some tests
require_once('simpletest/unit_tester.php');
require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
require_once('simpletest/web_tester.php');
require_once('simpletest/mock_objects.php');
require_once('simpletest/autorun.php');
require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
require_once(api_get_path(SYS_CODE_PATH).'admin/calendar.lib.php');
require_once(api_get_path(SYS_CODE_PATH).'admin/statistics/statistics.lib.php');
require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
@ -23,7 +26,7 @@ class AllTests2 extends TestSuite {
//$this->addTestFile(dirname(__FILE__).'/main/admin/statistics/statistics.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/auth/lost_password.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/auth/openid/xrds.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/auth/openid/openid.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/auth/openid/openid.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/chat/chat_functions.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/conference/get_translation.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/exercice/hotpotatoes.lib.test.php');
@ -34,7 +37,7 @@ class AllTests2 extends TestSuite {
//$this->addTestFile(dirname(__FILE__).'/main/webservices/user_import/import.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/work/work.lib.test.php');
/*
$this->addTestFile(dirname(__FILE__).'/main/admin/calendar.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/admin/statistics/statistics.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/auth/lost_password.lib.test.php');
@ -49,7 +52,7 @@ class AllTests2 extends TestSuite {
$this->addTestFile(dirname(__FILE__).'/main/user/userInfoLib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/webservices/user_import/import.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/work/work.lib.test.php');
*/
}
}
$test = &new AllTests2();

21
tests/main/auth/openid/openid.lib.test.php
Unescape View File

@ -200,23 +200,24 @@ class TestOpenId extends UnitTestCase {
}
function testopenid_redirect() {
$url='http://localhost/dokeossvn186/tests/all.test2.php';
$message='';
ob_start();
$res=openid_redirect($url, $message);
$this->assertTrue(is_null($res));
$url = api_get_path(WEB_PATH).'tests/all.test2.php';
$res = openid_redirect($url, $message = array());
ob_end_clean();
//var_dump($res);
$this->assertTrue(is_string($res));
}
function testopenid_redirect_http() {
$url='http://localhost/dokeossvn186/tests/all.test2.php';
$message='';
$url = api_get_path(WEB_PATH).'tests/all.test2.php';
ob_start();
$res=openid_redirect_http($url, $message);
$this->assertTrue(is_null($res));
$res=openid_redirect_http($url, $message = array());
$dd = $this->assertTrue(is_null($res));
var_dump($dd);
ob_end_clean();
//var_dump($res);
}
}
?>

Write Preview
Loading…
Cancel
Save