chamilo / chamilo-lms

main/session/add_many_session_to_category.php

Indentation +4 added lines, -4 removed lines

@@ -197,12 +197,12 @@
         if (!empty($rows_session_category)) {
             foreach($rows_session_category as $category) {
                 if($category['id'] == $categoryId)
-                      echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
-                  else
-                      echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
+                        echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
+                    else
+                        echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
             }
         }
-          ?>
+            ?>
       </select>
     </td>
 </tr>

Braces +13 added lines, -6 removed lines

@@ -196,10 +196,11 @@ 
         <?php
         if (!empty($rows_session_category)) {
             foreach($rows_session_category as $category) {
-                if($category['id'] == $categoryId)
-                      echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
-                  else
-                      echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
+                if($category['id'] == $categoryId) {
+                                      echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
+                } else {
+                                        echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
+                  }
             }
         }
           ?>
@@ -223,7 +224,10 @@ 
     <?php
     foreach($rows_session as $enreg) {
     ?>
-        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; if(in_array($enreg['id'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['name']; ?></option>
+        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; if(in_array($enreg['id'],$CourseList)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $enreg['name']; ?></option>
     <?php } ?>
     </select></div>
 <?php unset($nosessionCourses); ?>
@@ -245,7 +249,10 @@ 
   <select id='destination' name="SessionCategoryList[]" multiple="multiple" size="20" style="width:320px;">
     <?php
     foreach($rows_category_session as $enreg) { ?>
-        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; if(in_array($enreg['id'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['name']; ?></option>
+        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; if(in_array($enreg['id'],$CourseList)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $enreg['name']; ?></option>
     <?php } ?>
   </select></td>
 </tr>

Spacing +15 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
 $this_section = SECTION_PLATFORM_ADMIN;
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 // Database Table Definitions
 $tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@@ -38,7 +38,7 @@ 
 }
 
 if (!api_is_platform_admin() && !api_is_session_admin()) {
-    $sql = 'SELECT session_admin_id FROM ' . Database:: get_main_table(TABLE_MAIN_SESSION) . ' WHERE id=' . $id_session;
+    $sql = 'SELECT session_admin_id FROM '.Database:: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session;
     $rs = Database::query($sql);
     if (Database::result($rs, 0, 0) != $_user['user_id']) {
         api_not_allowed(true);
@@ -100,7 +100,7 @@ 
 
         $sql = "UPDATE $tbl_session SET session_category_id = $categoryId WHERE id in ($session_id) ";
         Database::query($sql);
-        header('Location: add_many_session_to_category.php?id_category=' . $categoryId . '&msg=ok');
+        header('Location: add_many_session_to_category.php?id_category='.$categoryId.'&msg=ok');
         exit;
     } else {
         header('Location: add_many_session_to_category.php?msg=error');
@@ -128,8 +128,8 @@ 
 $rows_category_session = array();
 if ((isset($_POST['CategorySessionId']) && $_POST['formSent'] == 0) || isset($_GET['id_category'])) {
 
-    $where = 'WHERE session_category_id != ' . $categoryId .' OR session_category_id IS NULL';
-    $sql = 'SELECT id, name  FROM ' . $tbl_session . ' WHERE session_category_id =' . $categoryId . ' ORDER BY name';
+    $where = 'WHERE session_category_id != '.$categoryId.' OR session_category_id IS NULL';
+    $sql = 'SELECT id, name  FROM '.$tbl_session.' WHERE session_category_id ='.$categoryId.' ORDER BY name';
     $result = Database::query($sql);
     $rows_category_session = Database::store_result($result);
 }
@@ -142,13 +142,13 @@ 
 }
 
 if (api_get_multiple_access_url()) {
-    $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+    $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
     $access_url_id = api_get_current_access_url_id();
     $sql = "SELECT s.id, s.name  FROM $tbl_session s INNER JOIN $table_access_url_rel_session u ON s.id = u.session_id $where AND u.access_url_id = $access_url_id ORDER BY name";
 } else {
     $sql = "SELECT id, name  FROM $tbl_session $where ORDER BY name";
 }
-$result=Database::query($sql);
+$result = Database::query($sql);
 $rows_session = Database::store_result($result);
 ?>
 <form name="formulaire" method="post"
@@ -156,7 +156,7 @@ 
 if (!empty($_GET['add'])) {
     echo '&add=true';
 } ?>" style="margin:0px;">
-<?php echo '<legend>' . $tool_name . '</legend>'; ?>
+<?php echo '<legend>'.$tool_name.'</legend>'; ?>
 <input type="hidden" name="formSent" value="1"/>
 <?php
 if (!empty($errorMsg)) {
@@ -194,8 +194,8 @@ 
         <option value="0" ></option>
         <?php
         if (!empty($rows_session_category)) {
-            foreach($rows_session_category as $category) {
-                if($category['id'] == $categoryId)
+            foreach ($rows_session_category as $category) {
+                if ($category['id'] == $categoryId)
                       echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
                   else
                       echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
@@ -211,7 +211,7 @@ 
   <td align="center" width="45%"><b><?php echo get_lang('SessionListInCategory') ?> :</b></td>
 </tr>
 
-<?php if($add_type == 'multiple') { ?>
+<?php if ($add_type == 'multiple') { ?>
 <tr>
 <td>&nbsp;</td></tr>
 <?php } ?>
@@ -220,9 +220,9 @@ 
     <div id="ajax_list_courses_multiple">
     <select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:320px;">
     <?php
-    foreach($rows_session as $enreg) {
+    foreach ($rows_session as $enreg) {
     ?>
-        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; if(in_array($enreg['id'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['name']; ?></option>
+        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; if (in_array($enreg['id'], $CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['name']; ?></option>
     <?php } ?>
     </select></div>
 <?php unset($nosessionCourses); ?>
@@ -243,8 +243,8 @@ 
   <td width="45%" align="center">
   <select id='destination' name="SessionCategoryList[]" multiple="multiple" size="20" style="width:320px;">
     <?php
-    foreach($rows_category_session as $enreg) { ?>
-        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; if(in_array($enreg['id'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['name']; ?></option>
+    foreach ($rows_category_session as $enreg) { ?>
+        <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; if (in_array($enreg['id'], $CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['name']; ?></option>
     <?php } ?>
   </select></td>
 </tr>

main/session/session_category_add.php

Indentation +27 added lines, -27 removed lines

@@ -29,29 +29,29 @@ 
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
-	$formSent = 1;
-	$name = $_POST['name'];
-	$year_start = $_POST['year_start'];
-	$month_start = $_POST['month_start'];
-	$day_start = $_POST['day_start'];
-	$year_end = $_POST['year_end'];
-	$month_end = $_POST['month_end'];
-	$day_end = $_POST['day_end'];
-	$return = SessionManager::create_category_session(
-		$name,
-		$year_start,
-		$month_start,
-		$day_start,
-		$year_end,
-		$month_end,
-		$day_end
-	);
+    $formSent = 1;
+    $name = $_POST['name'];
+    $year_start = $_POST['year_start'];
+    $month_start = $_POST['month_start'];
+    $day_start = $_POST['day_start'];
+    $year_end = $_POST['year_end'];
+    $month_end = $_POST['month_end'];
+    $day_end = $_POST['day_end'];
+    $return = SessionManager::create_category_session(
+        $name,
+        $year_start,
+        $month_start,
+        $day_start,
+        $year_end,
+        $month_end,
+        $day_end
+    );
 
-	if ($return == strval(intval($return))) {
-		Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
-		header('Location: session_category_list.php');
-		exit();
-	}
+    if ($return == strval(intval($return))) {
+        Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
+        header('Location: session_category_list.php');
+        exit();
+    }
 }
 $thisYear = date('Y');
 $thisMonth = date('m');
@@ -61,7 +61,7 @@ 
 //display the header
 Display::display_header($tool_name);
 if (!empty($return)) {
-	Display::display_error_message($return,false);
+    Display::display_error_message($return,false);
 }
 ?>
 <div class="row">
@@ -139,12 +139,12 @@ 
                     /
                       <select name="year_start">
                       <?php
-                      for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
-                      ?>
+                        for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
+                        ?>
                               <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
                       <?php
-                      }
-                      ?>
+                        }
+                        ?>
                         </select>
                 </div>
                 <div class="col-md-3"></div>

Spacing +51 added lines, -51 removed lines

@@ -18,11 +18,11 @@ 
 
 api_protect_admin_script(true);
 
-$formSent=0;
-$errorMsg='';
+$formSent = 0;
+$errorMsg = '';
 //$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "session_category_list.php","name" => get_lang('ListSessionCategory'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => "session_category_list.php", "name" => get_lang('ListSessionCategory'));
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -61,7 +61,7 @@ 
 //display the header
 Display::display_header($tool_name);
 if (!empty($return)) {
-	Display::display_error_message($return,false);
+	Display::display_error_message($return, false);
 }
 ?>
 <div class="row">
@@ -72,13 +72,13 @@ 
             <div class="form-group">
                 <label class="col-sm-3 control-label"><?php echo get_lang('SessionCategoryName') ?></label>
                 <div class="col-sm-6">
-                    <input type="text" class="form-control" name="name" placeholder="<?php echo get_lang('Category') ?>" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); ?>">
+                    <input type="text" class="form-control" name="name" placeholder="<?php echo get_lang('Category') ?>" size="50" maxlength="50" value="<?php if ($formSent) echo api_htmlentities($name, ENT_QUOTES, $charset); ?>">
                 </div>
                 <div class="col-md-3"></div>
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-3 col-sm-6">
-                    <?php echo get_lang('TheTimeLimitsAreReferential');?> <a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('AddTimeLimit') ?></a>
+                    <?php echo get_lang('TheTimeLimitsAreReferential'); ?> <a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('AddTimeLimit') ?></a>
                 </div>
                 <div class="col-md-3"></div>
             </div>
@@ -90,58 +90,58 @@ 
                 <div class="col-sm-6">
                     <select name="day_start">
                         <option value="1">01</option>
-                        <option value="2" <?php if((!$formSent && $thisDay == 2) || ($formSent && $day_start == 2)) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if((!$formSent && $thisDay == 3) || ($formSent && $day_start == 3)) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if((!$formSent && $thisDay == 4) || ($formSent && $day_start == 4)) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if((!$formSent && $thisDay == 5) || ($formSent && $day_start == 5)) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if((!$formSent && $thisDay == 6) || ($formSent && $day_start == 6)) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if((!$formSent && $thisDay == 7) || ($formSent && $day_start == 7)) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if((!$formSent && $thisDay == 8) || ($formSent && $day_start == 8)) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if((!$formSent && $thisDay == 9) || ($formSent && $day_start == 9)) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if((!$formSent && $thisDay == 10) || ($formSent && $day_start == 10)) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if((!$formSent && $thisDay == 11) || ($formSent && $day_start == 11)) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if((!$formSent && $thisDay == 12) || ($formSent && $day_start == 12)) echo 'selected="selected"'; ?> >12</option>
-                        <option value="13" <?php if((!$formSent && $thisDay == 13) || ($formSent && $day_start == 13)) echo 'selected="selected"'; ?> >13</option>
-                        <option value="14" <?php if((!$formSent && $thisDay == 14) || ($formSent && $day_start == 14)) echo 'selected="selected"'; ?> >14</option>
-                        <option value="15" <?php if((!$formSent && $thisDay == 15) || ($formSent && $day_start == 15)) echo 'selected="selected"'; ?> >15</option>
-                        <option value="16" <?php if((!$formSent && $thisDay == 16) || ($formSent && $day_start == 16)) echo 'selected="selected"'; ?> >16</option>
-                        <option value="17" <?php if((!$formSent && $thisDay == 17) || ($formSent && $day_start == 17)) echo 'selected="selected"'; ?> >17</option>
-                        <option value="18" <?php if((!$formSent && $thisDay == 18) || ($formSent && $day_start == 18)) echo 'selected="selected"'; ?> >18</option>
-                        <option value="19" <?php if((!$formSent && $thisDay == 19) || ($formSent && $day_start == 19)) echo 'selected="selected"'; ?> >19</option>
-                        <option value="20" <?php if((!$formSent && $thisDay == 20) || ($formSent && $day_start == 20)) echo 'selected="selected"'; ?> >20</option>
-                        <option value="21" <?php if((!$formSent && $thisDay == 21) || ($formSent && $day_start == 21)) echo 'selected="selected"'; ?> >21</option>
-                        <option value="22" <?php if((!$formSent && $thisDay == 22) || ($formSent && $day_start == 22)) echo 'selected="selected"'; ?> >22</option>
-                        <option value="23" <?php if((!$formSent && $thisDay == 23) || ($formSent && $day_start == 23)) echo 'selected="selected"'; ?> >23</option>
-                        <option value="24" <?php if((!$formSent && $thisDay == 24) || ($formSent && $day_start == 24)) echo 'selected="selected"'; ?> >24</option>
-                        <option value="25" <?php if((!$formSent && $thisDay == 25) || ($formSent && $day_start == 25)) echo 'selected="selected"'; ?> >25</option>
-                        <option value="26" <?php if((!$formSent && $thisDay == 26) || ($formSent && $day_start == 26)) echo 'selected="selected"'; ?> >26</option>
-                        <option value="27" <?php if((!$formSent && $thisDay == 27) || ($formSent && $day_start == 27)) echo 'selected="selected"'; ?> >27</option>
-                        <option value="28" <?php if((!$formSent && $thisDay == 28) || ($formSent && $day_start == 28)) echo 'selected="selected"'; ?> >28</option>
-                        <option value="29" <?php if((!$formSent && $thisDay == 29) || ($formSent && $day_start == 29)) echo 'selected="selected"'; ?> >29</option>
-                        <option value="30" <?php if((!$formSent && $thisDay == 30) || ($formSent && $day_start == 30)) echo 'selected="selected"'; ?> >30</option>
-                        <option value="31" <?php if((!$formSent && $thisDay == 31) || ($formSent && $day_start == 31)) echo 'selected="selected"'; ?> >31</option>
+                        <option value="2" <?php if ((!$formSent && $thisDay == 2) || ($formSent && $day_start == 2)) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if ((!$formSent && $thisDay == 3) || ($formSent && $day_start == 3)) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if ((!$formSent && $thisDay == 4) || ($formSent && $day_start == 4)) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if ((!$formSent && $thisDay == 5) || ($formSent && $day_start == 5)) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if ((!$formSent && $thisDay == 6) || ($formSent && $day_start == 6)) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if ((!$formSent && $thisDay == 7) || ($formSent && $day_start == 7)) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if ((!$formSent && $thisDay == 8) || ($formSent && $day_start == 8)) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if ((!$formSent && $thisDay == 9) || ($formSent && $day_start == 9)) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if ((!$formSent && $thisDay == 10) || ($formSent && $day_start == 10)) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if ((!$formSent && $thisDay == 11) || ($formSent && $day_start == 11)) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if ((!$formSent && $thisDay == 12) || ($formSent && $day_start == 12)) echo 'selected="selected"'; ?> >12</option>
+                        <option value="13" <?php if ((!$formSent && $thisDay == 13) || ($formSent && $day_start == 13)) echo 'selected="selected"'; ?> >13</option>
+                        <option value="14" <?php if ((!$formSent && $thisDay == 14) || ($formSent && $day_start == 14)) echo 'selected="selected"'; ?> >14</option>
+                        <option value="15" <?php if ((!$formSent && $thisDay == 15) || ($formSent && $day_start == 15)) echo 'selected="selected"'; ?> >15</option>
+                        <option value="16" <?php if ((!$formSent && $thisDay == 16) || ($formSent && $day_start == 16)) echo 'selected="selected"'; ?> >16</option>
+                        <option value="17" <?php if ((!$formSent && $thisDay == 17) || ($formSent && $day_start == 17)) echo 'selected="selected"'; ?> >17</option>
+                        <option value="18" <?php if ((!$formSent && $thisDay == 18) || ($formSent && $day_start == 18)) echo 'selected="selected"'; ?> >18</option>
+                        <option value="19" <?php if ((!$formSent && $thisDay == 19) || ($formSent && $day_start == 19)) echo 'selected="selected"'; ?> >19</option>
+                        <option value="20" <?php if ((!$formSent && $thisDay == 20) || ($formSent && $day_start == 20)) echo 'selected="selected"'; ?> >20</option>
+                        <option value="21" <?php if ((!$formSent && $thisDay == 21) || ($formSent && $day_start == 21)) echo 'selected="selected"'; ?> >21</option>
+                        <option value="22" <?php if ((!$formSent && $thisDay == 22) || ($formSent && $day_start == 22)) echo 'selected="selected"'; ?> >22</option>
+                        <option value="23" <?php if ((!$formSent && $thisDay == 23) || ($formSent && $day_start == 23)) echo 'selected="selected"'; ?> >23</option>
+                        <option value="24" <?php if ((!$formSent && $thisDay == 24) || ($formSent && $day_start == 24)) echo 'selected="selected"'; ?> >24</option>
+                        <option value="25" <?php if ((!$formSent && $thisDay == 25) || ($formSent && $day_start == 25)) echo 'selected="selected"'; ?> >25</option>
+                        <option value="26" <?php if ((!$formSent && $thisDay == 26) || ($formSent && $day_start == 26)) echo 'selected="selected"'; ?> >26</option>
+                        <option value="27" <?php if ((!$formSent && $thisDay == 27) || ($formSent && $day_start == 27)) echo 'selected="selected"'; ?> >27</option>
+                        <option value="28" <?php if ((!$formSent && $thisDay == 28) || ($formSent && $day_start == 28)) echo 'selected="selected"'; ?> >28</option>
+                        <option value="29" <?php if ((!$formSent && $thisDay == 29) || ($formSent && $day_start == 29)) echo 'selected="selected"'; ?> >29</option>
+                        <option value="30" <?php if ((!$formSent && $thisDay == 30) || ($formSent && $day_start == 30)) echo 'selected="selected"'; ?> >30</option>
+                        <option value="31" <?php if ((!$formSent && $thisDay == 31) || ($formSent && $day_start == 31)) echo 'selected="selected"'; ?> >31</option>
                     </select>
                     /
                     <select name="month_start">
                           <option value="1">01</option>
-                          <option value="2" <?php if((!$formSent && $thisMonth == 2) || ($formSent && $month_start == 2)) echo 'selected="selected"'; ?> >02</option>
-                          <option value="3" <?php if((!$formSent && $thisMonth == 3) || ($formSent && $month_start == 3)) echo 'selected="selected"'; ?> >03</option>
-                          <option value="4" <?php if((!$formSent && $thisMonth == 4) || ($formSent && $month_start == 4)) echo 'selected="selected"'; ?> >04</option>
-                          <option value="5" <?php if((!$formSent && $thisMonth == 5) || ($formSent && $month_start == 5)) echo 'selected="selected"'; ?> >05</option>
-                          <option value="6" <?php if((!$formSent && $thisMonth == 6) || ($formSent && $month_start == 6)) echo 'selected="selected"'; ?> >06</option>
-                          <option value="7" <?php if((!$formSent && $thisMonth == 7) || ($formSent && $month_start == 7)) echo 'selected="selected"'; ?> >07</option>
-                          <option value="8" <?php if((!$formSent && $thisMonth == 8) || ($formSent && $month_start == 8)) echo 'selected="selected"'; ?> >08</option>
-                          <option value="9" <?php if((!$formSent && $thisMonth == 9) || ($formSent && $month_start == 9)) echo 'selected="selected"'; ?> >09</option>
-                          <option value="10" <?php if((!$formSent && $thisMonth == 10) || ($formSent && $month_start == 10)) echo 'selected="selected"'; ?> >10</option>
-                          <option value="11" <?php if((!$formSent && $thisMonth == 11) || ($formSent && $month_start == 11)) echo 'selected="selected"'; ?> >11</option>
-                          <option value="12" <?php if((!$formSent && $thisMonth == 12) || ($formSent && $month_start == 12)) echo 'selected="selected"'; ?> >12</option>
+                          <option value="2" <?php if ((!$formSent && $thisMonth == 2) || ($formSent && $month_start == 2)) echo 'selected="selected"'; ?> >02</option>
+                          <option value="3" <?php if ((!$formSent && $thisMonth == 3) || ($formSent && $month_start == 3)) echo 'selected="selected"'; ?> >03</option>
+                          <option value="4" <?php if ((!$formSent && $thisMonth == 4) || ($formSent && $month_start == 4)) echo 'selected="selected"'; ?> >04</option>
+                          <option value="5" <?php if ((!$formSent && $thisMonth == 5) || ($formSent && $month_start == 5)) echo 'selected="selected"'; ?> >05</option>
+                          <option value="6" <?php if ((!$formSent && $thisMonth == 6) || ($formSent && $month_start == 6)) echo 'selected="selected"'; ?> >06</option>
+                          <option value="7" <?php if ((!$formSent && $thisMonth == 7) || ($formSent && $month_start == 7)) echo 'selected="selected"'; ?> >07</option>
+                          <option value="8" <?php if ((!$formSent && $thisMonth == 8) || ($formSent && $month_start == 8)) echo 'selected="selected"'; ?> >08</option>
+                          <option value="9" <?php if ((!$formSent && $thisMonth == 9) || ($formSent && $month_start == 9)) echo 'selected="selected"'; ?> >09</option>
+                          <option value="10" <?php if ((!$formSent && $thisMonth == 10) || ($formSent && $month_start == 10)) echo 'selected="selected"'; ?> >10</option>
+                          <option value="11" <?php if ((!$formSent && $thisMonth == 11) || ($formSent && $month_start == 11)) echo 'selected="selected"'; ?> >11</option>
+                          <option value="12" <?php if ((!$formSent && $thisMonth == 12) || ($formSent && $month_start == 12)) echo 'selected="selected"'; ?> >12</option>
                     </select>
                     /
                       <select name="year_start">
                       <?php
-                      for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
+                      for ($i = $thisYear - 5; $i <= ($thisYear + 5); $i++) {
                       ?>
-                              <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                              <option value="<?php echo $i; ?>" <?php if ((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
                       <?php
                       }
                       ?>
@@ -206,7 +206,7 @@ 
                 <select name="year_end">
                   <option value="0">----</option>
                     <?php
-                        for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
+                        for ($i = $thisYear - 5; $i <= ($thisYear + 5); $i++) {
                         ?>
                                 <option value="<?php echo $i; ?>"><?php echo $i; ?></option>
                     <?php

Braces +172 added lines, -43 removed lines

@@ -72,7 +72,10 @@ 
             <div class="form-group">
                 <label class="col-sm-3 control-label"><?php echo get_lang('SessionCategoryName') ?></label>
                 <div class="col-sm-6">
-                    <input type="text" class="form-control" name="name" placeholder="<?php echo get_lang('Category') ?>" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); ?>">
+                    <input type="text" class="form-control" name="name" placeholder="<?php echo get_lang('Category') ?>" size="50" maxlength="50" value="<?php if($formSent) {
+    echo api_htmlentities($name,ENT_QUOTES,$charset);
+}
+?>">
                 </div>
                 <div class="col-md-3"></div>
             </div>
@@ -90,58 +93,184 @@ 
                 <div class="col-sm-6">
                     <select name="day_start">
                         <option value="1">01</option>
-                        <option value="2" <?php if((!$formSent && $thisDay == 2) || ($formSent && $day_start == 2)) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if((!$formSent && $thisDay == 3) || ($formSent && $day_start == 3)) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if((!$formSent && $thisDay == 4) || ($formSent && $day_start == 4)) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if((!$formSent && $thisDay == 5) || ($formSent && $day_start == 5)) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if((!$formSent && $thisDay == 6) || ($formSent && $day_start == 6)) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if((!$formSent && $thisDay == 7) || ($formSent && $day_start == 7)) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if((!$formSent && $thisDay == 8) || ($formSent && $day_start == 8)) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if((!$formSent && $thisDay == 9) || ($formSent && $day_start == 9)) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if((!$formSent && $thisDay == 10) || ($formSent && $day_start == 10)) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if((!$formSent && $thisDay == 11) || ($formSent && $day_start == 11)) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if((!$formSent && $thisDay == 12) || ($formSent && $day_start == 12)) echo 'selected="selected"'; ?> >12</option>
-                        <option value="13" <?php if((!$formSent && $thisDay == 13) || ($formSent && $day_start == 13)) echo 'selected="selected"'; ?> >13</option>
-                        <option value="14" <?php if((!$formSent && $thisDay == 14) || ($formSent && $day_start == 14)) echo 'selected="selected"'; ?> >14</option>
-                        <option value="15" <?php if((!$formSent && $thisDay == 15) || ($formSent && $day_start == 15)) echo 'selected="selected"'; ?> >15</option>
-                        <option value="16" <?php if((!$formSent && $thisDay == 16) || ($formSent && $day_start == 16)) echo 'selected="selected"'; ?> >16</option>
-                        <option value="17" <?php if((!$formSent && $thisDay == 17) || ($formSent && $day_start == 17)) echo 'selected="selected"'; ?> >17</option>
-                        <option value="18" <?php if((!$formSent && $thisDay == 18) || ($formSent && $day_start == 18)) echo 'selected="selected"'; ?> >18</option>
-                        <option value="19" <?php if((!$formSent && $thisDay == 19) || ($formSent && $day_start == 19)) echo 'selected="selected"'; ?> >19</option>
-                        <option value="20" <?php if((!$formSent && $thisDay == 20) || ($formSent && $day_start == 20)) echo 'selected="selected"'; ?> >20</option>
-                        <option value="21" <?php if((!$formSent && $thisDay == 21) || ($formSent && $day_start == 21)) echo 'selected="selected"'; ?> >21</option>
-                        <option value="22" <?php if((!$formSent && $thisDay == 22) || ($formSent && $day_start == 22)) echo 'selected="selected"'; ?> >22</option>
-                        <option value="23" <?php if((!$formSent && $thisDay == 23) || ($formSent && $day_start == 23)) echo 'selected="selected"'; ?> >23</option>
-                        <option value="24" <?php if((!$formSent && $thisDay == 24) || ($formSent && $day_start == 24)) echo 'selected="selected"'; ?> >24</option>
-                        <option value="25" <?php if((!$formSent && $thisDay == 25) || ($formSent && $day_start == 25)) echo 'selected="selected"'; ?> >25</option>
-                        <option value="26" <?php if((!$formSent && $thisDay == 26) || ($formSent && $day_start == 26)) echo 'selected="selected"'; ?> >26</option>
-                        <option value="27" <?php if((!$formSent && $thisDay == 27) || ($formSent && $day_start == 27)) echo 'selected="selected"'; ?> >27</option>
-                        <option value="28" <?php if((!$formSent && $thisDay == 28) || ($formSent && $day_start == 28)) echo 'selected="selected"'; ?> >28</option>
-                        <option value="29" <?php if((!$formSent && $thisDay == 29) || ($formSent && $day_start == 29)) echo 'selected="selected"'; ?> >29</option>
-                        <option value="30" <?php if((!$formSent && $thisDay == 30) || ($formSent && $day_start == 30)) echo 'selected="selected"'; ?> >30</option>
-                        <option value="31" <?php if((!$formSent && $thisDay == 31) || ($formSent && $day_start == 31)) echo 'selected="selected"'; ?> >31</option>
+                        <option value="2" <?php if((!$formSent && $thisDay == 2) || ($formSent && $day_start == 2)) {
+    echo 'selected="selected"';
+}
+?> >02</option>
+                        <option value="3" <?php if((!$formSent && $thisDay == 3) || ($formSent && $day_start == 3)) {
+    echo 'selected="selected"';
+}
+?> >03</option>
+                        <option value="4" <?php if((!$formSent && $thisDay == 4) || ($formSent && $day_start == 4)) {
+    echo 'selected="selected"';
+}
+?> >04</option>
+                        <option value="5" <?php if((!$formSent && $thisDay == 5) || ($formSent && $day_start == 5)) {
+    echo 'selected="selected"';
+}
+?> >05</option>
+                        <option value="6" <?php if((!$formSent && $thisDay == 6) || ($formSent && $day_start == 6)) {
+    echo 'selected="selected"';
+}
+?> >06</option>
+                        <option value="7" <?php if((!$formSent && $thisDay == 7) || ($formSent && $day_start == 7)) {
+    echo 'selected="selected"';
+}
+?> >07</option>
+                        <option value="8" <?php if((!$formSent && $thisDay == 8) || ($formSent && $day_start == 8)) {
+    echo 'selected="selected"';
+}
+?> >08</option>
+                        <option value="9" <?php if((!$formSent && $thisDay == 9) || ($formSent && $day_start == 9)) {
+    echo 'selected="selected"';
+}
+?> >09</option>
+                        <option value="10" <?php if((!$formSent && $thisDay == 10) || ($formSent && $day_start == 10)) {
+    echo 'selected="selected"';
+}
+?> >10</option>
+                        <option value="11" <?php if((!$formSent && $thisDay == 11) || ($formSent && $day_start == 11)) {
+    echo 'selected="selected"';
+}
+?> >11</option>
+                        <option value="12" <?php if((!$formSent && $thisDay == 12) || ($formSent && $day_start == 12)) {
+    echo 'selected="selected"';
+}
+?> >12</option>
+                        <option value="13" <?php if((!$formSent && $thisDay == 13) || ($formSent && $day_start == 13)) {
+    echo 'selected="selected"';
+}
+?> >13</option>
+                        <option value="14" <?php if((!$formSent && $thisDay == 14) || ($formSent && $day_start == 14)) {
+    echo 'selected="selected"';
+}
+?> >14</option>
+                        <option value="15" <?php if((!$formSent && $thisDay == 15) || ($formSent && $day_start == 15)) {
+    echo 'selected="selected"';
+}
+?> >15</option>
+                        <option value="16" <?php if((!$formSent && $thisDay == 16) || ($formSent && $day_start == 16)) {
+    echo 'selected="selected"';
+}
+?> >16</option>
+                        <option value="17" <?php if((!$formSent && $thisDay == 17) || ($formSent && $day_start == 17)) {
+    echo 'selected="selected"';
+}
+?> >17</option>
+                        <option value="18" <?php if((!$formSent && $thisDay == 18) || ($formSent && $day_start == 18)) {
+    echo 'selected="selected"';
+}
+?> >18</option>
+                        <option value="19" <?php if((!$formSent && $thisDay == 19) || ($formSent && $day_start == 19)) {
+    echo 'selected="selected"';
+}
+?> >19</option>
+                        <option value="20" <?php if((!$formSent && $thisDay == 20) || ($formSent && $day_start == 20)) {
+    echo 'selected="selected"';
+}
+?> >20</option>
+                        <option value="21" <?php if((!$formSent && $thisDay == 21) || ($formSent && $day_start == 21)) {
+    echo 'selected="selected"';
+}
+?> >21</option>
+                        <option value="22" <?php if((!$formSent && $thisDay == 22) || ($formSent && $day_start == 22)) {
+    echo 'selected="selected"';
+}
+?> >22</option>
+                        <option value="23" <?php if((!$formSent && $thisDay == 23) || ($formSent && $day_start == 23)) {
+    echo 'selected="selected"';
+}
+?> >23</option>
+                        <option value="24" <?php if((!$formSent && $thisDay == 24) || ($formSent && $day_start == 24)) {
+    echo 'selected="selected"';
+}
+?> >24</option>
+                        <option value="25" <?php if((!$formSent && $thisDay == 25) || ($formSent && $day_start == 25)) {
+    echo 'selected="selected"';
+}
+?> >25</option>
+                        <option value="26" <?php if((!$formSent && $thisDay == 26) || ($formSent && $day_start == 26)) {
+    echo 'selected="selected"';
+}
+?> >26</option>
+                        <option value="27" <?php if((!$formSent && $thisDay == 27) || ($formSent && $day_start == 27)) {
+    echo 'selected="selected"';
+}
+?> >27</option>
+                        <option value="28" <?php if((!$formSent && $thisDay == 28) || ($formSent && $day_start == 28)) {
+    echo 'selected="selected"';
+}
+?> >28</option>
+                        <option value="29" <?php if((!$formSent && $thisDay == 29) || ($formSent && $day_start == 29)) {
+    echo 'selected="selected"';
+}
+?> >29</option>
+                        <option value="30" <?php if((!$formSent && $thisDay == 30) || ($formSent && $day_start == 30)) {
+    echo 'selected="selected"';
+}
+?> >30</option>
+                        <option value="31" <?php if((!$formSent && $thisDay == 31) || ($formSent && $day_start == 31)) {
+    echo 'selected="selected"';
+}
+?> >31</option>
                     </select>
                     /
                     <select name="month_start">
                           <option value="1">01</option>
-                          <option value="2" <?php if((!$formSent && $thisMonth == 2) || ($formSent && $month_start == 2)) echo 'selected="selected"'; ?> >02</option>
-                          <option value="3" <?php if((!$formSent && $thisMonth == 3) || ($formSent && $month_start == 3)) echo 'selected="selected"'; ?> >03</option>
-                          <option value="4" <?php if((!$formSent && $thisMonth == 4) || ($formSent && $month_start == 4)) echo 'selected="selected"'; ?> >04</option>
-                          <option value="5" <?php if((!$formSent && $thisMonth == 5) || ($formSent && $month_start == 5)) echo 'selected="selected"'; ?> >05</option>
-                          <option value="6" <?php if((!$formSent && $thisMonth == 6) || ($formSent && $month_start == 6)) echo 'selected="selected"'; ?> >06</option>
-                          <option value="7" <?php if((!$formSent && $thisMonth == 7) || ($formSent && $month_start == 7)) echo 'selected="selected"'; ?> >07</option>
-                          <option value="8" <?php if((!$formSent && $thisMonth == 8) || ($formSent && $month_start == 8)) echo 'selected="selected"'; ?> >08</option>
-                          <option value="9" <?php if((!$formSent && $thisMonth == 9) || ($formSent && $month_start == 9)) echo 'selected="selected"'; ?> >09</option>
-                          <option value="10" <?php if((!$formSent && $thisMonth == 10) || ($formSent && $month_start == 10)) echo 'selected="selected"'; ?> >10</option>
-                          <option value="11" <?php if((!$formSent && $thisMonth == 11) || ($formSent && $month_start == 11)) echo 'selected="selected"'; ?> >11</option>
-                          <option value="12" <?php if((!$formSent && $thisMonth == 12) || ($formSent && $month_start == 12)) echo 'selected="selected"'; ?> >12</option>
+                          <option value="2" <?php if((!$formSent && $thisMonth == 2) || ($formSent && $month_start == 2)) {
+    echo 'selected="selected"';
+}
+?> >02</option>
+                          <option value="3" <?php if((!$formSent && $thisMonth == 3) || ($formSent && $month_start == 3)) {
+    echo 'selected="selected"';
+}
+?> >03</option>
+                          <option value="4" <?php if((!$formSent && $thisMonth == 4) || ($formSent && $month_start == 4)) {
+    echo 'selected="selected"';
+}
+?> >04</option>
+                          <option value="5" <?php if((!$formSent && $thisMonth == 5) || ($formSent && $month_start == 5)) {
+    echo 'selected="selected"';
+}
+?> >05</option>
+                          <option value="6" <?php if((!$formSent && $thisMonth == 6) || ($formSent && $month_start == 6)) {
+    echo 'selected="selected"';
+}
+?> >06</option>
+                          <option value="7" <?php if((!$formSent && $thisMonth == 7) || ($formSent && $month_start == 7)) {
+    echo 'selected="selected"';
+}
+?> >07</option>
+                          <option value="8" <?php if((!$formSent && $thisMonth == 8) || ($formSent && $month_start == 8)) {
+    echo 'selected="selected"';
+}
+?> >08</option>
+                          <option value="9" <?php if((!$formSent && $thisMonth == 9) || ($formSent && $month_start == 9)) {
+    echo 'selected="selected"';
+}
+?> >09</option>
+                          <option value="10" <?php if((!$formSent && $thisMonth == 10) || ($formSent && $month_start == 10)) {
+    echo 'selected="selected"';
+}
+?> >10</option>
+                          <option value="11" <?php if((!$formSent && $thisMonth == 11) || ($formSent && $month_start == 11)) {
+    echo 'selected="selected"';
+}
+?> >11</option>
+                          <option value="12" <?php if((!$formSent && $thisMonth == 12) || ($formSent && $month_start == 12)) {
+    echo 'selected="selected"';
+}
+?> >12</option>
                     </select>
                     /
                       <select name="year_start">
                       <?php
                       for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
                       ?>
-                              <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                              <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) {
+    echo 'selected="selected"';
+}
+?> ><?php echo $i; ?></option>
                       <?php
                       }
                       ?>

main/session/session_edit.php

Indentation +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
 $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id,"name" => get_lang('SessionOverview'));
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
-	$formSent = 1;
+    $formSent = 1;
 }
 
 $order_clause = 'ORDER BY ';
@@ -52,15 +52,15 @@ 
         WHERE status='1'".$order_clause;
 
 if (api_is_multiple_url_enabled()) {
-	$table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
+    $table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
 		        FROM $tbl_user u
                 INNER JOIN $table_access_url_rel_user url_rel_user
                 ON (url_rel_user.user_id = u.user_id)
 			    WHERE status='1' AND access_url_id = '$access_url_id' $order_clause";
-	}
+    }
 }
 
 $result = Database::query($sql);
@@ -170,9 +170,9 @@ 
     );
 
     if ($return == strval(intval($return))) {
-		header('Location: resume_session.php?id_session=' . $return);
-		exit();
-	}
+        header('Location: resume_session.php?id_session=' . $return);
+        exit();
+    }
 }
 
 // display the header

Spacing +9 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 $formSent = 0;
 
 // Crop picture plugin for session images
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     var $image = $("#previewImage");
@@ -103,8 +103,8 @@ 
 $tool_name = get_lang('EditSession');
 
 //$interbreadcrumb[] = array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => "session_list.php","name" => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id,"name" => get_lang('SessionOverview'));
+$interbreadcrumb[] = array('url' => "session_list.php", "name" => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id, "name" => get_lang('SessionOverview'));
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
 	$formSent = 1;
@@ -118,7 +118,7 @@ 
         WHERE status='1'".$order_clause;
 
 if (api_is_multiple_url_enabled()) {
-	$table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+	$table_access_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 	$access_url_id = api_get_current_access_url_id();
 	if ($access_url_id != -1) {
 		$sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
@@ -134,7 +134,7 @@ 
 $thisYear = date('Y');
 
 $coachesOption = array(
-    '' => '----- ' . get_lang('None') . ' -----'
+    '' => '----- '.get_lang('None').' -----'
 );
 
 foreach ($coaches as $coach) {
@@ -154,7 +154,7 @@ 
     }
 }
 
-$formAction = api_get_self() . '?';
+$formAction = api_get_self().'?';
 $formAction .= http_build_query(array(
     'page' => Security::remove_XSS($_GET['page']),
     'id' => $id
@@ -220,7 +220,7 @@ 
         $duration = null;
     }
     $description = $params['description'];
-    $showDescription = isset($params['show_description']) ? 1: 0;
+    $showDescription = isset($params['show_description']) ? 1 : 0;
     $sendSubscriptionNotification = isset($params['send_subscription_notification']);
     $isThisImageCropped = isset($params['cropResult']);
 
@@ -256,7 +256,7 @@ 
     );
 
     if ($return == strval(intval($return))) {
-		header('Location: resume_session.php?id_session=' . $return);
+		header('Location: resume_session.php?id_session='.$return);
 		exit();
 	}
 }

main/session/session_export.php

Spacing +22 added lines, -22 removed lines

@@ -32,7 +32,7 @@ 
 
 $tool_name = get_lang('ExportSessionListXMLCSV');
 
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 set_time_limit(0);
 
@@ -56,9 +56,9 @@ 
 				ORDER BY id";
 
 		if (api_is_multiple_url_enabled()) {
-			$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+			$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 			$access_url_id = api_get_current_access_url_id();
-			if ($access_url_id != -1){
+			if ($access_url_id != -1) {
 			$sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
 					FROM $tbl_session s
 					INNER JOIN $tbl_session_rel_access_url as session_rel_url
@@ -113,7 +113,7 @@ 
 
 			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
 			while (file_exists($archivePath.$archiveFile)) {
-				$archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
+				$archiveFile = 'export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
 			}
 
 			$cvs = false;
@@ -123,12 +123,12 @@ 
 
 
 		while ($row = Database::fetch_array($result)) {
-			$row['name'] = str_replace(';',',',$row['name']);
-			$row['username'] = str_replace(';',',',$row['username']);
-			$row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
-			$row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
-			$row['visibility'] = str_replace(';',',',$row['visibility']);
-			$row['session_category'] = str_replace(';',',',$row['session_category_id']);
+			$row['name'] = str_replace(';', ',', $row['name']);
+			$row['username'] = str_replace(';', ',', $row['username']);
+			$row['access_start_date'] = str_replace(';', ',', $row['access_start_date']);
+			$row['access_end_date'] = str_replace(';', ',', $row['access_end_date']);
+			$row['visibility'] = str_replace(';', ',', $row['visibility']);
+			$row['session_category'] = str_replace(';', ',', $row['session_category_id']);
 
 
 			// users
@@ -142,9 +142,9 @@ 
 
 			$rsUsers = Database::query($sql);
 			$users = '';
-			while ($rowUsers = Database::fetch_array($rsUsers)){
-				if($cvs){
-					$users .= str_replace(';',',',$rowUsers['username']).'|';
+			while ($rowUsers = Database::fetch_array($rsUsers)) {
+				if ($cvs) {
+					$users .= str_replace(';', ',', $rowUsers['username']).'|';
 				} else {
 					$users .= "\t\t<User>$rowUsers[username]</User>\n";
 				}
@@ -184,8 +184,8 @@ 
 				$coachs = implode(",", $coachs);
 
 				if ($cvs) {
-					$courses .= str_replace(';',',',$rowCourses['code']);
-					$courses .= '['.str_replace(';',',',$coachs).'][';
+					$courses .= str_replace(';', ',', $rowCourses['code']);
+					$courses .= '['.str_replace(';', ',', $coachs).'][';
 				} else {
 					$courses .= "\t\t<Course>\n";
 					$courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
@@ -208,9 +208,9 @@ 
 
 				$rsUsersCourse = Database::query($sql);
 				$userscourse = '';
-				while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
+				while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)) {
 					if ($cvs) {
-						$userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
+						$userscourse .= str_replace(';', ',', $rowUsersCourse['username']).',';
 					} else {
 						$courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
 					}
@@ -291,7 +291,7 @@ 
 if (api_is_multiple_url_enabled()) {
 	$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1){
+	if ($access_url_id != -1) {
 	$sql = "SELECT s.id, name FROM $tbl_session s
 			INNER JOIN $tbl_session_rel_access_url as session_rel_url
 			ON (s.id = session_rel_url.session_id)
@@ -304,7 +304,7 @@ 
 
 echo '<div class="actions">';
 echo '<a href="../session/session_list.php">'.
-		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (!empty($errorMsg)) {
@@ -313,8 +313,8 @@ 
 
 $form = new FormValidator('session_export', 'post', api_get_self());
 $form->addElement('hidden', 'formSent', 1);
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);
-$form->addElement('radio', 'file_type', '', 'XLS' , 'xls', null);
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV', 'csv', null);
+$form->addElement('radio', 'file_type', '', 'XLS', 'xls', null);
 $form->addElement('radio', 'file_type', null, 'XML', 'xml', null, array('id' => 'file_type_xml'));
 
 $options = array();
@@ -323,7 +323,7 @@ 
     $options[$enreg['id']] = $enreg['name'];
 }
 
-$form->addElement('select', 'session_id', get_lang('WhichSessionToExport'),  $options);
+$form->addElement('select', 'session_id', get_lang('WhichSessionToExport'), $options);
 $form->addButtonExport(get_lang('ExportSession'));
 
 $defaults = array();

Indentation +177 added lines, -177 removed lines

@@ -37,11 +37,11 @@ 
 set_time_limit(0);
 
 if (isset($_POST['formSent'])) {
-	$formSent = $_POST['formSent'];
-	$file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
-	$session_id = $_POST['session_id'];
-	if (empty($session_id)) {
-		$sql = "SELECT
+    $formSent = $_POST['formSent'];
+    $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
+    $session_id = $_POST['session_id'];
+    if (empty($session_id)) {
+        $sql = "SELECT
 					s.id,
 					name,
 					id_coach,
@@ -55,84 +55,84 @@ 
 				ON $tbl_user.user_id = s.id_coach
 				ORDER BY id";
 
-		if (api_is_multiple_url_enabled()) {
-			$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-			$access_url_id = api_get_current_access_url_id();
-			if ($access_url_id != -1){
-			$sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
+        if (api_is_multiple_url_enabled()) {
+            $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $access_url_id = api_get_current_access_url_id();
+            if ($access_url_id != -1){
+            $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
 					FROM $tbl_session s
 					INNER JOIN $tbl_session_rel_access_url as session_rel_url
 					ON (s.id= session_rel_url.session_id)
 					INNER JOIN $tbl_user u ON (u.user_id = s.id_coach)
 					WHERE access_url_id = $access_url_id
 					ORDER BY id";
-			}
-		}
+            }
+        }
 
-		$result = Database::query($sql);
-	} else {
-		$sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
+        $result = Database::query($sql);
+    } else {
+        $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
 				FROM $tbl_session s
 				INNER JOIN $tbl_user
 					ON $tbl_user.user_id = s.id_coach
 				WHERE id='$session_id'";
-		$result = Database::query($sql);
-	}
+        $result = Database::query($sql);
+    }
 
-	if (Database::num_rows($result)) {
+    if (Database::num_rows($result)) {
 
 
 
-		$sessionListToExport = [];
+        $sessionListToExport = [];
 
-		if (in_array($file_type, ['csv', 'xls'])) {
+        if (in_array($file_type, ['csv', 'xls'])) {
 
-			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
+            $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
 
-			$cvs = true;
-			$sessionListToExport[] = [
-				'SessionName',
-				'Coach',
-				'DateStart',
-				'DateEnd',
-				'Visibility',
-				'SessionCategory',
-				'Users',
-				'Courses'
-			];
-		} else {
-			if (!file_exists($archivePath)) {
-				mkdir($archivePath, api_get_permissions_for_new_directories(), true);
-			}
+            $cvs = true;
+            $sessionListToExport[] = [
+                'SessionName',
+                'Coach',
+                'DateStart',
+                'DateEnd',
+                'Visibility',
+                'SessionCategory',
+                'Users',
+                'Courses'
+            ];
+        } else {
+            if (!file_exists($archivePath)) {
+                mkdir($archivePath, api_get_permissions_for_new_directories(), true);
+            }
 
-			if (!file_exists($archivePath.'index.html')) {
-				$fp = fopen($archivePath.'index.html', 'w');
-				fputs($fp, '<html><head></head><body></body></html>');
-				fclose($fp);
-			}
+            if (!file_exists($archivePath.'index.html')) {
+                $fp = fopen($archivePath.'index.html', 'w');
+                fputs($fp, '<html><head></head><body></body></html>');
+                fclose($fp);
+            }
 
-			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
-			while (file_exists($archivePath.$archiveFile)) {
-				$archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
-			}
+            $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
+            while (file_exists($archivePath.$archiveFile)) {
+                $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
+            }
 
-			$cvs = false;
-			$fp = fopen($archivePath.$archiveFile, 'w');
-			fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
-		}
+            $cvs = false;
+            $fp = fopen($archivePath.$archiveFile, 'w');
+            fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
+        }
 
 
-		while ($row = Database::fetch_array($result)) {
-			$row['name'] = str_replace(';',',',$row['name']);
-			$row['username'] = str_replace(';',',',$row['username']);
-			$row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
-			$row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
-			$row['visibility'] = str_replace(';',',',$row['visibility']);
-			$row['session_category'] = str_replace(';',',',$row['session_category_id']);
+        while ($row = Database::fetch_array($result)) {
+            $row['name'] = str_replace(';',',',$row['name']);
+            $row['username'] = str_replace(';',',',$row['username']);
+            $row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
+            $row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
+            $row['visibility'] = str_replace(';',',',$row['visibility']);
+            $row['session_category'] = str_replace(';',',',$row['session_category_id']);
 
 
-			// users
-			$sql = "SELECT DISTINCT $tbl_user.username
+            // users
+            $sql = "SELECT DISTINCT $tbl_user.username
 					FROM $tbl_user
 					INNER JOIN $tbl_session_user
 					ON
@@ -140,33 +140,33 @@ 
 						$tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
 						$tbl_session_user.session_id = '".$row['id']."'";
 
-			$rsUsers = Database::query($sql);
-			$users = '';
-			while ($rowUsers = Database::fetch_array($rsUsers)){
-				if($cvs){
-					$users .= str_replace(';',',',$rowUsers['username']).'|';
-				} else {
-					$users .= "\t\t<User>$rowUsers[username]</User>\n";
-				}
-			}
-
-			if (!empty($users) && $cvs) {
-				$users = api_substr($users, 0, api_strlen($users) - 1);
-			}
-
-			// Courses
-			$sql = "SELECT DISTINCT c.code, sc.id, c_id
+            $rsUsers = Database::query($sql);
+            $users = '';
+            while ($rowUsers = Database::fetch_array($rsUsers)){
+                if($cvs){
+                    $users .= str_replace(';',',',$rowUsers['username']).'|';
+                } else {
+                    $users .= "\t\t<User>$rowUsers[username]</User>\n";
+                }
+            }
+
+            if (!empty($users) && $cvs) {
+                $users = api_substr($users, 0, api_strlen($users) - 1);
+            }
+
+            // Courses
+            $sql = "SELECT DISTINCT c.code, sc.id, c_id
 					FROM $tbl_course c
 					INNER JOIN $tbl_session_course_user sc
 						ON c.id = sc.c_id
 						AND sc.session_id = '".$row['id']."'";
 
-			$rsCourses = Database::query($sql);
+            $rsCourses = Database::query($sql);
 
-			$courses = '';
-			while ($rowCourses = Database::fetch_array($rsCourses)) {
-				// get coachs from a course
-				$sql = "SELECT u.username
+            $courses = '';
+            while ($rowCourses = Database::fetch_array($rsCourses)) {
+                // get coachs from a course
+                $sql = "SELECT u.username
 						FROM $tbl_session_course_user scu
 						INNER JOIN $tbl_user u
 						ON u.user_id = scu.user_id
@@ -175,25 +175,25 @@ 
 							scu.session_id = '".$row['id']."' AND
 							scu.status = 2 ";
 
-				$rs_coachs = Database::query($sql);
-				$coachs = array();
-				while ($row_coachs = Database::fetch_array($rs_coachs)) {
-					$coachs[] = $row_coachs['username'];
-				}
-
-				$coachs = implode(",", $coachs);
-
-				if ($cvs) {
-					$courses .= str_replace(';',',',$rowCourses['code']);
-					$courses .= '['.str_replace(';',',',$coachs).'][';
-				} else {
-					$courses .= "\t\t<Course>\n";
-					$courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
-					$courses .= "\t\t\t<Coach>$coachs</Coach>\n";
-				}
-
-				// rel user courses
-				$sql = "SELECT DISTINCT u.username
+                $rs_coachs = Database::query($sql);
+                $coachs = array();
+                while ($row_coachs = Database::fetch_array($rs_coachs)) {
+                    $coachs[] = $row_coachs['username'];
+                }
+
+                $coachs = implode(",", $coachs);
+
+                if ($cvs) {
+                    $courses .= str_replace(';',',',$rowCourses['code']);
+                    $courses .= '['.str_replace(';',',',$coachs).'][';
+                } else {
+                    $courses .= "\t\t<Course>\n";
+                    $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
+                    $courses .= "\t\t\t<Coach>$coachs</Coach>\n";
+                }
+
+                // rel user courses
+                $sql = "SELECT DISTINCT u.username
 						FROM $tbl_session_course_user scu
 						INNER JOIN $tbl_session_user su
 						ON
@@ -206,79 +206,79 @@ 
 							scu.c_id='".$rowCourses['c_id']."' AND
 							scu.session_id='".$row['id']."'";
 
-				$rsUsersCourse = Database::query($sql);
-				$userscourse = '';
-				while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
-					if ($cvs) {
-						$userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
-					} else {
-						$courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
-					}
-				}
-
-				if ($cvs) {
-					if (!empty($userscourse)) {
-						$userscourse = api_substr(
-							$userscourse,
-							0,
-							api_strlen($userscourse) - 1
-						);
-					}
-
-					$courses .= $userscourse.']|';
-				} else {
-					$courses .= "\t\t</Course>\n";
-				}
-			}
-
-			if (!empty($courses) && $cvs) {
-				$courses = api_substr($courses, 0, api_strlen($courses) - 1);
-			}
-			$add = $courses;
-
-			if (in_array($file_type, ['csv', 'xls'])) {
-				$sessionListToExport[] = [
-					$row['name'],
-					$row['username'],
-					$row['access_start_date'],
-					$row['access_end_date'],
-					$row['visibility'],
-					$row['session_category'],
-					$users,
-					$courses
-				];
-			} else {
-				$add = "\t<Session>\n"
-						 ."\t\t<SessionName>$row[name]</SessionName>\n"
-						 ."\t\t<Coach>$row[username]</Coach>\n"
-						 ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
-						 ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
-						 ."\t\t<Visibility>$row[visibility]</Visibility>\n"
-						 ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
-			}
-
-		 	if (!$cvs) {
-				$add .= "\t</Session>\n";
-				fputs($fp, $add);
-			}
-		}
-
-		switch ($file_type) {
-			case 'xml':
-				fputs($fp, "</Sessions>\n");
-				fclose($fp);
-				$errorMsg = get_lang('UserListHasBeenExported').'<br/>
+                $rsUsersCourse = Database::query($sql);
+                $userscourse = '';
+                while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
+                    if ($cvs) {
+                        $userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
+                    } else {
+                        $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
+                    }
+                }
+
+                if ($cvs) {
+                    if (!empty($userscourse)) {
+                        $userscourse = api_substr(
+                            $userscourse,
+                            0,
+                            api_strlen($userscourse) - 1
+                        );
+                    }
+
+                    $courses .= $userscourse.']|';
+                } else {
+                    $courses .= "\t\t</Course>\n";
+                }
+            }
+
+            if (!empty($courses) && $cvs) {
+                $courses = api_substr($courses, 0, api_strlen($courses) - 1);
+            }
+            $add = $courses;
+
+            if (in_array($file_type, ['csv', 'xls'])) {
+                $sessionListToExport[] = [
+                    $row['name'],
+                    $row['username'],
+                    $row['access_start_date'],
+                    $row['access_end_date'],
+                    $row['visibility'],
+                    $row['session_category'],
+                    $users,
+                    $courses
+                ];
+            } else {
+                $add = "\t<Session>\n"
+                            ."\t\t<SessionName>$row[name]</SessionName>\n"
+                            ."\t\t<Coach>$row[username]</Coach>\n"
+                            ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
+                            ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
+                            ."\t\t<Visibility>$row[visibility]</Visibility>\n"
+                            ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
+            }
+
+                if (!$cvs) {
+                $add .= "\t</Session>\n";
+                fputs($fp, $add);
+            }
+        }
+
+        switch ($file_type) {
+            case 'xml':
+                fputs($fp, "</Sessions>\n");
+                fclose($fp);
+                $errorMsg = get_lang('UserListHasBeenExported').'<br/>
 				<a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
-				break;
-			case 'csv':
-				Export::arrayToCsv($sessionListToExport, $archiveFile);
-				exit;
-			case 'xls':
-				Export::arrayToXls($sessionListToExport, $archiveFile);
-				exit;
-				break;
-		}
-	}
+                break;
+            case 'csv':
+                Export::arrayToCsv($sessionListToExport, $archiveFile);
+                exit;
+            case 'xls':
+                Export::arrayToXls($sessionListToExport, $archiveFile);
+                exit;
+                break;
+        }
+    }
 }
 
 // display the header
@@ -288,26 +288,26 @@ 
 $sql = "SELECT id, name FROM $tbl_session ORDER BY name";
 
 if (api_is_multiple_url_enabled()) {
-	$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1){
-	$sql = "SELECT s.id, name FROM $tbl_session s
+    $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1){
+    $sql = "SELECT s.id, name FROM $tbl_session s
 			INNER JOIN $tbl_session_rel_access_url as session_rel_url
 			ON (s.id = session_rel_url.session_id)
 			WHERE access_url_id = $access_url_id
 			ORDER BY name";
-	}
+    }
 }
 $result = Database::query($sql);
 $Sessions = Database::store_result($result);
 
 echo '<div class="actions">';
 echo '<a href="../session/session_list.php">'.
-		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg, false); //main API
+    Display::display_normal_message($errorMsg, false); //main API
 }
 
 $form = new FormValidator('session_export', 'post', api_get_self());

main/messages/index.php

Indentation +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 */
 require_once '../inc/global.inc.php';
 if (api_get_setting('allow_social_tool')=='true' &&  api_get_setting('allow_message_tool')=='true') {
-	header('Location:inbox.php?f=social');
+    header('Location:inbox.php?f=social');
 } elseif ( api_get_setting('allow_message_tool')=='true') {
-	header('Location:inbox.php');
+    header('Location:inbox.php');
 }
 exit;

Spacing +2 added lines, -2 removed lines

@@ -4,9 +4,9 @@
 *	@package chamilo.messages
 */
 require_once '../inc/global.inc.php';
-if (api_get_setting('allow_social_tool')=='true' &&  api_get_setting('allow_message_tool')=='true') {
+if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
 	header('Location:inbox.php?f=social');
-} elseif ( api_get_setting('allow_message_tool')=='true') {
+} elseif (api_get_setting('allow_message_tool') == 'true') {
 	header('Location:inbox.php');
 }
 exit;

main/messages/download.php

Indentation +16 added lines, -16 removed lines

@@ -50,11 +50,11 @@ 
 $message_uid = '';
 $message_type = array('inbox','outbox');
 if (in_array($_GET['type'],$message_type)) {
-	if ($_GET['type'] == 'inbox') {
-		$message_uid = $row_users['user_receiver_id'];
-	} else {
-		$message_uid = $row_users['user_sender_id'];
-	}
+    if ($_GET['type'] == 'inbox') {
+        $message_uid = $row_users['user_receiver_id'];
+    } else {
+        $message_uid = $row_users['user_sender_id'];
+    }
 }
 
 // allow to the correct user for download this file
@@ -62,19 +62,19 @@ 
 $userGroup = new UserGroup();
 
 if (!empty($row_users['group_id'])) {
-	$users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
-	if (!in_array($current_uid,array_keys($users_group))) {
-		$not_allowed_to_edit = true;
-	}
+    $users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
+    if (!in_array($current_uid,array_keys($users_group))) {
+        $not_allowed_to_edit = true;
+    }
 } else {
-	if ($current_uid != $message_uid) {
-		$not_allowed_to_edit = true;
-	}
+    if ($current_uid != $message_uid) {
+        $not_allowed_to_edit = true;
+    }
 }
 
 if ($not_allowed_to_edit) {
-	api_not_allowed();
-	exit;
+    api_not_allowed();
+    exit;
 }
 
 // set the path directory file
@@ -85,14 +85,14 @@ 
         true
     );
 } else {
-	$path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
+    $path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
 }
 
 $full_file_name = $path_user_info['dir'].'message_attachments/'.$file_url;
 
 if (Security::check_abs_path($full_file_name, $path_user_info['dir'].'message_attachments/')) {
     // launch event
-	Event::event_download($file_url);
+    Event::event_download($file_url);
     DocumentManager::file_send_for_download($full_file_name,TRUE, $title);
 }
 exit;

Spacing +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
 
 // get message user id for inbox/outbox
 $message_uid = '';
-$message_type = array('inbox','outbox');
-if (in_array($_GET['type'],$message_type)) {
+$message_type = array('inbox', 'outbox');
+if (in_array($_GET['type'], $message_type)) {
 	if ($_GET['type'] == 'inbox') {
 		$message_uid = $row_users['user_receiver_id'];
 	} else {
@@ -63,7 +63,7 @@ 
 
 if (!empty($row_users['group_id'])) {
 	$users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
-	if (!in_array($current_uid,array_keys($users_group))) {
+	if (!in_array($current_uid, array_keys($users_group))) {
 		$not_allowed_to_edit = true;
 	}
 } else {
@@ -93,6 +93,6 @@ 
 if (Security::check_abs_path($full_file_name, $path_user_info['dir'].'message_attachments/')) {
     // launch event
 	Event::event_download($file_url);
-    DocumentManager::file_send_for_download($full_file_name,TRUE, $title);
+    DocumentManager::file_send_for_download($full_file_name, TRUE, $title);
 }
 exit;

main/messages/outbox.php

Indentation +17 added lines, -17 removed lines

@@ -9,20 +9,20 @@ 
 api_block_anonymous_users();
 
 if (isset($_GET['messages_page_nr'])) {
-	if (api_get_setting('allow_social_tool')=='true' &&
+    if (api_get_setting('allow_social_tool')=='true' &&
         api_get_setting('allow_message_tool')=='true'
     ) {
-		$social_link = '';
-		if ($_REQUEST['f']=='social') {
-			$social_link = '&f=social';
-		}
-		header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.'');
-		exit;
-	}
+        $social_link = '';
+        if ($_REQUEST['f']=='social') {
+            $social_link = '&f=social';
+        }
+        header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.'');
+        exit;
+    }
 }
 
 if (api_get_setting('allow_message_tool')!='true'){
-	api_not_allowed();
+    api_not_allowed();
 }
 //jquery thickbox already called from main/inc/header.inc.php
 
@@ -54,13 +54,13 @@ 
 		MAIN CODE
 */
 if (isset($_GET['f']) && $_GET['f']=='social') {
-	$this_section = SECTION_SOCIAL;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
+    $this_section = SECTION_SOCIAL;
+    $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
+    $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
 } else {
-	$this_section = SECTION_MYPROFILE;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
+    $this_section = SECTION_MYPROFILE;
+    $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
+    $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
 }
 
 $actions = '';
@@ -83,8 +83,8 @@ 
 
 if (isset($info_delete_outbox[0]) && trim($info_delete_outbox[0])=='delete') {
     for ($i = 1; $i <= $count_delete_outbox; $i++) {
-		MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]);
-	}
+        MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]);
+    }
     $message_box=get_lang('SelectedMessagesDeleted').
         '&nbsp
         <br><a href="../social/index.php?#remote-tab-3">'.

Spacing +24 added lines, -24 removed lines

@@ -9,11 +9,11 @@ 
 api_block_anonymous_users();
 
 if (isset($_GET['messages_page_nr'])) {
-	if (api_get_setting('allow_social_tool')=='true' &&
-        api_get_setting('allow_message_tool')=='true'
+	if (api_get_setting('allow_social_tool') == 'true' &&
+        api_get_setting('allow_message_tool') == 'true'
     ) {
 		$social_link = '';
-		if ($_REQUEST['f']=='social') {
+		if ($_REQUEST['f'] == 'social') {
 			$social_link = '&f=social';
 		}
 		header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.'');
@@ -51,46 +51,46 @@ 
 */
 if (isset($_GET['f']) && $_GET['f'] === 'social') {
 	$this_section = SECTION_SOCIAL;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
+	$interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'main/social/home.php', 'name' => get_lang('Social'));
+	$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Outbox'));
 } else {
 	$this_section = SECTION_MYPROFILE;
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
+	$interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'main/auth/profile.php', 'name' => get_lang('Profile'));
+	$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Outbox'));
 }
 
 $actions = '';
 if (api_get_setting('extended_profile') == 'true') {
     if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
-        $actions .=  '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
+        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
             Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
     }
     if (api_get_setting('allow_message_tool') == 'true') {
         //echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
-        $actions .=  '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
-            Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>';
-        $actions .=  '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-            Display::return_icon('inbox.png',get_lang('Inbox')).'</a>';
-        $actions .=  '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
-            Display::return_icon('outbox.png',get_lang('Outbox')).'</a>';
+        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
+            Display::return_icon('message_new.png', get_lang('ComposeMessage')).'</a>';
+        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+            Display::return_icon('inbox.png', get_lang('Inbox')).'</a>';
+        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
+            Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
     }
 }
 
 
-$info_delete_outbox =array();
-$info_delete_outbox = isset($_GET['form_delete_outbox']) ? explode(',',$_GET['form_delete_outbox']) : '';
+$info_delete_outbox = array();
+$info_delete_outbox = isset($_GET['form_delete_outbox']) ? explode(',', $_GET['form_delete_outbox']) : '';
 $count_delete_outbox = count($info_delete_outbox) - 1;
 
 if (isset($info_delete_outbox[0]) && trim($info_delete_outbox[0]) == 'delete') {
     for ($i = 1; $i <= $count_delete_outbox; $i++) {
-		MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]);
+		MessageManager::delete_message_by_user_sender(api_get_user_id(), $info_delete_outbox[$i]);
 	}
-    $message_box=get_lang('SelectedMessagesDeleted').
+    $message_box = get_lang('SelectedMessagesDeleted').
         '&nbsp
         <br><a href="../social/index.php?#remote-tab-3">'.
         get_lang('BackToOutbox').
         '</a>';
-    Display::display_normal_message(api_xml_http_response_encode($message_box),false);
+    Display::display_normal_message(api_xml_http_response_encode($message_box), false);
     exit;
 }
 
@@ -117,23 +117,23 @@ 
 }
 //MAIN CONTENT
 if ($action == 'delete') {
-    $delete_list_id=array();
+    $delete_list_id = array();
     if (isset($_POST['out'])) {
-        $delete_list_id=$_POST['out'];
+        $delete_list_id = $_POST['out'];
     }
     if (isset($_POST['id'])) {
-        $delete_list_id=$_POST['id'];
+        $delete_list_id = $_POST['id'];
     }
     for ($i = 0; $i < count($delete_list_id); $i++) {
         MessageManager::delete_message_by_user_sender(api_get_user_id(), $delete_list_id[$i]);
     }
-    $delete_list_id=array();
+    $delete_list_id = array();
     $social_right_content .= MessageManager::outbox_display($keyword);
 } elseif ($action == 'deleteone') {
     $delete_list_id = array();
     $id = Security::remove_XSS($_GET['id']);
     MessageManager::delete_message_by_user_sender(api_get_user_id(), $id);
-    $delete_list_id=array();
+    $delete_list_id = array();
     $social_right_content .= MessageManager::outbox_display($keyword);
 } else {
     $social_right_content .= MessageManager::outbox_display($keyword);

main/attendance/attendance_controller.php

Indentation +5 added lines, -5 removed lines

@@ -636,11 +636,11 @@
             }
             $formToDisplay = $form->returnForm();
         } else {
-           if (!empty($sessionId)) {
-               $sessionInfo = api_get_session_info($sessionId);
-               $startDate = $sessionInfo['access_start_date'];
-               $endDate = $sessionInfo['access_end_date'];
-           }
+            if (!empty($sessionId)) {
+                $sessionInfo = api_get_session_info($sessionId);
+                $startDate = $sessionInfo['access_start_date'];
+                $endDate = $sessionInfo['access_end_date'];
+            }
         }
 
         $attendance = new Attendance();

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
                     $attendance->set_attendance_qualify_title($_POST['attendance_qualify_title']);
                     $attendance->set_attendance_weight($_POST['attendance_weight']);
                     $link_to_gradebook = false;
-                    if ( isset($_POST['attendance_qualify_gradebook']) && $_POST['attendance_qualify_gradebook'] == 1 ) {
+                    if (isset($_POST['attendance_qualify_gradebook']) && $_POST['attendance_qualify_gradebook'] == 1) {
                         $link_to_gradebook = true;
                     }
                     $attendance->category_id = $_POST['category_id'];
@@ -539,17 +539,17 @@ 
             }
         }
         $max_cols_per_page = 12; //10 dates + 2 name and number
-        $max_dates_per_page = $max_dates_per_page_original = $max_cols_per_page - 2;//10
+        $max_dates_per_page = $max_dates_per_page_original = $max_cols_per_page - 2; //10
         $rows = count($data_table);
 
         if ($cols > $max_cols_per_page) {
-            $number_tables = round(($cols-2)/$max_dates_per_page);
+            $number_tables = round(($cols - 2) / $max_dates_per_page);
             $headers = $data_table[0];
             $all = array();
             $tables = array();
             $changed = 1;
 
-            for ($i= 0; $i <= $rows; $i++) {
+            for ($i = 0; $i <= $rows; $i++) {
                 $row = isset($data_table[$i]) ? $data_table[$i] : null;
                 $key = 1;
                 $max_dates_per_page = 10;
@@ -560,7 +560,7 @@ 
                     foreach ($item as $value) {
                         if ($count_j >= $max_dates_per_page) {
                             $key++;
-                            $max_dates_per_page = $max_dates_per_page_original*$key;
+                            $max_dates_per_page = $max_dates_per_page_original * $key;
                             //magic hack
                             $tables[$key][$i][] = $tables[1][$i][0];
                             $tables[$key][$i][] = $tables[1][$i][1];
@@ -617,8 +617,8 @@ 
             $form = new FormValidator(
                 'search',
                 'post',
-                api_get_self() . '?' . api_get_cidreq(
-                ) . '&action=calendar_logins'
+                api_get_self().'?'.api_get_cidreq(
+                ).'&action=calendar_logins'
             );
             $form->addDateRangePicker('range', get_lang('DateRange'));
             $form->addButton('submit', get_lang('Submit'));

main/attendance/calendar_logins.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 // See AttendanceController::calendarLogins function
 echo '<div class="actions">';
 echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list">'.
-    Display::return_icon('back.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 echo $form;