chamilo / chamilo-lms

main/session/session_category_edit.php

Braces +354 added lines, -88 removed lines

@@ -84,7 +84,12 @@ 
         <div class="form-group">
             <label class="col-sm-3 control-label"><?php echo get_lang('SessionName') ?></label>
             <div class="col-sm-6">
-                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); else echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); ?>">
+                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) {
+    echo api_htmlentities($name,ENT_QUOTES,$charset);
+} else {
+    echo api_htmlentities($infos['name'],ENT_QUOTES,$charset);
+}
+?>">
             </div>
             <div class="col-sm-3"></div>
         </div>
@@ -100,58 +105,184 @@ 
                 <div class="col-sm-6">
                     <select name="day_start">
                         <option value="1">01</option>
-                        <option value="2" <?php if($day_start == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($day_start == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($day_start == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($day_start == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($day_start == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($day_start == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($day_start == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($day_start == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($day_start == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($day_start == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($day_start == 12) echo 'selected="selected"'; ?> >12</option>
-                        <option value="13" <?php if($day_start == 13) echo 'selected="selected"'; ?> >13</option>
-                        <option value="14" <?php if($day_start == 14) echo 'selected="selected"'; ?> >14</option>
-                        <option value="15" <?php if($day_start == 15) echo 'selected="selected"'; ?> >15</option>
-                        <option value="16" <?php if($day_start == 16) echo 'selected="selected"'; ?> >16</option>
-                        <option value="17" <?php if($day_start == 17) echo 'selected="selected"'; ?> >17</option>
-                        <option value="18" <?php if($day_start == 18) echo 'selected="selected"'; ?> >18</option>
-                        <option value="19" <?php if($day_start == 19) echo 'selected="selected"'; ?> >19</option>
-                        <option value="20" <?php if($day_start == 20) echo 'selected="selected"'; ?> >20</option>
-                        <option value="21" <?php if($day_start == 21) echo 'selected="selected"'; ?> >21</option>
-                        <option value="22" <?php if($day_start == 22) echo 'selected="selected"'; ?> >22</option>
-                        <option value="23" <?php if($day_start == 23) echo 'selected="selected"'; ?> >23</option>
-                        <option value="24" <?php if($day_start == 24) echo 'selected="selected"'; ?> >24</option>
-                        <option value="25" <?php if($day_start == 25) echo 'selected="selected"'; ?> >25</option>
-                        <option value="26" <?php if($day_start == 26) echo 'selected="selected"'; ?> >26</option>
-                        <option value="27" <?php if($day_start == 27) echo 'selected="selected"'; ?> >27</option>
-                        <option value="28" <?php if($day_start == 28) echo 'selected="selected"'; ?> >28</option>
-                        <option value="29" <?php if($day_start == 29) echo 'selected="selected"'; ?> >29</option>
-                        <option value="30" <?php if($day_start == 30) echo 'selected="selected"'; ?> >30</option>
-                        <option value="31" <?php if($day_start == 31) echo 'selected="selected"'; ?> >31</option>
+                        <option value="2" <?php if($day_start == 2) {
+    echo 'selected="selected"';
+}
+?> >02</option>
+                        <option value="3" <?php if($day_start == 3) {
+    echo 'selected="selected"';
+}
+?> >03</option>
+                        <option value="4" <?php if($day_start == 4) {
+    echo 'selected="selected"';
+}
+?> >04</option>
+                        <option value="5" <?php if($day_start == 5) {
+    echo 'selected="selected"';
+}
+?> >05</option>
+                        <option value="6" <?php if($day_start == 6) {
+    echo 'selected="selected"';
+}
+?> >06</option>
+                        <option value="7" <?php if($day_start == 7) {
+    echo 'selected="selected"';
+}
+?> >07</option>
+                        <option value="8" <?php if($day_start == 8) {
+    echo 'selected="selected"';
+}
+?> >08</option>
+                        <option value="9" <?php if($day_start == 9) {
+    echo 'selected="selected"';
+}
+?> >09</option>
+                        <option value="10" <?php if($day_start == 10) {
+    echo 'selected="selected"';
+}
+?> >10</option>
+                        <option value="11" <?php if($day_start == 11) {
+    echo 'selected="selected"';
+}
+?> >11</option>
+                        <option value="12" <?php if($day_start == 12) {
+    echo 'selected="selected"';
+}
+?> >12</option>
+                        <option value="13" <?php if($day_start == 13) {
+    echo 'selected="selected"';
+}
+?> >13</option>
+                        <option value="14" <?php if($day_start == 14) {
+    echo 'selected="selected"';
+}
+?> >14</option>
+                        <option value="15" <?php if($day_start == 15) {
+    echo 'selected="selected"';
+}
+?> >15</option>
+                        <option value="16" <?php if($day_start == 16) {
+    echo 'selected="selected"';
+}
+?> >16</option>
+                        <option value="17" <?php if($day_start == 17) {
+    echo 'selected="selected"';
+}
+?> >17</option>
+                        <option value="18" <?php if($day_start == 18) {
+    echo 'selected="selected"';
+}
+?> >18</option>
+                        <option value="19" <?php if($day_start == 19) {
+    echo 'selected="selected"';
+}
+?> >19</option>
+                        <option value="20" <?php if($day_start == 20) {
+    echo 'selected="selected"';
+}
+?> >20</option>
+                        <option value="21" <?php if($day_start == 21) {
+    echo 'selected="selected"';
+}
+?> >21</option>
+                        <option value="22" <?php if($day_start == 22) {
+    echo 'selected="selected"';
+}
+?> >22</option>
+                        <option value="23" <?php if($day_start == 23) {
+    echo 'selected="selected"';
+}
+?> >23</option>
+                        <option value="24" <?php if($day_start == 24) {
+    echo 'selected="selected"';
+}
+?> >24</option>
+                        <option value="25" <?php if($day_start == 25) {
+    echo 'selected="selected"';
+}
+?> >25</option>
+                        <option value="26" <?php if($day_start == 26) {
+    echo 'selected="selected"';
+}
+?> >26</option>
+                        <option value="27" <?php if($day_start == 27) {
+    echo 'selected="selected"';
+}
+?> >27</option>
+                        <option value="28" <?php if($day_start == 28) {
+    echo 'selected="selected"';
+}
+?> >28</option>
+                        <option value="29" <?php if($day_start == 29) {
+    echo 'selected="selected"';
+}
+?> >29</option>
+                        <option value="30" <?php if($day_start == 30) {
+    echo 'selected="selected"';
+}
+?> >30</option>
+                        <option value="31" <?php if($day_start == 31) {
+    echo 'selected="selected"';
+}
+?> >31</option>
                   </select>
                   /
                   <select name="month_start">
                         <option value="1">01</option>
-                        <option value="2" <?php if($month_start == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($month_start == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($month_start == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($month_start == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($month_start == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($month_start == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($month_start == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($month_start == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($month_start == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($month_start == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($month_start == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="2" <?php if($month_start == 2) {
+    echo 'selected="selected"';
+}
+?> >02</option>
+                        <option value="3" <?php if($month_start == 3) {
+    echo 'selected="selected"';
+}
+?> >03</option>
+                        <option value="4" <?php if($month_start == 4) {
+    echo 'selected="selected"';
+}
+?> >04</option>
+                        <option value="5" <?php if($month_start == 5) {
+    echo 'selected="selected"';
+}
+?> >05</option>
+                        <option value="6" <?php if($month_start == 6) {
+    echo 'selected="selected"';
+}
+?> >06</option>
+                        <option value="7" <?php if($month_start == 7) {
+    echo 'selected="selected"';
+}
+?> >07</option>
+                        <option value="8" <?php if($month_start == 8) {
+    echo 'selected="selected"';
+}
+?> >08</option>
+                        <option value="9" <?php if($month_start == 9) {
+    echo 'selected="selected"';
+}
+?> >09</option>
+                        <option value="10" <?php if($month_start == 10) {
+    echo 'selected="selected"';
+}
+?> >10</option>
+                        <option value="11" <?php if($month_start == 11) {
+    echo 'selected="selected"';
+}
+?> >11</option>
+                        <option value="12" <?php if($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($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                                <option value="<?php echo $i; ?>" <?php if($year_start == $i) {
+    echo 'selected="selected"';
+}
+?> ><?php echo $i; ?></option>
                         <?php
                         } ?>
                 </select>
@@ -163,53 +294,182 @@ 
                 <div class="col-sm-6">
                     <select name="day_end">
                         <option value="0">--</option>
-                        <option value="1" <?php if($day_end == 1) echo 'selected="selected"'; ?> >01</option>
-                        <option value="2" <?php if($day_end == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($day_end == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($day_end == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($day_end == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($day_end == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($day_end == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($day_end == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($day_end == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($day_end == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($day_end == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($day_end == 12) echo 'selected="selected"'; ?> >12</option>
-                        <option value="13" <?php if($day_end == 13) echo 'selected="selected"'; ?> >13</option>
-                        <option value="14" <?php if($day_end == 14) echo 'selected="selected"'; ?> >14</option>
-                        <option value="15" <?php if($day_end == 15) echo 'selected="selected"'; ?> >15</option>
-                        <option value="16" <?php if($day_end == 16) echo 'selected="selected"'; ?> >16</option>
-                        <option value="17" <?php if($day_end == 17) echo 'selected="selected"'; ?> >17</option>
-                        <option value="18" <?php if($day_end == 18) echo 'selected="selected"'; ?> >18</option>
-                        <option value="19" <?php if($day_end == 19) echo 'selected="selected"'; ?> >19</option>
-                        <option value="20" <?php if($day_end == 20) echo 'selected="selected"'; ?> >20</option>
-                        <option value="21" <?php if($day_end == 21) echo 'selected="selected"'; ?> >21</option>
-                        <option value="22" <?php if($day_end == 22) echo 'selected="selected"'; ?> >22</option>
-                        <option value="23" <?php if($day_end == 23) echo 'selected="selected"'; ?> >23</option>
-                        <option value="24" <?php if($day_end == 24) echo 'selected="selected"'; ?> >24</option>
-                        <option value="25" <?php if($day_end == 25) echo 'selected="selected"'; ?> >25</option>
-                        <option value="26" <?php if($day_end == 26) echo 'selected="selected"'; ?> >26</option>
-                        <option value="27" <?php if($day_end == 27) echo 'selected="selected"'; ?> >27</option>
-                        <option value="28" <?php if($day_end == 28) echo 'selected="selected"'; ?> >28</option>
-                        <option value="29" <?php if($day_end == 29) echo 'selected="selected"'; ?> >29</option>
-                        <option value="30" <?php if($day_end == 30) echo 'selected="selected"'; ?> >30</option>
-                        <option value="31" <?php if($day_end == 31) echo 'selected="selected"'; ?> >31</option>
+                        <option value="1" <?php if($day_end == 1) {
+    echo 'selected="selected"';
+}
+?> >01</option>
+                        <option value="2" <?php if($day_end == 2) {
+    echo 'selected="selected"';
+}
+?> >02</option>
+                        <option value="3" <?php if($day_end == 3) {
+    echo 'selected="selected"';
+}
+?> >03</option>
+                        <option value="4" <?php if($day_end == 4) {
+    echo 'selected="selected"';
+}
+?> >04</option>
+                        <option value="5" <?php if($day_end == 5) {
+    echo 'selected="selected"';
+}
+?> >05</option>
+                        <option value="6" <?php if($day_end == 6) {
+    echo 'selected="selected"';
+}
+?> >06</option>
+                        <option value="7" <?php if($day_end == 7) {
+    echo 'selected="selected"';
+}
+?> >07</option>
+                        <option value="8" <?php if($day_end == 8) {
+    echo 'selected="selected"';
+}
+?> >08</option>
+                        <option value="9" <?php if($day_end == 9) {
+    echo 'selected="selected"';
+}
+?> >09</option>
+                        <option value="10" <?php if($day_end == 10) {
+    echo 'selected="selected"';
+}
+?> >10</option>
+                        <option value="11" <?php if($day_end == 11) {
+    echo 'selected="selected"';
+}
+?> >11</option>
+                        <option value="12" <?php if($day_end == 12) {
+    echo 'selected="selected"';
+}
+?> >12</option>
+                        <option value="13" <?php if($day_end == 13) {
+    echo 'selected="selected"';
+}
+?> >13</option>
+                        <option value="14" <?php if($day_end == 14) {
+    echo 'selected="selected"';
+}
+?> >14</option>
+                        <option value="15" <?php if($day_end == 15) {
+    echo 'selected="selected"';
+}
+?> >15</option>
+                        <option value="16" <?php if($day_end == 16) {
+    echo 'selected="selected"';
+}
+?> >16</option>
+                        <option value="17" <?php if($day_end == 17) {
+    echo 'selected="selected"';
+}
+?> >17</option>
+                        <option value="18" <?php if($day_end == 18) {
+    echo 'selected="selected"';
+}
+?> >18</option>
+                        <option value="19" <?php if($day_end == 19) {
+    echo 'selected="selected"';
+}
+?> >19</option>
+                        <option value="20" <?php if($day_end == 20) {
+    echo 'selected="selected"';
+}
+?> >20</option>
+                        <option value="21" <?php if($day_end == 21) {
+    echo 'selected="selected"';
+}
+?> >21</option>
+                        <option value="22" <?php if($day_end == 22) {
+    echo 'selected="selected"';
+}
+?> >22</option>
+                        <option value="23" <?php if($day_end == 23) {
+    echo 'selected="selected"';
+}
+?> >23</option>
+                        <option value="24" <?php if($day_end == 24) {
+    echo 'selected="selected"';
+}
+?> >24</option>
+                        <option value="25" <?php if($day_end == 25) {
+    echo 'selected="selected"';
+}
+?> >25</option>
+                        <option value="26" <?php if($day_end == 26) {
+    echo 'selected="selected"';
+}
+?> >26</option>
+                        <option value="27" <?php if($day_end == 27) {
+    echo 'selected="selected"';
+}
+?> >27</option>
+                        <option value="28" <?php if($day_end == 28) {
+    echo 'selected="selected"';
+}
+?> >28</option>
+                        <option value="29" <?php if($day_end == 29) {
+    echo 'selected="selected"';
+}
+?> >29</option>
+                        <option value="30" <?php if($day_end == 30) {
+    echo 'selected="selected"';
+}
+?> >30</option>
+                        <option value="31" <?php if($day_end == 31) {
+    echo 'selected="selected"';
+}
+?> >31</option>
                   </select>
                   /
                   <select name="month_end">
                         <option value="0">--</option>
-                        <option value="1" <?php if($month_end == 1) echo 'selected="selected"'; ?> >01</option>
-                        <option value="2" <?php if($month_end == 2) echo 'selected="selected"'; ?> >02</option>
-                        <option value="3" <?php if($month_end == 3) echo 'selected="selected"'; ?> >03</option>
-                        <option value="4" <?php if($month_end == 4) echo 'selected="selected"'; ?> >04</option>
-                        <option value="5" <?php if($month_end == 5) echo 'selected="selected"'; ?> >05</option>
-                        <option value="6" <?php if($month_end == 6) echo 'selected="selected"'; ?> >06</option>
-                        <option value="7" <?php if($month_end == 7) echo 'selected="selected"'; ?> >07</option>
-                        <option value="8" <?php if($month_end == 8) echo 'selected="selected"'; ?> >08</option>
-                        <option value="9" <?php if($month_end == 9) echo 'selected="selected"'; ?> >09</option>
-                        <option value="10" <?php if($month_end == 10) echo 'selected="selected"'; ?> >10</option>
-                        <option value="11" <?php if($month_end == 11) echo 'selected="selected"'; ?> >11</option>
-                        <option value="12" <?php if($month_end == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="1" <?php if($month_end == 1) {
+    echo 'selected="selected"';
+}
+?> >01</option>
+                        <option value="2" <?php if($month_end == 2) {
+    echo 'selected="selected"';
+}
+?> >02</option>
+                        <option value="3" <?php if($month_end == 3) {
+    echo 'selected="selected"';
+}
+?> >03</option>
+                        <option value="4" <?php if($month_end == 4) {
+    echo 'selected="selected"';
+}
+?> >04</option>
+                        <option value="5" <?php if($month_end == 5) {
+    echo 'selected="selected"';
+}
+?> >05</option>
+                        <option value="6" <?php if($month_end == 6) {
+    echo 'selected="selected"';
+}
+?> >06</option>
+                        <option value="7" <?php if($month_end == 7) {
+    echo 'selected="selected"';
+}
+?> >07</option>
+                        <option value="8" <?php if($month_end == 8) {
+    echo 'selected="selected"';
+}
+?> >08</option>
+                        <option value="9" <?php if($month_end == 9) {
+    echo 'selected="selected"';
+}
+?> >09</option>
+                        <option value="10" <?php if($month_end == 10) {
+    echo 'selected="selected"';
+}
+?> >10</option>
+                        <option value="11" <?php if($month_end == 11) {
+    echo 'selected="selected"';
+}
+?> >11</option>
+                        <option value="12" <?php if($month_end == 12) {
+    echo 'selected="selected"';
+}
+?> >12</option>
                   </select>
                   /
                   <select name="year_end">
@@ -217,7 +477,10 @@ 
                         <?php
                         for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
                         { ?>
-                         <option value="<?php echo $i; ?>" <?php if($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                         <option value="<?php echo $i; ?>" <?php if($year_end == $i) {
+    echo 'selected="selected"';
+}
+?> ><?php echo $i; ?></option>
                         <?php
                         } ?>
                  </select>
@@ -238,7 +501,10 @@ 
 
 
 <script>
-<?php if($year_start=="0000") echo "setDisable(document.form.nolimit);\r\n"; ?>
+<?php if($year_start=="0000") {
+    echo "setDisable(document.form.nolimit);\r\n";
+}
+?>
 function setDisable(select){
 	document.form.day_start.disabled = (select.checked) ? true : false;
 	document.form.month_start.disabled = (select.checked) ? true : false;

main/webservices/registration.soap.php

Braces +186 added lines, -64 removed lines

@@ -63,14 +63,16 @@ 
         list($ip1) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
@@ -554,7 +556,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1045,9 +1049,15 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) {
+        error_log('$userId found: '. $userId);
+    }
+    if ($debug) {
+        error_log('$courseId found: '. $courseId);
+    }
+    if ($debug) {
+        error_log('$sessionId found: '. $sessionId);
+    }
 
     return [
         'user_id' => $userId,
@@ -1077,13 +1087,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1096,13 +1110,17 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  '. print_r($coaches, 1));
+        }
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) {
+        error_log('Result:  '. $result);
+    }
 
     return $result;
 }
@@ -1128,13 +1146,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1148,7 +1170,9 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  ' . print_r($coaches, 1));
+        }
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1156,7 +1180,9 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) {
+        error_log('Final Result: '. $result);
+    }
 
     return $result;
 }
@@ -1208,8 +1234,12 @@ 
 {
     global $_user, $_configuration, $debug;
     $debug = 1;
-    if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) {
+        error_log('WSCreateUserPasswordCrypted');
+    }
+    if ($debug) {
+        error_log(print_r($params,1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1241,22 +1271,30 @@ 
         if ($_configuration['password_encryption'] === $encrypt_method ) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
 
             } else if ($encrypt_method == 'sha1' && !preg_match('/^[A-Fa-f0-9]{40}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
             }
         } else {
             $msg = "This encryption $encrypt_method is not configured";
-            if ($debug) error_log($msg);
+            if ($debug) {
+                error_log($msg);
+            }
             return $msg;
         }
     } else {
         $msg = 'The chamilo setting $_configuration["password_encryption"] is not configured';
-        if ($debug) error_log($msg);
+        if ($debug) {
+            error_log($msg);
+        }
         return $msg;
     }
 
@@ -1276,10 +1314,14 @@ 
         $original_user_id_name
     );
 
-    if ($debug) error_log('Ready to create user');
+    if ($debug) {
+        error_log('Ready to create user');
+    }
 
     if ($user_id > 0) {
-        if ($debug) error_log('User found with id: '.$user_id);
+        if ($debug) {
+            error_log('User found with id: '.$user_id);
+        }
 
         // Check whether user is not active
         //@todo why this condition exists??
@@ -1290,7 +1332,9 @@ 
         $count_check_user = Database::num_rows($resu);
         if ($count_check_user > 0) {
 
-            if ($debug) error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            if ($debug) {
+                error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            }
 
             $sql = "UPDATE $table_user SET
                     lastname='".Database::escape_string($lastName)."',
@@ -1311,7 +1355,9 @@ 
                     hr_dept_id=".intval($hr_dept_id)." 
                 WHERE user_id='".$r_check_user[0]."'";
 
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
 
             if (is_array($extra_list) && count($extra_list) > 0) {
@@ -1328,11 +1374,15 @@ 
             }
             return $r_check_user[0];
         } else {
-            if ($debug) error_log('User exists but is active. Cant be updated');
+            if ($debug) {
+                error_log('User exists but is active. Cant be updated');
+            }
             return 0;
         }
     } else {
-        if ($debug) error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        if ($debug) {
+            error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        }
     }
 
     // Default language.
@@ -1348,12 +1398,16 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
     $queryExpirationDate = '';
-    if (!empty($params['expiration_date'])) $queryExpirationDate = "expiration_date     = '".Database::escape_string($expiration_date)."', ";
+    if (!empty($params['expiration_date'])) {
+        $queryExpirationDate = "expiration_date     = '".Database::escape_string($expiration_date)."', ";
+    }
 
     $sql = "INSERT INTO $table_user SET
             lastname            = '".Database::escape_string(trim($lastName))."',
@@ -1373,7 +1427,9 @@ 
             ".$queryExpirationDate."
             hr_dept_id          = '".Database::escape_string($hr_dept_id)."',
             active              = '".Database::escape_string($active)."'";
-    if ($debug) error_log($sql);
+    if ($debug) {
+        error_log($sql);
+    }
 
     Database::query($sql);
     $return = Database::insert_id();
@@ -1385,7 +1441,9 @@ 
 
         $url_id = api_get_current_access_url_id();
         UrlManager::add_user_to_url($return, $url_id);
-        if ($debug) error_log("Adding user_id = $return to URL id $url_id ");
+        if ($debug) {
+            error_log("Adding user_id = $return to URL id $url_id ");
+        }
 
         // Create extra field for the original_user_id_name
         UserManager::create_extra_field(
@@ -1422,7 +1480,9 @@ 
             }
         }
     } else {
-        if ($debug) error_log('Error while inserting a user');
+        if ($debug) {
+            error_log('Error while inserting a user');
+        }
 
         return 0;
     }
@@ -4504,7 +4564,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4523,7 +4585,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        if ($debug) {
+            error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        }
 
         if ($user_id == 0) {
             // If user was not found, there was a problem
@@ -4541,13 +4605,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                }
                 $result = CourseManager::add_user_to_course($user_id, $courseCode, $status, false);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSSubscribeUserToCourse subscribed');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse subscribed');
+                    }
                 } else {
-                    if ($debug) error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    }
                 }
             }
         }
@@ -4606,8 +4676,12 @@ 
 function WSSubscribeUserToCourseSimple($params) {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourseSimple');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4625,7 +4699,9 @@ 
     if (empty($user_data)) {
         // If user was not found, there was a problem
         $result = "User $user_id does not exist";
-        if ($debug) error_log($result);
+        if ($debug) {
+            error_log($result);
+        }
         return $result;
     }
     if (!empty($course_code)) {
@@ -4633,14 +4709,22 @@ 
         if (empty($course_data)) {
             // Course was not found
             $result = "Course $course_code does not exist in the platform ";
-            if ($debug) error_log($result);
+            if ($debug) {
+                error_log($result);
+            }
         } else {
-            if ($debug) error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            if ($debug) {
+                error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            }
             if (!CourseManager::add_user_to_course($user_id, $course_data['code'], $status)) {
                 $result = 'User was not registered possible reasons: User already registered to the course, Course visibility doesnt allow user subscriptions ';
-                if ($debug) error_log($result);
+                if ($debug) {
+                    error_log($result);
+                }
             } else {
-                if ($debug) error_log('User registered to the course: '.$course_data['code']);
+                if ($debug) {
+                    error_log('User registered to the course: '.$course_data['code']);
+                }
                 $result = 1;
             }
         }
@@ -4693,8 +4777,12 @@ 
 function WSGetUser($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUser');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUser');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -4748,8 +4836,12 @@ 
 function WSGetUserFromUsername($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUserFromUsername');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUserFromUsername');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -5216,7 +5308,9 @@ 
                 SessionManager::suscribe_users_to_session($sessionId, array($user_id), SESSION_VISIBLE_READ_ONLY, false);
                 $results[] = 1;
 
-                if ($debug) error_log("subscribe user:$user_id to session $sessionId");
+                if ($debug) {
+                    error_log("subscribe user:$user_id to session $sessionId");
+                }
             }
         }
     } // end principal foreach
@@ -5300,7 +5394,9 @@ 
                 SESSION_VISIBLE_READ_ONLY,
                 false
             );
-            if ($debug) error_log('User registered to the course: '.$session_id);
+            if ($debug) {
+                error_log('User registered to the course: '.$session_id);
+            }
             $result = 1;
         }
     }
@@ -5448,7 +5544,9 @@ 
 
                 $results[] = 1;
 
-                if ($debug) error_log("Unsubscribe user:$user_id to session:$id_session");
+                if ($debug) {
+                    error_log("Unsubscribe user:$user_id to session:$id_session");
+                }
             }
         }
     } // end principal foreach
@@ -5595,7 +5693,9 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    }
 
     $coursessessions_params = $params['coursessessions'];
     $results = array();
@@ -5641,7 +5741,9 @@ 
                     array($courseInfo['real_id']),
                     false
                 );
-                if ($debug) error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                if ($debug) {
+                    error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                }
 
                 $results[] = 1;
             }
@@ -6914,7 +7016,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -6930,7 +7034,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        if ($debug) {
+            error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -6947,13 +7053,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::addUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    }
                 } else {
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    }
                 }
             }
         }
@@ -6986,7 +7098,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -7002,7 +7116,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        if ($debug) {
+            error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -7020,13 +7136,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::removeUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    }
                 } else {
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    }
                 }
             }
         }

plugin/ims_lti/OAuthSimple.php

Braces +7 added lines, -12 removed lines

@@ -74,8 +74,7 @@ 
         if (empty($this->_parameters))
 		{
 			$this->_parameters = $parameters;
-		}
-        else if (!empty($parameters))
+		} else if (!empty($parameters))
 		{
 			$this->_parameters = array_merge($this->_parameters,$parameters);
 		}
@@ -324,8 +323,7 @@ 
                 {
                     $result .= $pName .'="' . self::_oauthEscape($val) . '", ';
                 }
-            }
-            else
+            } else
             {
                 $result .= $pName . '="' . self::_oauthEscape($pValue) . '", ';
             }
