Completed
Push — 1.10.x ( 5d5324...cf3164 )
by Julito
60:26
created
plugin/pens/lib/pens/pens_config.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -16,54 +16,54 @@
 block discarded – undo
16 16
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
17 17
  */
18 18
  
19
- /**
20
- * PENSConfig
21
- * 
22
- * Provides the PENSConfig class
23
- * 
24
- * @package PENS
25
- * @author Guillaume Viguier-Just <[email protected]>
26
- * @licence http://www.gnu.org/licenses/gpl.txt
27
- */
19
+    /**
20
+     * PENSConfig
21
+     * 
22
+     * Provides the PENSConfig class
23
+     * 
24
+     * @package PENS
25
+     * @author Guillaume Viguier-Just <[email protected]>
26
+     * @licence http://www.gnu.org/licenses/gpl.txt
27
+     */
28 28
  
29
- /**
30
- * PENSConfig
31
- * 
32
- * This class provides different static variables to configure php-pens.
33
- * 
34
- * @package PENS
35
- * @author Guillaume Viguier-Just <[email protected]>
36
- * @licence http://www.gnu.org/licenses/gpl.txt
37
- */
29
+    /**
30
+     * PENSConfig
31
+     * 
32
+     * This class provides different static variables to configure php-pens.
33
+     * 
34
+     * @package PENS
35
+     * @author Guillaume Viguier-Just <[email protected]>
36
+     * @licence http://www.gnu.org/licenses/gpl.txt
37
+     */
38 38
 class PENSConfig {
39 39
 
40
-	/**
41
-	 * PENS version
42
-	 * @var string
43
-	 */
44
-	public static $version = "1.0.0";
40
+    /**
41
+     * PENS version
42
+     * @var string
43
+     */
44
+    public static $version = "1.0.0";
45 45
 	
46
-	/**
47
-	 * Allowed commands
48
-	 * @var array
49
-	 */
50
-	public static $allowed_commands = array("collect", "receipt", "alert");
46
+    /**
47
+     * Allowed commands
48
+     * @var array
49
+     */
50
+    public static $allowed_commands = array("collect", "receipt", "alert");
51 51
 	
52
-	/**
53
-	 * Allowed package types
54
-	 * @var array
55
-	 */
56
-	public static $allowed_package_types = array("aicc-pkg", "scorm-pif", "ims-qti");
52
+    /**
53
+     * Allowed package types
54
+     * @var array
55
+     */
56
+    public static $allowed_package_types = array("aicc-pkg", "scorm-pif", "ims-qti");
57 57
 	
58
-	/**
59
-	 * Allowed package formats
60
-	 * @var array
61
-	 */
62
-	public static $allowed_package_formats = array("zip", "url", "jar", "war", "xml");
58
+    /**
59
+     * Allowed package formats
60
+     * @var array
61
+     */
62
+    public static $allowed_package_formats = array("zip", "url", "jar", "war", "xml");
63 63
 	
64
-	/**
65
-	 * End of line as specified by the PENS specification
66
-	 * @var string
67
-	 */
68
-	public static $eol = "\r\n";
64
+    /**
65
+     * End of line as specified by the PENS specification
66
+     * @var string
67
+     */
68
+    public static $eol = "\r\n";
69 69
 }
Please login to merge, or discard this patch.
plugin/pens/lib/pens/pens_exception.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -37,62 +37,62 @@
 block discarded – undo
37 37
  */
38 38
 class PENSException extends Exception {
39 39
 
40
-	/**
41
-	 * Array that provides an association between exception codes and messages
42
-	 * @var array
43
-	 */
44
-	protected static $_code_to_messages = array(
45
-		1101 => "Unable to parse PENS command",
46
-		1201 => "Attempt to pass an invalid argument",
47
-		1301 => "Unable to retrieve package",
48
-		1302 => "Unable to retrieve package via HTTPS",
49
-		1304 => "Unable to retrieve package via FTP",
50
-		1306 => "Unable to retrieve package via FTPS",
51
-		1310 => "Unable to retrieve package at specified URL due to error in URL or lack of response from URL",
52
-		1312 => "Unable to retrieve package at specified URL due to error with access credential for package URL",
53
-		1320 => "Expiration date is non-null and in an improper format",
54
-		1322 => "Current time indicates expiry date has passed",
55
-		1420 => "PENS version not supported",
56
-		1421 => "Command not supported",
57
-		1430 => "Package type not supported",
58
-		// The following error code is not specified in the PENS specification and was added in this implementation
59
-		1431 => "Package format not supported",
60
-		1432 => "Internal package error",
61
-		1440 => "Insufficient host space/storage available",
62
-		1500 => "Unable to communicate with provided acknowledgement URL",
63
-		1510 => "Unsupported acknowledgement protocol",
64
-		1520 => "Unsupported alert protocol",
65
-		2001 => "PENS version invalid or not specified",
66
-		2002 => "PENS command invalid or not specified",
67
-		2003 => "package-type invalid or not specified",
68
-		2004 => "package-type-version invalid or not specified",
69
-		2005 => "package-format invalid or not specified",
70
-		2007 => "package-id invalid or not specified",
71
-		2008 => "package-url invalid or not specified",
72
-		2009 => "package-url-expiry date invalid or not specified",
73
-		2010 => "client submitting package invalid or not specified",
74
-		2011 => "receipt url invalid or not specified"
75
-	);
40
+    /**
41
+     * Array that provides an association between exception codes and messages
42
+     * @var array
43
+     */
44
+    protected static $_code_to_messages = array(
45
+        1101 => "Unable to parse PENS command",
46
+        1201 => "Attempt to pass an invalid argument",
47
+        1301 => "Unable to retrieve package",
48
+        1302 => "Unable to retrieve package via HTTPS",
49
+        1304 => "Unable to retrieve package via FTP",
50
+        1306 => "Unable to retrieve package via FTPS",
51
+        1310 => "Unable to retrieve package at specified URL due to error in URL or lack of response from URL",
52
+        1312 => "Unable to retrieve package at specified URL due to error with access credential for package URL",
53
+        1320 => "Expiration date is non-null and in an improper format",
54
+        1322 => "Current time indicates expiry date has passed",
55
+        1420 => "PENS version not supported",
56
+        1421 => "Command not supported",
57
+        1430 => "Package type not supported",
58
+        // The following error code is not specified in the PENS specification and was added in this implementation
59
+        1431 => "Package format not supported",
60
+        1432 => "Internal package error",
61
+        1440 => "Insufficient host space/storage available",
62
+        1500 => "Unable to communicate with provided acknowledgement URL",
63
+        1510 => "Unsupported acknowledgement protocol",
64
+        1520 => "Unsupported alert protocol",
65
+        2001 => "PENS version invalid or not specified",
66
+        2002 => "PENS command invalid or not specified",
67
+        2003 => "package-type invalid or not specified",
68
+        2004 => "package-type-version invalid or not specified",
69
+        2005 => "package-format invalid or not specified",
70
+        2007 => "package-id invalid or not specified",
71
+        2008 => "package-url invalid or not specified",
72
+        2009 => "package-url-expiry date invalid or not specified",
73
+        2010 => "client submitting package invalid or not specified",
74
+        2011 => "receipt url invalid or not specified"
75
+    );
76 76
 	
77
-	/**
78
-	 * Redefines the constructor so that code is the first argument
79
-	 * 
80
-	 * @param int Exception code
81
-	 * @param string Message to display
82
-	 * @return PENSException Exception created
83
-	 */
84
-	public function __construct($code, $message = null) {
85
-		parent::__construct($message, $code);
86
-		$this->setMessageBasedOnCode();
87
-	}
77
+    /**
78
+     * Redefines the constructor so that code is the first argument
79
+     * 
80
+     * @param int Exception code
81
+     * @param string Message to display
82
+     * @return PENSException Exception created
83
+     */
84
+    public function __construct($code, $message = null) {
85
+        parent::__construct($message, $code);
86
+        $this->setMessageBasedOnCode();
87
+    }
88 88
 	
89
-	/**
90
-	 * Sets the message based on the code
91
-	 */
92
-	protected function setMessageBasedOnCode() {
93
-		if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
94
-			$this->message = self::$_code_to_messages[$this->code];
95
-		}
96
-	}
89
+    /**
90
+     * Sets the message based on the code
91
+     */
92
+    protected function setMessageBasedOnCode() {
93
+        if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
94
+            $this->message = self::$_code_to_messages[$this->code];
95
+        }
96
+    }
97 97
 	
98 98
 }
Please login to merge, or discard this patch.
plugin/pens/pens.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -29,19 +29,19 @@
 block discarded – undo
29 29
 require_once __DIR__ . '/chamilo_pens.php';
