From caf33cad4f1646fb5619a0623e2ae9e318c5a4f1 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 29 Sep 2014 10:56:10 +0200
Subject: [PATCH] Minor - format code.

---
 main/admin/settings.lib.php                   |   1 -
 .../default/auth/courses_categories.php       |   2 +
 main/template/default/auth/courses_list.php   | 227 +++++++++---------
 main/user/subscribe_user.php                  |   1 -
 4 files changed, 121 insertions(+), 110 deletions(-)

diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index e9b84bcde2..6a691b0c17 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -17,7 +17,6 @@
  */
 function handle_regions()
 {
-
     if (isset($_POST['submit_plugins'])) {
         store_regions();
         // Add event to the system log.
diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php
index bbbbbba870..9711da3274 100755
--- a/main/template/default/auth/courses_categories.php
+++ b/main/template/default/auth/courses_categories.php
@@ -166,6 +166,8 @@ $stok = Security::get_token();
                 $count_connections = $course['count_connections'];
                 $creation_date = substr($course['creation_date'],0,10);
 
+                $icon_title = null;
+
                 // display the course bloc
                 echo '<div class="well_border"><div class="row">';
 
diff --git a/main/template/default/auth/courses_list.php b/main/template/default/auth/courses_list.php
index d748eebe06..50f5fda76c 100755
--- a/main/template/default/auth/courses_list.php
+++ b/main/template/default/auth/courses_list.php
@@ -20,32 +20,32 @@ $courses_without_category = $courses_in_category[0];
 	&nbsp;<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'),'','32'); ?></a>
     <?php } ?>
 </div>
-    
-<?php 
+
+<?php
 if (!empty($message)) {
-    Display::display_confirmation_message($message, false); 
-}   
-        
+    Display::display_confirmation_message($message, false);
+}
+
 // COURSES WITH CATEGORIES
 if (!empty($user_course_categories)) {
        foreach ($user_course_categories as $row) {
            echo Display::page_subheader($row['title']);
            echo '<a name="category'.$row['id'].'"></a>';
-           
+
            if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
-            <!-- We display the edit form for the category -->            
-            
+            <!-- We display the edit form for the category -->
+
             <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
                 <input type="hidden" name="edit_course_category" value="<?php echo $row['id']; ?>" />
                 <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
                 <input type="text" name="title_course_category" value="<?php echo $row['title']; ?>" />
                 <button class="save" type="submit" name="submit_edit_course_category"><?php echo get_lang('Ok'); ?></button>
-            </form>            
+            </form>
             <?php } ?>
-            
-            
+
+
             <!-- display category icons -->
-            <?php 
+            <?php
             $max_category_key = count($user_course_categories);
             if ($action != 'unsubscribe') { ?>
                 <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
@@ -57,7 +57,7 @@ if (!empty($user_course_categories)) {
                         <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
                         </a>
                 <?php } else { ?>
-                    <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?> 
+                    <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?>
                <?php } ?>
 
                 <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
@@ -69,95 +69,108 @@ if (!empty($user_course_categories)) {
                 <?php } ?>
                 <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
                 <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
-                </a>	                   
+                </a>
             <?php }
             echo '<br /><br />';
-            // Show the courses inside this category            
+            // Show the courses inside this category
             echo '<table class="data_table">';
-            
-            $number_of_courses = count($courses_in_category[$row['id']]);
+
+            $number_of_courses = isset($courses_in_category[$row['id']]) ? count($courses_in_category[$row['id']]) : 0;
             $key = 0;
             if (!empty($courses_in_category[$row['id']])) {
                 foreach ($courses_in_category[$row['id']] as $course) {
             ?>
-                    <tr>
-                        <td>
-                        <a name="course<?php echo $course['code']; ?>"></a>
-                        <strong><?php echo $course['title']; ?></strong><br />
-                        <?php
-                        if (api_get_setting('display_coursecode_in_courselist') == 'true') { echo $course['visual_code']; }
-                        if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') { echo " - "; }
-                        if (api_get_setting('display_teacher_in_courselist') == 'true') { echo $course['tutor']; }
-                        ?>
-                        </td>
-                        <td valign="top">
-                        <!-- edit -->
-                        <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {
-                                $edit_course = Security::remove_XSS($_GET['edit']); ?>
+                <tr>
+                    <td>
+                    <a name="course<?php echo $course['code']; ?>"></a>
+                    <strong><?php echo $course['title']; ?></strong><br />
+                    <?php
+                    if (api_get_setting('display_coursecode_in_courselist') == 'true') {
+                        echo $course['visual_code'];
+                    }
 
-                                    <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
-                                    <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
-                                    <input type="hidden" name="course_2_edit_category" value="<?php echo $edit_course; ?>" />
-                                    <select name="course_categories">
-                                    <option value="0"><?php echo get_lang("NoCourseCategory"); ?></option>
-                                    <?php foreach ($user_course_categories as $row) { ?>
-                                        <option value="<?php echo $row['id'] ?>"><?php echo $row['title']; ?></option>
-                                    <?php } ?>
-                                    </select>
-                                    <button class="save" type="submit" name="submit_change_course_category"><?php echo get_lang('Ok'); ?></button>
-                                    </form>
-                        <?php }  ?>
+                    if (api_get_setting('display_coursecode_in_courselist') == 'true' &&
+                        api_get_setting('display_teacher_in_courselist') == 'true'
+                    ) {
+                        echo " - ";
+                    }
+
+                    if (api_get_setting('display_teacher_in_courselist') == 'true') {
+                        echo $course['tutor'];
+                    }
+                    ?>
+                    </td>
+                    <td valign="top">
+                    <!-- edit -->
+                    <?php
+                        if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {
+                            $edit_course = Security::remove_XSS($_GET['edit']); ?>
 
-                        <div style="float:left;width:110px;"> 
-                        <?php if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-                                $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
-                        ?>
-                        <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" title="<?php echo $icon_title ?>" class="thickbox"><?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
-                           <?php } ?>	                            	</a>
+                            <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
+                            <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
+                            <input type="hidden" name="course_2_edit_category" value="<?php echo $edit_course; ?>" />
+                            <select name="course_categories">
+                            <option value="0"><?php echo get_lang("NoCourseCategory"); ?></option>
+                            <?php foreach ($user_course_categories as $row) { ?>
+                                <option value="<?php echo $row['id'] ?>"><?php echo $row['title']; ?></option>
+                            <?php } ?>
+                            </select>
+                            <button class="save" type="submit" name="submit_change_course_category"><?php echo get_lang('Ok'); ?></button>
+                            </form>
+                    <?php }  ?>
 
-                        <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
-                              <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>   
-                        <?php } else { ?>	                            
-                            <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
-                                </a>
-                        <?php } ?>	                                    
+                    <div style="float:left;width:110px;">
+                    <?php
+                        if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
+                            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
+                    ?>
+                    <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" title="<?php echo $icon_title ?>" class="thickbox"><?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
+                       <?php } ?>
+                    </a>
 
