chamilo / chamilo-lms

main/reports/reports.php

Braces +43 added lines, -31 removed lines

@@ -37,16 +37,18 @@ 
 	// converting post vars to get uri
 	$params = '';
 	$kv = array();
-	foreach ($_POST as $key => $value)
-		if ($key != 'format')
+	foreach ($_POST as $key => $value) {
+			if ($key != 'format')
 			$kv[] = $key.'='.urlencode($value);
+	}
 	$query_string = join("&", $kv);
 	die('<a href="reports.php?format=directlink&'.$query_string.'">'.get_lang('ReportTypeLink').'</a>');
 }
 
 if ($_REQUEST['format'] == 'directlink') {
-	foreach (array('jquery.dataTables.min.js') as $js)
-		$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+	foreach (array('jquery.dataTables.min.js') as $js) {
+			$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+	}
 
 	$htmlCSSXtra[] = 'dataTable.css';
 
@@ -72,9 +74,10 @@ 
 	// converting post vars to get uri
 	$params = '';
 	$kv = array();
-	foreach ($_POST as $key => $value)
-		if ($key != 'format')
+	foreach ($_POST as $key => $value) {
+			if ($key != 'format')
 			$kv[] = $key.'='.urlencode($value);
+	}
 	$query_string = join("&", $kv);
 	die('<a href="reports.php?format=downloadcsv&'.$query_string.'">'.get_lang('DownloadFile').'</a>');
 } else if ($_REQUEST['format'] == 'downloadcsv') {
@@ -82,8 +85,7 @@ 
 		header("Pragma: must-revalidate");
 		header("Cache-Control: must-revalidate");
 		header("Content-type: application/vnd.ms-excel");
-	}
-	else {
+	} else {
 		header("Content-type: text/csv");
 	}
 	$date = date("Y-m-d");
@@ -96,10 +98,12 @@ 
 
 if (is_array($reports_template[$_REQUEST['type']])) {
 	$query = $reports_template[$_REQUEST['type']]['getSQL']();
-	if (! is_array($query))
-		$query = array($query);
-	if ($_REQUEST['format'] == 'sql')
-		die(var_export($query, true));
+	if (! is_array($query)) {
+			$query = array($query);
+	}
+	if ($_REQUEST['format'] == 'sql') {
+			die(var_export($query, true));
+	}
 
 	$result = multiquery_query($query);
 
@@ -155,32 +159,35 @@ 
 		if (substr($columns[$i], -5, 5) != '_link') {
 			$column_islink[$i] = false;
 			echo '<th>'.$columns[$i].'</th>';
-		} else
-			$columns_islink[$i] = true;
+		} else {
+					$columns_islink[$i] = true;
+		}
 	}
 
 	// checking resolving link column id
 	$columns_flip = array_flip($columns);
 	$columns_link = array();
-	for ($i=0; $i < $nfields; $i++)
-		if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
+	for ($i=0; $i < $nfields; $i++) {
+			if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
 			$columns_link[$i] = $columns_flip[$columns[$i].'_link'];
-		else
-			$columns_link[$i] = '';
+	}
+		else {
+					$columns_link[$i] = '';
+		}
 	echo '</tr></thead><tbody>';
 	while ($row = multiquery_fetch_row($result)) {
 		echo '<tr>';
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]){ // ignore links
+		for ($i = 0; $i<$nfields; $i++) {
+					if (!$columns_islink[$i]){ // ignore links
 				if ($columns_link[$i] != '') // link is defined
 					if (substr($columns_link[$i],0,10) == 'javascript') {
 						echo '<td><a href="#" onclick="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
-					}
-					else {
+		}
+					} else {
 						echo '<td><a href="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
-					}
-				else
-					echo '<td>'.$row[$i].'</td>';
+					} else {
+									echo '<td>'.$row[$i].'</td>';
+				}
 			}
 		echo "</tr>\n";
 	}
@@ -206,18 +213,23 @@ 
 		if (substr($columns[$i], -5, 5) != '_link') {
 			$column_islink[$i] = false;
 			echo csv_escaping($columns[$i]).',';
-		} else
-			$columns_islink[$i] = true;
+		} else {
+					$columns_islink[$i] = true;
+		}
 	}
 
 	echo "\n";
 	while ($row = multiquery_fetch_row($result)) {
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]) // ignore links
-				echo csv_escaping($row[$i]).',';  // fixme
+		for ($i = 0; $i<$nfields; $i++) {
+					if (!$columns_islink[$i]) // ignore links
+				echo csv_escaping($row[$i]).',';
+		}
+		// fixme
 		echo "\n";
 	}