30 30
 
31 31
 class ChamiloPackageHandler extends PENSPackageHandler {
32
-	public function processPackage($request, $path_to_package) {
33
-		$server = PENSServer::singleton();
34
-		// Moves the package to archive/pens
35
-		$path_to_archives = api_get_path(SYS_ARCHIVE_PATH) . 'pens';
36
-		if(!is_dir($path_to_archives)) {
37
-			mkdir($path_to_archives, 0777, true);
38
-		}
39
-		rename($path_to_package, $path_to_archives . '/' . $request->getFilename());
40
-		// Insert the request in the database
41
-		$chamilo_pens = new ChamiloPens($request);
42
-		$chamilo_pens->save();
43
-		$server->sendAlert($request, new PENSResponse(0, 'Package successfully processed'));
44
-	}
32
+    public function processPackage($request, $path_to_package) {
33
+        $server = PENSServer::singleton();
34
+        // Moves the package to archive/pens
35
+        $path_to_archives = api_get_path(SYS_ARCHIVE_PATH) . 'pens';
36
+        if(!is_dir($path_to_archives)) {
37
+            mkdir($path_to_archives, 0777, true);
38
+        }
39
+        rename($path_to_package, $path_to_archives . '/' . $request->getFilename());
40
+        // Insert the request in the database
41
+        $chamilo_pens = new ChamiloPens($request);
42
+        $chamilo_pens->save();
43
+        $server->sendAlert($request, new PENSResponse(0, 'Package successfully processed'));
44
+    }
45 45
 }
46 46
 
47 47
 $handler = new ChamiloPackageHandler();
Please login to merge, or discard this patch.
plugin/dashboard/block_student/block_student.class.php 1 patch
Indentation   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -14,36 +14,36 @@  discard block
 block discarded – undo
14 14
 class BlockStudent extends Block
15 15
 {
16 16
     private $user_id;
17
-	private $students;
18
-	private $path;
19
-	private $permission = array(DRH);
17
+    private $students;
18
+    private $path;
19
+    private $permission = array(DRH);
20 20
 
21
-	/**
22
-	 * Constructor
23
-	 */
21
+    /**
22
+     * Constructor
23
+     */
24 24
     public function __construct ($user_id)
25 25
     {
26
-    	$this->user_id  = $user_id;
27
-    	$this->path 	= 'block_student';
28
-    	if ($this->is_block_visible_for_user($user_id)) {
26
+        $this->user_id  = $user_id;
27
+        $this->path 	= 'block_student';
28
+        if ($this->is_block_visible_for_user($user_id)) {
29 29
             $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
30
-    	}
30
+        }
31 31
     }
32 32
 
33 33
     /**
34
-	 * This method check if a user is allowed to see the block inside dashboard interface
35
-	 * @param	int		User id
36
-	 * @return	bool	Is block visible for user
37
-	 */
34
+     * This method check if a user is allowed to see the block inside dashboard interface
35
+     * @param	int		User id
36
+     * @return	bool	Is block visible for user
37
+     */
38 38
     public function is_block_visible_for_user($user_id)
39 39
     {
40
-    	$user_info = api_get_user_info($user_id);
41
-		$user_status = $user_info['status'];
42
-		$is_block_visible_for_user = false;
43
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
44
-    		$is_block_visible_for_user = true;
45
-    	}
46
-    	return $is_block_visible_for_user;
40
+        $user_info = api_get_user_info($user_id);
41
+        $user_status = $user_info['status'];
42
+        $is_block_visible_for_user = false;
43
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
44
+            $is_block_visible_for_user = true;
45
+        }
46
+        return $is_block_visible_for_user;
47 47
     }
48 48
 
49 49
     /**
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
      */
54 54
     public function get_block()
55 55
     {
56
-    	global $charset;
57
-    	$column = 1;
58
-    	$data   = array();
56
+        global $charset;
57
+        $column = 1;
58
+        $data   = array();
59 59
 
60 60
         $student_content_html = $this->get_students_content_html_for_drh();
61
-		$html = '<div class="panel panel-default" id="intro">
61
+        $html = '<div class="panel panel-default" id="intro">
62 62
                     <div class="panel-heading">
63 63
                         '.get_lang('StudentsInformationsList').'
64 64
                         <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -70,24 +70,24 @@  discard block
 block discarded – undo
70 70
                         '.$student_content_html.'
71 71
                     </div>
72 72
                     </div>';
73
-    	$data['column'] = $column;
74
-    	$data['content_html'] = $html;
75
-    	return $data;
73
+        $data['column'] = $column;
74
+        $data['content_html'] = $html;
75
+        return $data;
76 76
     }
77 77
 
78 78
     /**
79
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
80
- 	 * @return string  content html
81
- 	 */
79
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
80
+     * @return string  content html
81
+     */
82 82
     public function get_students_content_html_for_platform_admin()
