chamilo / chamilo-lms

main/webservices/webservice_course.php

Indentation +455 added lines, -455 removed lines

@@ -12,490 +12,490 @@
  */
 class WSCourse extends WS
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	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) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    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) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			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) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            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) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	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") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		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) {
-			return $course_admin_id;
-		}
-		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);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    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") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        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) {
+            return $course_admin_id;
+        }
+        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);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
 
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            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) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                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) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	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) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    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) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
 
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string A list of visibility filter we want to apply
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string A list of visibility filter we want to apply
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
             $visibilities = split(',',$visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
             }
-			$courses_result = array();
-			$category_names = array();
+            $courses_result = array();
+            $category_names = array();
 
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
                 //skip elements that do not match required visibility
                 if (!in_array($course['visibility'],$visibilities)) { continue; }
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
 
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
 
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
-				$course_tmp['number_students'] = count($user_list);
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
+                $course_tmp['number_students'] = count($user_list);
 
-				// Determining external course id - this code misses the external course id field name
-				// $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
+                // Determining external course id - this code misses the external course id field name
+                // $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
 
 
-				$courses_result[] = $course_tmp;
-			}
+                $courses_result[] = $course_tmp;
+            }
 
-			return $courses_result;
-		}
-	}
+            return $courses_result;
+        }
+    }
 
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	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) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				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)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    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) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                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)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	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) {
-			$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) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    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) {
+            $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) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			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) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-										'course_desc_title' => $description->get_title(),
-										'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            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) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                                        'course_desc_title' => $description->get_title(),
+                                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
 
 
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	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) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-				// Get course info
-				$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    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) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+                // Get course info
+                $course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
                 $cd->set_course_id($course_info['real_id']);
-				// 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) {
-						$exists = true;
-					}
-				}
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
+                // 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) {
+                        $exists = true;
+                    }
+                }
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
 }

main/inc/lib/formvalidator/Rule/CompareFields.php

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare 
 {
-	/**
-	 * Function to check an array of fields 	 
-	 * @param   array of field names
+    /**
+     * Function to check an array of fields 	 
+     * @param   array of field names
      * @param   string operator ==, >=, etc
      * @param   string the value to compare
-	 * @return boolean True if date is valid
-	 */
-	function validate($values = [], $operator_and_max_value = null) {
+     * @return boolean True if date is valid
+     */
+    function validate($values = [], $operator_and_max_value = null) {
         if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) {
-           $final_value = 0;
-           foreach ($values as $value) {
-               $final_value += $value;
-           }
-           $params = explode('@', $operator_and_max_value);
-           $operator    = $params[0];
-           $max_value   = $params[1];                      
-           return parent::validate(array($final_value, $max_value), $operator);
+            $final_value = 0;
+            foreach ($values as $value) {
+                $final_value += $value;
+            }
+            $params = explode('@', $operator_and_max_value);
+            $operator    = $params[0];
+            $max_value   = $params[1];                      
+            return parent::validate(array($final_value, $max_value), $operator);
         }
         return false;        
-	}
+    }
 }
\ No newline at end of file

main/webservices/user_import/import.lib.php

Indentation +104 added lines, -104 removed lines