@@ -350,14 +348,13 @@ 
                 if (!is_array($result[$key]))
 				{
                     $result[$key] = array($result[$key],$token);
-				}
-                else
+				} else
 				{
                     array_push($result[$key],$token);
 				}
+            } else {
+                            $result[$key]=$token;
             }
-            else
-                $result[$key]=$token;
         }
         return $result;
     }
@@ -447,8 +444,7 @@ 
 					{
 						array_push($normalized_keys[self::_oauthEscape($paramName)],  self::_oauthEscape($item));
 					}
-				}
-				else
+				} else
 				{
 					$normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
 				}
@@ -466,8 +462,7 @@ 
 				{
 					array_push($return_array, $key . "=" . $element);
 				}
-			}
-			else
+			} else
 			{
 				array_push($return_array, $key .'='. $val);
 			}

main/gradebook/lib/be/abstractlink.class.php

Braces +10 added lines, -4 removed lines

@@ -244,14 +244,20 @@
             $paramcount ++;
         }
         if (isset($type)) {
-            if ($paramcount != 0) $sql .= ' AND';
-            else $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                $sql .= ' AND';
+            } else {
+                $sql .= ' WHERE';
+            }
             $sql .= ' type = '.intval($type);
             $paramcount ++;
         }
         if (isset($ref_id)) {
-            if ($paramcount != 0) $sql .= ' AND';
-            else $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                $sql .= ' AND';
+            } else {
+                $sql .= ' WHERE';
+            }
             $sql .= ' ref_id = '.intval($ref_id);
             $paramcount ++;
         }