83 83
     {
84
- 		$students = $this->students;
85
- 		//$content = '<div style="margin:10px;">';
86
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
84
+            $students = $this->students;
85
+            //$content = '<div style="margin:10px;">';
86
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
87 87
         $students_table = null;
88
- 		if (count($students) > 0) {
89
-	 		$students_table .= '<table class="data_table">';
90
-	 		$students_table .= '<tr>
88
+            if (count($students) > 0) {
89
+                $students_table .= '<table class="data_table">';
90
+                $students_table .= '<tr>
91 91
 									<th width="10%" rowspan="2">'.get_lang('FirstName').'</th>
92 92
 									<th width="10%" rowspan="2">'.get_lang('LastName').'</th>
93 93
 									<th width="30%" colspan="2">'.get_lang('CourseInformation').'</th>
@@ -97,146 +97,146 @@  discard block
 block discarded – undo
97 97
 									<th width="10%">'.get_lang('Time').'</th>
98 98
 								</tr>';
99 99
 
100
-	 		$i = 1;
101
-	 		foreach ($students as $student) {
100
+                $i = 1;
101
+                foreach ($students as $student) {
102 102
 
103
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
104
-	 			$count_courses = count($courses_by_user);
105
-				$rowspan = $count_courses?$count_courses+1:2;
103
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
104
+                    $count_courses = count($courses_by_user);
105
+                $rowspan = $count_courses?$count_courses+1:2;
106 106
 
107
-				if ($i%2 == 0) {
107
+                if ($i%2 == 0) {
108 108
                     $style = ' style="background-color:#F2F2F2" ';
109 109
                 } else {
110 110
                     $style = ' style="background-color:#FFF" ';
111 111
                 }
112 112
 
113
-	 			$students_table .= '<tr '.$style.'>
113
+                    $students_table .= '<tr '.$style.'>
114 114
 										<td rowspan="'.$rowspan.'">'.$student['firstname'].'</td>
115 115
 										<td rowspan="'.$rowspan.'">'.$student['lastname'].'</td>
116 116
 									</tr>';
117 117
 
118
-	 			// courses information about the student
119
-	 			if (!empty($courses_by_user)) {
120
-		 			foreach ($courses_by_user as $course) {
121
-		 				$course_code = $course['code'];
122
-						$courseInfo = api_get_course_info($course_code);
123
-						$courseId = $courseInfo['real_id'];
124
-		 				$course_title = $course['title'];
125
-		 				$time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
126
-		 				$students_table .= '<tr '.$style.'>
118
+                    // courses information about the student
119
+                    if (!empty($courses_by_user)) {
120
+                        foreach ($courses_by_user as $course) {
121
+                            $course_code = $course['code'];
122
+                        $courseInfo = api_get_course_info($course_code);
123
+                        $courseId = $courseInfo['real_id'];
124
+                            $course_title = $course['title'];
125
+                            $time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
126
+                            $students_table .= '<tr '.$style.'>
127 127
 											<td align="right">'.$course_title.'</td>
128 128
 											<td align="right">'.$time.'</td>
129 129
 											</tr>';
130
-		 			}
131
-	 			} else {
132
-	 				$students_table .= '<tr '.$style.'>
130
+                        }
131
+                    } else {
132
+                        $students_table .= '<tr '.$style.'>
133 133
 											<td align="center" colspan="2"><i>'.get_lang('Empty').'</i></td>
134 134
 										</tr>';
135
-	 			}
136
-	 			$i++;
137
-	 		}
138
-	 		$students_table .= '</table>';
139
- 		} else {
140
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
141
- 		}
142
-
143
- 		$content .= $students_table;
144
-
145
- 		if (count($students) > 0) {
146
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
147
-		}
148
-		//$content .= '</div>';
149
-
150
- 		return $content;
151
- 	}
152
-
153
-  	public function get_students_content_html_for_drh() {
154
-  		$attendance = new Attendance();
155
-  		$students = $this->students;
156
- 		//$content = '<div style="margin:5px;">';
157
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
135
+                    }
136
+                    $i++;
137
+                }
138
+                $students_table .= '</table>';
139
+            } else {
140
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
141
+            }
142
+
143
+            $content .= $students_table;
144
+
145
+            if (count($students) > 0) {
146
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
147
+        }
148
+        //$content .= '</div>';
149
+
150
+            return $content;
151
+        }
152
+
153
+        public function get_students_content_html_for_drh() {
154
+            $attendance = new Attendance();
155
+            $students = $this->students;
156
+            //$content = '<div style="margin:5px;">';
157
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
158 158
         $students_table = null;
159
- 		if (count($students) > 0) {
160
-	 		$students_table .= '<table class="data_table">';
161
-	 		$students_table .= '<tr>
159
+            if (count($students) > 0) {
160
+                $students_table .= '<table class="data_table">';
161
+                $students_table .= '<tr>
162 162
 									<th>'.get_lang('User').'</th>
163 163
 									<th>'.get_lang('AttendancesFaults').'</th>
164 164
 									<th>'.get_lang('Evaluations').'</th>
165 165
 								</tr>';
166
-	 		$i = 1;
167
-	 		foreach ($students as $student) {
168
-
169
-	 			$student_id = $student['user_id'];
170
-	 			$firstname  = $student['firstname'];
171
-	 			$lastname   = $student['lastname'];
172
-	 			$username	= $student['username'];
173
-
174
-
175
-				// get average of faults in attendances by student
176
-	 			$results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
177
-	 			if (!empty($results_faults_avg)) {
178
-	 				$attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
179
-	 			} else {
180
-	 				$attendances_faults_avg = '0%';
181
-	 			}
182
-
183
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
184
-				$evaluations_avg  = 0;
185
-				$score = $weight = 0;
186
-	 			foreach ($courses_by_user as $course) {
187
-	 				$course_code = $course['code'];
188
-	 				$cats = Category::load(null, null, $course_code, null, null, null, false);
189
-	 				$scoretotal = array();
190
-	 				if (isset($cats) && isset($cats[0])) {
191
-		 				$scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
192
-	 				}
193
-
194
-	 				if (!empty($scoretotal)) {
195
-	 					$score  += $scoretotal[0];
196
-	 					$weight += $scoretotal[1];
197
-	 				}
198
-	 			}
199
-
200
-	 			if (!empty($weight)) {
201
-	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
202
-	 			}
203
-
204
-	 			if ($i%2 == 0) {
166
+                $i = 1;
167
+                foreach ($students as $student) {
168
+
169
+                    $student_id = $student['user_id'];
170
+                    $firstname  = $student['firstname'];
171
+                    $lastname   = $student['lastname'];
172
+                    $username	= $student['username'];
173
+
174
+
175
+                // get average of faults in attendances by student
176
+                    $results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
177
+                    if (!empty($results_faults_avg)) {
178
+                        $attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
179
+                    } else {
180
+                        $attendances_faults_avg = '0%';
181
+                    }
182
+
183
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
184
+                $evaluations_avg  = 0;
185
+                $score = $weight = 0;
186
+                    foreach ($courses_by_user as $course) {
187
+                        $course_code = $course['code'];
188
+                        $cats = Category::load(null, null, $course_code, null, null, null, false);
189
+                        $scoretotal = array();
190
+                        if (isset($cats) && isset($cats[0])) {
191
+                            $scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
192
+                        }
193
+
194
+                        if (!empty($scoretotal)) {
195
+                            $score  += $scoretotal[0];
196
+                            $weight += $scoretotal[1];
197
+                        }
198
+                    }
199
+
200
+                    if (!empty($weight)) {
201
+                        $evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
202
+                    }
203
+
204
+                    if ($i%2 == 0) {
205 205
                     $class_tr = 'row_odd';
206 206
                 } else {
207 207
                     $class_tr = 'row_even';
208 208
                 }
209
-	    		$students_table .= '<tr class="'.$class_tr.'">
209
+                $students_table .= '<tr class="'.$class_tr.'">
210 210
 										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
211 211
 										<td>'.$attendances_faults_avg.'</td>
212 212
 										<td>'.$evaluations_avg.'</td>
213 213
 									</tr>';
214 214
 
215
-	 			$i++;
216
-	 		}
217
-	 		$students_table .= '</table>';
218
- 		} else {
219
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
220
- 		}
215
+                    $i++;
216
+                }
217
+                $students_table .= '</table>';
218
+            } else {
219
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
220
+            }
221 221
 
222
-  		$content .= $students_table;
222
+            $content .= $students_table;
223 223
 
224
- 		if (count($students) > 0) {
225
-			$content .= '<div style="text-align:right;margin-top:10px;">
224
+            if (count($students) > 0) {
225
+            $content .= '<div style="text-align:right;margin-top:10px;">
226 226
                             <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=yourstudents">'.get_lang('SeeMore').'</a>
227 227
                          </div>';
228
-		}
229
-		//$content .= '</div>';
228
+        }
229
+        //$content .= '</div>';
230 230
 
231
-  		return $content;
232
-  	}
231
+            return $content;
232
+        }
233 233
 
234 234
     /**
235
-	 * Get number of students
236
-	 * @return int
237
-	 */
238
-	function get_number_of_students()
235
+     * Get number of students
236
+     * @return int
237
+     */
238
+    function get_number_of_students()
239 239
     {
240
-		return count($this->students);
241
-	}
240
+        return count($this->students);
241
+    }
242 242
 }
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,6 @@
 block discarded – undo
16 16
  * @author Patrick Cool
17 17
  * @author René Haentjens, added CSV file import (October 2004)
18 18
  * @package chamilo.link
19
-
20 19
  */
21 20
 
22 21
 // Including libraries
Please login to merge, or discard this patch.
main/permissions/user_permissions.inc.php 1 patch
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 $user_id=$userIdViewed;
9 9
 if ($mainUserInfo['status']==1)
10 10
 {
11
-	$course_admin=1;
11
+    $course_admin=1;
12 12
 }
13 13
 include_once('permissions_functions.inc.php');
14 14
 include_once('all_permissions.inc.php');
@@ -19,26 +19,26 @@  discard block
 block discarded – undo
19 19
 // ---------------------------------------------------
20 20
 if ($_POST['StoreUserPermissions'] and $setting_visualisation=='checkbox')
21 21
 {
22
-	$result_message=store_permissions('user', $user_id);
23
-	if ($result_message)
24
-	{
25
-		Display::display_normal_message($result_message);
26
-	}
22
+    $result_message=store_permissions('user', $user_id);
23
+    if ($result_message)
24
+    {
25
+        Display::display_normal_message($result_message);
26
+    }
27 27
 }
28 28
 if (isset($_GET['action']))
29 29
 {
30
-	if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
31
-	{
32
-		$result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
33
-	}
34
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
35
-	{
36
-		$result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
37
-	}
30
+    if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
31
+    {
32
+        $result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
33
+    }
34
+    if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
35
+    {
36
+        $result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
37
+    }
38 38
 }
39 39
 if (isset($result_message))
40 40
 {
41
-	Display::display_normal_message($result_message);
41
+    Display::display_normal_message($result_message);
42 42
 }
43 43
 
44 44
 // ---------------------------------------------------
@@ -55,43 +55,43 @@  discard block
 block discarded – undo
55 55
 $groups_of_user=GroupManager::get_group_ids($_course['real_id'],$user_id);
56 56
 foreach ($groups_of_user as $group)
57 57
 {
58
-	$this_group_permissions=get_permissions('group',$group);
59
-	foreach ($this_group_permissions as $tool=>$permissions)
60
-	{
61
-		foreach ($permissions as $permission)
62
-		{
63
-			$inherited_group_permissions[$tool][]=$permission;
64
-		}
65
-	}
58
+    $this_group_permissions=get_permissions('group',$group);
59
+    foreach ($this_group_permissions as $tool=>$permissions)
60
+    {
61
+        foreach ($permissions as $permission)
62
+        {
63
+            $inherited_group_permissions[$tool][]=$permission;
64
+        }
65
+    }
66 66
 }
67 67
 $inherited_permissions=$inherited_group_permissions;
68 68
 
69 69
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
70 70
 if (api_get_setting('user_roles')=='true') {
71
-	// course roles that are assigned to the user
72
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
73
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
74
-	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
75
-	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
76
-	// groepsge�rfde permissions in beschouwing worden genomen
77
-	// dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
78
-	// en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
79
-	// omvatten.
80
-	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
81
-	// ophalen.
82
-	// platform roles that are assigned to the user
83
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
84
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
71
+    // course roles that are assigned to the user
72
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
73
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
74
+    // NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
75
+    // (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
76
+    // groepsge�rfde permissions in beschouwing worden genomen
77
+    // dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
78
+    // en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
79
+    // omvatten.
80
+    // NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
81
+    // ophalen.
82
+    // platform roles that are assigned to the user
83
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
84
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
85 85
 }
