chamilo / chamilo-lms

main/course_description/listing.php

Spacing +9 added lines, -9 removed lines

@@ -11,18 +11,18 @@ 
 api_protect_course_script(true);
 
 // display actions menu
-if (api_is_allowed_to_edit(null,true)) {
+if (api_is_allowed_to_edit(null, true)) {
     $categories = array();
     foreach ($default_description_titles as $id => $title) {
         $categories[$id] = $title;
     }
     $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-	$i=1;
+	$i = 1;
 	echo '<div class="actions" style="margin-bottom:30px">';
 	ksort($categories);
 	foreach ($categories as $id => $title) {
-		if ($i==ADD_BLOCK) {
+		if ($i == ADD_BLOCK) {
 			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
                 Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 			break;
@@ -43,7 +43,7 @@ 
             <tr>
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
                 <td align="right"><a href="index.php?action=listing">'.
-                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
+                Display::return_icon('info.png', get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'), ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
 }
 
 $user_info = api_get_user_info();
@@ -52,21 +52,21 @@ 
 	foreach ($descriptions as $id => $description) {
         if (!empty($description)) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true) && !$history) {
+            if (api_is_allowed_to_edit(null, true) && !$history) {
                 if (api_get_session_id() == $description['session_id']) {
                     $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
 
                     // delete
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
-                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
+                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
+                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
                     $actions .= '</a> ';
 
                     // edit
                     $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=edit&description_type='.$description['description_type'].'">';
-                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
+                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
                     $actions .= '</a> ';
                 } else {
-                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
+                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
                 }
             }
             echo Display::panel(

main/course_description/edit.php

Spacing +6 added lines, -6 removed lines

@@ -34,21 +34,21 @@ 
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-$i=1;
+$i = 1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
 	'</a>';
 
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i==ADD_BLOCK) {
+	if ($i == ADD_BLOCK) {
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		break;
 	} else {
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		$i++;
 	}
 }
@@ -56,7 +56,7 @@ 
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 // default header title form

main/inc/lib/app_view.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
      * @param string  tool name (optional)
      * @param string $template_path
      */
-    public function __construct($toolname = '', $template_path=null)
+    public function __construct($toolname = '', $template_path = null)
     {
         if (!empty($toolname)) {
             if (isset($template_path)) {
@@ -27,7 +27,7 @@ 
             if (is_dir($path)) {
                 $this->tool_path = $path;
             } else {
-                throw new Exception('View::__construct() $path directory does not exist ' . $path);
+                throw new Exception('View::__construct() $path directory does not exist '.$path);
             }
         }
     }
@@ -39,7 +39,7 @@ 
     public function set_data($data)
     {
         if (!is_array($data)) {
-            throw new Exception('View::set_data() $data must to be an array, you have sent a' . gettype( $data ));
+            throw new Exception('View::set_data() $data must to be an array, you have sent a'.gettype($data));
         }
         $this->data = $data;
     }
@@ -49,7 +49,7 @@ 
      * @param string layout view
      * @param string $layout
      */
-    public function set_layout( $layout )
+    public function set_layout($layout)
     {
         $this->layout = $layout;
     }

main/course_progress/thematic_plan.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 // actions menu
 $new_thematic_plan_data = array();
 if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+foreach ($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
@@ -25,7 +25,7 @@ 
     }
 }
 
-$i=1;
+$i = 1;
 
 echo Display::tag('h2', $thematic_data['title']);
 echo $thematic_data['content'];
@@ -67,8 +67,8 @@ 
             $thematic_plan = null;
         } else {
             $thematic_plan = null;
-            $default['title['.$id.']']       = $title;
-            $default['description['.$id.']']= '';
+            $default['title['.$id.']'] = $title;
+            $default['description['.$id.']'] = '';
         }
         $form->setDefaults($default);
     }

main/chat/chat.php

Spacing +4 added lines, -4 removed lines

@@ -17,11 +17,11 @@ 
 ];
 
 foreach ($externalCSS as $css) {
-    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH) . $css);
+    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH).$css);
 }
 
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'chat.css');
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'markdown.css');
+$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
+$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'markdown.css');
 
 $externalJS = [
     'highlight/highlight.pack.js',
@@ -41,7 +41,7 @@ 
         continue;
     }
 
-    $iconList[$key] = strtoupper($icon) . '.png';
+    $iconList[$key] = strtoupper($icon).'.png';
 }
 
 $view = new Template(get_lang('Chat'), false, false, false, true, false);

