chamilo / chamilo-lms

main/admin/subscribe_user2course.php

Braces +8 added lines, -2 removed lines

@@ -317,7 +317,10 @@ 
     <td width="40%" align="center">
      <select name="UserList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_users as $user) { ?>
-          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>>
+          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) {
+    echo 'selected="selected"';
+}
+?>>
       <?php
         $userName = $user['lastname'].' '.$user['firstname'].' ('.$user['username'].')';
         if ($showOfficialCode) {
@@ -338,7 +341,10 @@ 
    <td width="40%" align="center">
     <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_courses as $course) { ?>
-         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>>
+         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
+    echo 'selected="selected"';
+}
+?>>
              <?php echo '('.$course['visual_code'].') '.$course['title']; ?>
          </option>
     <?php } ?>

main/lp/learnpath.class.php

Braces +100 added lines, -68 removed lines

@@ -3885,8 +3885,9 @@ 
                 WHERE c_id = $course_id
                 ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
         $lps = array ();
         $lp_order = array();
         $num = Database :: num_rows($res);
@@ -4491,8 +4492,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4557,8 +4559,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4571,8 +4574,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4764,8 +4768,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5109,8 +5114,9 @@ 
 
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
 
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
@@ -5421,8 +5427,9 @@ 
             $position[$key] = $row['display_order'];
         }
 
-        if (count($array) > 0)
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        if (count($array) > 0) {
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        }
 
         return $array;
     }
@@ -6200,10 +6207,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
-                        if ($new_title)
-                            $ct .= ", title='" . Database::escape_string($new_title)."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='" . Database::escape_string($new_title)."' ";
+                        }
 
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6227,17 +6236,21 @@ 
         // Please, do not modify this dirname formatting.
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
 
-        if (strstr($dir, '..'))
-            $dir = '/';
+        if (strstr($dir, '..')) {
+                    $dir = '/';
+        }
 
-        if ($dir[0] == '.')
-            $dir = substr($dir, 1);
+        if ($dir[0] == '.') {
+                    $dir = substr($dir, 1);
+        }
 
-        if ($dir[0] != '/')
-            $dir = '/' . $dir;
+        if ($dir[0] != '/') {
+                    $dir = '/' . $dir;
+        }
 
-        if ($dir[strlen($dir) - 1] != '/')
-            $dir .= '/';
+        if ($dir[strlen($dir) - 1] != '/') {
+                    $dir .= '/';
+        }
 
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
 
@@ -6304,8 +6317,9 @@ 
                 }
                 $return .= '<div style="padding:10px;">';
 
-                if ($msg != '')
-                    $return .= $msg;
+                if ($msg != '') {
+                                    $return .= $msg;
+                }
 
                 $return .= '<h3>'.$row['title'].'</h3>';
                 switch ($row['item_type']) {
@@ -6584,10 +6598,11 @@ 
         $item_title			= Security::remove_XSS($item_title);
         $item_description 	= Security::remove_XSS($item_description);
 
-        if ($id != 0 && is_array($extra_info))
-            $parent = $extra_info['parent_item_id'];
-        else
-            $parent = 0;
+        if ($id != 0 && is_array($extra_info)) {
+                    $parent = $extra_info['parent_item_id'];
+        } else {
+                    $parent = 0;
+        }
 
         $sql = "SELECT * FROM " . $tbl_lp_item . "
                 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
@@ -6887,8 +6902,9 @@ 
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
-                    if ($arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    if ($arrLP[$i]['item_type'] == 'dir') {
+                                            $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    }
                 }
             }
             reset($arrLP);
@@ -6905,11 +6921,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -6936,9 +6954,11 @@ 
                 $arrHide = array ();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                            $s_selected_position = $arrLP[$i]['id'];
-                        elseif ($action == 'add') $s_selected_position = 0;
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                                    $s_selected_position = $arrLP[$i]['id'];
+                        } elseif ($action == 'add') {
+                            $s_selected_position = 0;
+                        }
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                     }
                 }
@@ -7131,9 +7151,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                 }
             }
@@ -7328,9 +7350,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -7364,8 +7388,7 @@ 
 
         if (is_numeric($extra_info)) {
             $form->addHidden('path', $extra_info);
-        }
-        elseif (is_array($extra_info)) {
+        } elseif (is_array($extra_info)) {
             $form->addHidden('path', $extra_info['path']);
         }
 
@@ -7418,8 +7441,9 @@ 
                     lp_id = " . $this->lp_id . " AND
                     id != $id";
 
-        if ($item_type == 'dir')
-            $sql .= " AND parent_item_id = 0";
+        if ($item_type == 'dir') {
+                    $sql .= " AND parent_item_id = 0";
+        }
 
         $result = Database::query($sql);
         $arrLP = array ();
@@ -7816,9 +7840,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir' && $arrLP[$i]['item_type'] !== TOOL_LP_FINAL_ITEM) {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
                         $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                    }
 
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
@@ -7829,17 +7855,18 @@ 
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $item_type == TOOL_LP_FINAL_ITEM || $edit == 'true')) {
-                    if (isset ($_POST['content']))
-                        $content = stripslashes($_POST['content']);
-                    elseif (is_array($extra_info)) {
+                    if (isset ($_POST['content'])) {
+                                            $content = stripslashes($_POST['content']);
+                    } elseif (is_array($extra_info)) {
                         //If it's an html document or a text file
                         if (!$no_display_edit_textarea) {
                             $content = $this->display_document($extra_info['path'], false, false);
                         }
-                    } elseif (is_numeric($extra_info))
-                        $content = $this->display_document($extra_info, false, false);
-                    else
-                        $content = '';
+                    } elseif (is_numeric($extra_info)) {
+                                            $content = $this->display_document($extra_info, false, false);
+                    } else {
+                                            $content = '';
+                    }
 
                     if (!$no_display_edit_textarea) {
                         // We need to calculate here some specific settings for the online editor.
@@ -8103,9 +8130,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -8299,9 +8328,11 @@ 
             $arrHide = array ();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -9377,10 +9408,11 @@ 
 
                 // Dependency to other files - not yet supported.
                 $i = 1;
-                if ($inc_docs)
-                foreach ($inc_docs as $doc_info) {
+                if ($inc_docs) {
+                                foreach ($inc_docs as $doc_info) {
                     if (count($doc_info) < 1 || empty($doc_info[0])) {
                         continue;
+                }
                     }
                     $my_dep = $xmldoc->createElement('resource');
                     $res_id = 'RESOURCE_'.$item->get_id().'_'.$i;