86 86
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
87 87
 if (api_get_setting('group_roles')=='true')
88 88
 {
89
-	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
90
-	foreach ($groups_of_user as $group)
91
-	{
92
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
93
-		//$inherited_permissions[$tool][]=$permission;
94
-	}
89
+    // NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
90
+    foreach ($groups_of_user as $group)
91
+    {
92
+        $this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
93
+        //$inherited_permissions[$tool][]=$permission;
94
+    }
95 95
 }
96 96
 
97 97
 // ---------------------------------------------------
@@ -101,11 +101,11 @@  discard block
 block discarded – undo
101 101
 $inherited_permissions=limited_or_full($inherited_permissions);
102 102
 if (api_get_setting('permissions')=='limited')
103 103
 {
104
-	$header_array=$rights_limited;
104
+    $header_array=$rights_limited;
105 105
 }
106 106
 if (api_get_setting('permissions')=='full')
107 107
 {
108
-	$header_array=$rights_full;
108
+    $header_array=$rights_full;
109 109
 }
110 110
 
111 111
 
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 // ---------------------------------------------------
117 117
 if (api_get_setting('user_roles')=='true')
118 118
 {
119
-	// the list of the roles for the user
120
-	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
121
-	$current_user_course_roles=get_roles('user',$user_id);
122
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
123
-	display_role_list($current_user_course_roles, $current_user_platform_roles);
124
-	echo '<br />';
119
+    // the list of the roles for the user
120
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
121
+    $current_user_course_roles=get_roles('user',$user_id);
122
+    $current_user_platform_roles=get_roles('user',$user_id, 'platform');
123
+    display_role_list($current_user_course_roles, $current_user_platform_roles);
124
+    echo '<br />';
125 125
 }
126 126
 
127 127
 // ---------------------------------------------------
@@ -135,59 +135,59 @@  discard block
 block discarded – undo
135 135
 echo "\t\t<th>".get_lang('Module')."</th>\n";
136 136
 foreach ($header_array as $header_key=>$header_value)
137 137
 {
138
-	echo "\t\t<th>".get_lang($header_value)."</th>\n";
138
+    echo "\t\t<th>".get_lang($header_value)."</th>\n";
139 139
 }
140 140
 echo "\t</tr>\n";
141 141
 
142 142
 // the main area with the checkboxes or images
143 143
 foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
144 144
 {
145
-	echo "\t<tr>\n";
146
-	echo "\t\t<td>\n";
147
-	if (strstr($tool,'BLOG'))
148
-	{
149
-		// Not dealing with a real tool here, get name of this blog
150
-		// Strip blog id
151
-		$tmp = strpos($tool,'_')+1;
152
-		$blog_id = substr($tool,$tmp,strlen($tool));
153
-		// Get title
154
-		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
155
-	}
156
-	else
157
-	{
158
-		echo get_lang($tool);
159
-	}
160
-
161
-	echo "\t\t</td>\n";
162
-
163
-	foreach ($header_array as $key=>$value)
164
-	{
165
-
166
-		echo "\t\t<td align='center'>\n";
167
-		if (in_array($value,$rights))
168
-		{
169
-			if ($setting_visualisation=='checkbox')
170
-			{
171
-				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
172
-			}
173
-			if ($setting_visualisation=='image')
174
-			{
175
-				display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
176
-			}
177
-		}
178
-		// note: in a later stage this part will be replaced by a function
179
-		// so that we can easily switch between a checkbox approach or an image approach
180
-		// where every click is in fact a change of status. In the checkbox approach you first have to
181
-		// do the changes and then store them by clicking the submit button.
182
-		echo "\t\t</td>\n";
183
-	}
184
-	echo "\t</tr>\n";
145
+    echo "\t<tr>\n";
146
+    echo "\t\t<td>\n";
147
+    if (strstr($tool,'BLOG'))
148
+    {
149
+        // Not dealing with a real tool here, get name of this blog
150
+        // Strip blog id
151
+        $tmp = strpos($tool,'_')+1;
152
+        $blog_id = substr($tool,$tmp,strlen($tool));
153
+        // Get title
154
+        echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
155
+    }
156
+    else
157
+    {
158
+        echo get_lang($tool);
159
+    }
160
+
161
+    echo "\t\t</td>\n";
162
+
163
+    foreach ($header_array as $key=>$value)
164
+    {
165
+
166
+        echo "\t\t<td align='center'>\n";
167
+        if (in_array($value,$rights))
168
+        {
169
+            if ($setting_visualisation=='checkbox')
170
+            {
171
+                display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
172
+            }
173
+            if ($setting_visualisation=='image')
174
+            {
175
+                display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
176
+            }
177
+        }
178
+        // note: in a later stage this part will be replaced by a function
179
+        // so that we can easily switch between a checkbox approach or an image approach
180
+        // where every click is in fact a change of status. In the checkbox approach you first have to
181
+        // do the changes and then store them by clicking the submit button.
182
+        echo "\t\t</td>\n";
183
+    }
184
+    echo "\t</tr>\n";
185 185
 }
186 186
 
187 187
 echo "</table>\n";
188 188
 if ($setting_visualisation=='checkbox')
189 189
 {
190
-	echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
190
+    echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
191 191
 }
192 192
 echo "</form><br />";
193 193
 
Please login to merge, or discard this patch.
main/blog/blog.php 1 patch
Indentation   +288 added lines, -288 removed lines patch added patch discarded remove patch
@@ -41,181 +41,181 @@  discard block
 block discarded – undo
41 41
 $safe_task_description  = isset($_POST['task_description']) ? Security::remove_XSS($_POST['task_description']) : null;
42 42
 
43 43
 if (!empty($_POST['new_post_submit'])) {
44
-	Blog:: create_post(
45
-		$_POST['title'],
46
-		$_POST['full_text'],
47
-		$_POST['post_file_comment'],
48
-		$blog_id
49
-	);
50
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
44
+    Blog:: create_post(
45
+        $_POST['title'],
46
+        $_POST['full_text'],
47
+        $_POST['post_file_comment'],
48
+        $blog_id
49
+    );
50
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
51 51
 }
52 52
 if (!empty($_POST['edit_post_submit'])) {
53
-	Blog:: edit_post(
54
-		$_POST['post_id'],
55
-		$_POST['title'],
56
-		$_POST['full_text'],
57
-		$blog_id
58
-	);
59
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
53
+    Blog:: edit_post(
54
+        $_POST['post_id'],
55
+        $_POST['title'],
56
+        $_POST['full_text'],
57
+        $blog_id
58
+    );
59
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
60 60
 }
61 61
 
62 62
 if (!empty($_POST['new_comment_submit'])) {
63
-	Blog:: create_comment(
64
-		$_POST['title'],
65
-		$_POST['comment'],
66
-		$_POST['post_file_comment'],
67
-		$blog_id,
68
-		$_GET['post_id'],
69
-		$_POST['comment_parent_id']
70
-	);
71
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
63
+    Blog:: create_comment(
64
+        $_POST['title'],
65
+        $_POST['comment'],
66
+        $_POST['post_file_comment'],
67
+        $blog_id,
68
+        $_GET['post_id'],
69
+        $_POST['comment_parent_id']
70
+    );
71
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
72 72
 }
73 73
 