main/inc/lib/sessionmanager.lib.php

Braces +5 added lines, -4 removed lines

@@ -2896,10 +2896,11 @@
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 } else {
                     // The user is not subscribed to the session, so make sure
                     // he isn't subscribed to a course in this session either

main/lp/lp_controller.php

Braces +83 added lines, -34 removed lines

@@ -14,7 +14,9 @@ 
 $use_anonymous = true;
 
 $debug = 0;
-if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+if ($debug > 0) {
+    error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+}
 
 // Language files that needs to be included.
 if (isset($_GET['action'])) {
@@ -210,10 +212,14 @@ 
     // If refresh is set, we regenerate the oLP object from the database (kind of flush).
     Session::erase('refresh');
     $myrefresh = 1;
-    if ($debug > 0) error_log('New LP - Refresh asked', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - Refresh asked', 0);
+    }
+    }
 
-if ($debug > 0) error_log('New LP - Passed refresh check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed refresh check', 0);
+}
 
 if (!empty($_REQUEST['dialog_box'])) {
     $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box']));
@@ -223,17 +229,23 @@ 
 $lp_found = false;
 
 if (isset($_SESSION['lpobject'])) {
-    if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0);
+    if ($debug > 0) {
+        error_log('New LP - SESSION[lpobject] is defined', 0);
+    }
     $oLP = unserialize($_SESSION['lpobject']);
     if (isset($oLP) && is_object($oLP)) {
-        if ($debug > 0) error_log('New LP - oLP is object', 0);
+        if ($debug > 0) {
+            error_log('New LP - oLP is object', 0);
+        }
         if ($myrefresh == 1 ||
             empty($oLP->cc) ||
             $oLP->cc != api_get_course_id() ||
             $oLP->lp_view_session_id != $session_id ||
             $oLP->scorm_debug == '1'
         ) {
-            if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0);
+            if ($debug > 0) {
+                error_log('New LP - Course has changed, discard lp object', 0);
+            }
             if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); }
             $oLP = null;
             Session::erase('oLP');