@@ -3,121 +3,121 @@ 
  * Validates imported data.
  */
 function validate_data($users) {
-	global $defined_auth_sources;
-	$errors = array ();
-	$usernames = array ();
-	if(is_array($users)) {
-		foreach ($users as $index => $user) {
-			// 1. Check whether mandatory fields have been set.
-			$mandatory_fields = array ('LastName', 'FirstName');
-			if (api_get_setting('registration', 'email') == 'true') {
-				$mandatory_fields[] = 'Email';
-			}
-			foreach ($mandatory_fields as $key => $field) {
-				if (!isset ($user[$field]) || strlen($user[$field]) == 0) {
-					$user['error'] = get_lang($field.'Mandatory');
-					$errors[] = $user;
-				}
-			}
-			// 2. Check username.
-			if (!UserManager::is_username_empty($user['UserName'])) {
-				// 2.1. Check whether username was used twice in the import file.
-				if (isset($usernames[$user['UserName']])) {
-					$user['error'] = get_lang('UserNameUsedTwice');
-					$errors[] = $user;
-				}
-				$usernames[$user['UserName']] = 1;
-				// 2.2. Check whether username is allready in use in database.
-				if (!UserManager::is_username_available($user['UserName'])) {
-					$user['error'] = get_lang('UserNameNotAvailable');
-					$errors[] = $user;
-				}
-				// 2.3. Check whether username is too long.
-				if (UserManager::is_username_too_long($user['UserName'])) {
-					$user['error'] = get_lang('UserNameTooLong');
-					$errors[] = $user;
-				}
-			}
-			// 3. Check status.
-			if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
-				$user['error'] = get_lang('WrongStatus');
-				$errors[] = $user;
-			}
-			// 5. Check authentication source.
-			if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
-				if (!in_array($user['AuthSource'], $defined_auth_sources)) {
-					$user['error'] = get_lang('AuthSourceNotAvailable');
-					$errors[] = $user;
-				}
-			}
-		}
-	}
-	return $errors;
+    global $defined_auth_sources;
+    $errors = array ();
+    $usernames = array ();
+    if(is_array($users)) {
+        foreach ($users as $index => $user) {
+            // 1. Check whether mandatory fields have been set.
+            $mandatory_fields = array ('LastName', 'FirstName');
+            if (api_get_setting('registration', 'email') == 'true') {
+                $mandatory_fields[] = 'Email';
+            }
+            foreach ($mandatory_fields as $key => $field) {
+                if (!isset ($user[$field]) || strlen($user[$field]) == 0) {
+                    $user['error'] = get_lang($field.'Mandatory');
+                    $errors[] = $user;
+                }
+            }
+            // 2. Check username.
+            if (!UserManager::is_username_empty($user['UserName'])) {
+                // 2.1. Check whether username was used twice in the import file.
+                if (isset($usernames[$user['UserName']])) {
+                    $user['error'] = get_lang('UserNameUsedTwice');
+                    $errors[] = $user;
+                }
+                $usernames[$user['UserName']] = 1;
+                // 2.2. Check whether username is allready in use in database.
+                if (!UserManager::is_username_available($user['UserName'])) {
+                    $user['error'] = get_lang('UserNameNotAvailable');
+                    $errors[] = $user;
+                }
+                // 2.3. Check whether username is too long.
+                if (UserManager::is_username_too_long($user['UserName'])) {
+                    $user['error'] = get_lang('UserNameTooLong');
+                    $errors[] = $user;
+                }
+            }
+            // 3. Check status.
+            if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
+                $user['error'] = get_lang('WrongStatus');
+                $errors[] = $user;
+            }
+            // 5. Check authentication source.
+            if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
+                if (!in_array($user['AuthSource'], $defined_auth_sources)) {
+                    $user['error'] = get_lang('AuthSourceNotAvailable');
+                    $errors[] = $user;
+                }
+            }
+        }
+    }
+    return $errors;
 }
 
 /**
  * Adds missing user-information (which isn't required, like password, username, etc).
  */
 function complete_missing_data($user) {
-	// 1. Create a username if necessary.
-	if (UserManager::is_username_empty($user['UserName'])) {
-		$user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
-	}
-	// 2. Generate a password if necessary.
-	if (!isset ($user['Password']) || strlen($user['Password']) == 0) {
-		$user['Password'] = api_generate_password();
-	}
-	// 3. set status if not allready set.
-	if (!isset ($user['Status']) || strlen($user['Status']) == 0) {
-		$user['Status'] = 'user';
-	}
-	// 4. Set authsource if not allready set.
-	if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) {
-		$user['AuthSource'] = PLATFORM_AUTH_SOURCE;
-	}
-	return $user;
+    // 1. Create a username if necessary.
+    if (UserManager::is_username_empty($user['UserName'])) {
+        $user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
+    }
+    // 2. Generate a password if necessary.
+    if (!isset ($user['Password']) || strlen($user['Password']) == 0) {
+        $user['Password'] = api_generate_password();
+    }
+    // 3. set status if not allready set.
+    if (!isset ($user['Status']) || strlen($user['Status']) == 0) {
+        $user['Status'] = 'user';
+    }
+    // 4. Set authsource if not allready set.
+    if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) {
+        $user['AuthSource'] = PLATFORM_AUTH_SOURCE;
+    }
+    return $user;
 }
 
 /**
  * Save the imported data
  */
 function save_data($users) {
-	$user_table = Database :: get_main_table(TABLE_MAIN_USER);
-	if(is_array($users)) {
-		foreach ($users as $index => $user) {
-			$user = complete_missing_data($user);
+    $user_table = Database :: get_main_table(TABLE_MAIN_USER);
+    if(is_array($users)) {
+        foreach ($users as $index => $user) {
+            $user = complete_missing_data($user);
 
-			$user['Status'] = api_status_key($user['Status']);
+            $user['Status'] = api_status_key($user['Status']);
 
-			$user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
-			foreach ($user['Courses'] as $index => $course) {
-				if(CourseManager :: course_exists($course))
-					CourseManager :: subscribe_user($user_id, $course,$user['Status']);
-			}
+            $user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
+            foreach ($user['Courses'] as $index => $course) {
+                if(CourseManager :: course_exists($course))
+                    CourseManager :: subscribe_user($user_id, $course,$user['Status']);
+            }
 
-			// TODO: Hard-coded French texts.
+            // TODO: Hard-coded French texts.
 
-			// Qualite
-			if (!empty($user['Qualite'])) {
-				UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
-			}
+            // Qualite
+            if (!empty($user['Qualite'])) {
+                UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
+            }
 
-			// Categorie
-			if (!empty($user['Categorie'])) {
-				UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
-			}
+            // Categorie
+            if (!empty($user['Categorie'])) {
+                UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
+            }
 
-			// Etat
-			if (!empty($user['Etat'])) {
-				UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
-			}
+            // Etat
+            if (!empty($user['Etat'])) {
+                UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
+            }
 
-			// Niveau
-			if (!empty($user['Niveau'])) {
-				UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
-			}
-		}
-	}
+            // Niveau
+            if (!empty($user['Niveau'])) {
+                UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
+            }
+        }
+    }
 }
 
 /**
@@ -126,12 +126,12 @@ 
  * @return array All userinformation read from the file
  */
 function parse_csv_data($file) {
-	$users = Import :: csvToArray($file);
-	foreach ($users as $index => $user) {
-		if (isset ($user['Courses'])) {
-			$user['Courses'] = explode('|', trim($user['Courses']));
-		}
-		$users[$index] = $user;
-	}
-	return $users;
+    $users = Import :: csvToArray($file);
+    foreach ($users as $index => $user) {
+        if (isset ($user['Courses'])) {
+            $user['Courses'] = explode('|', trim($user['Courses']));
+        }
+        $users[$index] = $user;
+    }
+    return $users;
 }