74 74
 if (!empty($_POST['new_task_submit'])) {
75 75
 
76
-	Blog:: create_task(
77
-		$blog_id,
78
-		$safe_task_name,
79
-		$safe_task_description,
80
-		(isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
81
-		(isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
82
-		(isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
83
-		(isset($_POST['task_color']) ? $_POST['task_color'] : null)
84
-	);
85
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
76
+    Blog:: create_task(
77
+        $blog_id,
78
+        $safe_task_name,
79
+        $safe_task_description,
80
+        (isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
81
+        (isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
82
+        (isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
83
+        (isset($_POST['task_color']) ? $_POST['task_color'] : null)
84
+    );
85
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
86 86
 }
87 87
 
88 88
 if (isset($_POST['edit_task_submit'])) {
89
-	Blog:: edit_task(
90
-		$_POST['blog_id'],
91
-		$_POST['task_id'],
92
-		$safe_task_name,
93
-		$safe_task_description,
94
-		$_POST['chkArticleDelete'],
95
-		$_POST['chkArticleEdit'],
96
-		$_POST['chkCommentsDelete'],
97
-		$_POST['task_color']
98
-	);
99
-	$return_message = array(
100
-		'type' => 'confirmation',
101
-		'message' => get_lang('TaskEdited')
102
-	);
89
+    Blog:: edit_task(
90
+        $_POST['blog_id'],
91
+        $_POST['task_id'],
92
+        $safe_task_name,
93
+        $safe_task_description,
94
+        $_POST['chkArticleDelete'],
95
+        $_POST['chkArticleEdit'],
96
+        $_POST['chkCommentsDelete'],
97
+        $_POST['task_color']
98
+    );
99
+    $return_message = array(
100
+        'type' => 'confirmation',
101
+        'message' => get_lang('TaskEdited')
102
+    );
103 103
 }
104 104
 
105 105
 if (!empty($_POST['assign_task_submit'])) {
106
-	Blog:: assign_task(
107
-		$blog_id,
108
-		$_POST['task_user_id'],
109
-		$_POST['task_task_id'],
110
-		$_POST['task_day']
111
-	);
112
-	$return_message = array(
113
-		'type' => 'confirmation',
114
-		'message' => get_lang('TaskAssigned')
115
-	);
106
+    Blog:: assign_task(
107
+        $blog_id,
108
+        $_POST['task_user_id'],
109
+        $_POST['task_task_id'],
110
+        $_POST['task_day']
111
+    );
112
+    $return_message = array(
113
+        'type' => 'confirmation',
114
+        'message' => get_lang('TaskAssigned')
115
+    );
116 116
 }
117 117
 
118 118
 if (isset($_POST['assign_task_edit_submit'])) {
119
-	Blog:: edit_assigned_task(
120
-		$blog_id,
121
-		$_POST['task_user_id'],
122
-		$_POST['task_task_id'],
123
-		$_POST['task_day'],
124
-		$_POST['old_user_id'],
125
-		$_POST['old_task_id'],
126
-		$_POST['old_target_date']
127
-	);
128
-	$return_message = array(
129
-		'type' => 'confirmation',
130
-		'message' => get_lang('AssignedTaskEdited')
131
-	);
119
+    Blog:: edit_assigned_task(
120
+        $blog_id,
121
+        $_POST['task_user_id'],
122
+        $_POST['task_task_id'],
123
+        $_POST['task_day'],
124
+        $_POST['old_user_id'],
125
+        $_POST['old_task_id'],
126
+        $_POST['old_target_date']
127
+    );
128
+    $return_message = array(
129
+        'type' => 'confirmation',
130
+        'message' => get_lang('AssignedTaskEdited')
131
+    );
132 132
 }
133 133
 if (!empty($_POST['new_task_execution_submit'])) {
134
-	Blog:: create_comment(
135
-		$safe_comment_title,
136
-		$safe_comment_text,
137
-		$blog_id,
138
-		(int)$_GET['post_id'],
139
-		$_POST['comment_parent_id'],
140
-		$_POST['task_id']
141
-	);
142
-	$return_message = array(
143
-		'type' => 'confirmation',
144
-		'message' => get_lang('CommentCreated')
145
-	);
134
+    Blog:: create_comment(
135
+        $safe_comment_title,
136
+        $safe_comment_text,
137
+        $blog_id,
138
+        (int)$_GET['post_id'],
139
+        $_POST['comment_parent_id'],
140
+        $_POST['task_id']
141
+    );
142
+    $return_message = array(
143
+        'type' => 'confirmation',
144
+        'message' => get_lang('CommentCreated')
145
+    );
146 146
 }
147 147
 if (!empty($_POST['register'])) {
148
-	if (is_array($_POST['user'])) {
149
-		foreach ($_POST['user'] as $index => $user_id) {
150
-			Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
151
-		}
152
-	}
148
+    if (is_array($_POST['user'])) {
149
+        foreach ($_POST['user'] as $index => $user_id) {
150
+            Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
151
+        }
152
+    }
153 153
 }
154 154
 if (!empty($_POST['unregister'])) {
155
-	if (is_array($_POST['user'])) {
156
-		foreach ($_POST['user'] as $index => $user_id) {
157
-			Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
158
-		}
159
-	}
155
+    if (is_array($_POST['user'])) {
156
+        foreach ($_POST['user'] as $index => $user_id) {
157
+            Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
158
+        }
159
+    }
160 160
 }
161 161
 if (!empty($_GET['register'])) {
162
-	Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
163
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
164
-	$flag = 1;
162
+    Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
163
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
164
+    $flag = 1;
165 165
 }
166 166
 if (!empty($_GET['unregister'])) {
167
-	Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
167
+    Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
168 168
 }
169 169
 
170 170
 if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
171
-	if (isset($_GET['do']) && $_GET['do'] == 'delete') {
172
-		Blog :: delete_task($blog_id, (int)$_GET['task_id']);
173
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
174
-	}
175
-
176
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
177
-		Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
178
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
179
-	}
171
+    if (isset($_GET['do']) && $_GET['do'] == 'delete') {
172
+        Blog :: delete_task($blog_id, (int)$_GET['task_id']);
173
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
174
+    }
175
+
176
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
177
+        Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
178
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
179
+    }
180 180
 }
181 181
 
182 182
 if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
183
-	$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
184
-
185
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
186
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
187
-			Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
188
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
189
-		} else {
190
-			$error = true;
191
-			$message = get_lang('ActionNotAllowed');
192
-		}
193
-	}
194
-
195
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
196
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
197
-			Blog :: delete_post($blog_id, (int)$_GET['article_id']);
198
-			$action = ''; // Article is gone, go to blog home
199
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
200
-		} else {
201
-			$error = true;
202
-			$message = get_lang('ActionNotAllowed');
203
-		}
204
-	}
205
-	if (isset($_GET['do']) && $_GET['do'] == 'rate') {
206
-		if (isset($_GET['type']) && $_GET['type'] == 'post') {
207
-			if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
208
-				Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
209
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
210
-			}
211
-		}
212
-		if (isset($_GET['type']) && $_GET['type'] == 'comment') {
213
-			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
214
-				Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
215
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
216
-			}
217
-		}
218
-	}
183
+    $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
184
+
185
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
186
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
187
+            Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
188
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
189
+        } else {
190
+            $error = true;
191
+            $message = get_lang('ActionNotAllowed');
192
+        }
193
+    }
194
+
195
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
196
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
197
+            Blog :: delete_post($blog_id, (int)$_GET['article_id']);
198
+            $action = ''; // Article is gone, go to blog home
199
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
200
+        } else {
201
+            $error = true;
202
+            $message = get_lang('ActionNotAllowed');
203
+        }
204
+    }
205
+    if (isset($_GET['do']) && $_GET['do'] == 'rate') {
206
+        if (isset($_GET['type']) && $_GET['type'] == 'post') {
207
+            if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
208
+                Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
209
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
210
+            }
211
+        }
212
+        if (isset($_GET['type']) && $_GET['type'] == 'comment') {
213
+            if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
214
+                Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
215
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
216
+            }
217
+        }
218
+    }
219 219
 }
