@@ -129,8 +129,8 @@ |
||
129 | 129 | */ |
130 | 130 | public function getTourConfig() |
131 | 131 | { |
132 | - $pluginPath = api_get_path(SYS_PLUGIN_PATH) . 'tour/'; |
|
133 | - $jsonContent = file_get_contents($pluginPath . 'config/tour.json'); |
|
132 | + $pluginPath = api_get_path(SYS_PLUGIN_PATH).'tour/'; |
|
133 | + $jsonContent = file_get_contents($pluginPath.'config/tour.json'); |
|
134 | 134 | $jsonData = json_decode($jsonContent, true); |
135 | 135 | |
136 | 136 | return $jsonData; |
@@ -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(SYS_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(SYS_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 |
@@ -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(SYS_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(SYS_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'] : ''; |
@@ -129,27 +129,27 @@ |
||
129 | 129 | |
130 | 130 | // pixlr |
131 | 131 | // max size 1 Mb ?? |
132 | -$title = urlencode(utf8_encode(get_lang('NewImage')));//TODO:check |
|
132 | +$title = urlencode(utf8_encode(get_lang('NewImage'))); //TODO:check |
|
133 | 133 | // |
134 | 134 | $image = Display::returnIconPath('canvas1024x768.png'); |
135 | 135 | // |
136 | 136 | $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
137 | -$langpixlr = api_get_language_isocode(); |
|
137 | +$langpixlr = api_get_language_isocode(); |
|
138 | 138 | $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr; |
139 | -$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser |
|
140 | - |
|
141 | -$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; |
|
142 | -$_SESSION['exit_pixlr']=$document_data['path']; |
|
143 | -$referrer="Chamilo"; |
|
144 | -$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php'; |
|
145 | -$target=$target_path; |
|
146 | -$locktarget="true"; |
|
147 | -$locktitle="false"; |
|
148 | - |
|
149 | -if ($_SERVER['HTTP_HOST']=="localhost") { |
|
150 | - $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
139 | +$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser |
|
140 | + |
|
141 | +$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php'; |
|
142 | +$_SESSION['exit_pixlr'] = $document_data['path']; |
|
143 | +$referrer = "Chamilo"; |
|
144 | +$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php'; |
|
145 | +$target = $target_path; |
|
146 | +$locktarget = "true"; |
|
147 | +$locktitle = "false"; |
|
148 | + |
|
149 | +if ($_SERVER['HTTP_HOST'] == "localhost") { |
|
150 | + $path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
151 | 151 | if (!file_exists($path_and_file)) { |
152 | - $crossdomain='<?xml version="1.0"?> |
|
152 | + $crossdomain = '<?xml version="1.0"?> |
|
153 | 153 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
154 | 154 | <cross-domain-policy> |
155 | 155 | <allow-access-from domain="cdn.pixlr.com" /> |
@@ -52,26 +52,26 @@ discard block |
||
52 | 52 | // Please, do not modify this dirname formatting |
53 | 53 | |
54 | 54 | if (strstr($dir, '..')) { |
55 | - $dir = '/'; |
|
55 | + $dir = '/'; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | if ($dir[0] == '.') { |
59 | - $dir = substr($dir, 1); |
|
59 | + $dir = substr($dir, 1); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | if ($dir[0] != '/') { |
63 | - $dir = '/'.$dir; |
|
63 | + $dir = '/'.$dir; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | if ($dir[strlen($dir) - 1] != '/') { |
67 | - $dir .= '/'; |
|
67 | + $dir .= '/'; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
71 | 71 | |
72 | 72 | if (!is_dir($filepath)) { |
73 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
74 | - $dir = '/'; |
|
73 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
74 | + $dir = '/'; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | $groupId = api_get_group_id(); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | if (!($is_allowed_to_edit || $groupRights || |
102 | - DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id())) |
|
102 | + DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id())) |
|
103 | 103 | ) { |
104 | 104 | api_not_allowed(true); |
105 | 105 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | // Interbreadcrumb for the current directory root path |
118 | 118 | if (empty($document_data['parents'])) { |
119 | - $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
|
119 | + $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']); |
|
120 | 120 | } else { |
121 | 121 | foreach ($document_data['parents'] as $document_sub_data) { |
122 | 122 | $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']); |
@@ -149,17 +149,17 @@ discard block |
||
149 | 149 | $locktitle="false"; |
150 | 150 | |
151 | 151 | if ($_SERVER['HTTP_HOST']=="localhost") { |
152 | - $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
153 | - if (!file_exists($path_and_file)) { |
|
154 | - $crossdomain='<?xml version="1.0"?> |
|
152 | + $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
153 | + if (!file_exists($path_and_file)) { |
|
154 | + $crossdomain='<?xml version="1.0"?> |
|
155 | 155 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
156 | 156 | <cross-domain-policy> |
157 | 157 | <allow-access-from domain="cdn.pixlr.com" /> |
158 | 158 | <site-control permitted-cross-domain-policies="master-only"/> |
159 | 159 | <allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/> |
160 | 160 | </cross-domain-policy>';//more open domain="*" |
161 | - @file_put_contents($path_and_file, $crossdomain); |
|
162 | - } |
|
161 | + @file_put_contents($path_and_file, $crossdomain); |
|
162 | + } |
|
163 | 163 | $credentials = "true"; |
164 | 164 | } else { |
165 | 165 | $credentials = "false"; |
@@ -219,7 +219,7 @@ |
||
219 | 219 | */ |
220 | 220 | public function getEntityIdentifier() |
221 | 221 | { |
222 | - return 'GenjFaqBundle:Question:' . $this->getId(); |
|
222 | + return 'GenjFaqBundle:Question:'.$this->getId(); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | /** |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * |
94 | 94 | * @param string $rank |
95 | 95 | * |
96 | - * @return Question |
|
96 | + * @return Category |
|
97 | 97 | */ |
98 | 98 | public function setRank($rank) |
99 | 99 | { |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | /** |
202 | 202 | * Get questions |
203 | 203 | * |
204 | - * @return \Doctrine\Common\Collections\Collection |
|
204 | + * @return Question[] |
|
205 | 205 | */ |
206 | 206 | public function getQuestions() |
207 | 207 | { |
@@ -22,5 +22,5 @@ |
||
22 | 22 | * See facebook section of the auth.conf.php file |
23 | 23 | */ |
24 | 24 | |
25 | -require dirname(__FILE__) . '/../../../app/config/auth.conf.php'; |
|
25 | +require dirname(__FILE__).'/../../../app/config/auth.conf.php'; |
|
26 | 26 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | api_not_allowed(true); |
17 | 17 | } |
18 | 18 | |
19 | -$interbreadcrumb[] = array ('url' => api_is_student_boss()?'#':'index.php', 'name' => get_lang('MySpace')); |
|
19 | +$interbreadcrumb[] = array('url' => api_is_student_boss() ? '#' : 'index.php', 'name' => get_lang('MySpace')); |
|
20 | 20 | $tool_name = get_lang('Report'); |
21 | 21 | |
22 | 22 | $this_section = SECTION_TRACKING; |
@@ -42,13 +42,13 @@ discard block |
||
42 | 42 | |
43 | 43 | //Column config |
44 | 44 | $column_model = array( |
45 | - array('name'=>'course', 'index'=>'title', 'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'), |
|
46 | - array('name'=>'user', 'index'=>'user', 'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'), |
|
47 | - array('name'=>'email', 'index'=>'email', 'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'), |
|
48 | - array('name'=>'time', 'index'=>'time', 'width'=>'50', 'align'=>'left','sortable'=>'false'), |
|
49 | - array('name'=>'certificate', 'index'=>'certificate', 'width'=>'50', 'align'=>'left','sortable'=>'false'), |
|
50 | - array('name'=>'progress_100', 'index'=>'progress_100', 'width'=>'50', 'align'=>'left','sortable'=>'false'), |
|
51 | - array('name'=>'progress', 'index'=>'progress', 'width'=>'50', 'align'=>'left','sortable'=>'false') |
|
45 | + array('name'=>'course', 'index'=>'title', 'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'), |
|
46 | + array('name'=>'user', 'index'=>'user', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'), |
|
47 | + array('name'=>'email', 'index'=>'email', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'), |
|
48 | + array('name'=>'time', 'index'=>'time', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'), |
|
49 | + array('name'=>'certificate', 'index'=>'certificate', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'), |
|
50 | + array('name'=>'progress_100', 'index'=>'progress_100', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'), |
|
51 | + array('name'=>'progress', 'index'=>'progress', 'width'=>'50', 'align'=>'left', 'sortable'=>'false') |
|
52 | 52 | ); |
53 | 53 | |
54 | 54 | if (!empty($extra_fields)) { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | if (api_is_student_boss()) { |
70 | - $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left','sortable'=>'false'); |
|
70 | + $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'); |
|
71 | 71 | $columns[] = get_lang('Group'); |
72 | 72 | } |
73 | 73 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $htmlHeadXtra[] = '<script> |
80 | 80 | $(function() { |
81 | - '.Display::grid_js('user_course_report', $url, $columns, $column_model, $extra_params, array(), null, true).' |
|
81 | + '.Display::grid_js('user_course_report', $url, $columns, $column_model, $extra_params, array(), null, true).' |
|
82 | 82 | jQuery("#user_course_report").jqGrid("navGrid","#user_course_report_pager",{ |
83 | 83 | view:false, |
84 | 84 | edit:false, |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | if (api_is_student_boss()) { |
103 | 103 | $actions .= Display::url( |
104 | 104 | Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), |
105 | - api_get_path(WEB_CODE_PATH) . "auth/my_progress.php" |
|
105 | + api_get_path(WEB_CODE_PATH)."auth/my_progress.php" |
|
106 | 106 | ); |
107 | 107 | $actions .= Display::url( |
108 | 108 | Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), |
109 | - api_get_path(WEB_CODE_PATH) . "mySpace/student.php" |
|
109 | + api_get_path(WEB_CODE_PATH)."mySpace/student.php" |
|
110 | 110 | ); |
111 | 111 | $actions .= Display::url( |
112 | 112 | Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM), |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | [], |
120 | 120 | ICON_SIZE_MEDIUM |
121 | 121 | ), |
122 | - api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php" |
|
122 | + api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php" |
|
123 | 123 | ); |
124 | 124 | } |
125 | 125 | |
@@ -130,13 +130,13 @@ discard block |
||
130 | 130 | } |
131 | 131 | $content .= Display::url( |
132 | 132 | get_lang("CompanyReportResumed"), |
133 | - api_get_path(WEB_CODE_PATH) . "mySpace/company_reports_resumed.php", |
|
133 | + api_get_path(WEB_CODE_PATH)."mySpace/company_reports_resumed.php", |
|
134 | 134 | array( |
135 | 135 | 'class' => 'btn btn-success' |
136 | 136 | ) |
137 | 137 | ); |
138 | 138 | $content .= '</div>'; |
139 | -$content .= '<h1 class="page-header">' . get_lang('CompanyReport') . '</h1>'; |
|
139 | +$content .= '<h1 class="page-header">'.get_lang('CompanyReport').'</h1>'; |
|
140 | 140 | $content .= Display::grid_html('user_course_report'); |
141 | 141 | |
142 | 142 | $tpl = new Template($tool_name); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | api_not_allowed(true); |
16 | 16 | } |
17 | 17 | |
18 | -$interbreadcrumb[] = array('url' => api_is_student_boss()?'#':'index.php', 'name' => get_lang('MySpace')); |
|
18 | +$interbreadcrumb[] = array('url' => api_is_student_boss() ? '#' : 'index.php', 'name' => get_lang('MySpace')); |
|
19 | 19 | |
20 | 20 | $tool_name = get_lang('Report'); |
21 | 21 | $this_section = SECTION_TRACKING; |
@@ -89,15 +89,15 @@ discard block |
||
89 | 89 | if (api_is_student_boss()) { |
90 | 90 | $actions .= Display::url( |
91 | 91 | Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), |
92 | - api_get_path(WEB_CODE_PATH) . "auth/my_progress.php" |
|
92 | + api_get_path(WEB_CODE_PATH)."auth/my_progress.php" |
|
93 | 93 | ); |
94 | 94 | $actions .= Display::url( |
95 | 95 | Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), |
96 | - api_get_path(WEB_CODE_PATH) . "mySpace/student.php" |
|
96 | + api_get_path(WEB_CODE_PATH)."mySpace/student.php" |
|
97 | 97 | ); |
98 | 98 | $actions .= Display::url( |
99 | 99 | Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM), |
100 | - api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php" |
|
100 | + api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php" |
|
101 | 101 | ); |
102 | 102 | $actions .= Display::url( |
103 | 103 | Display::return_icon( |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | [], |
107 | 107 | ICON_SIZE_MEDIUM |
108 | 108 | ), |
109 | - api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php" |
|
109 | + api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php" |
|
110 | 110 | ); |
111 | 111 | } |
112 | 112 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | if (!api_is_student_boss()) { |
120 | 120 | $content .= Display::url( |
121 | 121 | get_lang("CompanyReport"), |
122 | - api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php", |
|
122 | + api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php", |
|
123 | 123 | array( |
124 | 124 | 'class' => 'btn btn-success' |
125 | 125 | ) |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | $content .= '</div>'; |
130 | -$content .= '<h1 class="page-header">' . get_lang('CompanyReportResumed') . '</h1>'; |
|
130 | +$content .= '<h1 class="page-header">'.get_lang('CompanyReportResumed').'</h1>'; |
|
131 | 131 | $content .= Display::grid_html('user_course_report'); |
132 | 132 | |
133 | 133 | $tpl = new Template($tool_name); |