@@ -247,13 +259,19 @@ 
 
 $course_id = api_get_course_int_id();
 
-if ($debug>0) error_log('New LP - Passed data remains check', 0);
+if ($debug>0) {
+    error_log('New LP - Passed data remains check', 0);
+}
 
 if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) {
-    if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    if ($debug > 0) {
+        error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    }
     // Regenerate a new lp object? Not always as some pages don't need the object (like upload?)
     if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) {
-        if ($debug > 0) error_log('New LP - lp_id is defined', 0);
+        if ($debug > 0) {
+            error_log('New LP - lp_id is defined', 0);
+        }
         // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the
         // right object.
         if (!empty($_REQUEST['lp_id'])) {
@@ -265,16 +283,22 @@ 
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
         if (is_numeric($lp_id)) {
             $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
-            if ($debug > 0) error_log('New LP - querying '.$sel, 0);
+            if ($debug > 0) {
+                error_log('New LP - querying '.$sel, 0);
+            }
             $res = Database::query($sel);
 
             if (Database::num_rows($res)) {
                 $row = Database::fetch_array($res);
                 $type = $row['lp_type'];
-                if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                if ($debug > 0) {
+                    error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                }
                 switch ($type) {
                     case 1:
-                        if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
 
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
@@ -284,7 +308,9 @@ 
                         }
                         break;
                     case 2:
-                        if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
                             $lp_found = true;
@@ -293,7 +319,9 @@ 
                         }
                         break;
                     case 3:
-                        if ($debug > 0) error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
                             $lp_found = true;
@@ -302,7 +330,9 @@ 
                         }
                         break;
                     default:
-                        if ($debug > 0) error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
                             $lp_found = true;
@@ -313,17 +343,23 @@ 
                 }
             }
         } else {
-            if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0);
+            if ($debug > 0) {
+                error_log('New LP - Request[lp_id] is not numeric', 0);
+            }
         }
     } else {
-        if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        if ($debug > 0) {
+            error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        }
     }
     if ($lp_found) {
         $_SESSION['oLP'] = $oLP;
     }
 }
 