220 220
 /*
221 221
 	DISPLAY
@@ -223,67 +223,67 @@  discard block
 block discarded – undo
223 223
 
224 224
 // Set breadcrumb
225 225
 switch ($action) {
226
-	case 'new_post' :
227
-		$nameTools = get_lang('NewPost');
226
+    case 'new_post' :
227
+        $nameTools = get_lang('NewPost');
228 228
         $interbreadcrumb[] = array(
229 229
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
230 230
             "name" => Blog:: get_blog_title($blog_id),
231 231
         );
232
-		Display :: display_header($nameTools, 'Blogs');
233
-		break;
234
-	case 'manage_tasks' :
235
-		$nameTools = get_lang('TaskManager');
232
+        Display :: display_header($nameTools, 'Blogs');
233
+        break;
234
+    case 'manage_tasks' :
235
+        $nameTools = get_lang('TaskManager');
236 236
         $interbreadcrumb[] = array(
237 237
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
238 238
             "name" => Blog:: get_blog_title($blog_id),
239 239
         );
240
-		Display :: display_header($nameTools, 'Blogs');
241
-		break;
242
-	case 'manage_members' :
243
-		$nameTools = get_lang('MemberManager');
240
+        Display :: display_header($nameTools, 'Blogs');
241
+        break;
242
+    case 'manage_members' :
243
+        $nameTools = get_lang('MemberManager');
244 244
         $interbreadcrumb[] = array(
245 245
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
246 246
             "name" => Blog:: get_blog_title($blog_id),
247 247
         );
248
-		Display :: display_header($nameTools, 'Blogs');
249
-		break;
250
-	case 'manage_rights' :
251
-		$nameTools = get_lang('RightsManager');
248
+        Display :: display_header($nameTools, 'Blogs');
249
+        break;
250
+    case 'manage_rights' :
251
+        $nameTools = get_lang('RightsManager');
252 252
         $interbreadcrumb[] = array(
253 253
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
254 254
             'name' => Blog:: get_blog_title($blog_id),
255 255
         );
256
-		Display :: display_header($nameTools, 'Blogs');
257
-		break;
258
-	case 'view_search_result' :
259
-		$nameTools = get_lang('SearchResults');
256
+        Display :: display_header($nameTools, 'Blogs');
257
+        break;
258
+    case 'view_search_result' :
259
+        $nameTools = get_lang('SearchResults');
260 260
         $interbreadcrumb[] = array(
261 261
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
262 262
             'name' => Blog:: get_blog_title($blog_id),
263 263
         );
264
-		Display :: display_header($nameTools, 'Blogs');
265
-		break;
266
-	case 'execute_task' :
267
-		$nameTools = get_lang('ExecuteThisTask');
264
+        Display :: display_header($nameTools, 'Blogs');
265
+        break;
266
+    case 'execute_task' :
267
+        $nameTools = get_lang('ExecuteThisTask');
268 268
         $interbreadcrumb[] = array(
269 269
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
270 270
             'name' => Blog:: get_blog_title($blog_id),
271 271
         );
272
-		Display :: display_header($nameTools, 'Blogs');
273
-		break;
274
-	default :
275
-		$nameTools = Blog :: get_blog_title($blog_id);
276
-		Display :: display_header($nameTools, 'Blogs');
272
+        Display :: display_header($nameTools, 'Blogs');
273
+        break;
274
+    default :
275
+        $nameTools = Blog :: get_blog_title($blog_id);
276
+        Display :: display_header($nameTools, 'Blogs');
277 277
 }
278 278
 
279 279
 // feedback messages
280 280
 if (!empty($return_message)) {
281
-	if ($return_message['type'] == 'confirmation') {
282
-		Display::display_confirmation_message($return_message['message']);
283
-	}
284
-	if ($return_message['type'] == 'error') {
285
-		Display::display_error_message($return_message['message']);
286
-	}
281
+    if ($return_message['type'] == 'confirmation') {
282
+        Display::display_confirmation_message($return_message['message']);
283
+    }
284
+    if ($return_message['type'] == 'error') {
285
+        Display::display_error_message($return_message['message']);
286
+    }
287 287
 }
288 288
 
289 289
 // actions
@@ -350,12 +350,12 @@  discard block
 block discarded – undo
350 350
 		<?php
351 351
 
352 352
 if (isset($error)) {
353
-	Display :: display_error_message($message);
353
+    Display :: display_error_message($message);
354 354
 }
355 355
 
356 356
 if (isset($flag) && $flag == '1') {
357
-	$action = "manage_tasks";
358
-	Blog :: display_assign_task_form($blog_id);
357
+    $action = "manage_tasks";
358
+    Blog :: display_assign_task_form($blog_id);
359 359
 }
360 360
 
361 361
 $user_task = false;
@@ -363,12 +363,12 @@  discard block
 block discarded – undo
363 363
 $course_id = api_get_course_int_id();
364 364
 
365 365
 if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
366
-	$task_id = (int)$_GET['task_id'];
366
+    $task_id = (int)$_GET['task_id'];
367 367
 } else {
368
-	$task_id = 0;
369
-	$tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
368
+    $task_id = 0;
369
+    $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
370 370
 
371
-	$sql = "SELECT COUNT(*) as number
371
+    $sql = "SELECT COUNT(*) as number
372 372
 			FROM ".$tbl_blogs_tasks_rel_user."
373 373
 			WHERE
374 374
 			    c_id = $course_id AND
@@ -376,120 +376,120 @@  discard block
 block discarded – undo
376 376
 				user_id = ".api_get_user_id()." AND
377 377
 				task_id = ".$task_id;
378 378
 
379
-	$result = Database::query($sql);
380
-	$row = Database::fetch_array($result);
379
+    $result = Database::query($sql);
380
+    $row = Database::fetch_array($result);
381 381
 
382
-	if ($row['number'] == 1)
383
-		$user_task = true;
382
+    if ($row['number'] == 1)
383
+        $user_task = true;
384 384
 }
385 385
 
386 386
 switch ($action) {
387
-	case 'new_post':
388
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
389
-			// we show the form if
390
-			// 1. no post data
391
-			// 2. there is post data and the required field is empty
392
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
393
-				// if there is post data there is certainly an error in the form
394
-				if ($_POST) {
395
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
396
-				}
397
-			Blog :: display_form_new_post($blog_id);
398
-		} else {
399
-				if (isset($_GET['filter']) && !empty($_GET['filter'])) {
400
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
401
-				} else {
402
-					Blog :: display_blog_posts($blog_id);
403
-				}
404
-			}
405
-		} else {
406
-			api_not_allowed();
407
-		}
408
-		break;
409
-	case 'view_post' :
410
-		Blog :: display_post($blog_id, intval($_GET['post_id']));
411
-		break;
412
-	case 'edit_post' :
413
-		$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
414
-
415
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
416
-			// we show the form if
417
-			// 1. no post data
418
-			// 2. there is post data and the required field is empty
419
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
420
-				// if there is post data there is certainly an error in the form
421
-				if ($_POST) {
422
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
423
-				}
387
+    case 'new_post':
388
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
389
+            // we show the form if
390
+            // 1. no post data
391
+            // 2. there is post data and the required field is empty
392
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
393
+                // if there is post data there is certainly an error in the form
394
+                if ($_POST) {
395
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
396
+                }
397
+            Blog :: display_form_new_post($blog_id);
398
+        } else {
399
+                if (isset($_GET['filter']) && !empty($_GET['filter'])) {
400
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
401
+                } else {
402
+                    Blog :: display_blog_posts($blog_id);
403
+                }
404
+            }
405
+        } else {
406
+            api_not_allowed();
407
+        }
408
+        break;
409
+    case 'view_post' :
410
+        Blog :: display_post($blog_id, intval($_GET['post_id']));
411
+        break;
412
+    case 'edit_post' :
413
+        $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
414
+
415
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
416
+            // we show the form if
417
+            // 1. no post data
418
+            // 2. there is post data and the required field is empty
419
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
420
+                // if there is post data there is certainly an error in the form
421
+                if ($_POST) {
422
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
423
+                }
424 424
                 Blog :: display_form_edit_post($blog_id, intval($_GET['post_id']));
425
-			} else {
426
-				if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
427
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
428
-				} else {
429
-					Blog :: display_blog_posts($blog_id);
430
-				}
431
-			}
432
-		} else {
433
-			api_not_allowed();
434
-		}
435
-
436
-		break;
437
-	case 'manage_members' :
438
-		if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
439
-			Blog :: display_form_user_subscribe($blog_id);
440
-			echo '<br /><br />';
441
-			Blog :: display_form_user_unsubscribe($blog_id);
442
-		} else {
443
-			api_not_allowed();
425
+            } else {
426
+                if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
427
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
428
+                } else {
429
+                    Blog :: display_blog_posts($blog_id);
430
+                }
431
+            }
432
+        } else {
433
+            api_not_allowed();
434
+        }
435
+
436
+        break;
437
+    case 'manage_members' :
438
+        if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
439
+            Blog :: display_form_user_subscribe($blog_id);
440
+            echo '<br /><br />';
441
+            Blog :: display_form_user_unsubscribe($blog_id);
442
+        } else {
443
+            api_not_allowed();
444 444
         }
445 445
 
446
-		break;
447
-	case 'manage_rights' :
448
-		Blog :: display_form_user_rights($blog_id);
449
-		break;
450
-	case 'manage_tasks' :
451
-		if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
452
-			if (isset($_GET['do']) && $_GET['do'] == 'add') {
453
-				Blog:: display_new_task_form($blog_id);
454
-			}
455
-			if (isset($_GET['do']) && $_GET['do'] == 'assign') {
456
-				Blog:: display_assign_task_form($blog_id);
457
-			}
458
-			if (isset($_GET['do']) && $_GET['do'] == 'edit') {
459
-				Blog:: display_edit_task_form(
460
-					$blog_id,
461
-					intval($_GET['task_id'])
462
-				);
463
-			}
464
-			if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
465
-				Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
466
-			}
467
-			Blog :: display_task_list($blog_id);
468
-			echo '<br /><br />';
469
-			Blog :: display_assigned_task_list($blog_id);
470
-			echo '<br /><br />';
471
-		}
472
-		else
473
-			api_not_allowed();
474
-
475
-		break;
476
-	case 'execute_task' :
477
-		if (isset ($_GET['post_id']))
478
-			Blog :: display_post($blog_id, intval($_GET['post_id']));
479
-		else
480
-			Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
481
-
482
-		break;
483
-	case 'view_search_result' :
484
-		Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
485
-		break;
486
-	case '' :
487
-	default :
488
-		if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
489
-			Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
490
-		} else {
491
-			Blog :: display_blog_posts($blog_id);
492
-		}
446
+        break;
447
+    case 'manage_rights' :
448
+        Blog :: display_form_user_rights($blog_id);
449
+        break;
450
+    case 'manage_tasks' :
451
+        if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
452
+            if (isset($_GET['do']) && $_GET['do'] == 'add') {
453
+                Blog:: display_new_task_form($blog_id);
454
+            }
455
+            if (isset($_GET['do']) && $_GET['do'] == 'assign') {
456
+                Blog:: display_assign_task_form($blog_id);
457
+            }
458
+            if (isset($_GET['do']) && $_GET['do'] == 'edit') {
459
+                Blog:: display_edit_task_form(
460
+                    $blog_id,
461
+                    intval($_GET['task_id'])
462
+                );
463
+            }
464
+            if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
465
+                Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
466
+            }
467
+            Blog :: display_task_list($blog_id);
468
+            echo '<br /><br />';
469
+            Blog :: display_assigned_task_list($blog_id);
470
+            echo '<br /><br />';
471
+        }
472
+        else
473
+            api_not_allowed();
474
+
475
+        break;
476
+    case 'execute_task' :
477
+        if (isset ($_GET['post_id']))
478
+            Blog :: display_post($blog_id, intval($_GET['post_id']));
479
+        else
480
+            Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
481
+
482
+        break;
483
+    case 'view_search_result' :
484
+        Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
485
+        break;
486
+    case '' :
487
+    default :
488
+        if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
489
+            Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
490
+        } else {
491
+            Blog :: display_blog_posts($blog_id);
492
+        }
493 493
 }
494 494
 ?>
495 495
 </div>
Please login to merge, or discard this patch.
main/webservices/courses_list.soap.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
         'all',
29 29
         '',
30 30
         array(
31
-          'name'=>'code'  , 'type'=>'xsd:string',
32
-          'name'=>'title'  , 'type'=>'xsd:string',
33
-          'name'=>'url'    , 'type'=>'xsd:string',
34
-          'name'=>'teacher', 'type'=>'xsd:string',
35
-          'name'=>'language','type'=>'xsd:string',
31
+            'name'=>'code'  , 'type'=>'xsd:string',
32
+            'name'=>'title'  , 'type'=>'xsd:string',
33
+            'name'=>'url'    , 'type'=>'xsd:string',
34
+            'name'=>'teacher', 'type'=>'xsd:string',
35
+            'name'=>'language','type'=>'xsd:string',
36 36
         )
37 37
 );
38 38
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 // Register the method to expose
54 54
 $server->register('WSCourseList',         // method name
55 55
     array('username' => 'xsd:string',
56
-          'signature' => 'xsd:string',
57
-          'visibilities' => 'xsd:string'),      // input parameters
56
+            'signature' => 'xsd:string',
57
+            'visibilities' => 'xsd:string'),      // input parameters
58 58
     array('return' => 'xsd:Array'),             // output parameters
59 59
     'urn:WSCourseList',                         // namespace
60 60
     'urn:WSCourseList#WSCourseList',      // soapaction
@@ -97,19 +97,19 @@  discard block
 block discarded – undo
97 97
 
98 98
     $courses_list = array();
99 99
 
100
-	if (!is_array($visibilities)) {
101
-		$visibilities = split(',', $visibilities);
102
-	}
103
-	foreach ($visibilities as $visibility) {
104
-		if (!in_array($visibility, array_keys($vis))) {
105
-   			return array('error_msg' => 'Security check failed');
106
-		}
107
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
108
-		foreach ($courses_list_tmp as $index => $course) {
109
-			$course_info = CourseManager::get_course_information($course['code']);
110
-			$courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
111
-		}
112
-	}
100
+    if (!is_array($visibilities)) {
101
+        $visibilities = split(',', $visibilities);
102
+    }
103
+    foreach ($visibilities as $visibility) {
104
+        if (!in_array($visibility, array_keys($vis))) {
105
+                return array('error_msg' => 'Security check failed');
106
+        }
107
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
108
+        foreach ($courses_list_tmp as $index => $course) {
109
+            $course_info = CourseManager::get_course_information($course['code']);
110
+            $courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
111
+        }
112
+    }
113 113
     return $courses_list;
114 114
 }
115 115
 
Please login to merge, or discard this patch.
main/webservices/webservice.php 1 patch
Indentation   +220 added lines, -220 removed lines patch added patch discarded remove patch
@@ -11,237 +11,237 @@
 block discarded – undo
11 11
  */