-                        <?php if ($key > 0) { ?>
-                            <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
+                    <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
+                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
+                    <?php } else { ?>
+                        <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
                             </a>
-                        <?php } else { ?>
-                            <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
-                        <?php } ?>
+                    <?php } ?>
+
+                    <?php if ($key > 0) { ?>
+                        <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
+                        <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
+                        </a>
+                    <?php } else { ?>
+                        <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
+                    <?php } ?>
 
-                        <?php if ($key < $number_of_courses - 1) { ?>
-                                <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
-                                </a>
-                        <?php } else { ?>	
-                            <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
-                        <?php } ?>  
+                    <?php if ($key < $number_of_courses - 1) { ?>
+                        <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
+                        <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
+                        </a>
+                    <?php } else { ?>
+                        <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
+                    <?php } ?>
 
-                      </div>
-                      <div style="float:left; margin-right:10px;">
-                        <?php if ($course['status'] != 1) {
-                                if ($course['unsubscr'] == 1) {
-                        ?>
+                  </div>
+                  <div style="float:left; margin-right:10px;">
+                    <?php if ($course['status'] != 1) {
+                            if ($course['unsubscr'] == 1) {
+                    ?>
 
-                            <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding()))?>')) return false">
-                                <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
-                                <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />                                    	
-                                 <button class="btn" value="<?php echo get_lang('Unsubscribe'); ?>" name="unsub">
-                                <?php echo get_lang('Unsubscribe'); ?>
-                                </button>
-                                </form>
-                      </div>
-                          <?php }
-                        }
-                        $key++;
+                    <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding()))?>')) return false">
+                        <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
+                        <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
+                         <button class="btn" value="<?php echo get_lang('Unsubscribe'); ?>" name="unsub">
+                        <?php echo get_lang('Unsubscribe'); ?>
+                        </button>
+                    </form>
+                  </div>
+                      <?php }
                     }