main/exercise/unique_answer_no_option.class.php

Indentation +61 added lines, -61 removed lines

@@ -14,20 +14,20 @@ 
  */
 class UniqueAnswerNoOption extends Question
 {
-	public static $typePicture = 'mcuao.png';
-	public static $explanationLangVar = 'UniqueAnswerNoOption';
+    public static $typePicture = 'mcuao.png';
+    public static $explanationLangVar = 'UniqueAnswerNoOption';
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
+    /**
+     * Constructor
+     */
+    public function __construct()
     {
-		parent::__construct();
-		$this -> type = UNIQUE_ANSWER_NO_OPTION;
-		$this -> isContent = $this-> getIsContent();
-	}
+        parent::__construct();
+        $this -> type = UNIQUE_ANSWER_NO_OPTION;
+        $this -> isContent = $this-> getIsContent();
+    }
 
-	/**
+    /**
      * function which redifines Question::createAnswersForm
      * @param the formvalidator instance
      * @param the answers number to display
@@ -283,37 +283,37 @@ 
     }
 
     /**
-	 * Function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function processAnswersCreation($form)
+     * Function which creates the form to create / edit the answers of the question
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function processAnswersCreation($form)
     {
-		$questionWeighting = $nbrGoodAnswers = 0;
-		$correct = $form -> getSubmitValue('correct');
-		$objAnswer = new Answer($this->id);
-		$nb_answers = $form -> getSubmitValue('nb_answers');
-		$minus = 1;
-		if ($form -> getSubmitValue('new_question')) {
-		    $minus = 0;
-		}
-
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $correct = $form -> getSubmitValue('correct');
+        $objAnswer = new Answer($this->id);
+        $nb_answers = $form -> getSubmitValue('nb_answers');
+        $minus = 1;
+        if ($form -> getSubmitValue('new_question')) {
+            $minus = 0;
+        }
+
+        for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
+            $position   = trim($form -> getSubmitValue('position['.$i.']'));
+            $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
 
-           	//$list_destination = $form -> getSubmitValue('destination'.$i);
-           	//$destination_str = $form -> getSubmitValue('destination'.$i);
+                //$list_destination = $form -> getSubmitValue('destination'.$i);
+                //$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
+                $try           = $scenario['try'.$i];
             $lp            = $scenario['lp'.$i];
- 			$destination   = $scenario['destination'.$i];
- 			$url           = trim($scenario['url'.$i]);
+                $destination   = $scenario['destination'.$i];
+                $url           = trim($scenario['url'.$i]);
 
- 			/*
+                /*
  			How we are going to parse the destination value
 
 			here we parse the destination value which is a string
@@ -326,41 +326,41 @@ 
 			selected_questions= ids of questions
 			url= an url
 			*/