12 12
 class WSError
13 13
 {
14
-	/**
15
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
16
-	 *
17
-	 * @var WSErrorHandler
18
-	 */
19
-	protected static $_handler;
20
-
21
-	/**
22
-	 * Error code
23
-	 *
24
-	 * @var int
25
-	 */
26
-	public $code;
27
-
28
-	/**
29
-	 * Error message
30
-	 *
31
-	 * @var string
32
-	 */
33
-	public $message;
34
-
35
-	/**
36
-	 * Constructor
37
-	 *
38
-	 * @param int Error code
39
-	 * @param string Error message
40
-	 */
41
-	public function __construct($code, $message) {
42
-		$this->code = $code;
43
-		$this->message = $message;
44
-	}
45
-
46
-	/**
47
-	 * Sets the error handler
48
-	 *
49
-	 * @param WSErrorHandler Error handler
50
-	 */
51
-	public static function setErrorHandler($handler) {
52
-		if($handler instanceof WSErrorHandler) {
53
-			self::$_handler = $handler;
54
-		}
55
-	}
56
-
57
-	/**
58
-	 * Returns the error handler
59
-	 *
60
-	 * @return WSErrorHandler Error handler
61
-	 */
62
-	public static function getErrorHandler() {
63
-		return self::$_handler;
64
-	}
65
-
66
-	/**
67
-	 * Transforms the error into an array
68
-	 *
69
-	 * @return array Associative array with code and message
70
-	 */
71
-	public function toArray() {
72
-		return array('code' => $this->code, 'message' => $this->message);
73
-	}
14
+    /**
15
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
16
+     *
17
+     * @var WSErrorHandler
18
+     */
19
+    protected static $_handler;
20
+
21
+    /**
22
+     * Error code
23
+     *
24
+     * @var int
25
+     */
26
+    public $code;
27
+
28
+    /**
29
+     * Error message
30
+     *
31
+     * @var string
32
+     */
33
+    public $message;
34
+
35
+    /**
36
+     * Constructor
37
+     *
38
+     * @param int Error code
39
+     * @param string Error message
40
+     */
41
+    public function __construct($code, $message) {
42
+        $this->code = $code;
43
+        $this->message = $message;
44
+    }
45
+
46
+    /**
47
+     * Sets the error handler
48
+     *
49
+     * @param WSErrorHandler Error handler
50
+     */
51
+    public static function setErrorHandler($handler) {
52
+        if($handler instanceof WSErrorHandler) {
53
+            self::$_handler = $handler;
54
+        }
55
+    }
56
+
57
+    /**
58
+     * Returns the error handler
59
+     *
60
+     * @return WSErrorHandler Error handler
61
+     */
62
+    public static function getErrorHandler() {
63
+        return self::$_handler;
64
+    }
65
+
66
+    /**
67
+     * Transforms the error into an array
68
+     *
69
+     * @return array Associative array with code and message
70
+     */
71
+    public function toArray() {
72
+        return array('code' => $this->code, 'message' => $this->message);
73
+    }
74 74
 }
75 75
 
76 76
 /**
77 77
  * Interface that must be implemented by any error handler
78 78
  */
79 79
 interface WSErrorHandler {
80
-	/**
81
-	 * Handle method
82
-	 *
83
-	 * @param WSError Error
84
-	 */
85
-	public function handle($error);
80
+    /**
81
+     * Handle method
82
+     *
83
+     * @param WSError Error
84
+     */
85
+    public function handle($error);
86 86
 }
87 87
 
88 88
 /**
89 89
  * Main class of the webservice. Webservice classes extend this class
90 90
  */
