View GitHub Repository chamilo-lms

Schedule Inspection
Subscribe
Completed
Pull Request — 1.11.x (#1697)
by José
29:12
created
Status
Category
Toggle Patches
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/index-unlogged-dist.php 1 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.
custompages/first_login-dist.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -13,17 +13,17 @@  discard block
 
 block discarded – undo
13 13 
 /**
14 14 
  * Security checks
15 15 
  */
16 
-if (! isset($_SESSION['conditional_login']['uid']))
16 
+if (!isset($_SESSION['conditional_login']['uid']))
17 17 
   die("Not Authorised");
18 18
19 19 
 if (isset($_POST['password'])) {
20 20 
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
21 21 
     if ($_POST['password'] != $_POST['password2']) {
22 
-        header('Location: '. api_get_self().'?invalid=2');
22 
+        header('Location: '.api_get_self().'?invalid=2');
23 23 
         exit();
24 24 
     }
25 
-    if (empty($_POST['password'])){ //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
26 
-        header('Location: '. api_get_self().'?invalid=1');
25 
+    if (empty($_POST['password'])) { //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
26 
+        header('Location: '.api_get_self().'?invalid=1');
27 27 
         exit();
28 28 
     }
29 29 
     $password = $_POST['password'];
 
@@ -99,23 +99,23 @@  discard block
 
 block discarded – undo
99 99 
 		<div id="header">
100 100 
 			<img src="/custompages/images/header.png" alt="Logo" />
101 101 
 		</div> <!-- #header -->
102 
-    <h2> <?php echo custompages_get_lang('FirstLogin');?> </h2>
102 
+    <h2> <?php echo custompages_get_lang('FirstLogin'); ?> </h2>
103 103
104 104 
 		<div id="changepassword-form-box" class="form-box">
105 
-      <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
105 
+      <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword'); ?> </div>
106 106 
 		<?php if (isset($error_message)) {
107 107 
 			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
108 108 
 		}?>
109 109 
 			<form id="changepassword-form" class="form" method="post">
110 110 
 				<div>
111 
-          <label for="password">*<?php echo custompages_get_lang('Password');?></label>
111 
+          <label for="password">*<?php echo custompages_get_lang('Password'); ?></label>
112 112 
 					<input name="password" type="password" /><br />
113 
-          <label for="password2">*<?php echo custompages_get_lang('Password');?></label>
113 
+          <label for="password2">*<?php echo custompages_get_lang('Password'); ?></label>
114 114 
 					<input name="password2" type="password" /><br />
115 115 
 				</div>
116 116 
 			</form>
117 117 
 			<div id="changepassword-form-submit" class="form-submit" onclick="document.forms['changepassword-form'].submit();">
118 
-      <span><?php echo custompages_get_lang('LoginEnter');?></span>
118 
+      <span><?php echo custompages_get_lang('LoginEnter'); ?></span>
119 119 
 			</div> <!-- #form-submit -->
120 120 
 		</div> <!-- #form -->
121 121 
 		<div id="footer">
Please login to merge, or discard this patch.
custompages/loggedout-dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -52,7 +52,7 @@
 
 block discarded – undo
52 52 
                     You have been logged out.
53 53 
                 </div>
54 54 
             </div>
55 
-            <a href="<?php echo $www . 'user_portal.php'; ?>">Go to your portal</a>
55 
+            <a href="<?php echo $www.'user_portal.php'; ?>">Go to your portal</a>
56 56 
             <div id="footer">
57 57 
                 <img src="<?php echo $www ?>/custompages/images/footer.png" alt="footer"/>
58 58 
             </div>
Please login to merge, or discard this patch.
custompages/registration-feedback-dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,7 @@  discard block
 
 block discarded – undo
13 13 
 ?>
14 14 
 <html>
15 15 
 <head>
16 
-    <title><?php echo custompages_get_lang('Registration');?></title>
16 
+    <title><?php echo custompages_get_lang('Registration'); ?></title>
17 17 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
18 18 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
19 19 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -39,7 +39,7 @@  discard block
 
 block discarded – undo
39 39 
                     </div>
40 40 
                     <div id="registration-form-box" class="form-box">
41 41 
                         <div class="block-form-login">
42 
-                            <?php   echo $content['info'];  ?>
42 
+                            <?php   echo $content['info']; ?>
43 43 
                         </div>
44 44 
                     </div>
45 45 
                     <div id="footer">
Please login to merge, or discard this patch.
app/config/events.conf.dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@  discard block
 
 block discarded – undo
23 23 
         'self_sent' => false, // this key states that we can't add user to this event through the admin panel
24 24 
         'name_lang_var' => get_lang('PortalHomepageEdited'),
25 25 
         'desc_lang_var' => get_lang('PortalHomepageEdited'),
26 
-        'available_keyvars' => array (// keys used for the mail template
26 
+        'available_keyvars' => array(// keys used for the mail template
27 27 
             'url'           => 'portal',
28 28 
             'sitename'      => 'sitename',
29 29 
             'firstname'     => 'firstname',
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
         'self_sent' => true, // this key states that we can't add user to this event through the admin panel
46 46 
         'name_lang_var' => get_lang('UserRegistrationTitle'),
47 47 
         'desc_lang_var' => get_lang('UserRegistrationComment'),
48 
-        'available_keyvars' => array (// keys used for the mail template
48 
+        'available_keyvars' => array(// keys used for the mail template
49 49 
             'url'           => 'portal',
50 50 
             'sitename'      => 'sitename',
51 51 
             'firstname'     => 'firstname',
Please login to merge, or discard this patch.
app/config/auth.conf.dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -57,7 +57,7 @@
 
 block discarded – undo
57 57 
   //String used to search the user in ldap. %username will ber replaced by the username.
58 58 
   //See extldap_get_user_search_string() function below
59 59 
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
60 
-  'user_search' => 'uid=%username%',  // no () arround the string
60 
+  'user_search' => 'uid=%username%', // no () arround the string
61 61 
   //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62 62 
   'encoding' => 'UTF-8',
63 63 
   //Set to true if user info have to be update at each login
Please login to merge, or discard this patch.
news_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -18,7 +18,7 @@
 
 block discarded – undo
18 18 
 }
19 19
20 20 
 if (!isset($_GET['id']) || empty($_GET['id'])) {
21 
-    $content =  SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
21 
+    $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
22 22 
 } else {
23 23 
     $content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
24 24 
 }
Please login to merge, or discard this patch.