Completed
Push — 1.10.x ( 432f77...78f0b0 )
by Angel Fernando Quiroz
244:02 queued 198:19
created
plugin/add_cas_logout_button/plugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 //the plugin title
13
-$plugin_info['title']      = 'Add a button to logout from CAS';
13
+$plugin_info['title'] = 'Add a button to logout from CAS';
14 14
 
15 15
 //the comments that go with the plugin
16 16
 $plugin_info['comment']     = "If CAS is activated, this plugin add a text and a button on the user page to logout from a CAS session. Configure plugin to add title, comment and logo.";
@@ -36,4 +36,4 @@  discard block
 block discarded – undo
36 36
 $plugin_info['settings_form'] = $form;
37 37
 
38 38
 // Set the templates that are going to be used
39
-$plugin_info['templates']   = array('template.tpl');
39
+$plugin_info['templates'] = array('template.tpl');
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     Event::addEvent(
61 61
         LOG_ATTEMPTED_FORCED_LOGIN,
62 62
         'tried_hacking_get',
63
-        $_SERVER['REMOTE_ADDR'].(empty($_POST['login'])?'':'/'.$_POST['login']),
63
+        $_SERVER['REMOTE_ADDR'].(empty($_POST['login']) ? '' : '/'.$_POST['login']),
64 64
         null,
65 65
         $i
66 66
     );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 if (!empty($_POST['submitAuth'])) {
93 93
     // The user has been already authenticated, we are now to find the last login of the user.
94 94
     if (isset ($_user['user_id'])) {
95
-        $track_login_table      = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
95
+        $track_login_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
96 96
         $sql_last_login = "SELECT UNIX_TIMESTAMP(login_date)
97 97
                                 FROM $track_login_table
98 98
                                 WHERE login_user_id = '".$_user['user_id']."'
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             if (Database::num_rows($result_last_login) > 0) {
103 103
                 $user_last_login_datetime = Database::fetch_array($result_last_login);
104 104
                 $user_last_login_datetime = $user_last_login_datetime[0];
105
-                Session::write('user_last_login_datetime',$user_last_login_datetime);
105
+                Session::write('user_last_login_datetime', $user_last_login_datetime);
106 106
             }
107 107
         }
108 108
         //Event::event_login();
Please login to merge, or discard this patch.
whoisonline.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
         if (!isset($_GET['id'])) {
62 62
             if (api_get_setting('allow_social_tool') == 'true') {
63 63
                 if (!api_is_anonymous()) {
64
-                    $query = isset($_GET['q']) ? $_GET['q']: null;
64
+                    $query = isset($_GET['q']) ? $_GET['q'] : null;
65 65
                     $social_search = UserManager::get_search_form($query);
66 66
                 }
67 67
             }
Please login to merge, or discard this patch.
whoisonlinesession.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
             $time_limit = 60;
78 78
         }
79 79
 
80
-        $online_time    = time() - $time_limit*60;
80
+        $online_time    = time() - $time_limit * 60;
81 81
         $current_date   = api_get_utc_datetime($online_time);
82 82
 
83 83
         $students_online = array();
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
 			$result = Database::query($sql);
99 99
 
100
-			while($user_list = Database::fetch_array($result)) {
100
+			while ($user_list = Database::fetch_array($result)) {
101 101
 				$students_online[$user_list['access_user_id']] = $user_list;
102 102
 			}
103 103
 		}
Please login to merge, or discard this patch.
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@  discard block
 block discarded – undo
41 41
 		</th>
42 42
 	</tr>
43 43
 <?php
44
-	$session_is_coach = array();
45
-	if (isset($_user['user_id']) && $_user['user_id'] != '') {
46
-		$_user['user_id'] = intval($_user['user_id']);
47
-		$sql = "SELECT DISTINCT session.id,
44
+    $session_is_coach = array();
45
+    if (isset($_user['user_id']) && $_user['user_id'] != '') {
46
+        $_user['user_id'] = intval($_user['user_id']);
47
+        $sql = "SELECT DISTINCT session.id,
48 48
 					name,
49 49
 					access_start_date,
50 50
 					access_end_date
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
53 53
 					ON srcru.user_id = ".$_user['user_id']." AND srcru.status=2
54 54
 					AND session.id = srcru.session_id
55 55
 				ORDER BY access_start_date, access_end_date, name";
56
-		$result = Database::query($sql);
56
+        $result = Database::query($sql);
57 57
 
58
-		while ($session = Database:: fetch_array($result)) {
59
-			$session_is_coach[$session['id']] = $session;
60
-		}
58
+        while ($session = Database:: fetch_array($result)) {
59
+            $session_is_coach[$session['id']] = $session;
60
+        }
61 61
 
62
-		$sql = "SELECT DISTINCT session.id,
62
+        $sql = "SELECT DISTINCT session.id,
63 63
 					name,
64 64
 					access_start_date,
65 65
 					access_end_date
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 				WHERE session.id_coach = ".$_user['user_id']."
68 68
 				ORDER BY access_start_date, access_end_date, name";
69 69
         $result = Database::query($sql);
70
-		while ($session = Database:: fetch_array($result)) {
71
-			$session_is_coach[$session['id']] = $session;
72
-		}
70
+        while ($session = Database:: fetch_array($result)) {
71
+            $session_is_coach[$session['id']] = $session;
72
+        }
73 73
 
74 74
         if (empty($time_limit)) {
75 75
             $time_limit = api_get_setting('time_limit_whosonline');
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
         $students_online = array();
84 84
         foreach ($session_is_coach as $session) {
85
-			$sql = "SELECT DISTINCT last_access.access_user_id,
85
+            $sql = "SELECT DISTINCT last_access.access_user_id,
86 86
 						last_access.access_date,
87 87
 						last_access.c_id,
88 88
 						last_access.access_session_id,
@@ -95,49 +95,49 @@  discard block
 block discarded – undo
95 95
 					AND access_date >= '$current_date'
96 96
 					GROUP BY access_user_id";
97 97
 
98
-			$result = Database::query($sql);
98
+            $result = Database::query($sql);
99 99
 
100
-			while($user_list = Database::fetch_array($result)) {
101
-				$students_online[$user_list['access_user_id']] = $user_list;
102
-			}
103
-		}
100
+            while($user_list = Database::fetch_array($result)) {
101
+                $students_online[$user_list['access_user_id']] = $user_list;
102
+            }
103
+        }
104 104
 
105
-		if (count($students_online) > 0) {
106
-			foreach ($students_online as $student_online) {
107
-				echo "<tr>
105
+        if (count($students_online) > 0) {
106
+            foreach ($students_online as $student_online) {
107
+                echo "<tr>
108 108
 						<td>
109 109
 					";
110
-				echo $student_online['name'];
111
-				echo "	</td>
110
+                echo $student_online['name'];
111
+                echo "	</td>
112 112
 						<td align='center'>
113 113
 					 ";
114
-				$courseInfo = api_get_course_info_by_id($student_online['c_id']);
115
-				echo $courseInfo['title'];
116
-				echo "	</td>
114
+                $courseInfo = api_get_course_info_by_id($student_online['c_id']);
115
+                echo $courseInfo['title'];
116
+                echo "	</td>
117 117
 						<td align='center'>
118 118
 					 ";
119
-							 if (!empty($student_online['email'])) {
120
-								echo $student_online['email'];
121
-							 } else {
122
-							 	echo get_lang('NoEmail');
123
-							 }
124
-				echo "	</td>
119
+                                if (!empty($student_online['email'])) {
120
+                                echo $student_online['email'];
121
+                                } else {
122
+                                    echo get_lang('NoEmail');
123
+                                }
124
+                echo "	</td>
125 125
 						<td align='center'>
126 126
 					 ";
127
-				echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
128
-				echo "	</td>
127
+                echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
128
+                echo "	</td>
129 129
 					</tr>
130 130
 					 ";
131
-			}
132
-		} else {
133
-			echo '	<tr>
131
+            }
132
+        } else {
133
+            echo '	<tr>
134 134
 						<td colspan="4">
135 135
 							'.get_lang('NoOnlineStudents').'
136 136
 						</td>
137 137
 					</tr>
138 138
 				 ';
139
-		}
140
-	}
139
+        }
140
+    }
141 141
 ?>
142 142
 </table>
143 143
 <?php
Please login to merge, or discard this patch.
user.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -27,18 +27,18 @@
 block discarded – undo
27 27
 $array_keys = array_keys($_GET);
28 28
 
29 29
 if (!empty($array_keys)) {
30
-	$username 	= substr($array_keys[0],0,20); // max len of an username
31
-	$friend_id 	= UserManager::get_user_id_from_username($username);
30
+    $username 	= substr($array_keys[0],0,20); // max len of an username
31
+    $friend_id 	= UserManager::get_user_id_from_username($username);
32 32
 
33
-	if ($friend_id) {
34
-		SocialManager::display_individual_user($friend_id);
35
-	} else {
36
-		// we cant find your friend
37
-		header('Location: whoisonline.php');
38
-		exit;
39
-	}
33
+    if ($friend_id) {
34
+        SocialManager::display_individual_user($friend_id);
35
+    } else {
36
+        // we cant find your friend
37
+        header('Location: whoisonline.php');
38
+        exit;
39
+    }
40 40
 } else {
41
-		// we cant find your friend
42
-	header('Location: whoisonline.php');
43
-	exit;
41
+        // we cant find your friend
42
+    header('Location: whoisonline.php');
43
+    exit;
44 44
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@
 block discarded – undo
27 27
 $array_keys = array_keys($_GET);
28 28
 
29 29
 if (!empty($array_keys)) {
30
-	$username 	= substr($array_keys[0],0,20); // max len of an username
31
-	$friend_id 	= UserManager::get_user_id_from_username($username);
30
+	$username 	= substr($array_keys[0], 0, 20); // max len of an username
31
+	$friend_id = UserManager::get_user_id_from_username($username);
32 32
 
33 33
 	if ($friend_id) {
34 34
 		SocialManager::display_individual_user($friend_id);
Please login to merge, or discard this patch.
custompages/lostpassword-dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 ?>
12 12
 <html>
13 13
 <head>
14
-	<title><?php echo custompages_get_lang('LostPassword');?></title>
14
+	<title><?php echo custompages_get_lang('LostPassword'); ?></title>
15 15
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
16 16
 	<!--[if !IE 6]><!-->
17 17
 	<link rel="stylesheet" type="text/css" href="../../custompages/style.css" />
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 		<div id="lostpassword-form-box" class="form-box">
44 44
             <?php
45 45
             if (isset($content['info']) && !empty($content['info'])) {
46
-                echo '<div id="registration-form-error" class="form-error"><ul>' . $content['info'] . '</ul></div>';
46
+                echo '<div id="registration-form-error" class="form-error"><ul>'.$content['info'].'</ul></div>';
47 47
             }
48 48
 
49 49
             echo isset($content['form']) ? $content['form'] : ''
Please login to merge, or discard this patch.
custompages/registration-dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 ?>
82 82
 <html>
83 83
 <head>
84
-    <title><?php echo custompages_get_lang('Registration');?></title>
84
+    <title><?php echo custompages_get_lang('Registration'); ?></title>
85 85
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
86 86
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
87 87
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
Please login to merge, or discard this patch.
custompages/language.inc.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     }
29 29
     krsort($langs, SORT_NUMERIC);
30 30
     // Choosing the best match
31
-    foreach($langs as $weight => $codes) {
31
+    foreach ($langs as $weight => $codes) {
32 32
 		foreach ($codes as $code) {
33 33
         	if (in_array($code, $available_langs)) {
34 34
             	return $code;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', 'es' => 'spanish');
57 57
 
58 58
 // Which of these can we actually pick from ?
59
-$available_langs = array('en','fr');
59
+$available_langs = array('en', 'fr');
60 60
 
61 61
 // Let's find out which language to serve to this particular browser
62 62
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
     krsort($langs, SORT_NUMERIC);
30 30
     // Choosing the best match
31 31
     foreach($langs as $weight => $codes) {
32
-		foreach ($codes as $code) {
33
-        	if (in_array($code, $available_langs)) {
34
-            	return $code;
35
-        	}
36
-		}
32
+        foreach ($codes as $code) {
33
+            if (in_array($code, $available_langs)) {
34
+                return $code;
35
+            }
36
+        }
37 37
     }
38 38
     // No match
39 39
     return null;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
  * use this if you want to avoid translation caching issues
45 45
  */
46 46
 function cp_get_lang($variable) {
47
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
47
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
48 48
 }
49 49
 /**
50 50
  * Code
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
63 63
 
64 64
 // Chamilo overrides this parameters at some places, e.g. in the logout link
65 65
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
66
-	$lang_match = $_REQUEST['language'];
66
+    $lang_match = $_REQUEST['language'];
67 67
 }
68 68
 
69 69
 // Maybe a language had already been selected, we should honor this
70 70
 if (isset($_SESSION['user_language_choice']) && in_array($_SESSION['user_language_choice'], $chamilo_langs)) {
71
-	$lang_match = $_SESSION['user_language_choice'];
71
+    $lang_match = $_SESSION['user_language_choice'];
72 72
 }
73 73
 
74 74
 // We need to set the relevant session variables to the best match, to use Chamilo's i18n lib.
Please login to merge, or discard this patch.
custompages/index-unlogged-dist.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 		<div id="login-form-box" class="form-box">
80 80
             <div id="login-form-info" class="form-info">
81 81
             <?php if (isset($content['info']) && !empty($content['info'])) {
82
-              echo $content['info'];
82
+                echo $content['info'];
83 83
             }
84 84
             ?>
85 85
             </div>
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,14 +89,14 @@
 block discarded – undo
89 89
             ?>
90 90
             <form id="login-form" class="form" action="<?php echo api_get_path(WEB_PATH)?>index.php" method="post">
91 91
                 <div>
92
-                    <label for="login">*<?php echo custompages_get_lang('User');?></label>
92
+                    <label for="login">*<?php echo custompages_get_lang('User'); ?></label>
93 93
                     <input name="login" type="text" /><br />
94
-                    <label for="password">*<?php echo custompages_get_lang('Password');?></label>
94
+                    <label for="password">*<?php echo custompages_get_lang('Password'); ?></label>
95 95
                     <input name="password" type="password" /><br />
96 96
                 </div>
97 97
             </form>
98 98
             <div id="login-form-submit" class="form-submit" onclick="document.forms['login-form'].submit();">
99
-                <span><?php echo custompages_get_lang('LoginEnter');?></span>
99
+                <span><?php echo custompages_get_lang('LoginEnter'); ?></span>
100 100
             </div> <!-- #form-submit -->
101 101
 			<div id="links">
102 102
 
Please login to merge, or discard this patch.