91 91
 class WS {
92
-	/**
93
-	 * Chamilo configuration
94
-	 *
95
-	 * @var array
96
-	 */
97
-	protected $_configuration;
98
-
99
-	/**
100
-	 * Constructor
101
-	 */
102
-	public function __construct() {
103
-		$this->_configuration = $GLOBALS['_configuration'];
104
-	}
105
-
106
-	/**
107
-	 * Verifies the API key
108
-	 *
109
-	 * @param string Secret key
110
-	 * @return mixed WSError in case of failure, null in case of success
111
-	 */
112
-	protected function verifyKey($secret_key) {
113
-		$ip = trim($_SERVER['REMOTE_ADDR']);
114
-		// if we are behind a reverse proxy, assume it will send the
115
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
116
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
117
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
118
-			$ip = trim($ip1);
119
-		}
120
-		$security_key = $ip.$this->_configuration['security_key'];
121
-
122
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
123
-			return new WSError(1, "API key is invalid");
124
-		} else {
125
-			return null;
126
-		}
127
-	}
128
-
129
-	/**
130
-	 * Gets the real user id based on the user id field name and value.
131
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
132
-	 * in the system database
133
-	 *
134
-	 * @param string User id field name
135
-	 * @param string User id value
136
-	 * @return mixed System user id if the user was found, WSError otherwise
137
-	 */
138
-	protected function getUserId($user_id_field_name, $user_id_value) {
139
-		if($user_id_field_name == "chamilo_user_id") {
140
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
141
-				return intval($user_id_value);
142
-			} else {
143
-				return new WSError(100, "User not found");
144
-			}
145
-		} else {
146
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
147
-			if($user_id == 0) {
148
-				return new WSError(100, "User not found");
149
-			} else {
150
-				return $user_id;
151
-			}
152
-		}
153
-	}
154
-
155
-	/**
156
-	 * Gets the real course id based on the course id field name and value.
157
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
158
-	 * in the system database
159
-	 *
160
-	 * @param string Course id field name
161
-	 * @param string Course id value
162
-	 * @return mixed System course id if the course was found, WSError otherwise
163
-	 */
164
-	protected function getCourseId($course_id_field_name, $course_id_value)
165
-	{
166
-		if ($course_id_field_name == "chamilo_course_id") {
167
-			if (CourseManager::get_course_code_from_course_id(
168
-					intval($course_id_value)
169
-				) != null
170
-			) {
171
-				return intval($course_id_value);
172
-			} else {
173
-				return new WSError(200, "Course not found");
174
-			}
175
-		} else {
176
-			$courseId = CourseManager::get_course_code_from_original_id(
177
-				$course_id_value,
178
-				$course_id_field_name
179
-			);
180
-			if (!empty($courseId)) {
181
-				return $courseId;
182
-			} else {
183
-				return new WSError(200, "Course not found");
184
-			}
185
-		}
186
-	}
187
-
188
-	/**
189
-	 * Gets the real session id based on the session id field name and value.
190
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
191
-	 * in the system database
192
-	 *
193
-	 * @param string Session id field name
194
-	 * @param string Session id value
195
-	 * @return mixed System session id if the session was found, WSError otherwise
196
-	 */
197
-	protected function getSessionId($session_id_field_name, $session_id_value)
198
-	{
199
-		if ($session_id_field_name == "chamilo_session_id") {
200
-			$session = SessionManager::fetch((int)$session_id_value);
201
-			if (!empty($session)) {
202
-				return intval($session_id_value);
203
-			} else {
204
-				return new WSError(300, "Session not found");
205
-			}
206
-		} else {
207
-			$session_id = SessionManager::getSessionIdFromOriginalId(
208
-				$session_id_value,
209
-				$session_id_field_name
210
-			);
211
-			if ($session_id == 0) {
212
-				return new WSError(300, "Session not found");
213
-			} else {
214
-				return $session_id;
215
-			}
216
-		}
217
-	}
218
-
219
-	/**
220
-	 * Handles an error by calling the WSError error handler
221
-	 *
222
-	 * @param WSError Error
223
-	 */
224
-	protected function handleError($error) {
225
-		$handler = WSError::getErrorHandler();
226
-		$handler->handle($error);
227
-	}
228
-
229
-	/**
230
-	 * Gets a successful result
231
-	 *
232
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
233
-	 */
234
-	protected function getSuccessfulResult() {
235
-		return array('code' => 0, 'message' => 'Operation was successful');
236
-	}
237
-
238
-	/**
239
-	 * Test function. Returns the string success
240
-	 *
241
-	 * @return string Success
242
-	 */
243
-	public function test() {
244
-		return "success";
245
-	}
92
+    /**
93
+     * Chamilo configuration
94
+     *
95
+     * @var array
96
+     */
97
+    protected $_configuration;
98
+
99
+    /**
100
+     * Constructor
101
+     */
102
+    public function __construct() {
103
+        $this->_configuration = $GLOBALS['_configuration'];
104
+    }
105
+
106
+    /**
107
+     * Verifies the API key
108
+     *
109
+     * @param string Secret key
110
+     * @return mixed WSError in case of failure, null in case of success
111
+     */
112
+    protected function verifyKey($secret_key) {
113
+        $ip = trim($_SERVER['REMOTE_ADDR']);
114
+        // if we are behind a reverse proxy, assume it will send the
115
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
116
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
117
+            list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
118
+            $ip = trim($ip1);
119
+        }
120
+        $security_key = $ip.$this->_configuration['security_key'];
121
+
122
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
123
+            return new WSError(1, "API key is invalid");
124
+        } else {
125
+            return null;
126
+        }
127
+    }
128
+
129
+    /**
130
+     * Gets the real user id based on the user id field name and value.
131
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
132
+     * in the system database
133
+     *
134
+     * @param string User id field name
135
+     * @param string User id value
136
+     * @return mixed System user id if the user was found, WSError otherwise
137
+     */
138
+    protected function getUserId($user_id_field_name, $user_id_value) {
139
+        if($user_id_field_name == "chamilo_user_id") {
140
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
141
+                return intval($user_id_value);
142
+            } else {
143
+                return new WSError(100, "User not found");
144
+            }
145
+        } else {
146
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
147
+            if($user_id == 0) {
148
+                return new WSError(100, "User not found");
149
+            } else {
150
+                return $user_id;
151
+            }
152
+        }
153
+    }
154
+
155
+    /**
156
+     * Gets the real course id based on the course id field name and value.
157
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
158
+     * in the system database
159
+     *
160
+     * @param string Course id field name
161
+     * @param string Course id value
162
+     * @return mixed System course id if the course was found, WSError otherwise
163
+     */
164
+    protected function getCourseId($course_id_field_name, $course_id_value)
165
+    {
166
+        if ($course_id_field_name == "chamilo_course_id") {
167
+            if (CourseManager::get_course_code_from_course_id(
168
+                    intval($course_id_value)
169
+                ) != null
170
+            ) {
171
+                return intval($course_id_value);
172
+            } else {
173
+                return new WSError(200, "Course not found");
174
+            }
175
+        } else {
176
+            $courseId = CourseManager::get_course_code_from_original_id(
177
+                $course_id_value,
178
+                $course_id_field_name
179
+            );
180
+            if (!empty($courseId)) {
181
+                return $courseId;
182
+            } else {
183
+                return new WSError(200, "Course not found");
184
+            }
185
+        }
186
+    }
187
+
188
+    /**
189
+     * Gets the real session id based on the session id field name and value.
190
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
191
+     * in the system database
192
+     *
193
+     * @param string Session id field name
194
+     * @param string Session id value
195
+     * @return mixed System session id if the session was found, WSError otherwise
196
+     */
197
+    protected function getSessionId($session_id_field_name, $session_id_value)
198
+    {
199
+        if ($session_id_field_name == "chamilo_session_id") {
200
+            $session = SessionManager::fetch((int)$session_id_value);
201
+            if (!empty($session)) {
202
+                return intval($session_id_value);
203
+            } else {
204
+                return new WSError(300, "Session not found");
205
+            }
206
+        } else {
207
+            $session_id = SessionManager::getSessionIdFromOriginalId(
208
+                $session_id_value,
209
+                $session_id_field_name
210
+            );
211
+            if ($session_id == 0) {
212
+                return new WSError(300, "Session not found");
213
+            } else {
214
+                return $session_id;
215
+            }
216
+        }
217
+    }
218
+
219
+    /**
220
+     * Handles an error by calling the WSError error handler
221
+     *
222
+     * @param WSError Error
223
+     */
224
+    protected function handleError($error) {
225
+        $handler = WSError::getErrorHandler();
226
+        $handler->handle($error);
227
+    }
228
+
229
+    /**
230
+     * Gets a successful result
231
+     *
232
+     * @return array Array with a code of 0 and a message 'Operation was successful'
233
+     */
234
+    protected function getSuccessfulResult() {
235
+        return array('code' => 0, 'message' => 'Operation was successful');
236
+    }
237
+
238
+    /**
239
+     * Test function. Returns the string success
240
+     *
241
+     * @return string Success
242
+     */
243
+    public function test() {
244
+        return "success";
245
+    }
246 246
 }
247 247
 
Please login to merge, or discard this patch.