-if ($debug > 0) error_log('New LP - Passed oLP creation check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed oLP creation check', 0);
+}
 
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false);
 
@@ -360,7 +396,9 @@ 
 }
 
 $redirectTo = '';
-if ($debug > 0) error_log('New LP - action "'.$action.'" triggered');
+if ($debug > 0) {
+    error_log('New LP - action "'.$action.'" triggered');
+}
 
 switch ($action) {
     case 'add_item':
@@ -369,7 +407,9 @@ 
         }
         if (!$lp_found) {
             //check if the learnpath ID was defined, otherwise send back to list
-            if ($debug > 0) error_log('New LP - No learnpath given for add item', 0);
+            if ($debug > 0) {
+                error_log('New LP - No learnpath given for add item', 0);
+            }
             require 'lp_list.php';
         } else {
             $_SESSION['refresh'] = 1;
@@ -459,7 +499,9 @@ 
         }
         if (!$lp_found) {
             //check if the learnpath ID was defined, otherwise send back to list
-            if ($debug > 0) error_log('New LP - No learnpath given for add audio', 0);
+            if ($debug > 0) {
+                error_log('New LP - No learnpath given for add audio', 0);
+            }
             require 'lp_list.php';
         } else {
             $_SESSION['refresh'] = 1;
@@ -607,8 +649,7 @@ 
             if (!$is_allowed_to_edit) {
                 api_not_allowed(true);
             }
-            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; }
-            else {
+            if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } else {
                 $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
                 require 'lp_list.php';
                 exit;
@@ -689,8 +730,7 @@ 
         if (!$is_allowed_to_edit) {
             api_not_allowed(true);
         }
-        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else {
             if (isset($_POST['submit_button'])) {
                 //Updating the lp.modified_on
                 $_SESSION['oLP']->set_modified_on();
@@ -1119,16 +1159,24 @@ 
         }
         break;
     case 'content':
-        if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        if ($debug > 0) {
+            error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for content', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) error_log('New LP - save_last()', 0);
+            if ($debug > 0) {
+                error_log('New LP - save_last()', 0);
+            }
             $_SESSION['oLP']->save_last();
-            if ($debug > 0) error_log('New LP - set_current_item()', 0);
+            if ($debug > 0) {
+                error_log('New LP - set_current_item()', 0);
+            }
             $_SESSION['oLP']->set_current_item($_GET['item_id']);
-            if ($debug > 0) error_log('New LP - start_current_item()', 0);
+            if ($debug > 0) {
+                error_log('New LP - start_current_item()', 0);
+            }
             $_SESSION['oLP']->start_current_item();
             require 'lp_content.php';
         }
@@ -1244,8 +1292,7 @@ 
         require 'lp_message.php';
         break;
     case 'return_to_course_homepage':
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_current();
             $_SESSION['oLP']->save_last();
             $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id();
@@ -1438,8 +1485,10 @@ 
 
 if (!empty($_SESSION['oLP'])) {
     $_SESSION['lpobject'] = serialize($_SESSION['oLP']);
-    if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - lpobject is serialized in session', 0);
+    }
+    }
 
 if (!empty($redirectTo)) {
     header("Location: $redirectTo");

main/admin/user_move_stats.php

Braces +99 added lines, -43 removed lines

@@ -108,7 +108,9 @@ 
                 //Check if the user is registered in the session otherwise we will add it
                 $result = SessionManager::get_users_by_session($new_session_id);
                 if (empty($result) || !in_array($user_id, array_keys($result))) {
-                    if ($debug) echo 'User added to the session';
+                    if ($debug) {
+                        echo 'User added to the session';
+                    }
                     //Registering user to the new session
                     SessionManager::subscribe_users_to_session($new_session_id,array($user_id),false);
                 }
@@ -143,10 +145,11 @@ 
                     $list[$row['exe_id']]= $row;
                 }
 
-                if (!empty($list))
-                    foreach ($list as $exe_id =>$data) {
+                if (!empty($list)) {
+                                    foreach ($list as $exe_id =>$data) {
                         if ($update_database) {
                             $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id";
+                }
                             $res = Database::query($sql);
                             $result_message[$TABLETRACK_EXERCICES]++;
                         } else {
@@ -170,10 +173,11 @@ 
                         $list[$row['exe_id']]= $row;
                     }
 
-                    if (!empty($list))
-                        foreach ($list as $exe_id =>$data) {
+                    if (!empty($list)) {
+                                            foreach ($list as $exe_id =>$data) {
                             if ($update_database) {
                                 $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id";
+                    }
                                 $res = Database::query($sql);
                                 $result_message[$TABLETRACK_EXERCICES]++;
                             } else {
@@ -198,10 +202,11 @@ 
                     $list[$row['course_access_id']] = $row;
                 }
 
-                if (!empty($list))
-                    foreach ($list as $id => $data) {
+                if (!empty($list)) {
+                                    foreach ($list as $id => $data) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = $new_session_id WHERE course_access_id = $id";
+                }
                             if ($debug) {
                                 echo $sql;
                             }
@@ -220,13 +225,18 @@ 
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $list[] = $row['access_id'];
                 }
-                if (!empty($list))
-                    foreach ($list as $id) {
+                if (!empty($list)) {
+                                    foreach ($list as $id) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = $new_session_id WHERE access_id = $id";
-                            if ($debug) echo $sql;
+                }
+                            if ($debug) {
+                                echo $sql;
+                            }
                             $res = Database::query($sql);
-                            if ($debug) var_dump($res);
+                            if ($debug) {
+                                var_dump($res);
+                            }
                             $result_message[$TBL_TRACK_E_LAST_ACCESS]++;
                         }
                     }
@@ -250,13 +260,18 @@ 
                     }
                 }
 
-                if (!empty($list))
-                    foreach ($list as $id=>$data) {
+                if (!empty($list)) {
+                                    foreach ($list as $id=>$data) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_LP_VIEW SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id ";
-                            if ($debug) var_dump($sql);
+                }
+                            if ($debug) {
+                                var_dump($sql);
+                            }
                             $res = Database::query($sql);
-                            if ($debug) var_dump($res);
+                            if ($debug) {
+                                var_dump($res);
+                            }
                             $result_message[$TBL_LP_VIEW]++;
                         } else {
                             //Getting all information of that lp_item_id
@@ -283,10 +298,11 @@ 
                             $list[$row['id']] = $row;
                         }
                     }
-                    if (!empty($list))
-                        foreach ($list as $id=>$data) {
+                    if (!empty($list)) {
+                                            foreach ($list as $id=>$data) {
                             //Getting all information of that lp_item_id
                             $score    = Tracking::get_avg_student_score($user_id, $origin_course_code,        array($data['lp_id']), $new_session_id);
+                    }
                             $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code,     array($data['lp_id']), $new_session_id);
                             $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress);
                         }