-			/*
+            /*
  			$destination_str='';
  			foreach ($list_destination as $destination_id)
  			{
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+            $goodAnswer= ($correct == $i) ? true : false;
 
-        	if ($goodAnswer) {
-        		$nbrGoodAnswers++;
-        		$weighting = abs($weighting);
-        		if($weighting > 0) {
+            if ($goodAnswer) {
+                $nbrGoodAnswers++;
+                $weighting = abs($weighting);
+                if($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
-        	}
+            }
 
- 			if (empty($try))
- 				$try=0;
+                if (empty($try))
+                    $try=0;
 
- 			if (empty($lp)) {
- 				$lp=0;
- 			}
+                if (empty($lp)) {
+                    $lp=0;
+                }
 
- 			if (empty($destination)) {
- 				$destination=0;
- 			}
+                if (empty($destination)) {
+                    $destination=0;
+                }
 
- 			if ($url=='') {
- 				$url=0;
- 			}
+                if ($url=='') {
+                    $url=0;
+                }
 
- 			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+                //1@@1;2;@@2;4;4;@@http://www.chamilo.org
+            $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+            $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
         }
 
         //Create 666 answer
@@ -373,18 +373,18 @@ 
 
         $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer -> save();
 
         // sets the total weighting of the question
         $this -> updateWeighting($questionWeighting);
         $this -> save();
-	}
+    }
 
-	function return_header($feedback_type = null, $counter = null, $score = null)
+    function return_header($feedback_type = null, $counter = null, $score = null)
     {
-	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+        $header = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -392,5 +392,5 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

main/exercise/hotspot_savescore.inc.php

Indentation +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     // user clicked ON a hotspot
     $hit = 1;
     $answerId = api_substr($_GET['answerId'],22,2);
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 //round-up the coordinates
 $coords = explode('/',$coordinates);

main/exercise/hotspot_updatescore.inc.php

Indentation +7 added lines, -7 removed lines

@@ -20,16 +20,16 @@
 $exerciseId = $objExercise->selectId();
 if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
     $hit = 0;
-	$answerId = $hotspotId;
+    $answerId = $hotspotId;
 
-	// remove from session
-	unset($_SESSION['exerciseResult'][$questionId][$answerId]);
+    // remove from session
+    unset($_SESSION['exerciseResult'][$questionId][$answerId]);
 } else { // user clicked ON a hotspot
-	$hit = 1;
-	$answerId = $hotspotId;
+    $hit = 1;
+    $answerId = $hotspotId;
 
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 
 //round-up the coordinates

main/upload/upload.document.php

Indentation +21 added lines, -21 removed lines

@@ -47,9 +47,9 @@ 
  */
 //user has submitted a file
 if (isset($_FILES['user_upload'])) {
-	$upload_ok = process_uploaded_file($_FILES['user_upload']);
-	if ($upload_ok) {
-		//file got on the server without problems, now process it
+    $upload_ok = process_uploaded_file($_FILES['user_upload']);
+    if ($upload_ok) {
+        //file got on the server without problems, now process it
         $new_path = handle_uploaded_document(
             $_course,
             $_FILES['user_upload'],
@@ -61,21 +61,21 @@ 
             $_POST['unzip'],
             $_POST['if_exists']
         );
-    	$new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
-    	$new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
+        $new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
+        $new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
-        	$table_document = Database::get_course_table(TABLE_DOCUMENT);
-        	$ct = '';
+        if ($new_path && ($new_comment || $new_title))
+        if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+            $table_document = Database::get_course_table(TABLE_DOCUMENT);
+            $ct = '';
             if ($new_comment) {
                 $ct .= ", comment='$new_comment'";
             }
             if ($new_title) {
                 $ct .= ", title='$new_title'";
             }
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
-    	}
+            Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        }
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
         if ($missing_files) {
@@ -133,7 +133,7 @@ 
 //they want to create a directory
 if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
     $added_slash = $path == '/' ? '' : '/';
-	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
+    $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
         api_get_user_id(),
@@ -153,15 +153,15 @@ 
 }
 
 if (isset($_GET['createdir'])) {
-	//create the form that asks for the directory name
-	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
-	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
-	$new_folder_text .= '<input type="text" name="dirname"/>';
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
-	$new_folder_text .= '</form>';
-	//show the form
-	Display::display_normal_message($new_folder_text);
+    //create the form that asks for the directory name
+    $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
+    $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
+    $new_folder_text .= get_lang('NewDir') .' ';
+    $new_folder_text .= '<input type="text" name="dirname"/>';
+    $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
+    $new_folder_text .= '</form>';
+    //show the form
+    Display::display_normal_message($new_folder_text);
 } else {	//give them a link to create a directory
 ?>
 	<p>

main/exercise/hotspot.class.php

Indentation +98 added lines, -98 removed lines

@@ -12,31 +12,31 @@ 
  **/
 class HotSpot extends Question
 {
-	public static $typePicture = 'hotspot.png';
-	public static $explanationLangVar = 'HotSpot';
+    public static $typePicture = 'hotspot.png';
+    public static $explanationLangVar = 'HotSpot';
 
     /**
      * HotSpot constructor.
      */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->type = HOT_SPOT;
-	}
-
-	public function display()
-	{
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param int $fck_config
-	 */
-	public function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm($form, $fck_config);
-
-		if (!isset($_GET['editQuestion'])) {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->type = HOT_SPOT;
+    }
+
+    public function display()
+    {
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param int $fck_config
+     */
+    public function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm($form, $fck_config);
+
+        if (!isset($_GET['editQuestion'])) {
             $form->addElement(
                 'file',
                 'imageUpload',
@@ -46,54 +46,54 @@ 
                 )
             );
 
-			// setting the save button here and not in the question class.php
-			// Saving a question
-			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
-			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
-		} else {
-			// setting the save button here and not in the question class.php
-			// Editing a question
-			$form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
-		}
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param null $objExercise
-	 * @return null|false
-	 */
-	public function processCreation($form, $objExercise = null)
-	{
-		$file_info = $form->getSubmitValue('imageUpload');
-		$_course = api_get_course_info();
-		parent::processCreation($form, $objExercise);
-
-		if(!empty($file_info['tmp_name'])) {
-			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
-			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$picturePath   = $documentPath.'/images';
-
-			// fixed width ang height
-			if (file_exists($picturePath.'/'.$this->picture)) {
-				$this->resizePicture('width', 800);
-				$this->save();
-			} else {
-				return false;
-			}
-		}
-	}
-
-	function createAnswersForm($form)
-	{
-		// nothing
-	}
-
-	function processAnswersCreation($form)
-	{
-		// nothing
-	}
+            // setting the save button here and not in the question class.php
+            // Saving a question
+            $form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            //$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            $form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+            $form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
+        } else {
+            // setting the save button here and not in the question class.php
+            // Editing a question
+            $form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
+        }
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param null $objExercise
+     * @return null|false
+     */
+    public function processCreation($form, $objExercise = null)
+    {
+        $file_info = $form->getSubmitValue('imageUpload');
+        $_course = api_get_course_info();
+        parent::processCreation($form, $objExercise);
+
+        if(!empty($file_info['tmp_name'])) {
+            $this->uploadPicture($file_info['tmp_name'], $file_info['name']);
+            $documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $picturePath   = $documentPath.'/images';
+
+            // fixed width ang height
+            if (file_exists($picturePath.'/'.$this->picture)) {
+                $this->resizePicture('width', 800);
+                $this->save();
+            } else {
+                return false;
+            }
+        }
+    }
+
+    function createAnswersForm($form)
+    {
+        // nothing
+    }
+
+    function processAnswersCreation($form)
+    {
+        // nothing
+    }
 }
 
 /**
@@ -101,38 +101,38 @@ 
  */
 class HotSpotDelineation extends HotSpot
 {
-	public static $typePicture = 'hotspot-delineation.png';
-	public static $explanationLangVar = 'HotspotDelineation';
+    public static $typePicture = 'hotspot-delineation.png';
+    public static $explanationLangVar = 'HotspotDelineation';
 
     /**
      * HotSpotDelineation constructor.
      */
-	public function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT_DELINEATION;
-
-	}
-
-	function createForm(&$form, $fck_config=0)
-	{
-		parent::createForm ($form, $fck_config);
-	}
-
-	function processCreation ($form, $objExercise = null)
-	{
-		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
-	}
-
-	function createAnswersForm ($form)
-	{
-		parent::createAnswersForm ($form);
-	}
-
-	function processAnswersCreation ($form)
-	{
-		parent::processAnswersCreation ($form);
-	}
+    public function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT_DELINEATION;
+
+    }
+
+    function createForm(&$form, $fck_config=0)
+    {
+        parent::createForm ($form, $fck_config);
+    }
+
+    function processCreation ($form, $objExercise = null)
+    {
+        $file_info = $form -> getSubmitValue('imageUpload');
+        parent::processCreation ($form, $objExercise);
+    }
+
+    function createAnswersForm ($form)
+    {
+        parent::createAnswersForm ($form);
+    }
+
+    function processAnswersCreation ($form)
+    {
+        parent::processAnswersCreation ($form);
+    }
 }
 

