@@ -124,7 +124,7 @@ |
||
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
127 | - * @param $variable |
|
127 | + * @param string $variable |
|
128 | 128 | * @return mixed |
129 | 129 | */ |
130 | 130 | public function getConfigurationValue($variable) |
@@ -907,7 +907,7 @@ discard block |
||
907 | 907 | * display the edit and delete icons in the sortable table |
908 | 908 | * |
909 | 909 | * @param integer $id the id of the template |
910 | - * @return html code for the link to edit and delete the template |
|
910 | + * @return string code for the link to edit and delete the template |
|
911 | 911 | * |
912 | 912 | * @author Patrick Cool <[email protected]>, Ghent University, Belgium |
913 | 913 | * @version August 2008 |
@@ -923,7 +923,7 @@ discard block |
||
923 | 923 | * Display the image of the template in the sortable table |
924 | 924 | * |
925 | 925 | * @param string $image the image |
926 | - * @return html code for the image |
|
926 | + * @return string code for the image |
|
927 | 927 | * |
928 | 928 | * @author Patrick Cool <[email protected]>, Ghent University, Belgium |
929 | 929 | * @version August 2008 |
@@ -1120,7 +1120,7 @@ discard block |
||
1120 | 1120 | /** |
1121 | 1121 | * Returns an array containing the list of options used to populate the gradebook_number_decimals variable |
1122 | 1122 | * This function is called through a call_user_func() in the generate_settings_form function. |
1123 | - * @return array List of gradebook_number_decimals options |
|
1123 | + * @return string[] List of gradebook_number_decimals options |
|
1124 | 1124 | * |
1125 | 1125 | * @author Guillaume Viguier <[email protected]> |
1126 | 1126 | */ |
@@ -28,7 +28,7 @@ |
||
28 | 28 | * @param string ISO code (fr_FR, ...) |
29 | 29 | * @param int Whether the sublanguage is published (0=unpublished, 1=published) |
30 | 30 | * @param int ID del idioma padre |
31 | - * @return int New sub language ID or false on error |
|
31 | + * @return false|string New sub language ID or false on error |
|
32 | 32 | */ |
33 | 33 | function add_sub_language ($original_name,$english_name,$isocode,$sublanguage_available,$parent_id) { |
34 | 34 | $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); |
@@ -128,7 +128,7 @@ |
||
128 | 128 | /** |
129 | 129 | * Update users from the imported data |
130 | 130 | * @param array $users List of users |
131 | - * @return void |
|
131 | + * @return false|null |
|
132 | 132 | * @uses global variable $inserted_in_course, which returns the list of courses the user was inserted in |
133 | 133 | */ |
134 | 134 |
@@ -454,7 +454,10 @@ |
||
454 | 454 | <blockquote> |
455 | 455 | <pre> |
456 | 456 | <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId; |
457 | - xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br /> |
|
457 | + xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) { |
|
458 | + echo implode(';', $list_reponse).';'; |
|
459 | +} |
|
460 | +?></span>xxx1|xxx2|xxx3;1;<br /> |
|
458 | 461 | </pre> |
459 | 462 | </blockquote> |
460 | 463 | <p><?php |
@@ -206,7 +206,7 @@ |
||
206 | 206 | |
207 | 207 | /** |
208 | 208 | * Restores an attendance entry and fallback to attendances rendering |
209 | - * @param int $attendanceId |
|
209 | + * @param int $attendance_id |
|
210 | 210 | */ |
211 | 211 | public function attendance_restore($attendance_id) |
212 | 212 | { |
@@ -529,10 +529,11 @@ |
||
529 | 529 | $result['full_name'] = api_get_person_name($user['firstname'], $user['lastname']); |
530 | 530 | foreach ($data_array['attendant_calendar'] as $class_day) { |
531 | 531 | if ($class_day['done_attendance'] == 1) { |
532 | - if ($data_users_presence[$user['user_id']][$class_day['id']]['presence'] == 1) |
|
533 | - $result[$class_day['id']] = get_lang('UserAttendedSymbol'); |
|
534 | - else |
|
535 | - $result[$class_day['id']] = '<span style="color:red">'.get_lang('UserNotAttendedSymbol').'</span>'; |
|
532 | + if ($data_users_presence[$user['user_id']][$class_day['id']]['presence'] == 1) { |
|
533 | + $result[$class_day['id']] = get_lang('UserAttendedSymbol'); |
|
534 | + } else { |
|
535 | + $result[$class_day['id']] = '<span style="color:red">'.get_lang('UserNotAttendedSymbol').'</span>'; |
|
536 | + } |
|
536 | 537 | } else { |
537 | 538 | $result[$class_day['id']] = " "; |
538 | 539 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | /** |
63 | 63 | * This method returns the PEAR DB URL to use to connect to the database. |
64 | 64 | * |
65 | - * @return a PEAR DB URL |
|
65 | + * @return string PEAR DB URL |
|
66 | 66 | * |
67 | 67 | * @private |
68 | 68 | */ |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | /** |
106 | 106 | * This method returns the name of the table where PGT's are stored. |
107 | 107 | * |
108 | - * @return the name of a table. |
|
108 | + * @return string name of a table. |
|
109 | 109 | * |
110 | 110 | * @private |
111 | 111 | */ |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * This method returns an informational string giving the type of storage |
123 | 123 | * used by the object (used for debugging purposes). |
124 | 124 | * |
125 | - * @return an informational string. |
|
125 | + * @return string informational string. |
|
126 | 126 | * @public |
127 | 127 | */ |
128 | 128 | function getStorageType() |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | /** |
149 | 149 | * The class constructor, called by CASClient::SetPGTStorageDB(). |
150 | 150 | * |
151 | - * @param $cas_parent the CASClient instance that creates the object. |
|
151 | + * @param CASClient $cas_parent the CASClient instance that creates the object. |
|
152 | 152 | * @param $user the user to access the data with |
153 | 153 | * @param $password the user's password |
154 | 154 | * @param $database_type the type of the database hosting the data |
@@ -166,11 +166,21 @@ discard block |
||
166 | 166 | // call the ancestor's constructor |
167 | 167 | $this->PGTStorage($cas_parent); |
168 | 168 | |
169 | - if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE; |
|
170 | - if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME; |
|
171 | - if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT; |
|
172 | - if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE; |
|
173 | - if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE; |
|
169 | + if ( empty($database_type) ) { |
|
170 | + $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE; |
|
171 | + } |
|
172 | + if ( empty($hostname) ) { |
|
173 | + $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME; |
|
174 | + } |
|
175 | + if ( $port==0 ) { |
|
176 | + $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT; |
|
177 | + } |
|
178 | + if ( empty($database) ) { |
|
179 | + $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE; |
|
180 | + } |
|
181 | + if ( empty($table) ) { |
|
182 | + $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE; |
|
183 | + } |
|
174 | 184 | |
175 | 185 | // build and store the PEAR DB URL |
176 | 186 | $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database; |
@@ -192,8 +202,9 @@ discard block |
||
192 | 202 | { |
193 | 203 | phpCAS::traceBegin(); |
194 | 204 | // if the storage has already been initialized, return immediatly |
195 | - if ( $this->isInitialized() ) |
|
196 | - return; |
|
205 | + if ( $this->isInitialized() ) { |
|
206 | + return; |
|
207 | + } |
|
197 | 208 | // call the ancestor's method (mark as initialized) |
198 | 209 | parent::init(); |
199 | 210 |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * This method returns an informational string giving the type of storage |
99 | 99 | * used by the object (used for debugging purposes). |
100 | 100 | * |
101 | - * @return an informational string. |
|
101 | + * @return string informational string. |
|
102 | 102 | * @public |
103 | 103 | */ |
104 | 104 | function getStorageType() |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * This method returns an informational string giving informations on the |
111 | 111 | * parameters of the storage.(used for debugging purposes). |
112 | 112 | * |
113 | - * @return an informational string. |
|
113 | + * @return string informational string. |
|
114 | 114 | * @public |
115 | 115 | */ |
116 | 116 | function getStorageInfo() |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | /** |
126 | 126 | * The class constructor, called by CASClient::SetPGTStorageFile(). |
127 | 127 | * |
128 | - * @param $cas_parent the CASClient instance that creates the object. |
|
129 | - * @param $format the format used to store the PGT's (`plain' and `xml' allowed). |
|
130 | - * @param $path the path where the PGT's should be stored |
|
128 | + * @param CASClient $cas_parent the CASClient instance that creates the object. |
|
129 | + * @param string $format the format used to store the PGT's (`plain' and `xml' allowed). |
|
130 | + * @param string $path the path where the PGT's should be stored |
|
131 | 131 | * |
132 | 132 | * @public |
133 | 133 | */ |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * |
203 | 203 | * @param $pgt_iou the PGT iou. |
204 | 204 | * |
205 | - * @return a filename |
|
205 | + * @return string filename |
|
206 | 206 | * @private |
207 | 207 | */ |
208 | 208 | function getPGTIouFilename($pgt_iou) |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * |
244 | 244 | * @param $pgt_iou the PGT iou |
245 | 245 | * |
246 | - * @return the corresponding PGT, or FALSE on error |
|
246 | + * @return false|string corresponding PGT, or FALSE on error |
|
247 | 247 | * |
248 | 248 | * @public |
249 | 249 | */ |
@@ -137,8 +137,12 @@ discard block |
||
137 | 137 | // call the ancestor's constructor |
138 | 138 | $this->PGTStorage($cas_parent); |
139 | 139 | |
140 | - if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT; |
|
141 | - if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH; |
|
140 | + if (empty($format) ) { |
|
141 | + $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT; |
|
142 | + } |
|
143 | + if (empty($path) ) { |
|
144 | + $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH; |
|
145 | + } |
|
142 | 146 | |
143 | 147 | // check that the path is an absolute path |
144 | 148 | if (getenv("OS")=="Windows_NT"){ |
@@ -147,8 +151,7 @@ discard block |
||
147 | 151 | phpCAS::error('an absolute path is needed for PGT storage to file'); |
148 | 152 | } |
149 | 153 | |
150 | - } |
|
151 | - else |
|
154 | + } else |
|
152 | 155 | { |
153 | 156 | |
154 | 157 | if ( $path[0] != '/' ) { |
@@ -186,8 +189,9 @@ discard block |
||
186 | 189 | { |
187 | 190 | phpCAS::traceBegin(); |
188 | 191 | // if the storage has already been initialized, return immediatly |
189 | - if ( $this->isInitialized() ) |
|
190 | - return; |
|
192 | + if ( $this->isInitialized() ) { |
|
193 | + return; |
|
194 | + } |
|
191 | 195 | // call the ancestor's method (mark as initialized) |
192 | 196 | parent::init(); |
193 | 197 | phpCAS::traceEnd(); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | /** |
127 | 127 | * This method returns an error message set by PGTStorage::setErrorMessage(). |
128 | 128 | * |
129 | - * @return an error message when set by PGTStorage::setErrorMessage(), FALSE |
|
129 | + * @return boolean error message when set by PGTStorage::setErrorMessage(), FALSE |
|
130 | 130 | * otherwise. |
131 | 131 | * |
132 | 132 | * @public |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | /** |
154 | 154 | * This method tells if the storage has already been intialized. |
155 | 155 | * |
156 | - * @return a boolean |
|
156 | + * @return boolean boolean |
|
157 | 157 | * |
158 | 158 | * @protected |
159 | 159 | */ |
@@ -33,6 +33,7 @@ discard block |
||
33 | 33 | * render to courses_list view |
34 | 34 | * @param string action |
35 | 35 | * @param string confirmation message(optional) |
36 | + * @param string $action |
|
36 | 37 | */ |
37 | 38 | public function courses_list($action, $message = '') |
38 | 39 | { |
@@ -79,7 +80,7 @@ discard block |
||
79 | 80 | /** |
80 | 81 | * It's used for listing courses with categories, |
81 | 82 | * render to courses_categories view |
82 | - * @param $action |
|
83 | + * @param string $action |
|
83 | 84 | * @param string $category_code |
84 | 85 | * @param string $message |
85 | 86 | * @param string $error |