-} else die(get_lang('UnknownFormat'));
+} else {
+    die(get_lang('UnknownFormat'));
+}
 
 function csv_escaping($value, $csv_separator = ',') {
 	$value = str_replace('"','""',$value);

main/wiki/wiki.inc.php

Braces +4 added lines, -7 removed lines

@@ -1878,7 +1878,7 @@ 
                 $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />';
                 if($session_id==0){
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />';
-                }else{
+                } else{
                     $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />';
                 }
                 $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />';
@@ -2261,8 +2261,7 @@ 
                                         s1.reflink = s2.reflink AND
                                         ".$groupfilter.$condition_session.")";
                     // warning don't use group by reflink because don't return the last version
-                }
-                else {
+                } else {
                     $sql = " SELECT * FROM ".$tbl_wiki." s1
                             WHERE
                                 s1.c_id = $course_id AND
@@ -3696,8 +3695,7 @@ 
                 '.api_htmlentities($obj->title).'</a>';
                 if ($obj->user_id <>0) {
                     $row[] = UserManager::getUserProfileLink($userinfo);
-                }
-                else {
+                } else {
                     $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
                 }
                 $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
@@ -3932,8 +3930,7 @@ 
                         api_htmlentities($obj->title).'</a>';
                     if ($obj->user_id <>0) {
                         $row[] = UserManager::getUserProfileLink($userinfo);
-                    }
-                    else {
+                    } else {
                         $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')';
                     }
                     $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds;

main/permissions/group_permissions.inc.php

Braces +3 added lines, -1 removed lines

@@ -97,9 +97,11 @@
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
-foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
+foreach ($tool_rights as $tool=>$rights) {
+    // $tool_rights contains all the possible tools and their rights
 {
 	echo "\t<tr>\n";
+}
 	echo "\t\t<td>\n";
 	echo get_lang($tool);
 	echo "\t\t</td>\n";

main/permissions/permissions_functions.inc.php

Braces +10 added lines, -16 removed lines

@@ -132,24 +132,20 @@ 
 	{
 		$table=Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
-	}
-	elseif ($content == 'group')
+	} elseif ($content == 'group')
 	{
 		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
-	}
-	elseif ($content == 'role')
+	} elseif ($content == 'role')
 	{
 		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
-	}
-	elseif ($content == 'platform_role')
+	} elseif ($content == 'platform_role')
 	{
 		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
-	}
-	elseif ($content == 'task')
+	} elseif ($content == 'task')
 	{
 		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
@@ -162,8 +158,9 @@ 
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
-		$currentpermissions[$row['tool']][] = $row['action'];
+	while($row = Database::fetch_array($result)) {
+			$currentpermissions[$row['tool']][] = $row['action'];
+	}
 
 	return $currentpermissions;
 }
@@ -321,14 +318,12 @@ 
 	if ($course_admin)
 	{
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	}
-	else
+	} else
 	{
 		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		}
-		else
+		} else
 		{
 			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
 			{
@@ -439,8 +434,7 @@ 
 			$checked='checked';
 			$image='checkbox_on2.gif';
 			$action='revoke';
-		}
-		else
+		} else
 		{
 			$checked='';
 			$image='wrong.gif';

main/permissions/user_permissions.inc.php

Braces +4 added lines, -3 removed lines

@@ -140,9 +140,11 @@ 
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
-foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
+foreach ($tool_rights as $tool=>$rights) {
+    // $tool_rights contains all the possible tools and their rights
 {
 	echo "\t<tr>\n";
+}
 	echo "\t\t<td>\n";
 	if (strstr($tool,'BLOG'))
 	{
@@ -152,8 +154,7 @@ 
 		$blog_id = substr($tool,$tmp,strlen($tool));
 		// Get title
 		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
-	}
-	else
+	} else
 	{
 		echo get_lang($tool);
 	}

main/permissions/roles.php

Braces +8 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
 		$result=Database::query($sql);
 		$role_id=Database::insert_id();
 		$result_message=store_permissions('role', $role_id);
-	}
-	else
+	} else
 	{
 		$result_message=get_lang('ErrorPleaseGiveRoleName');
 	}
@@ -122,9 +121,11 @@ 
 	echo "\t</tr>\n";
 
 	// the main area with the checkboxes or images
