Browse Source

Minor - cleaning style code

Julio Montoya 13 years ago
parent
commit
b3594e03bf
5 changed files with 107 additions and 112 deletions
  1. 0 1
      main/auth/courses.php
  2. 61 63
      main/auth/courses_controller.php
  3. 33 33
      main/inc/lib/auth.lib.php
  4. 13 13
      main/inc/lib/userportal.lib.php
  5. 0 2
      main/user/user.php

+ 0 - 1
main/auth/courses.php

@@ -87,7 +87,6 @@ if ($action == 'display_random_courses' || $action == 'display_courses' ) {
 	$nameTools = get_lang('CourseManagement');
 }
 
-
 // Breadcrumbs.
 $interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'user_portal.php', 'name' => get_lang('MyCourses'));
 

+ 61 - 63
main/auth/courses_controller.php

@@ -19,10 +19,10 @@ class CoursesController { // extends Controller {
      * Constructor
      */
     public function __construct() {		
-            $this->toolname = 'auth';
-            $actived_theme_path = api_get_template();
-            $this->view = new View($this->toolname, $actived_theme_path);
-            $this->model = new Auth();
+        $this->toolname = 'auth';
+        $actived_theme_path = api_get_template();
+        $this->view = new View($this->toolname, $actived_theme_path);
+        $this->model = new Auth();
     }
 
     /**
@@ -32,25 +32,23 @@ class CoursesController { // extends Controller {
      * @param string    confirmation message(optional)
      */
     public function courses_list($action, $message = '') {
+        $data = array();
+        $user_id = api_get_user_id();
+        
+        $data['user_courses']             = $this->model->get_courses_of_user($user_id);
+        $data['user_course_categories']   = $this->model->get_user_course_categories();
+        $data['courses_in_category']      = $this->model->get_courses_in_category();
+        $data['all_user_categories']      = $this->model->get_user_course_categories();
 
-            $data = array();
-            $user_id = api_get_user_id();
-
-            //$user_courses = $auth->get_courses_of_user($user_id);
-            $data['user_courses']             = $this->model->get_courses_of_user($user_id);
-            $data['user_course_categories']   = $this->model->get_user_course_categories();
-            $data['courses_in_category']      = $this->model->get_courses_in_category();
-            $data['all_user_categories']      = $this->model->get_user_course_categories();
-
-            $data['action'] = $action;
+        $data['action'] = $action;
 
-            $data['message'] = $message;
+        $data['message'] = $message;
 
-            // render to the view
-            $this->view->set_data($data);
-            $this->view->set_layout('layout');
-            $this->view->set_template('courses_list');
-            $this->view->render();
+        // render to the view
+        $this->view->set_data($data);
+        $this->view->set_layout('layout');
+        $this->view->set_template('courses_list');
+        $this->view->render();
 
     }
 
@@ -62,17 +60,17 @@ class CoursesController { // extends Controller {
      * @param string    error message(optional)
      */
     public function categories_list($action, $message='', $error='') {
-            $data = array();            
-            $data['user_course_categories'] = $this->model->get_user_course_categories();
-            $data['action'] = $action;
-            $data['message'] = $message;
-            $data['error'] = $error;
-
-            // render to the view
-            $this->view->set_data($data);
-            $this->view->set_layout('layout');
-            $this->view->set_template('categories_list');
-            $this->view->render();
+        $data = array();            
+        $data['user_course_categories'] = $this->model->get_user_course_categories();
+        $data['action'] = $action;
+        $data['message'] = $message;
+        $data['error'] = $error;
+
+        // render to the view
+        $this->view->set_data($data);
+        $this->view->set_layout('layout');
+        $this->view->set_template('categories_list');
+        $this->view->render();
     }
 
     /**
@@ -82,41 +80,41 @@ class CoursesController { // extends Controller {
      * @param string    Category code (optional)
      */
     public function courses_categories($action, $category_code = null, $message = '', $error = '') {
-            $data = array();
-            $browse_course_categories = $this->model->browse_course_categories();
-            
-            if ($action == 'display_random_courses') {
-                $data['browse_courses_in_category'] = $this->model->browse_courses_in_category(null, 20);
-            } else {
-                if (!isset($category_code)) {
-                    $category_code = $browse_course_categories[0][1]['code']; // by default first category
-                }            
-                $data['browse_courses_in_category'] = $this->model->browse_courses_in_category($category_code);
-            }
-            $data['browse_course_categories'] = $browse_course_categories;
-            $data['code'] = Security::remove_XSS($category_code);
+        $data = array();
+        $browse_course_categories = $this->model->browse_course_categories();        
+        
+        if ($action == 'display_random_courses') {
+            $data['browse_courses_in_category'] = $this->model->browse_courses_in_category(null, 20);
+        } else {
+            if (!isset($category_code)) {
+                $category_code = $browse_course_categories[0][1]['code']; // by default first category
+            }            
+            $data['browse_courses_in_category'] = $this->model->browse_courses_in_category($category_code);
+        }
+        $data['browse_course_categories'] = $browse_course_categories;
+        $data['code'] = Security::remove_XSS($category_code);
 
-            // getting all the courses to which the user is subscribed to
-            $curr_user_id = api_get_user_id();
-            $user_courses = $this->model->get_courses_of_user($curr_user_id);            
-            $user_coursecodes = array();
+        // getting all the courses to which the user is subscribed to
+        $curr_user_id = api_get_user_id();
+        $user_courses = $this->model->get_courses_of_user($curr_user_id);            
+        $user_coursecodes = array();
 
-            // we need only the course codes as these will be used to match against the courses of the category
-            if ($user_courses != '') {
-                foreach($user_courses as $key => $value) {
-                    $user_coursecodes[] = $value['code'];
-                }
+        // we need only the course codes as these will be used to match against the courses of the category
+        if ($user_courses != '') {
+            foreach($user_courses as $key => $value) {
+                $user_coursecodes[] = $value['code'];
             }
-            $data['user_coursecodes'] = $user_coursecodes;
-            $data['action']           = $action;
-            $data['message']          = $message;
-            $data['error']            = $error;
-
-            // render to the view
-            $this->view->set_data($data);
-            $this->view->set_layout('layout');
-            $this->view->set_template('courses_categories');
-            $this->view->render();
+        }
+        $data['user_coursecodes'] = $user_coursecodes;
+        $data['action']           = $action;
+        $data['message']          = $message;
+        $data['error']            = $error;
+
+        // render to the view
+        $this->view->set_data($data);
+        $this->view->set_layout('layout');
+        $this->view->set_template('courses_categories');
+        $this->view->render();
     }
 
     /**

+ 33 - 33
main/inc/lib/auth.lib.php

@@ -27,43 +27,43 @@ class Auth
      * @return  array an array containing all the information of the courses of the given user
     */
     public function get_courses_of_user($user_id) {
-            $TABLECOURS                 = Database::get_main_table(TABLE_MAIN_COURSE);
-            $TABLECOURSUSER             = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-            $TABLE_COURSE_FIELD 		= Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
-            $TABLE_COURSE_FIELD_VALUE	= Database::get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
+        $TABLECOURS                 = Database::get_main_table(TABLE_MAIN_COURSE);
+        $TABLECOURSUSER             = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+        $TABLE_COURSE_FIELD 		= Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
+        $TABLE_COURSE_FIELD_VALUE	= Database::get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
 
-            // get course list auto-register
-            $sql = "SELECT course_code FROM $TABLE_COURSE_FIELD_VALUE tcfv INNER JOIN $TABLE_COURSE_FIELD tcf ON " .
-                  " tcfv.field_id =  tcf.id WHERE tcf.field_variable = 'special_course' AND tcfv.field_value = 1 ";
+        // get course list auto-register
+        $sql = "SELECT course_code FROM $TABLE_COURSE_FIELD_VALUE tcfv INNER JOIN $TABLE_COURSE_FIELD tcf ON " .
+              " tcfv.field_id =  tcf.id WHERE tcf.field_variable = 'special_course' AND tcfv.field_value = 1 ";
 
-            $special_course_result = Database::query($sql);
-            if (Database::num_rows($special_course_result)>0) {
-                    $special_course_list = array();
-                    while ($result_row = Database::fetch_array($special_course_result)) {
-                            $special_course_list[] = '"'.$result_row['course_code'].'"';
-                    }
-            }
-            $without_special_courses = '';
-            if (!empty($special_course_list)) {
-                    $without_special_courses = ' AND course.code NOT IN ('.implode(',',$special_course_list).')';
+        $special_course_result = Database::query($sql);
+        if (Database::num_rows($special_course_result)>0) {
+            $special_course_list = array();
+            while ($result_row = Database::fetch_array($special_course_result)) {
+                    $special_course_list[] = '"'.$result_row['course_code'].'"';
             }
+        }
+        $without_special_courses = '';
+        if (!empty($special_course_list)) {
+                $without_special_courses = ' AND course.code NOT IN ('.implode(',',$special_course_list).')';
+        }
 
-            // Secondly we select the courses that are in a category (user_course_cat<>0) and sort these according to the sort of the category
-            $user_id = intval($user_id);
-            $sql_select_courses = "SELECT course.code k, course.visual_code  vc, course.subscribe subscr, course.unsubscribe unsubscr,
-                                          course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status,
-                                          course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
-                                    FROM $TABLECOURS course, $TABLECOURSUSER  course_rel_user
-                                    WHERE course.code = course_rel_user.course_code
-                                    AND   course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
-                                    AND   course_rel_user.user_id = '".$user_id."' $without_special_courses
-                                    ORDER BY course_rel_user.sort ASC";
-            $result = Database::query($sql_select_courses);
-            while ($row = Database::fetch_array($result)) {
-                //we only need the database name of the course
-                $courses[] = array('db' => $row['db'], 'code' => $row['k'], 'visual_code' => $row['vc'], 'title' => $row['i'], 'directory' => $row['dir'], 'status' => $row['status'], 'tutor' => $row['t'], 'subscribe' => $row['subscr'], 'unsubscribe' => $row['unsubscr'], 'sort' => $row['sort'], 'user_course_category' => $row['user_course_cat']);
-            }
-            return $courses;
+        // Secondly we select the courses that are in a category (user_course_cat<>0) and sort these according to the sort of the category
+        $user_id = intval($user_id);
+        $sql_select_courses = "SELECT course.code k, course.visual_code  vc, course.subscribe subscr, course.unsubscribe unsubscr,
+                                      course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status,
+                                      course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
+                                FROM $TABLECOURS course, $TABLECOURSUSER  course_rel_user
+                                WHERE course.code = course_rel_user.course_code
+                                AND   course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
+                                AND   course_rel_user.user_id = '".$user_id."' $without_special_courses
+                                ORDER BY course_rel_user.sort ASC";
+        $result = Database::query($sql_select_courses);
+        while ($row = Database::fetch_array($result)) {
+            //we only need the database name of the course
+            $courses[] = array('db' => $row['db'], 'code' => $row['k'], 'visual_code' => $row['vc'], 'title' => $row['i'], 'directory' => $row['dir'], 'status' => $row['status'], 'tutor' => $row['t'], 'subscribe' => $row['subscr'], 'unsubscribe' => $row['unsubscr'], 'sort' => $row['sort'], 'user_course_category' => $row['user_course_cat']);
+        }
+        return $courses;
     }
 
     /**

+ 13 - 13
main/inc/lib/userportal.lib.php

@@ -710,19 +710,19 @@ class IndexManager {
 	* @return array an array containing all the information of the courses of the given user
 		*/
 	function get_courses_of_user($user_id) {
-			$table_course       = Database::get_main_table(TABLE_MAIN_COURSE);
-	    	$table_course_user  = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-			// Secondly we select the courses that are in a category (user_course_cat <> 0) and sort these according to the sort of the category
-			$user_id = intval($user_id);
-			$sql_select_courses = "SELECT course.code k, course.visual_code  vc, course.subscribe subscr, course.unsubscribe unsubscr,
-			course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status,
-			course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
-			FROM    $table_course       course,
-			$table_course_user  course_rel_user
-			WHERE course.code = course_rel_user.course_code
-			AND   course_rel_user.user_id = '".$user_id."'
-	                                AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
-	                                ORDER BY course_rel_user.sort ASC";
+		$table_course       = Database::get_main_table(TABLE_MAIN_COURSE);
+    	$table_course_user  = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+		// Secondly we select the courses that are in a category (user_course_cat <> 0) and sort these according to the sort of the category
+		$user_id = intval($user_id);
+		$sql_select_courses = "SELECT course.code k, course.visual_code  vc, course.subscribe subscr, course.unsubscribe unsubscr,
+    		course.title i, course.tutor_name t, course.db_name db, course.directory dir, course_rel_user.status status,
+    		course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
+    		FROM    $table_course       course,
+    		$table_course_user  course_rel_user
+    		WHERE course.code = course_rel_user.course_code
+    		AND   course_rel_user.user_id = '".$user_id."'
+                                    AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
+                                    ORDER BY course_rel_user.sort ASC";
 	    $result = Database::query($sql_select_courses);
 	    $courses = array();
 	    while ($row = Database::fetch_array($result)) {

+ 0 - 2
main/user/user.php

@@ -81,8 +81,6 @@ if (api_is_allowed_to_edit(null, true)) {
 if (api_is_allowed_to_edit(null, true)) {
 	if ( isset ($_GET['action'])) {
 		switch ($_GET['action']) {
-		    case 'import' :
-                break;
 			case 'export' :
 				$table_course_user      = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 				$table_users            = Database::get_main_table(TABLE_MAIN_USER);