@@ -302,9 +318,13 @@ 
                     $id = $row['ref'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id ";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res_update = Database::query($sql);
-                        if ($debug) var_dump($res_update);
+                        if ($debug) {
+                            var_dump($res_update);
+                        }
                         $result_message['agenda']++;
                     }
                 }
@@ -316,22 +336,30 @@ 
                 //echo '<h1>Student publication</h1>';
 
                 $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'work' AND insert_user_id = $user_id AND c_id = $course_id";
-                if ($debug) echo $sql;
+                if ($debug) {
+                    echo $sql;
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['ref'];
                     $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id";
-                    if ($debug) var_dump($sql);
+                    if ($debug) {
+                        var_dump($sql);
+                    }
                     $sub_res = Database::query($sql);
                     if (Database::num_rows($sub_res) > 0 ) {
                         $data = Database::fetch_array($sub_res,'ASSOC');
-                        if ($debug) var_dump($data);
+                        if ($debug) {
+                            var_dump($data);
+                        }
                         $parent_id = $data['parent_id'];
                         if (isset($data['parent_id']) && !empty($data['parent_id'])) {
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $parent_id AND c_id = $course_id";
                             $select_res     = Database::query($sql);
                             $parent_data    = Database::fetch_array($select_res,'ASSOC');
-                            if ($debug)     var_dump($parent_data);
+                            if ($debug) {
+                                var_dump($parent_data);
+                            }
 
                             $sys_course_path = api_get_path(SYS_COURSE_PATH);
                             $course_dir = $sys_course_path . $course_info['path'];
@@ -346,7 +374,9 @@ 
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION
                             		WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id
                             		ORDER BY id desc  LIMIT 1";
-                            if ($debug) echo $sql;
+                            if ($debug) {
+                                echo $sql;
+                            }
                             $sub_res = Database::query($sql);
                             $num_rows = Database::num_rows($sub_res);
 
@@ -390,7 +420,9 @@ 
 
                             //Creating student_publication_assignment if exists
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION_ASSIGNMENT WHERE publication_id = $parent_id AND c_id = $course_id";
-                            if ($debug) var_dump($sql);
+                            if ($debug) {
+                                var_dump($sql);
+                            }
                             $rest_select     = Database::query($sql);
                             if (Database::num_rows($rest_select) > 0 ) {
                                 if ($update_database) {
@@ -402,7 +434,9 @@ 
                                        add_to_calendar      = '".$assignment_data['add_to_calendar']."',
                                        enable_qualification = '".$assignment_data['enable_qualification']."',
                                        publication_id       = '".$new_parent_id."'";
-                                    if ($debug) echo $sql_add_publication;
+                                    if ($debug) {
+                                        echo $sql_add_publication;
+                                    }
                                     $rest_select     = Database::query($sql_add_publication);
                                     $id = Database::insert_id();
 
@@ -410,11 +444,15 @@ 
                                         "has_properties         = '".$id."',
                                        view_properties    = '1'
                                        WHERE id   = ".$new_parent_id;
-                                    if ($debug) echo $sql_update;
+                                    if ($debug) {
+                                        echo $sql_update;
+                                    }
                                     $rest_update     = Database::query($sql_update);
 
 
-                                    if ($debug) var_dump($sql_update);
+                                    if ($debug) {
+                                        var_dump($sql_update);
+                                    }
                                     $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++;
                                 }
                             }
@@ -455,7 +493,9 @@ 
                                     if ($result) {
                                         unlink($full_file_name);
                                         $sql = "DELETE FROM $TBL_STUDENT_PUBLICATION WHERE id= ".$data['id'];
-                                        if ($debug) var_dump($sql);
+                                        if ($debug) {
+                                            var_dump($sql);
+                                        }
                                         $result_delete     = Database::query($sql);
                                         api_item_property_update($course_info, 'work', $data['id'], 'DocumentDeleted', api_get_user_id());
                                     }
@@ -471,22 +511,30 @@ 
                 //10. Dropbox - not neccesary to move categories (no presence of session_id)
 
                 $sql = "SELECT id FROM $TBL_DROPBOX_FILE WHERE uploader_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id";
-                if ($debug) var_dump($sql);
+                if ($debug) {
+                    var_dump($sql);
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['id'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug) var_dump($res);
+                        if ($debug) {
+                            var_dump($res);
+                        }
 
                         $sql = "UPDATE $TBL_DROPBOX_POST SET session_id = $new_session_id WHERE file_id = $id";
-                        if ($debug)
-                            var_dump($sql);
+                        if ($debug) {
+                                                    var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug)
-                            var_dump($res);
+                        if ($debug) {
+                                                    var_dump($res);
+                        }
                         $result_message[$TBL_DROPBOX_FILE]++;
                     }
                 }
@@ -495,23 +543,30 @@ 
 
                 $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK
                         WHERE user_id = $user_id AND session_id = $origin_session_id AND course = '$origin_course_code' AND c_id = $course_id";
-                if ($debug) var_dump($sql);
+                if ($debug) {
+                    var_dump($sql);
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['notebook_id'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_NOTEBOOK SET session_id = $new_session_id WHERE c_id = $course_id AND notebook_id = $id";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug) var_dump($res);
+                        if ($debug) {
+                            var_dump($res);
+                        }
                     }
                 }
 
                 if ($update_database) {
                     echo '<h2>'.get_lang('StatsMoved').'</h2>';
-                    if (is_array($result_message))
-                        foreach ($result_message as $table=>$times) {
+                    if (is_array($result_message)) {
+                                            foreach ($result_message as $table=>$times) {
                             echo 'Table '.$table.' - '.$times.' records updated <br />';
+                    }
                         }
                 } else {
                     echo '<h2>'.get_lang('UserInformationOfThisCourse').'</h2>';
@@ -626,10 +681,11 @@ 
 }
 $navigation .= '&nbsp;';
 $page ++;
-if ($page < $nro_pages)
+if ($page < $nro_pages) {
     $navigation .= '<a href="'.api_get_self().'?page='.$page.'">'.get_lang('Next').'</a>';
-else
+} else {
     $navigation .= get_lang('Next');
+}
 
 echo $navigation;
 $user_list      = UserManager::get_user_list(array(), array(), $begin, $default);