-                    echo '</table>';
+                    $key++;
+                }
+                echo '</table>';
             }
     }
 }
@@ -170,27 +183,25 @@ if (!empty($courses_without_category)) {
     $number_of_courses = count($courses_without_category);
     $key = 0;
 
-    foreach ($courses_without_category as $course) { 
+    foreach ($courses_without_category as $course) {
         echo '<tr>';
         ?>
 
         <td>
             <a name="course<?php echo $course['code']; ?>"></a>
-            <strong><?php echo $course['title']; ?></strong><br />                
+            <strong><?php echo $course['title']; ?></strong><br />
             <?php
             if (api_get_setting('display_coursecode_in_courselist') == 'true') { echo $course['visual_code']; }
             if (api_get_setting('display_coursecode_in_courselist') == 'true' && api_get_setting('display_teacher_in_courselist') == 'true') { echo " - "; }
             if (api_get_setting('display_teacher_in_courselist') == 'true') { echo $course['tutor']; }
             ?>
         </td>
-
         <td valign="top">
 
-
             <!-- the edit icon OR the edit dropdown list -->
             <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {
                 $edit_course = Security::remove_XSS($_GET['edit']);
-            ?>                
+            ?>
             <div style="float:left;">
             <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
                 <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
@@ -203,7 +214,7 @@ if (!empty($courses_without_category)) {
                 </select>
                 <button class="save" type="submit" name="submit_change_course_category"><?php echo get_lang('Ok') ?></button>
             </form><br />
-            </div>                
+            </div>
             <?php } ?>
 
             <div style="float:left; width:110px">
@@ -216,22 +227,22 @@ if (!empty($courses_without_category)) {
             </a>
             <?php } ?>
 
-             <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {   ?>               
+             <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {   ?>
                     <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
-                  <?php } else { ?>                                                    
+                  <?php } else { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
                     <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
-                    </a>                        
-             <?php } ?>       
+                    </a>
+             <?php } ?>
 
-            <!-- up /down icons-->                
+            <!-- up /down icons-->
             <?php if ($key > 0) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
                     <?php echo Display::display_icon('up.png', get_lang('Up'),'',22) ?>
                     </a>
             <?php } else {
                     echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
-                  } 
+                  }
 
                   if ($key < $number_of_courses - 1) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
@@ -246,21 +257,21 @@ if (!empty($courses_without_category)) {
             <?php if ($course['status'] != 1) {
                     if ($course['unsubscr'] == 1) {
             ?>
-                        <!-- changed link to submit to avoid action by the search tool indexer -->                           
-                        <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding())) ?>')) return false;">
-                            <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
-                            <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
-                            <button class="btn" value="<?php echo get_lang('Unsubscribe'); ?>" name="unsub">
-                                <?php echo get_lang('Unsubscribe'); ?>
-                            </button>
-                        </form>
-                        </div>
+                    <!-- changed link to submit to avoid action by the search tool indexer -->
+                    <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding())) ?>')) return false;">
+                        <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
+                        <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
+                        <button class="btn" value="<?php echo get_lang('Unsubscribe'); ?>" name="unsub">
+                            <?php echo get_lang('Unsubscribe'); ?>
+                        </button>
+                    </form>
+                    </div>
               <?php }
                 }
               ?>
             </td>
             </tr>
-            <?php 
+            <?php
             $key++;
         }
     }
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index f1e3cb2460..e4fded1992 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -406,7 +406,6 @@ function get_user_data($from, $number_of_items, $column, $direction)
                 u.user_id              AS col5";
     }
 
-
 	if (isset($_REQUEST['type']) && $_REQUEST['type'] == 'teacher') {
 		// adding a teacher through a session
 		if (!empty($session_id)) {