main/inc/lib/extra_field_option.lib.php

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
 
                         foreach ($sub_options as $sub_option) {
                             if (!empty($sub_option)) {
-                                $new_params  = array(
+                                $new_params = array(
                                     'field_id' => $field_id,
                                     'option_value' => $sub_id,
                                     'display_text' => $sub_option,
@@ -660,7 +660,7 @@ 
         $form->addElement('hidden', 'field_id', $this->field_id);
 
         if ($action == 'edit') {
-            $translateUrl = api_get_path(WEB_CODE_PATH) . 'extrafield/translate.php?' . http_build_query([
+            $translateUrl = api_get_path(WEB_CODE_PATH).'extrafield/translate.php?'.http_build_query([
                 'extra_field_option' => $id
             ]);
             $translateButton = Display::toolbarButton(get_lang('TranslateThisTerm'), $translateUrl, 'language', 'link');

main/auth/openid/login.php

Spacing +14 added lines, -14 removed lines

@@ -64,7 +64,7 @@ 
     // Now that there is an association created, move on
     // to request authentication from the IdP
     $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id;
-    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 . '/server', $services[0]['types'])) {
+    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0.'/server', $services[0]['types'])) {
         $identity = 'http://openid.net/identifier_select/2.0';
     }
     $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']);
@@ -119,7 +119,7 @@ 
 
     $xrds_url = $claimed_id;
     if (_openid_is_xri($claimed_id)) {
-        $xrds_url = 'http://xri.net/' . $claimed_id;
+        $xrds_url = 'http://xri.net/'.$claimed_id;
     }
     $url = @parse_url($xrds_url);
     if ($url['scheme'] == 'http' || $url['scheme'] == 'https') {
@@ -182,7 +182,7 @@ 
     //@todo Remove Old Associations:
     $openid_association = Database::get_main_table(TABLE_MAIN_OPENID_ASSOCIATION);
     $sql = "DELETE FROM $openid_association
-            WHERE created + expires_in < '" . api_get_utc_datetime() . "'";
+            WHERE created + expires_in < '".api_get_utc_datetime()."'";
     Database::query($sql);
 
     // Check to see if we have an association for this IdP already
@@ -339,17 +339,17 @@ 
     switch ($uri['scheme']) {
         case 'http':
             $port = isset($uri['port']) ? $uri['port'] : 80;
-            $host = $uri['host'] . ($port != 80 ? ':' . $port : '');
+            $host = $uri['host'].($port != 80 ? ':'.$port : '');
             $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
             break;
         case 'https':
             // Note: Only works for PHP 4.3 compiled with OpenSSL.
             $port = isset($uri['port']) ? $uri['port'] : 443;
-            $host = $uri['host'] . ($port != 443 ? ':' . $port : '');
-            $fp = @fsockopen('ssl://' . $uri['host'], $port, $errno, $errstr, 20);
+            $host = $uri['host'].($port != 443 ? ':'.$port : '');
+            $fp = @fsockopen('ssl://'.$uri['host'], $port, $errno, $errstr, 20);
             break;
         default:
-            $result->error = 'invalid schema ' . $uri['scheme'];
+            $result->error = 'invalid schema '.$uri['scheme'];
             return $result;
     }
 
@@ -365,7 +365,7 @@ 
     // Construct the path to act on.
     $path = isset($uri['path']) ? $uri['path'] : '/';
     if (isset($uri['query'])) {
-        $path .= '?' . $uri['query'];
+        $path .= '?'.$uri['query'];
     }
 
     // Create HTTP request.
@@ -375,23 +375,23 @@ 
         // host that do not take into account the port number.
         'Host' => "Host: $host",
         'User-Agent' => 'User-Agent: Chamilo (+http://www.chamilo.org/)',
-        'Content-Length' => 'Content-Length: ' . strlen($data)
+        'Content-Length' => 'Content-Length: '.strlen($data)
     );
 
     // If the server url has a user then attempt to use basic authentication
     if (isset($uri['user'])) {
-        $defaults['Authorization'] = 'Authorization: Basic ' . base64_encode($uri['user'] . (!empty($uri['pass']) ? ":" . $uri['pass'] : ''));
+        $defaults['Authorization'] = 'Authorization: Basic '.base64_encode($uri['user'].(!empty($uri['pass']) ? ":".$uri['pass'] : ''));
     }
 
     foreach ($headers as $header => $value) {
-        $defaults[$header] = $header . ': ' . $value;
+        $defaults[$header] = $header.': '.$value;
     }
 
-    $request = $method . ' ' . $path . " HTTP/1.0\r\n";
+    $request = $method.' '.$path." HTTP/1.0\r\n";
     $request .= implode("\r\n", $defaults);
     $request .= "\r\n\r\n";
     if ($data) {
-        $request .= $data . "\r\n";
+        $request .= $data."\r\n";
     }
     $result->request = $request;
 
@@ -417,7 +417,7 @@ 
         if (isset($result->headers[$header]) && $header == 'Set-Cookie') {
             // RFC 2109: the Set-Cookie response header comprises the token Set-
             // Cookie:, followed by a comma-separated list of one or more cookies.
-            $result->headers[$header] .= ',' . trim($value);
+            $result->headers[$header] .= ','.trim($value);
         } else {
             $result->headers[$header] = trim($value);
         }

main/webservices/cm_webservice_course.php

Spacing +56 added lines, -56 removed lines

@@ -19,7 +19,7 @@ 
 	 */
 	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSCMError) {
+		if ($course_id instanceof WSCMError) {
 			return $course_id;
 		} else {
 			$course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -37,11 +37,11 @@ 
 	 */
 	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -57,15 +57,15 @@ 
 	 */
 	public function DeleteCourses($secret_key, $courses) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
 				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
 				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSCMError) {
+				if ($result_op instanceof WSCMError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -95,17 +95,17 @@ 
 	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// Add the original course id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
+		if ($course_id_field_name != "chamilo_course_id") {
 			$extras_associative[$course_id_field_name] = $course_id_value;
 		}
-		foreach($extras as $extra) {
+		foreach ($extras as $extra) {
 			$extras_associative[$extra['field_name']] = $extra['field_value'];
 		}
 		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
+		if ($course_admin_id instanceof WSError) {
 			return $course_admin_id;
 		}
-		if($wanted_code == '') {
+		if ($wanted_code == '') {
 			$wanted_code = CourseManager::generate_course_code($title);
 		}
 		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
@@ -113,7 +113,7 @@ 
 			return new WSError(202, 'There was an error creating the course');
 		} else {
 			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
+			foreach ($extras_associative as $fname => $fvalue) {
 				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
 			}
 			// Get course id
@@ -141,11 +141,11 @@ 
 	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -163,17 +163,17 @@ 
 	public function CreateCourses($secret_key, $courses) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSCMError) {
+		if ($verifKey instanceof WSCMError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
 				//reinitialize variables just in case
 				$title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = null;
 				extract($course);
 				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSCMError) {
+				if ($result instanceof WSCMError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['course_id_value'] = $course_id_value;
 					$result_tmp['course_id_generated'] = 0;
@@ -207,47 +207,47 @@ 
 	 */
 	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSCMError) {
+		if ($course_id instanceof WSCMError) {
 			return $course_id;
 		} else {
 			$attributes = array();
-			if(!empty($title)) {
+			if (!empty($title)) {
 				$attributes['title'] = $title;
 			}
-			if(!empty($category_code)) {
+			if (!empty($category_code)) {
 				$attributes['category_code'] = $category_code;
 			}
-			if(!empty($department_name)) {
+			if (!empty($department_name)) {
 				$attributes['department_name'] = $department_name;
 			}
-			if(!empty($department_url)) {
+			if (!empty($department_url)) {
 				$attributes['department_url'] = $department_url;
 			}
-			if(!empty($language)) {
+			if (!empty($language)) {
 				$attributes['course_language'] = $language;
 			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
+			if ($visibility != '') {
+				$attributes['visibility'] = (int) $visibility;
 			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
+			if ($subscribe != '') {
+				$attributes['subscribe'] = (int) $subscribe;
 			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
+			if ($unsubscribe != '') {
+				$attributes['unsubscribe'] = (int) $unsubscribe;
 			}
-			if(!empty($visual_code)) {
+			if (!empty($visual_code)) {
 				$attributes['visual_code'] = $visual_code;
 			}
-			if(!empty($attributes)) {
+			if (!empty($attributes)) {
 				CourseManager::update_attributes($course_id, $attributes);
 			}
-			if(!empty($extras)) {
+			if (!empty($extras)) {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
 				$extras_associative = array();
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
-				foreach($extras_associative as $fname => $fvalue) {
+				foreach ($extras_associative as $fname => $fvalue) {
 					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
 				}
 			}
@@ -274,11 +274,11 @@ 
 	 */
 	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSCMError) {
+		if ($verifKey instanceof WSCMError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSCMError) {
+			if ($result instanceof WSCMError) {
 				$this->handleError($result);
 			}
 		}
@@ -294,14 +294,14 @@ 
 	 */
 	public function ListCourses($secret_key, $course_id_field_name) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$courses_result = array();
 			$category_names = array();
 
 			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$course_tmp = array();
 				$course_tmp['id'] = $course['id'];
 				$course_tmp['code'] = $course['code'];
@@ -310,7 +310,7 @@ 
 				$course_tmp['visibility'] = $course['visibility'];
 
 				// Determining category name
-				if($category_names[$course['category_code']]) {
+				if ($category_names[$course['category_code']]) {
 					$course_tmp['category_name'] = $category_names[$course['category_code']];
 				} else {
 					$category = CourseManager::get_course_category($course['category_code']);
@@ -346,21 +346,21 @@ 
 	 */
 	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
+			if ($user_id instanceof WSError) {
 				return $user_id;
 			} else {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
+				if ($state == 0) {
 					// Unsubscribe user
 					CourseManager::unsubscribe_user($user_id, $course_code);
 					return true;
 				} else {
 					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+					if (CourseManager::subscribe_user($user_id, $course_code, $status)) {
 						return true;
 					} else {
 						return new WSError(203, 'An error occured subscribing to this course');
@@ -382,11 +382,11 @@ 
 	 */
 	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -403,11 +403,11 @@ 
 	 */
 	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -423,17 +423,17 @@ 
 	 */
 	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
 				// Course exists, get its descriptions
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$results = array();
-				foreach($descriptions as $description) {
+				foreach ($descriptions as $description) {
 					$results[] = array('course_desc_id' => $description->get_description_type(),
 						'course_desc_title' => $description->get_title(),
 						'course_desc_content' => $description->get_content());
@@ -456,11 +456,11 @@ 
 	 */
 	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
 				// Create the new course description
@@ -477,8 +477,8 @@ 
 				// Check if this course description exists
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
+				foreach ($descriptions as $description) {
+					if ($description->get_description_type() == $course_desc_id) {
 						$exists = true;
 					}
 				}
@@ -494,7 +494,7 @@ 
 	}
 	public function unreadMessage($username, $password)
 	{
-		if($this->verifyUserPass($username, $password) == "valid")
+		if ($this->verifyUserPass($username, $password) == "valid")
 		{
 			$table_message = Database::get_main_table(TABLE_MESSAGE);
 			$user_id = UserManager::get_user_id_from_username($username);
@@ -511,7 +511,7 @@ 
 
 	public function get_message_data($username, $password)
 	{
-		if($this->verifyUserPass($username, $password) == "valid")
+		if ($this->verifyUserPass($username, $password) == "valid")
 		{
 			$user_id = get_user_id_from_username($username);
 
@@ -521,7 +521,7 @@ 
 
 	public function nada($username, $password)
 	{
-		if($this->verifyUserPass($username, $password) == "valid")
+		if ($this->verifyUserPass($username, $password) == "valid")
 			return $username.$password;
 		return $username;
 	}

main/webservices/webservice_course.php

Spacing +55 added lines, -55 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -39,11 +39,11 @@ 
 	 */
 	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -59,15 +59,15 @@ 
 	 */
 	public function DeleteCourses($secret_key, $courses) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
 				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
 				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -97,17 +97,17 @@ 
 	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// Add the original course id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
+		if ($course_id_field_name != "chamilo_course_id") {
 			$extras_associative[$course_id_field_name] = $course_id_value;
 		}
-		foreach($extras as $extra) {
+		foreach ($extras as $extra) {
 			$extras_associative[$extra['field_name']] = $extra['field_value'];
 		}
 		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
+		if ($course_admin_id instanceof WSError) {
 			return $course_admin_id;
 		}
-		if($wanted_code == '') {
+		if ($wanted_code == '') {
 			$wanted_code = CourseManager::generate_course_code($title);
 		}
 		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
@@ -115,7 +115,7 @@ 
 			return new WSError(202, 'There was an error creating the course');
 		} else {
 			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
+			foreach ($extras_associative as $fname => $fvalue) {
 				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
 			}
 			// Get course id
@@ -143,11 +143,11 @@ 
 	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -165,17 +165,17 @@ 
 	public function CreateCourses($secret_key, $courses) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
 				extract($course);
 				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSError) {
+				if ($result instanceof WSError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['course_id_value'] = $course_id_value;
 					$result_tmp['course_id_generated'] = 0;
@@ -209,47 +209,47 @@ 
 	 */
 	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$attributes = array();
-			if(!empty($title)) {
+			if (!empty($title)) {
 				$attributes['title'] = $title;
 			}
-			if(!empty($category_code)) {
+			if (!empty($category_code)) {
 				$attributes['category_code'] = $category_code;
 			}
-			if(!empty($department_name)) {
+			if (!empty($department_name)) {
 				$attributes['department_name'] = $department_name;
 			}
-			if(!empty($department_url)) {
+			if (!empty($department_url)) {
 				$attributes['department_url'] = $department_url;
 			}
-			if(!empty($language)) {
+			if (!empty($language)) {
 				$attributes['course_language'] = $language;
 			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
+			if ($visibility != '') {
+				$attributes['visibility'] = (int) $visibility;
 			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
+			if ($subscribe != '') {
+				$attributes['subscribe'] = (int) $subscribe;
 			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
+			if ($unsubscribe != '') {
+				$attributes['unsubscribe'] = (int) $unsubscribe;
 			}
-			if(!empty($visual_code)) {
+			if (!empty($visual_code)) {
 				$attributes['visual_code'] = $visual_code;
 			}
-			if(!empty($attributes)) {
+			if (!empty($attributes)) {
 				CourseManager::update_attributes($course_id, $attributes);
 			}
-			if(!empty($extras)) {
+			if (!empty($extras)) {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
 				$extras_associative = array();
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
-				foreach($extras_associative as $fname => $fvalue) {
+				foreach ($extras_associative as $fname => $fvalue) {
 					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
 				}
 			}
@@ -276,11 +276,11 @@ 
 	 */
 	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -296,10 +296,10 @@ 
 	 */
 	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
-            $visibilities = split(',',$visibility);
+            $visibilities = split(',', $visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
@@ -308,9 +308,9 @@ 
 			$category_names = array();
 
 			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+			foreach ($courses as $course) {
                 //skip elements that do not match required visibility
-                if (!in_array($course['visibility'],$visibilities)) { continue; }
+                if (!in_array($course['visibility'], $visibilities)) { continue; }
 				$course_tmp = array();
 				$course_tmp['id'] = $course['id'];
 				$course_tmp['code'] = $course['code'];
@@ -319,7 +319,7 @@ 
 				$course_tmp['visibility'] = $course['visibility'];
 
 				// Determining category name
-				if($category_names[$course['category_code']]) {
+				if ($category_names[$course['category_code']]) {
 					$course_tmp['category_name'] = $category_names[$course['category_code']];
 				} else {
 					$category = CourseManager::get_course_category($course['category_code']);
@@ -355,21 +355,21 @@ 
 	 */
 	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
+		if ($course_id instanceof WSError) {
 			return $course_id;
 		} else {
 			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
+			if ($user_id instanceof WSError) {
 				return $user_id;
 			} else {
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
+				if ($state == 0) {
 					// Unsubscribe user
 					CourseManager::unsubscribe_user($user_id, $course_code);
 					return true;
 				} else {
 					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+					if (CourseManager::subscribe_user($user_id, $course_code, $status)) {
 						return true;
 					} else {
 						return new WSError(203, 'An error occured subscribing to this course');
@@ -391,11 +391,11 @@ 
 	 */
 	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -412,11 +412,11 @@ 
 	 */
 	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -432,17 +432,17 @@ 
 	 */
 	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
 				// Course exists, get its descriptions
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$results = array();
-				foreach($descriptions as $description) {
+				foreach ($descriptions as $description) {
 					$results[] = array('course_desc_id' => $description->get_description_type(),
 										'course_desc_title' => $description->get_title(),
 										'course_desc_content' => $description->get_content());
@@ -465,11 +465,11 @@ 
 	 */
 	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
 				// Create the new course description
@@ -484,8 +484,8 @@ 
 				// Check if this course description exists
 				$descriptions = CourseDescription::get_descriptions($course_id);
 				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
+				foreach ($descriptions as $description) {
+					if ($description->get_description_type() == $course_desc_id) {
 						$exists = true;
 					}
 				}