-	foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
+	foreach ($tool_rights as $tool=>$rights) {
+	    // $tool_rights contains all the possible tools and their rights
 	{
 		echo "\t<tr>\n";
+	}
 		echo "\t\t<td>\n";
 		echo get_lang($tool);
 		echo "\t\t</td>\n";
@@ -216,9 +217,11 @@ 
 	echo "\t</tr>\n";
 
 	// the main area with the checkboxes or images
-	foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
+	foreach ($tool_rights as $tool=>$rights) {
+	    // $tool_rights contains all the possible tools and their rights
 	{
 		echo "\t<tr>\n";
+	}
 		echo "\t\t<td>\n";
 		echo get_lang($tool);
 		echo "\t\t</td>\n";
@@ -237,8 +240,7 @@ 
 					if ($_GET['scope']=='platform')
 					{
 						$roles_editable=false;
-					}
-					else
+					} else
 					{
 						$roles_editable=true;
 					}

main/webservices/access_url.php

Braces +12 added lines, -8 removed lines

@@ -58,19 +58,22 @@ 
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -87,8 +90,9 @@ 
 
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 

main/webservices/lp.php

Braces +48 added lines, -20 removed lines

@@ -48,19 +48,22 @@ 
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -76,8 +79,9 @@ 
     }
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -140,7 +144,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSImportLP');
+    if ($debug) {
+        error_log('WSImportLP');
+    }
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -156,7 +162,9 @@ 
     $courseId = $courseInfo['real_id'];
 
     if (empty($courseInfo)) {
-        if ($debug) error_log('Course not found');
+        if ($debug) {
+            error_log('Course not found');
+        }
         return 'Course not found';
     }
 
@@ -169,7 +177,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -196,7 +206,9 @@ 
     $manifest = $oScorm->import_package($fileInfo, '', $courseInfo);
 
     if (!$manifest) {
-        if ($debug) error_log('manifest.xml file not found');
+        if ($debug) {
+            error_log('manifest.xml file not found');
+        }
         //if api_set_failure
         return 'manifest.xml file not found';
     }
@@ -215,10 +227,14 @@ 
         $oScorm->set_maker($maker, $courseId);
         //$oScorm->set_jslib('scorm_api.php');
 
-        if ($debug) error_log('scorm was added');
+        if ($debug) {
+            error_log('scorm was added');
+        }
         return 1;
     } else {
-        if ($debug) error_log('manifest data empty');
+        if ($debug) {
+            error_log('manifest data empty');
+        }
         return 'manifest data empty';
     }
 }
@@ -311,7 +327,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
 
@@ -326,7 +344,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -407,7 +427,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
     $courseId = $courseInfo['real_id'];
@@ -432,7 +454,9 @@ 
 
     $lp = new learnpath($courseCode, $lpId, null);
     if ($lp) {
-        if ($debug) error_log("LP deleted $lpId");
+        if ($debug) {
+            error_log("LP deleted $lpId");
+        }
 
         $course_dir = $courseInfo['directory'] . '/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
@@ -448,7 +472,9 @@ 
                 if ($item) {
                     $documentId = $item->get_path();
 
-                    if ($debug) error_log("lp item id found #$itemId");
+                    if ($debug) {
+                        error_log("lp item id found #$itemId");
+                    }
 
                     $documentInfo = DocumentManager::get_document_data_by_id(
                         $documentId,
@@ -474,7 +500,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log("Document not found #$itemId");
+                    if ($debug) {
+                        error_log("Document not found #$itemId");
+                    }
                 }
             }
         }

main/webservices/cm_webservice_forum.php

Braces +24 added lines, -16 removed lines

@@ -32,8 +32,9 @@ 
                 }
             }
             return $foruns_id;
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_title($username, $password, $course_code, $forum_id)
@@ -54,8 +55,9 @@ 
 
             $forum_title = utf8_decode($forum_info['forum_title']);
             return $forum_title;
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
@@ -73,8 +75,9 @@ 
 
             return $threads_id;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
@@ -115,8 +118,9 @@ 
 
             return $thread_info[$field_table];
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
@@ -139,8 +143,9 @@ 
 
             return $thread_info[$field_table];
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
 
@@ -184,8 +189,9 @@ 
                 }
             }
             return $posts_id;
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function get_post_data($username, $password, $course_code, $post_id, $field)
@@ -226,8 +232,9 @@ 
                     $field_table = "title";
             }
             return (htmlcode) ? html_entity_decode($post_info[$field_table]) : $post_info[$field_table];
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
     }
 
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
@@ -269,8 +276,9 @@ 
 
             //send_notification_mails($thread_id, $values);
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }