@@ -46,77 +46,77 @@ |
||
46 | 46 | */ |
47 | 47 | class TestPENSServer extends WebTestCase { |
48 | 48 | |
49 | - private $_valid_params = array( |
|
50 | - "command" => "collect", |
|
51 | - "pens-version" => "1.0.0", |
|
52 | - "package-type" => "aicc-pkg", |
|
53 | - "package-type-version" => "1.0", |
|
54 | - "package-format" => "zip", |
|
55 | - "package-id" => "http://myurl.com/12345", |
|
56 | - "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip", |
|
57 | - "package-url-expiry" => "2099-04-09T14:17:43Z", |
|
58 | - "client" => "test-pens-server", |
|
59 | - "receipt" => PENS_TEST_RECEIPT_MAILTO); |
|
49 | + private $_valid_params = array( |
|
50 | + "command" => "collect", |
|
51 | + "pens-version" => "1.0.0", |
|
52 | + "package-type" => "aicc-pkg", |
|
53 | + "package-type-version" => "1.0", |
|
54 | + "package-format" => "zip", |
|
55 | + "package-id" => "http://myurl.com/12345", |
|
56 | + "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip", |
|
57 | + "package-url-expiry" => "2099-04-09T14:17:43Z", |
|
58 | + "client" => "test-pens-server", |
|
59 | + "receipt" => PENS_TEST_RECEIPT_MAILTO); |
|
60 | 60 | |
61 | - public function testEmptyQuery() { |
|
62 | - $this->get(PENS_TEST_SERVER_URL); |
|
63 | - $this->assertText("error=2002"); |
|
64 | - } |
|
61 | + public function testEmptyQuery() { |
|
62 | + $this->get(PENS_TEST_SERVER_URL); |
|
63 | + $this->assertText("error=2002"); |
|
64 | + } |
|
65 | 65 | |
66 | - public function testValidQuery() { |
|
67 | - $this->get(PENS_TEST_SERVER_URL, $this->_valid_params); |
|
68 | - $this->assertText("error=0"); |
|
69 | - } |
|
66 | + public function testValidQuery() { |
|
67 | + $this->get(PENS_TEST_SERVER_URL, $this->_valid_params); |
|
68 | + $this->assertText("error=0"); |
|
69 | + } |
|
70 | 70 | |
71 | - private function invalidParameterTest($name, $value, $error) { |
|
72 | - $params = $this->_valid_params; |
|
73 | - $params[$name] = $value; |
|
74 | - $this->get(PENS_TEST_SERVER_URL, $params); |
|
75 | - $this->assertText("error=".$error); |
|
76 | - } |
|
71 | + private function invalidParameterTest($name, $value, $error) { |
|
72 | + $params = $this->_valid_params; |
|
73 | + $params[$name] = $value; |
|
74 | + $this->get(PENS_TEST_SERVER_URL, $params); |
|
75 | + $this->assertText("error=".$error); |
|
76 | + } |
|
77 | 77 | |
78 | - private function validParameterTest($name, $value) { |
|
79 | - $params = $this->_valid_params; |
|
80 | - $params[$name] = $value; |
|
81 | - $this->get(PENS_TEST_SERVER_URL, $params); |
|
82 | - $this->assertText("error=0"); |
|
83 | - } |
|
78 | + private function validParameterTest($name, $value) { |
|
79 | + $params = $this->_valid_params; |
|
80 | + $params[$name] = $value; |
|
81 | + $this->get(PENS_TEST_SERVER_URL, $params); |
|
82 | + $this->assertText("error=0"); |
|
83 | + } |
|
84 | 84 | |
85 | - public function testInvalidCommand() { |
|
86 | - $this->invalidParameterTest("command", "invalid", 2002); |
|
87 | - } |
|
85 | + public function testInvalidCommand() { |
|
86 | + $this->invalidParameterTest("command", "invalid", 2002); |
|
87 | + } |
|
88 | 88 | |
89 | - public function testInvalidVersion() { |
|
90 | - $this->invalidParameterTest("pens-version", "0.8.0", 2001); |
|
91 | - } |
|
89 | + public function testInvalidVersion() { |
|
90 | + $this->invalidParameterTest("pens-version", "0.8.0", 2001); |
|
91 | + } |
|
92 | 92 | |
93 | - public function testInvalidPackageType() { |
|
94 | - $this->invalidParameterTest("package-type", "invalid", 2003); |
|
95 | - } |
|
93 | + public function testInvalidPackageType() { |
|
94 | + $this->invalidParameterTest("package-type", "invalid", 2003); |
|
95 | + } |
|
96 | 96 | |
97 | - public function testEmptyPackageTypeVersion() { |
|
98 | - $this->invalidParameterTest("package-type-version", null, 2004); |
|
99 | - } |
|
97 | + public function testEmptyPackageTypeVersion() { |
|
98 | + $this->invalidParameterTest("package-type-version", null, 2004); |
|
99 | + } |
|
100 | 100 | |
101 | - public function testInvalidPackageFormat() { |
|
102 | - $this->invalidParameterTest("package-format", "invalid", 2005); |
|
103 | - } |
|
101 | + public function testInvalidPackageFormat() { |
|
102 | + $this->invalidParameterTest("package-format", "invalid", 2005); |
|
103 | + } |
|
104 | 104 | |
105 | - public function testInvalidPackageId() { |
|
106 | - $this->invalidParameterTest("package-id", "invalid", 2007); |
|
107 | - } |
|
105 | + public function testInvalidPackageId() { |
|
106 | + $this->invalidParameterTest("package-id", "invalid", 2007); |
|
107 | + } |
|
108 | 108 | |
109 | - public function testInvalidPackageUrl() { |
|
110 | - $this->invalidParameterTest("package-url", "invalid", 2008); |
|
111 | - } |
|
109 | + public function testInvalidPackageUrl() { |
|
110 | + $this->invalidParameterTest("package-url", "invalid", 2008); |
|
111 | + } |
|
112 | 112 | |
113 | - public function testInvalidPackageUrlExpiry() { |
|
114 | - $this->invalidParameterTest("package-url-expiry", "invalid", 2009); |
|
115 | - } |
|
113 | + public function testInvalidPackageUrlExpiry() { |
|
114 | + $this->invalidParameterTest("package-url-expiry", "invalid", 2009); |
|
115 | + } |
|
116 | 116 | |
117 | - public function testValidPackageUrlExpiry() { |
|
118 | - $this->validParameterTest("package-url-expiry", "2099-01-01"); |
|
119 | - } |
|
117 | + public function testValidPackageUrlExpiry() { |
|
118 | + $this->validParameterTest("package-url-expiry", "2099-01-01"); |
|
119 | + } |
|
120 | 120 | |
121 | 121 | } |
122 | 122 |
@@ -129,9 +129,9 @@ |
||
129 | 129 | */ |
130 | 130 | public function getTourConfig() |
131 | 131 | { |
132 | - $pluginPath = api_get_path(PLUGIN_PATH) . 'tour/'; |
|
132 | + $pluginPath = api_get_path(PLUGIN_PATH).'tour/'; |
|
133 | 133 | |
134 | - $jsonContent = file_get_contents($pluginPath . 'config/tour.json'); |
|
134 | + $jsonContent = file_get_contents($pluginPath.'config/tour.json'); |
|
135 | 135 | |
136 | 136 | $jsonData = json_decode($jsonContent, true); |
137 | 137 |
@@ -5,10 +5,10 @@ |
||
5 | 5 | * @author Angel Fernando Quiroz Campos <[email protected]> |
6 | 6 | * @package chamilo.plugin.tour |
7 | 7 | */ |
8 | -require_once __DIR__ . '/config.php'; |
|
8 | +require_once __DIR__.'/config.php'; |
|
9 | 9 | |
10 | -$pluginPath = api_get_path(PLUGIN_PATH) . 'tour/'; |
|
11 | -$pluginWebPath = api_get_path(WEB_PLUGIN_PATH) . 'tour/'; |
|
10 | +$pluginPath = api_get_path(PLUGIN_PATH).'tour/'; |
|
11 | +$pluginWebPath = api_get_path(WEB_PLUGIN_PATH).'tour/'; |
|
12 | 12 | |
13 | 13 | $userId = api_get_user_id(); |
14 | 14 |
@@ -8,8 +8,8 @@ |
||
8 | 8 | /** |
9 | 9 | * Init |
10 | 10 | */ |
11 | -require_once __DIR__ . '/../../../main/inc/global.inc.php'; |
|
12 | -require_once __DIR__ . '/../config.php'; |
|
11 | +require_once __DIR__.'/../../../main/inc/global.inc.php'; |
|
12 | +require_once __DIR__.'/../config.php'; |
|
13 | 13 | |
14 | 14 | if (!api_is_anonymous()) { |
15 | 15 | $currentPageClass = isset($_POST['page_class']) ? $_POST['page_class'] : ''; |
@@ -6,8 +6,8 @@ |
||
6 | 6 | * @package chamilo.plugin.tour |
7 | 7 | */ |
8 | 8 | require_once __DIR__.'/../../../main/inc/global.inc.php'; |
9 | -require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php'; |
|
10 | -require_once api_get_path(PLUGIN_PATH) . 'tour/src/tour_plugin.class.php'; |
|
9 | +require_once api_get_path(LIBRARY_PATH).'plugin.class.php'; |
|
10 | +require_once api_get_path(PLUGIN_PATH).'tour/src/tour_plugin.class.php'; |
|
11 | 11 | |
12 | 12 | if (!api_is_anonymous()) { |
13 | 13 | $currentPageClass = isset($_GET['page_class']) ? $_GET['page_class'] : ''; |
@@ -9,7 +9,7 @@ |
||
9 | 9 | |
10 | 10 | define('TABLE_TOUR_LOG', 'plugin_tour_log'); |
11 | 11 | |
12 | -require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php'; |
|
13 | -require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php'; |
|
14 | -require_once api_get_path(PLUGIN_PATH) . 'tour/src/tour_plugin.class.php'; |
|
12 | +require_once api_get_path(SYS_PATH).'main/inc/global.inc.php'; |
|
13 | +require_once api_get_path(LIBRARY_PATH).'plugin.class.php'; |
|
14 | +require_once api_get_path(PLUGIN_PATH).'tour/src/tour_plugin.class.php'; |
|
15 | 15 | // Edit the config/tour.json file to add more pages or more elements to the guide |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | if ($data['type'] === HOOK_EVENT_TYPE_PRE) { |
68 | 68 | |
69 | 69 | } elseif ($data['type'] === HOOK_EVENT_TYPE_POST) { |
70 | - /** @var \nusoap_server $server */ |
|
70 | + /** @var \nusoap_server $server */ |
|
71 | 71 | $server = &$data['server']; |
72 | 72 | |
73 | 73 | /** WSSessionListInCategory */ |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | } |
425 | 425 | if (!WSHelperVerifyKey($params)) { |
426 | 426 | |
427 | - //return return_error(WS_ERROR_SECRET_KEY); |
|
427 | + //return return_error(WS_ERROR_SECRET_KEY); |
|
428 | 428 | } |
429 | 429 | // Check if category ID is set |
430 | 430 | if (!empty($params['id']) && empty($params['name'])) { |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | * @package chamilo.plugin.advanced_subscription |
7 | 7 | */ |
8 | 8 | |
9 | -require_once __DIR__ . '/../config.php'; |
|
9 | +require_once __DIR__.'/../config.php'; |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * Class HookAdvancedSubscription extends the HookObserver to implements |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | |
421 | 421 | if ($debug) { |
422 | 422 | error_log(__FUNCTION__); |
423 | - error_log('Params ' . print_r($params, 1)); |
|
423 | + error_log('Params '.print_r($params, 1)); |
|
424 | 424 | } |
425 | 425 | if (!WSHelperVerifyKey($params)) { |
426 | 426 | |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | |
472 | 472 | if ($debug) { |
473 | 473 | error_log('WSUserSubscribedInCourse'); |
474 | - error_log('Params ' . print_r($params, 1)); |
|
474 | + error_log('Params '.print_r($params, 1)); |
|
475 | 475 | } |
476 | 476 | if (!WSHelperVerifyKey($params)) { |
477 | 477 | return return_error(WS_ERROR_SECRET_KEY); |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | |
577 | 577 | if ($debug) { |
578 | 578 | error_log('WSListSessionsDetailsByCategory'); |
579 | - error_log('Params ' . print_r($params, 1)); |
|
579 | + error_log('Params '.print_r($params, 1)); |
|
580 | 580 | } |
581 | 581 | $secretKey = $params['secret_key']; |
582 | 582 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | /** |
8 | 8 | * Init |
9 | 9 | */ |
10 | -require_once __DIR__ . '/../config.php'; |
|
10 | +require_once __DIR__.'/../config.php'; |
|
11 | 11 | // protect |
12 | 12 | api_protect_admin_script(); |
13 | 13 | // start plugin |
@@ -85,8 +85,7 @@ discard block |
||
85 | 85 | $data['newStatus'] = ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_DISAPPROVED; |
86 | 86 | $student['rejectUrl'] = $plugin->getQueueUrl($data); |
87 | 87 | $student['complete_name'] = $isWesternNameOrder ? |
88 | - $student['firstname'] . ', ' . $student['lastname'] : |
|
89 | - $student['lastname'] . ', ' . $student['firstname']; |
|
88 | + $student['firstname'].', '.$student['lastname'] : $student['lastname'].', '.$student['firstname']; |
|
90 | 89 | } |
91 | 90 | $tpl->assign('session', $sessionArray); |
92 | 91 | $tpl->assign('students', $studentList['students']); |
@@ -7,7 +7,7 @@ |
||
7 | 7 | |
8 | 8 | //exit; |
9 | 9 | |
10 | -require_once __DIR__ . '/../../config.php'; |
|
10 | +require_once __DIR__.'/../../config.php'; |
|
11 | 11 | |
12 | 12 | api_protect_admin_script(); |
13 | 13 |