main/inc/lib/grade_model.lib.php

Indentation +12 added lines, -12 removed lines

@@ -51,15 +51,15 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		echo '<div class="actions" style="margin-bottom:20px">';
+        // action links
+        echo '<div class="actions" style="margin-bottom:20px">';
         echo '<a href="grade_models.php">'.Display::return_icon('back.png',get_lang('Back'),'', ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
-		echo '</div>';
+        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
+        echo '</div>';
         echo Display::grid_html('grade_model');
-	}
+    }
 
     /**
      * Returns a Form validator Obj
@@ -117,7 +117,7 @@ 
         }
 
         $form->addElement('hidden', 'maxvalue', '100');
-		$form->addElement('hidden', 'minvalue', '0');
+        $form->addElement('hidden', 'minvalue', '0');
         $renderer = & $form->defaultRenderer();
 
         $component_array = array();
@@ -192,7 +192,7 @@ 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     /**
@@ -255,7 +255,7 @@ 
      */
     public function delete($id)
     {
-	    parent::delete($id);
+        parent::delete($id);
     }
 
     /**
@@ -309,11 +309,11 @@ 
     /**
      * GradeModelComponents constructor.
      */
-	public function __construct()
+    public function __construct()
     {
         parent::__construct();
         $this->table = Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
-	}
+    }
 
     /**
      * @param array $params
@@ -322,7 +322,7 @@ 
      */
     public function save($params, $show_query = false)
     {
-	    $id = parent::save($params, $show_query);
+        $id = parent::save($params, $show_query);
 
         return $id;
     }