View GitHub Repository chamilo-lms

Schedule Inspection
Subscribe
Completed
Pull Request — 1.11.x (#1305)
by José
101:20 queued 63:48
created
Status
Category
Toggle Patches
main/user/add_users_to_session.php 1 patch
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -477,7 +477,10 @@  discard block
 
 block discarded – undo
477 477 
     <div class="actions">
478 478 
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
479 479 
     </div>
480 
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
480 
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) {
481 
+    echo '&add=true' ;
482 
+}
483 
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
481 484 
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
482 485 
     <?php
483 486 
     if ($add_type == 'multiple') {
 
@@ -545,7 +548,10 @@  discard block
 
 block discarded – undo
545 548 
                   <?php
546 549 
                   foreach ($nosessionUsersList as $uid => $enreg) {
547 550 
                   ?>
548 
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
551 
+                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) {
552 
+    echo 'selected="selected"';
553 
+}
554 
+?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
549 555 
                   <?php
550 556 
                   }
551 557 
                   ?>
Please login to merge, or discard this patch.
custompages/first_login-dist.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,9 @@
 
 block discarded – undo
4 4 
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
5 5 
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
6 6
7 
-if (! isset($_SESSION['conditional_login']['uid']))
7 
+if (! isset($_SESSION['conditional_login']['uid'])) {
8 8 
   die("Not Authorised");
9 
+}
9 10 
 ?>
10 11 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
11 12 
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">
Please login to merge, or discard this patch.
main/admin/add_courses_to_usergroup.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -144,7 +144,10 @@
 
 block discarded – undo
144 144 
 echo '</div>';
145 145 
 ?>
146 146
147 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
147 
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) {
148 
+    echo '&add=true' ;
149 
+}
150 
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
148 151 
 <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
149 152
150 153 
 if ($add_type=='multiple') {
Please login to merge, or discard this patch.
main/admin/add_sessions_to_usergroup.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -144,7 +144,10 @@
 
 block discarded – undo
144 144 
 echo '</div>';
145 145 
 ?>
146 146
147 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
147 
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) {
148 
+    echo '&add=true' ;
149 
+}
150 
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
148 151 
 <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
149 152
150 153 
 if ($add_type=='multiple') {
Please login to merge, or discard this patch.
src/Chamilo/ThemeBundle/Event/SidebarMenuEvent.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -76,7 +76,9 @@
 
 block discarded – undo
76 76
77 77 
         foreach($this->getItems() as $item) {
78 78 
             /** @var $item MenuItemInterface */
79 
-            if($item->isActive()) return $item;
79 
+            if($item->isActive()) {
80 
+                return $item;
81 
+            }
80 82 
         }
81 83 
         return null;
82 84 
     }
Please login to merge, or discard this patch.
src/Chamilo/ThemeBundle/EventListener/SidebarSetupMenuDemoListener.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -250,8 +250,7 @@
 
 block discarded – undo
250 250 
         case RESULT_DISABLE_SHOW_SCORE_ONLY:
251 251 
             if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) {
252 252 
                $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'));
253 
-            }
254 
-            else {
253 
+            } else {
255 254 
                 $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details'));
256 255 
             }
257 256 
             break;
Please login to merge, or discard this patch.
main/admin/user_update_import.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -454,7 +454,10 @@
 
 block discarded – undo
454 454 
     <blockquote>
455 455 
         <pre>
456 456 
             <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
457 
-            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
457 
+            xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
458 
+    echo implode(';', $list_reponse).';';
459 
+}
460 
+?></span>xxx1|xxx2|xxx3;1;<br />
458 461 
         </pre>
459 462 
     </blockquote>
460 463 
 <p><?php
Please login to merge, or discard this patch.
main/inc/lib/exercise_show_functions.lib.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -434,8 +434,7 @@
 
 block discarded – undo
434 434 
             } else {
435 435 
                 echo $question->options[2];
436 436 
             }
437 
-        }
438 
-        else {
437 
+        } else {
439 438 
             echo '-';
440 439 
         }
441 440 
         ?>
Please login to merge, or discard this patch.
main/dropbox/dropbox_functions.inc.php 1 patch
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -734,7 +734,9 @@  discard block
 
 block discarded – undo
734 734 
             WHERE user_id='$id'";
735 735 
     $result = Database::query($sql);
736 736 
     $res = Database::fetch_array($result);
737 
-    if (!$res) return false;
737 
+    if (!$res) {
738 
+        return false;
739 
+    }
738 740
739 741 
     return stripslashes($res['username']);
740 742 
 }
 
@@ -810,10 +812,15 @@  discard block
 
 block discarded – undo
810 812 
             ";
811 813 
     $result = Database::query($sql);
812 814
813 
-    if (!($res = Database::fetch_array($result)))
814 
-        die(get_lang('GeneralError').' (code 901)');
815 
-    if ($owner == 0) return $res['uploader_id'];
816 
-    if ($res['uploader_id'] == $owner) return true;
815 
+    if (!($res = Database::fetch_array($result))) {
816 
+            die(get_lang('GeneralError').' (code 901)');
817 
+    }
818 
+    if ($owner == 0) {
819 
+        return $res['uploader_id'];
820 
+    }
821 
+    if ($res['uploader_id'] == $owner) {
822 
+        return true;
823 
+    }
817 824 
     die(get_lang('GeneralError').' (code '.$or_die.')');
818 825 
 }
819 826
Please login to merge, or discard this patch.