chamilo / chamilo-lms

main/inc/lib/api.lib.php

Indentation +2 added lines, -4 removed lines

@@ -625,7 +625,6 @@ 
  * The other configuration parameters have not been changed.
  *
  * This is how we can get most used paths, for common purpose:
-
  * api_get_path(REL_PATH)                       /chamilo/
  * api_get_path(REL_COURSE_PATH)                /chamilo/courses/
  * api_get_path(REL_CODE_PATH)                  /chamilo/main/
@@ -1803,7 +1802,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -2734,7 +2732,7 @@ 
         switch ($session_user_status) {
             case 0:
                 $session_status['status'] = 'student';
-               break;
+                break;
             case 2:
                 $session_status['status'] = 'coach';
             break;
@@ -6492,7 +6490,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+        $libraries[]='jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

main/install/install.lib.php

Indentation +2 added lines, -2 removed lines

@@ -1682,7 +1682,7 @@ 
         $html .= '<label class="checkbox-inline">
                         <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
                     </label>';
-         $html .= '<label class="checkbox-inline">
+            $html .= '<label class="checkbox-inline">
                     <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
                 </label>';
         $html .= '</div>';
@@ -1716,7 +1716,7 @@ 
     </div>';
 
     echo panel($html, get_lang('Platform'), 'platform');
- ?>
+    ?>
     <div class='form-group'>
         <div class="col-sm-6">
             <button type="submit" class="btn btn-default pull-right" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" ><em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?></button>

main/course_home/course_home.php

Indentation +7 added lines, -7 removed lines

@@ -213,7 +213,7 @@ 
             if (Database::num_rows($result) ==  0) {
                 $condition = '';
             } else {
-            	//great, there is an specific auto launch for this session we leave the $condition
+                //great, there is an specific auto launch for this session we leave the $condition
             }
         }
 
@@ -225,7 +225,7 @@ 
             $lp_data = Database::fetch_array($result,'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
-                	$show_autolaunch_lp_warning = true;
+                    $show_autolaunch_lp_warning = true;
                 } else {
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
@@ -254,7 +254,7 @@ 
         //if (!isset($_SESSION[$forumKey])) {
             //redirecting to the LP
             $url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&id_session='.$session_id;
-          //  $_SESSION[$forumKey] = true;
+            //  $_SESSION[$forumKey] = true;
             header("Location: $url");
             exit;
         //}
@@ -280,13 +280,13 @@ 
 if (api_get_setting('course.homepage_view') == 'activity' ||
     api_get_setting('course.homepage_view') == 'activity_big'
 ) {
-	require 'activity.php';
+    require 'activity.php';
 } elseif (api_get_setting('course.homepage_view') == '2column') {
-	require '2column.php';
+    require '2column.php';
 } elseif (api_get_setting('course.homepage_view') == '3column') {
-	require '3column.php';
+    require '3column.php';
 } elseif (api_get_setting('course.homepage_view') == 'vertical_activity') {
-	require 'vertical_activity.php';
+    require 'vertical_activity.php';
 }
 
 $content = '<div id="course_tools">'.$content.'</div>';

main/dropbox/index.php

Indentation +428 added lines, -428 removed lines

@@ -7,12 +7,12 @@ 
 $last_access = '';
 // get the last time the user accessed the tool
 if (isset($_SESSION[$_course['id']]) && $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] == '') {
-	$last_access = get_last_tool_access(TOOL_DROPBOX);
-	$_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
+    $last_access = get_last_tool_access(TOOL_DROPBOX);
+    $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
 } else {
-	if (isset($_SESSION[$_course['id']])) {
-		$last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
-	}
+    if (isset($_SESSION[$_course['id']])) {
+        $last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
+    }
 }
 
 $postAction = isset($_POST['action']) ? $_POST['action'] : null;
@@ -49,9 +49,9 @@ 
 
 // Display the form for adding a new dropbox item.
 if ($action == 'add') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
     display_add_form(
         $dropbox_unid,
         $viewReceivedCategory,
@@ -61,56 +61,56 @@ 
 }
 
 if (isset($_POST['submitWork'])) {
-	$check = Security::check_token();
-	if ($check) {
+    $check = Security::check_token();
+    if ($check) {
         store_add_dropbox();
-	}
+    }
 }
 
 // Display the form for adding a category
 if ($action == 'addreceivedcategory' || $action == 'addsentcategory') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
-	display_addcategory_form($categoryName, '', $_GET['action']);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
+    display_addcategory_form($categoryName, '', $_GET['action']);
 }
 
 // Editing a category: displaying the form
 if ($action == 'editcategory' && isset($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	if (!$_POST) {
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			api_not_allowed();
-		}
-		display_addcategory_form('', $_GET['id'], 'editcategory');
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    if (!$_POST) {
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            api_not_allowed();
+        }
+        display_addcategory_form('', $_GET['id'], 'editcategory');
+    }
 }
 
 // Storing a new or edited category
 if (isset($_POST['StoreCategory'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$return_information = store_addcategory();
-	if ($return_information['type'] == 'confirmation') {
-		Display :: display_confirmation_message($return_information['message']);
-	}
-	if ($return_information['type'] == 'error') {
-		Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
-		display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $return_information = store_addcategory();
+    if ($return_information['type'] == 'confirmation') {
+        Display :: display_confirmation_message($return_information['message']);
+    }
+    if ($return_information['type'] == 'error') {
+        Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
+        display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
+    }
 }
 
 
 // Move a File
 if (($action == 'movesent' || $action == 'movereceived') AND isset($_GET['move_id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	display_move_form(
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    display_move_form(
         str_replace('move', '', $action),
         $_GET['move_id'],
         get_dropbox_categories(str_replace('move', '', $action)),
@@ -121,33 +121,33 @@ 
     );
 }
 if (isset($_POST['do_move'])) {
-	Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
+    Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
 }
 
 // Delete a file
 if (($action == 'deletereceivedfile' || $action == 'deletesentfile') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-	if ($action == 'deletereceivedfile') {
-		$dropboxfile->deleteReceivedWork($_GET['id']);
-		$message = get_lang('ReceivedFileDeleted');
-	}
-	if ($action == 'deletesentfile') {
-		$dropboxfile->deleteSentWork($_GET['id']);
-		$message = get_lang('SentFileDeleted');
-	}
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+    if ($action == 'deletereceivedfile') {
+        $dropboxfile->deleteReceivedWork($_GET['id']);
+        $message = get_lang('ReceivedFileDeleted');
+    }
+    if ($action == 'deletesentfile') {
+        $dropboxfile->deleteSentWork($_GET['id']);
+        $message = get_lang('SentFileDeleted');
+    }
+    Display :: display_confirmation_message($message);
 }
 
 // Delete a category
 if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$message = delete_category($action, $_GET['id']);
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $message = delete_category($action, $_GET['id']);
+    Display :: display_confirmation_message($message);
 }
 
 // Do an action on multiple files
@@ -162,27 +162,27 @@ 
     $postAction == 'delete_sent' ||
     $postAction == 'download_sent')
 ) {
-	$display_message = handle_multiple_actions();
-	Display :: display_normal_message($display_message);
+    $display_message = handle_multiple_actions();
+    Display :: display_normal_message($display_message);
 }
 
 // Store Feedback
 
 if (isset($_POST['feedback'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$check = Security::check_token();
-	if ($check) {
-		$display_message = store_feedback();
-		Display :: display_normal_message($display_message);
-		Security::check_token();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $check = Security::check_token();
+    if ($check) {
+        $display_message = store_feedback();
+        Display :: display_normal_message($display_message);
+        Security::check_token();
+    }
 }
 
 // Error Message
 if (isset($_GET['error']) AND !empty($_GET['error'])) {
-	Display :: display_normal_message(get_lang($_GET['error']));
+    Display :: display_normal_message(get_lang($_GET['error']));
 }
 
 $dropbox_data_sent = array();
@@ -190,96 +190,96 @@ 
 $dropbox_data_recieved = array();
 
 if ($action != 'add') {
-	// Getting all the categories in the dropbox for the given user
-	$dropbox_categories = get_dropbox_categories();
-	// Greating the arrays with the categories for the received files and for the sent files
-	foreach ($dropbox_categories as $category) {
-		if ($category['received'] == '1') {
-			$dropbox_received_category[] = $category;
-		}
-		if ($category['sent'] == '1') {
-			$dropbox_sent_category[] = $category;
-		}
-	}
-
-	// ACTIONS
-	if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
-		//echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
-
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		/* Menu Received */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-				$movelist[0] = 'Root'; // move_received selectbox content
-			} else {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-					echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-					$movelist[0] = 'Root'; // move_received selectbox content
-				} else {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-				}
-				echo '</div>';
-			}
-		}
-	}
-
-	if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		/* Menu Sent */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_sent != 0) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-			} else {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-			}
-			if (empty($viewSentCategory)) {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_sent != 0) {
-					echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				} else {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-				}
-				if (empty($viewSentCategory)) {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-				}
-				echo '</div>';
-			}
-		}
-	}
-	/*	THE MENU TABS */
-	if ($dropbox_cnf['sent_received_tabs']) {
+    // Getting all the categories in the dropbox for the given user
+    $dropbox_categories = get_dropbox_categories();
+    // Greating the arrays with the categories for the received files and for the sent files
+    foreach ($dropbox_categories as $category) {
+        if ($category['received'] == '1') {
+            $dropbox_received_category[] = $category;
+        }
+        if ($category['sent'] == '1') {
+            $dropbox_sent_category[] = $category;
+        }
+    }
+
+    // ACTIONS
+    if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
+        //echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
+
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        /* Menu Received */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                $movelist[0] = 'Root'; // move_received selectbox content
+            } else {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                    echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                    $movelist[0] = 'Root'; // move_received selectbox content
+                } else {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+                }
+                echo '</div>';
+            }
+        }
+    }
+
+    if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        /* Menu Sent */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_sent != 0) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+            } else {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+            }
+            if (empty($viewSentCategory)) {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_sent != 0) {
+                    echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                } else {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+                }
+                if (empty($viewSentCategory)) {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+                }
+                echo '</div>';
+            }
+        }
+    }
+    /*	THE MENU TABS */
+    if ($dropbox_cnf['sent_received_tabs']) {
 ?>
 <ul class="nav nav-tabs">
     <li <?php if (!$view || $view == 'sent') { echo 'class="active"'; } ?> >
@@ -293,150 +293,150 @@ 
     </li>
 </ul>
 <?php
-	}
+    }
     /*	RECEIVED FILES */
-	if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-		 // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('ReceivedTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('Authors'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true);
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false,true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the columns are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person -> receivedWork as $dropbox_file) {
-			$dropbox_file_data = array();
-			if ($view_dropbox_category_received == $dropbox_file->category) {
+    if ($view == 'received' || !$dropbox_cnf['sent_received_tabs']) {
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+            // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('ReceivedTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('Authors'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true);
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false,true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the columns are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person -> receivedWork as $dropbox_file) {
+            $dropbox_file_data = array();
+            if ($view_dropbox_category_received == $dropbox_file->category) {
                 // we only display the files that are in the category that we are in.
-				$dropbox_file_data[] = $dropbox_file->id;
+                $dropbox_file_data[] = $dropbox_file->id;
 
-				if (!is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
-					$_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
-				}
+                if (!is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
+                    $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
+                }
 
-				// New icon
-				$new_icon = '';
-				if ($dropbox_file->last_upload_date > $last_access &&
+                // New icon
+                $new_icon = '';
+                if ($dropbox_file->last_upload_date > $last_access &&
                     !in_array($dropbox_file->id, $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])
                 ) {
-					$new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL);
-				}
+                    $new_icon = '&nbsp;'.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL);
+                }
 
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
-				$dropbox_file_data[] = $dropbox_file->author;
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
+                $dropbox_file_data[] = $dropbox_file->author;
 
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
                     api_format_date($last_upload_date).'</span>';
 
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.
                 Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
 
-				// This is a hack to have an additional row in a sortable table
-
-				if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
-					$action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				if (api_get_session_id() == 0) {
-					$dropbox_file_data[] = $action_icons;
-				} elseif (api_is_allowed_to_session_edit(false, true)) {
-					$dropbox_file_data[] = $action_icons;
-				}
-				$action_icons = '';
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$dropbox_data_recieved[] = $dropbox_file_data;
-			}
-		}
-
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_received == 0) {
-			foreach ($dropbox_categories as $category) {
-			    /*  Note: This can probably be shortened since the categories
+                // This is a hack to have an additional row in a sortable table
+
+                if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
+                    $action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                if (api_get_session_id() == 0) {
+                    $dropbox_file_data[] = $action_icons;
+                } elseif (api_is_allowed_to_session_edit(false, true)) {
+                    $dropbox_file_data[] = $action_icons;
+                }
+                $action_icons = '';
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $dropbox_data_recieved[] = $dropbox_file_data;
+            }
+        }
+
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_received == 0) {
+            foreach ($dropbox_categories as $category) {
+                /*  Note: This can probably be shortened since the categories
 			    for the received files are already in the
 			    $dropbox_received_category array;*/
-				$dropbox_category_data = array();
-				if ($category['received'] == '1') {
-					$movelist[$category['cat_id']] = $category['cat_name'];
+                $dropbox_category_data = array();
+                if ($category['received'] == '1') {
+                    $movelist[$category['cat_id']] = $category['cat_name'];
                     // This is where the checkbox icon for the files appear
-					$dropbox_category_data[] = $category['cat_id'];
-					// The icon of the category
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // The icon of the category
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_recieved[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_recieved[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
         $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
@@ -447,15 +447,15 @@ 
             'download_received' => get_lang('Download')
         );
 
-		if (is_array($movelist)) {
-			foreach ($movelist as $catid => $catname){
-				$selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
-			}
-		}
+        if (is_array($movelist)) {
+            foreach ($movelist as $catid => $catname){
+                $selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
+            }
+        }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array();
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array();
+        }
         echo '<div class="files-table">';
         Display::display_sortable_config_table(
             'dropbox',
@@ -469,154 +469,154 @@ 
             $selectlist
         );
         echo '</div>';
-	}
-
-	/*	SENT FILES */
-
-	if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('SentTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('SentTo'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true, '');
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		$column_show = array();
-		$column_order = array();
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the colums are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person->sentWork as $dropbox_file) {
-			$dropbox_file_data = array();
-
-			if ($view_dropbox_category_sent == $dropbox_file->category) {
-				$dropbox_file_data[] = $dropbox_file->id;
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+    }
+
+    /*	SENT FILES */
+
+    if (!$view || $view == 'sent' || !$dropbox_cnf['sent_received_tabs']) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('SentTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('SentTo'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true, '');
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        $column_show = array();
+        $column_order = array();
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the colums are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person->sentWork as $dropbox_file) {
+            $dropbox_file_data = array();
+
+            if ($view_dropbox_category_sent == $dropbox_file->category) {
+                $dropbox_file_data[] = $dropbox_file->id;
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
                 $receivers_celldata = null;
-				foreach ($dropbox_file->recipients as $recipient) {
-					$userInfo = api_get_user_info($recipient['user_id']);
-					$receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
-				}
-				$receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
-				$dropbox_file_data[] = $receivers_celldata;
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
-					api_format_date($last_upload_date).'</span>';
-
-				//$dropbox_file_data[] = $dropbox_file->author;
-				$receivers_celldata = '';
-
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                foreach ($dropbox_file->recipients as $recipient) {
+                    $userInfo = api_get_user_info($recipient['user_id']);
+                    $receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
+                }
+                $receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
+                $dropbox_file_data[] = $receivers_celldata;
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                    api_format_date($last_upload_date).'</span>';
+
+                //$dropbox_file_data[] = $dropbox_file->author;
+                $receivers_celldata = '';
+
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				// This is a hack to have an additional row in a sortable table
-				if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
-					$action_icons .= "<tr><td colspan=\"2\">";
-					$action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
-					$action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				$dropbox_file_data[] = $action_icons;
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$action_icons = '';
-				$dropbox_data_sent[] = $dropbox_file_data;
-			}
-		}
+                // This is a hack to have an additional row in a sortable table
+                if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
+                    $action_icons .= "<tr><td colspan=\"2\">";
+                    $action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
+                    $action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                $dropbox_file_data[] = $action_icons;
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $action_icons = '';
+                $dropbox_data_sent[] = $dropbox_file_data;
+            }
+        }
 
         $moveList = array();
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_sent == 0) {
-			foreach ($dropbox_categories as $category) {
-				$dropbox_category_data = array();
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_sent == 0) {
+            foreach ($dropbox_categories as $category) {
+                $dropbox_category_data = array();
 
-				if ($category['sent'] == '1') {
+                if ($category['sent'] == '1') {
 
                     $moveList[$category['cat_id']] = $category['cat_name'];
-					$dropbox_category_data[] = $category['cat_id'];
-					// This is where the checkbox icon for the files appear.
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // This is where the checkbox icon for the files appear.
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
                                     Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 									<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
                                     Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_sent[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
-		$additional_get_parameters = array(
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_sent[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
+        $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
             'view_sent_category' => $viewSentCategory
         );
 
-		$selectlist = array(
+        $selectlist = array(
             'delete_received' => get_lang('Delete'),
             'download_received' => get_lang('Download')
         );
@@ -627,12 +627,12 @@ 
             }
         }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array('download_received' => get_lang('Download'));
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array('download_received' => get_lang('Download'));
+        }
 
         echo '<div class="files-table">';
-		Display::display_sortable_config_table(
+        Display::display_sortable_config_table(
             'dropbox',
             $column_header,
             $dropbox_data_sent,
@@ -644,7 +644,7 @@ 
             $selectlist
         );
         echo '</div>';
-	}
+    }
 }
 
 Display::display_footer();

main/inc/lib/login.lib.php

Indentation +6 added lines, -6 removed lines

@@ -852,14 +852,14 @@ 
             $email = false;
         }
 
-		if ($email) {
-			$condition = "LOWER(email) = '".Database::escape_string($username)."' ";
-		} else {
+        if ($email) {
+            $condition = "LOWER(email) = '".Database::escape_string($username)."' ";
+        } else {
             $condition = "LOWER(username) = '".Database::escape_string($username)."'";
         }
 
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$query = "SELECT 
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $query = "SELECT 
 		            user_id AS uid, 
 		            lastname AS lastName, 
 		            firstname AS firstName, 
@@ -874,7 +874,7 @@ 
                     auth_source
 				 FROM $tbl_user
 				 WHERE ( $condition AND active = 1) ";
-		$result = Database::query($query);
+        $result = Database::query($query);
         $num_rows = Database::num_rows($result);
         if ($result && $num_rows > 0) {
             return Database::fetch_assoc($result);

plugin/bbb/lib/bbb_api.php

Indentation +403 added lines, -403 removed lines

@@ -44,107 +44,107 @@ 
 
 class BigBlueButtonBN {
 
-	private $_securitySalt;
-	private $_bbbServerBaseUrl;
+    private $_securitySalt;
+    private $_bbbServerBaseUrl;
 
-	/* ___________ General Methods for the BigBlueButton Class __________ */
+    /* ___________ General Methods for the BigBlueButton Class __________ */
 
-	function __construct() {
-	/*
+    function __construct() {
+    /*
 	Establish just our basic elements in the constructor:
 	*/
-		// BASE CONFIGS - set these for your BBB server in config.php and they will
-		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
-	}
-
-	private function _processXmlResponse($url){
-	/*
+        // BASE CONFIGS - set these for your BBB server in config.php and they will
+        // simply flow in here via the constants:
+        $this->_securitySalt 		= CONFIG_SECURITY_SALT;
+        $this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+    }
+
+    private function _processXmlResponse($url){
+    /*
 	A private utility method used by other public methods to process XML responses.
 	*/
-		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
-			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
-				return (new SimpleXMLElement($data));
-			else
-				return false;
-		}
-		return (simplexml_load_file($url));
-	}
-
-	private function _requiredParam($param) {
-		/* Process required params and throw errors if we don't get values */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		elseif (!isset($param)) {
-			throw new Exception('Missing parameter.');
-		}
-		else {
-			throw new Exception(''.$param.' is required.');
-		}
-	}
-
-	private function _optionalParam($param) {
-		/* Pass most optional params through as set value, or set to '' */
-		/* Don't know if we'll use this one, but let's build it in case. */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		else {
-			$param = '';
-			return $param;
-		}
-	}
-
-	/* __________________ BBB ADMINISTRATION METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        if (extension_loaded('curl')) {
+            $ch = curl_init() or die ( curl_error($ch) );
+            $timeout = 10;
+            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt( $ch, CURLOPT_URL, $url );
+            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $data = curl_exec( $ch );
+            curl_close( $ch );
+
+            if($data)
+                return (new SimpleXMLElement($data));
+            else
+                return false;
+        }
+        return (simplexml_load_file($url));
+    }
+
+    private function _requiredParam($param) {
+        /* Process required params and throw errors if we don't get values */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        elseif (!isset($param)) {
+            throw new Exception('Missing parameter.');
+        }
+        else {
+            throw new Exception(''.$param.' is required.');
+        }
+    }
+
+    private function _optionalParam($param) {
+        /* Pass most optional params through as set value, or set to '' */
+        /* Don't know if we'll use this one, but let's build it in case. */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        else {
+            $param = '';
+            return $param;
+        }
+    }
+
+    /* __________________ BBB ADMINISTRATION METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- create
 	-- join
 	-- end
 	*/
 
-	public function getCreateMeetingUrl($creationParams) {
-		/*
+    public function getCreateMeetingUrl($creationParams) {
+        /*
 		USAGE:
 		(see $creationParams array in createMeetingArray method.)
 		*/
-		$this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
-		$this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
-		// Set up the basic creation URL:
-		$creationUrl = $this->_bbbServerBaseUrl."api/create?";
-		// Add params:
-		$params =
-		'name='.urlencode($this->_meetingName).
-		'&meetingID='.urlencode($this->_meetingId).
-		'&attendeePW='.urlencode($creationParams['attendeePw']).
-		'&moderatorPW='.urlencode($creationParams['moderatorPw']).
-		'&dialNumber='.urlencode($creationParams['dialNumber']).
-		'&voiceBridge='.urlencode($creationParams['voiceBridge']).
-		'&webVoice='.urlencode($creationParams['webVoice']).
-		'&logoutURL='.urlencode($creationParams['logoutUrl']).
-		'&maxParticipants='.urlencode($creationParams['maxParticipants']).
-		'&record='.urlencode($creationParams['record']).
-		'&duration='.urlencode($creationParams['duration']);
-		//'&meta_category='.urlencode($creationParams['meta_category']);
-		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
-			$params .= '&welcome='.urlencode($welcomeMessage);
-		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
-	}
-
-	public function createMeetingWithXmlResponseArray($creationParams) {
-		/*
+        $this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
+        $this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
+        // Set up the basic creation URL:
+        $creationUrl = $this->_bbbServerBaseUrl."api/create?";
+        // Add params:
+        $params =
+        'name='.urlencode($this->_meetingName).
+        '&meetingID='.urlencode($this->_meetingId).
+        '&attendeePW='.urlencode($creationParams['attendeePw']).
+        '&moderatorPW='.urlencode($creationParams['moderatorPw']).
+        '&dialNumber='.urlencode($creationParams['dialNumber']).
+        '&voiceBridge='.urlencode($creationParams['voiceBridge']).
+        '&webVoice='.urlencode($creationParams['webVoice']).
+        '&logoutURL='.urlencode($creationParams['logoutUrl']).
+        '&maxParticipants='.urlencode($creationParams['maxParticipants']).
+        '&record='.urlencode($creationParams['record']).
+        '&duration='.urlencode($creationParams['duration']);
+        //'&meta_category='.urlencode($creationParams['meta_category']);
+        $welcomeMessage = $creationParams['welcomeMsg'];
+        if(trim($welcomeMessage))
+            $params .= '&welcome='.urlencode($welcomeMessage);
+        // Return the complete URL:
+        return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+    }
+
+    public function createMeetingWithXmlResponseArray($creationParams) {
+        /*
 		USAGE:
 		$creationParams = array(
 			'name' => 'Meeting Name',	-- A name for the meeting (or username)
@@ -162,34 +162,34 @@ 
 			'meta_category' => '', 		-- Use to pass additional info to BBB server. See API docs to enable.
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
+        $xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
-				return array(
-					'returncode' => $xml->returncode,
-					'message' => $xml->message,
-					'messageKey' => $xml->messageKey,
-					'meetingId' => $xml->meetingID,
-					'attendeePw' => $xml->attendeePW,
-					'moderatorPw' => $xml->moderatorPW,
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-					'createTime' => $xml->createTime
-					);
-			else
-				return array(
-					'returncode' => $xml->returncode,
-					'message' => $xml->message,
-					'messageKey' => $xml->messageKey
-					);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getJoinMeetingURL($joinParams) {
-		/*
+            if($xml->meetingID)
+                return array(
+                    'returncode' => $xml->returncode,
+                    'message' => $xml->message,
+                    'messageKey' => $xml->messageKey,
+                    'meetingId' => $xml->meetingID,
+                    'attendeePw' => $xml->attendeePW,
+                    'moderatorPw' => $xml->moderatorPW,
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                    'createTime' => $xml->createTime
+                    );
+            else
+                return array(
+                    'returncode' => $xml->returncode,
+                    'message' => $xml->message,
+                    'messageKey' => $xml->messageKey
+                    );
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getJoinMeetingURL($joinParams) {
+        /*
 		NOTE: At this point, we don't use a corresponding joinMeetingWithXmlResponse here because the API
 		doesn't respond on success, but you can still code that method if you need it. Or, you can take the URL
 		that's returned from this method and simply send your users off to that URL in your code.
@@ -203,249 +203,249 @@ 
 			'webVoiceConf' => ''		-- OPTIONAL - string
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
-		$this->_username = $this->_requiredParam($joinParams['username']);
-		$this->_password = $this->_requiredParam($joinParams['password']);
-		// Establish the basic join URL:
-		$joinUrl = $this->_bbbServerBaseUrl."api/join?";
-		// Add parameters to the URL:
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&fullName='.urlencode($this->_username).
-		'&password='.urlencode($this->_password).
-		'&userID='.urlencode($joinParams['userID']).
-		'&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
-		// Only use createTime if we really want to use it. If it's '', then don't pass it:
-		if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
-			$params .= '&createTime='.urlencode($joinParams['createTime']);
-		}
-		// Return the URL:
-		return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
-	}
-
-	public function getEndMeetingURL($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
+        $this->_username = $this->_requiredParam($joinParams['username']);
+        $this->_password = $this->_requiredParam($joinParams['password']);
+        // Establish the basic join URL:
+        $joinUrl = $this->_bbbServerBaseUrl."api/join?";
+        // Add parameters to the URL:
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&fullName='.urlencode($this->_username).
+        '&password='.urlencode($this->_password).
+        '&userID='.urlencode($joinParams['userID']).
+        '&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
+        // Only use createTime if we really want to use it. If it's '', then don't pass it:
+        if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
+            $params .= '&createTime='.urlencode($joinParams['createTime']);
+        }
+        // Return the URL:
+        return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
+    }
+
+    public function getEndMeetingURL($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($endParams['meetingId']);
-		$this->_password = $this->_requiredParam($endParams['password']);
-		$endUrl = $this->_bbbServerBaseUrl."api/end?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
-	}
-
-	public function endMeetingWithXmlResponseArray($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($endParams['meetingId']);
+        $this->_password = $this->_requiredParam($endParams['password']);
+        $endUrl = $this->_bbbServerBaseUrl."api/end?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
+    }
+
+    public function endMeetingWithXmlResponseArray($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
-		if ($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'message' => $xml->message,
-				'messageKey' => $xml->messageKey
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB MONITORING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
+        if ($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'message' => $xml->message,
+                'messageKey' => $xml->messageKey
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB MONITORING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- isMeetingRunning
 	-- getMeetings
 	-- getMeetingInfo
 	*/
 
-	public function getIsMeetingRunningUrl($meetingId) {
-		/* USAGE:
+    public function getIsMeetingRunningUrl($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$this->_meetingId = $this->_requiredParam($meetingId);
-		$runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId);
-		return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
-	}
-
-	public function isMeetingRunningWithXmlResponseArray($meetingId) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($meetingId);
+        $runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId);
+        return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
+    }
+
+    public function isMeetingRunningWithXmlResponseArray($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'running' => $xml->running 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getGetMeetingsUrl() {
-		/* Simply formulate the getMeetings URL
+        $xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'running' => $xml->running 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getGetMeetingsUrl() {
+        /* Simply formulate the getMeetings URL
 		We do this in a separate function so we have the option to just get this
 		URL and print it if we want for some reason.
 		*/
-		$getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
-		return $getMeetingsUrl;
-	}
+        $getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
+        return $getMeetingsUrl;
+    }
 
-	public function getMeetingsWithXmlResponseArray() {
-		/* USAGE:
+    public function getMeetingsWithXmlResponseArray() {
+        /* USAGE:
 		We don't need to pass any parameters with this one, so we just send the query URL off to BBB
 		and then handle the results that we get in the XML response.
 		*/
-		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
-			// If we don't get a success code, stop processing and return just the returncode:
-			if ($xml->returncode != 'SUCCESS') {
-				$result = array(
-					'returncode' => $xml->returncode
-				);
-				return $result;
-			}
-			elseif ($xml->messageKey == 'noMeetings') {
-				/* No meetings on server, so return just this info: */
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meetings. First return general response:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				// Then interate through meeting results and return them as part of the array:
-				foreach ($xml->meetings->meeting as $m) {
-					$result[] = array(
-						'meetingId' => $m->meetingID,
-						'meetingName' => $m->meetingName,
-						'createTime' => $m->createTime,
-						'attendeePw' => $m->attendeePW,
-						'moderatorPw' => $m->moderatorPW,
-						'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded,
-						'running' => $m->running
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getMeetingInfoUrl($infoParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
+        if($xml) {
+            // If we don't get a success code, stop processing and return just the returncode:
+            if ($xml->returncode != 'SUCCESS') {
+                $result = array(
+                    'returncode' => $xml->returncode
+                );
+                return $result;
+            }
+            elseif ($xml->messageKey == 'noMeetings') {
+                /* No meetings on server, so return just this info: */
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meetings. First return general response:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                // Then interate through meeting results and return them as part of the array:
+                foreach ($xml->meetings->meeting as $m) {
+                    $result[] = array(
+                        'meetingId' => $m->meetingID,
+                        'meetingName' => $m->meetingName,
+                        'createTime' => $m->createTime,
+                        'attendeePw' => $m->attendeePW,
+                        'moderatorPw' => $m->moderatorPW,
+                        'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded,
+                        'running' => $m->running
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getMeetingInfoUrl($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
-		$this->_password = $this->_requiredParam($infoParams['password']);
-		$infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
-	}
-
-	public function getMeetingInfoWithXmlResponseArray($infoParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
+        $this->_password = $this->_requiredParam($infoParams['password']);
+        $infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
+    }
+
+    public function getMeetingInfoWithXmlResponseArray($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meeting info:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'meetingName' => $xml->meetingName,
-					'meetingId' => $xml->meetingID,
-					'createTime' => $xml->createTime,
-					'voiceBridge' => $xml->voiceBridge,
-					'attendeePw' => $xml->attendeePW,
-					'moderatorPw' => $xml->moderatorPW,
-					'running' => $xml->running,
-					'recording' => $xml->recording,
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-					'startTime' => $xml->startTime,
-					'endTime' => $xml->endTime,
-					'participantCount' => $xml->participantCount,
-					'maxUsers' => $xml->maxUsers,
-					'moderatorCount' => $xml->moderatorCount,
-				);
-				// Then interate through attendee results and return them as part of the array:
-				foreach ($xml->attendees->attendee as $a) {
-					$result[] = array(
-						'userId' => $a->userID,
-						'fullName' => $a->fullName,
-						'role' => $a->role
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB RECORDING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meeting info:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'meetingName' => $xml->meetingName,
+                    'meetingId' => $xml->meetingID,
+                    'createTime' => $xml->createTime,
+                    'voiceBridge' => $xml->voiceBridge,
+                    'attendeePw' => $xml->attendeePW,
+                    'moderatorPw' => $xml->moderatorPW,
+                    'running' => $xml->running,
+                    'recording' => $xml->recording,
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                    'startTime' => $xml->startTime,
+                    'endTime' => $xml->endTime,
+                    'participantCount' => $xml->participantCount,
+                    'maxUsers' => $xml->maxUsers,
+                    'moderatorCount' => $xml->moderatorCount,
+                );
+                // Then interate through attendee results and return them as part of the array:
+                foreach ($xml->attendees->attendee as $a) {
+                    $result[] = array(
+                        'userId' => $a->userID,
+                        'fullName' => $a->fullName,
+                        'role' => $a->role
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB RECORDING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- getRecordings
 	-- publishRecordings
 	-- deleteRecordings
 	*/
 
-	public function getRecordingsUrl($recordingParams) {
-		/* USAGE:
+    public function getRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
-		$params = 'meetingID='.urlencode($recordingParams['meetingId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
+        $params = 'meetingID='.urlencode($recordingParams['meetingId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function getRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function getRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
@@ -453,121 +453,121 @@ 
 		when creating a meeting, it will kick users out after the duration. Should
 		probably be required in user code when 'recording' is set to true.
 		*/
-		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and recording info:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-
-				foreach ($xml->recordings->recording as $r) {
-					$result[] = array(
-						'recordId' => $r->recordID,
-						'meetingId' => $r->meetingID,
-						'name' => $r->name,
-						'published' => $r->published,
-						'startTime' => $r->startTime,
-						'endTime' => $r->endTime,
-						'playbackFormatType' => $r->playback->format->type,
-						'playbackFormatUrl' => $r->playback->format->url,
-						'playbackFormatLength' => $r->playback->format->length,
-						'metadataTitle' => $r->metadata->title,
-						'metadataSubject' => $r->metadata->subject,
-						'metadataDescription' => $r->metadata->description,
-						'metadataCreator' => $r->metadata->creator,
-						'metadataContributor' => $r->metadata->contributor,
-						'metadataLanguage' => $r->metadata->language,
-						// Add more here as needed for your app depending on your
-						// use of metadata when creating recordings.
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getPublishRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and recording info:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+
+                foreach ($xml->recordings->recording as $r) {
+                    $result[] = array(
+                        'recordId' => $r->recordID,
+                        'meetingId' => $r->meetingID,
+                        'name' => $r->name,
+                        'published' => $r->published,
+                        'startTime' => $r->startTime,
+                        'endTime' => $r->endTime,
+                        'playbackFormatType' => $r->playback->format->type,
+                        'playbackFormatUrl' => $r->playback->format->url,
+                        'playbackFormatLength' => $r->playback->format->length,
+                        'metadataTitle' => $r->metadata->title,
+                        'metadataSubject' => $r->metadata->subject,
+                        'metadataDescription' => $r->metadata->description,
+                        'metadataCreator' => $r->metadata->creator,
+                        'metadataContributor' => $r->metadata->contributor,
+                        'metadataLanguage' => $r->metadata->language,
+                        // Add more here as needed for your app depending on your
+                        // use of metadata when creating recordings.
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getPublishRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']).
-		'&publish='.urlencode($recordingParams['publish']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']).
+        '&publish='.urlencode($recordingParams['publish']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function publishRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function publishRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'published' => $xml->published 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-
-	}
-
-	public function getDeleteRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'published' => $xml->published 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+
+    }
+
+    public function getDeleteRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
-	}
-
-	public function deleteRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
+    }
+
+    public function deleteRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
 
-		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'deleted' => $xml->deleted 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
+        $xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'deleted' => $xml->deleted 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
 
 
 

main/inc/lib/fileManage.lib.php

Indentation +185 added lines, -186 removed lines

@@ -170,37 +170,37 @@ 
  */
 function my_rename($file_path, $new_file_name) {
 
-	$save_dir = getcwd();
-	$path = dirname($file_path);
-	$old_file_name = basename($file_path);
-	$new_file_name = api_replace_dangerous_char($new_file_name);
-
-	// If no extension, take the old one
-	if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
-		$new_file_name .= substr($old_file_name, $dotpos);
-	}
-
-	// Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
-	// This is useful for folder names, where otherwise '.' would be sticky
-
-	// Extension PHP is not allowed, change to PHPS
-	$new_file_name = php2phps($new_file_name);
-
-	if ($new_file_name == $old_file_name) {
-		return $old_file_name;
-	}
-
-	if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
-		return false;
-	}
-	// On a Windows server, it would be better not to do the above check
-	// because it succeeds for some new names resembling the old name.
-	// But on Unix/Linux the check must be done because rename overwrites.
-
-	chdir($path);
-	$res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
-	chdir($save_dir);
-	return $res;
+    $save_dir = getcwd();
+    $path = dirname($file_path);
+    $old_file_name = basename($file_path);
+    $new_file_name = api_replace_dangerous_char($new_file_name);
+
+    // If no extension, take the old one
+    if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
+        $new_file_name .= substr($old_file_name, $dotpos);
+    }
+
+    // Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
+    // This is useful for folder names, where otherwise '.' would be sticky
+
+    // Extension PHP is not allowed, change to PHPS
+    $new_file_name = php2phps($new_file_name);
+
+    if ($new_file_name == $old_file_name) {
+        return $old_file_name;
+    }
+
+    if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
+        return false;
+    }
+    // On a Windows server, it would be better not to do the above check
+    // because it succeeds for some new names resembling the old name.
+    // But on Unix/Linux the check must be done because rename overwrites.
+
+    chdir($path);
+    $res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
+    chdir($save_dir);
+    return $res;
 }
 
 /**
@@ -217,38 +217,38 @@ 
  */
 function move($source, $target, $forceMove = false, $moveContent = false)
 {
-	if (check_name_exist($source)) {
-		$file_name = basename($source);
+    if (check_name_exist($source)) {
+        $file_name = basename($source);
         $isWindowsOS = api_is_windows_os();
         $canExec = function_exists('exec');
 
-		/* File case */
-		if (is_file($source)) {
-			if ($forceMove && !$isWindowsOS && $canExec) {
-				exec('mv ' . $source . ' ' . $target . '/' . $file_name);
-			} else {
-				copy($source, $target . '/' . $file_name);
-				unlink($source);
-			}
-			return true;
-		} elseif (is_dir($source)) {
-			/* Directory */
-			if ($forceMove && !$isWindowsOS && $canExec) {
-				if ($moveContent) {
-					$base = basename($source);
-					exec('mv '.$source.'/* '.$target.$base.'/');
-					exec('rm -rf '.$source);
-				} else {
-					exec('mv $source $target');
-				}
-			} else {
-				copyDirTo($source, $target);
-			}
-			return true;
-		}
-	} else {
-		return false;
-	}
+        /* File case */
+        if (is_file($source)) {
+            if ($forceMove && !$isWindowsOS && $canExec) {
+                exec('mv ' . $source . ' ' . $target . '/' . $file_name);
+            } else {
+                copy($source, $target . '/' . $file_name);
+                unlink($source);
+            }
+            return true;
+        } elseif (is_dir($source)) {
+            /* Directory */
+            if ($forceMove && !$isWindowsOS && $canExec) {
+                if ($moveContent) {
+                    $base = basename($source);
+                    exec('mv '.$source.'/* '.$target.$base.'/');
+                    exec('rm -rf '.$source);
+                } else {
+                    exec('mv $source $target');
+                }
+            } else {
+                copyDirTo($source, $target);
+            }
+            return true;
+        }
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -279,8 +279,8 @@ 
  * @param 	string	$filename 		filename
  */
 function getextension($filename) {
-	$bouts = explode('.', $filename);
-	return array(array_pop($bouts), implode('.', $bouts));
+    $bouts = explode('.', $filename);
+    return array(array_pop($bouts), implode('.', $bouts));
 }
 
 /**
@@ -291,19 +291,19 @@ 
  * @param 	boolean $recursive if true , include subdir in total
  */
 function dirsize($root, $recursive = true) {
-	$dir = @opendir($root);
-	$size = 0;
-	while ($file = @readdir($dir)) {
-		if (!in_array($file, array('.', '..'))) {
-			if (is_dir($root.'/'.$file)) {
-				$size += $recursive ? dirsize($root.'/'.$file) : 0;
-			} else {
-				$size += @filesize($root.'/'.$file);
-			}
-		}
-	}
-	@closedir($dir);
-	return $size;
+    $dir = @opendir($root);
+    $size = 0;
+    while ($file = @readdir($dir)) {
+        if (!in_array($file, array('.', '..'))) {
+            if (is_dir($root.'/'.$file)) {
+                $size += $recursive ? dirsize($root.'/'.$file) : 0;
+            } else {
+                $size += @filesize($root.'/'.$file);
+            }
+        }
+    }
+    @closedir($dir);
+    return $size;
 }
 
 /*	CLASS FileManager */
@@ -322,7 +322,7 @@ 
 */
 class FileManager
 {
-	/**
+    /**
 		Returns a list of all directories, except the base dir,
 		of the current course. This function uses recursion.
 
@@ -330,131 +330,130 @@ 
 
 		@author Roan Embrechts
 		@version 1.0.1
-	*/
-	function list_all_directories($path)
+     */
+    function list_all_directories($path)
     {
-		$result_array = array();
-		if (is_dir($path)) {
-			$save_dir = getcwd();
-			chdir($path);
-			$handle = opendir($path);
-			while ($element = readdir($handle)) {
-				if ($element == '.' || $element == '..') continue;
+        $result_array = array();
+        if (is_dir($path)) {
+            $save_dir = getcwd();
+            chdir($path);
+            $handle = opendir($path);
+            while ($element = readdir($handle)) {
+                if ($element == '.' || $element == '..') continue;
                 // Skip the current and parent directories
-				if (is_dir($element)) {
-					$dir_array[] = $path.'/'.$element;
-				}
-			}
-			closedir($handle);
-			// Recursive operation if subdirectories exist
-			$dir_number = sizeof($dir_array);
-			if ($dir_number > 0) {
-				for ($i = 0 ; $i < $dir_number ; $i++) {
-					$sub_dir_array = FileManager::list_all_directories($dir_array[$i]); // Function recursivity
-					if (is_array($dir_array) && is_array($sub_dir_array)) {
-						$dir_array  =  array_merge($dir_array, $sub_dir_array); // Data merge
-					}
-				}
-			}
-			$result_array  =  $dir_array;
-			chdir($save_dir) ;
-		}
-		return $result_array ;
-	}
-
-	/**
+                if (is_dir($element)) {
+                    $dir_array[] = $path.'/'.$element;
+                }
+            }
+            closedir($handle);
+            // Recursive operation if subdirectories exist
+            $dir_number = sizeof($dir_array);
+            if ($dir_number > 0) {
+                for ($i = 0 ; $i < $dir_number ; $i++) {
+                    $sub_dir_array = FileManager::list_all_directories($dir_array[$i]); // Function recursivity
+                    if (is_array($dir_array) && is_array($sub_dir_array)) {
+                        $dir_array  =  array_merge($dir_array, $sub_dir_array); // Data merge
+                    }
+                }
+            }
+            $result_array  =  $dir_array;
+            chdir($save_dir) ;
+        }
+        return $result_array ;
+    }
+
+    /**
 		This function receives a list of directories.
 		It returns a list of all files in these directories
 
 		@author Roan Embrechts
 		@version 1.0
-	*/
-	function list_all_files($dir_array)
+     */
+    function list_all_files($dir_array)
     {
-		$element_array = array();
-		if (is_dir($dir_array)) {
-
-			$save_dir = getcwd();
-			foreach ($dir_array as $directory) {
-				chdir($directory);
-				$handle = opendir($directory);
-			   	while ($element = readdir($handle)) {
-					if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
+        $element_array = array();
+        if (is_dir($dir_array)) {
+
+            $save_dir = getcwd();
+            foreach ($dir_array as $directory) {
+                chdir($directory);
+                $handle = opendir($directory);
+                    while ($element = readdir($handle)) {
+                    if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
                     // Skip the current and parent directories
-					if (!is_dir($element)) {
-						$element_array[] = $directory.'/'.$element;
-					}
-				}
-				closedir($handle);
-				chdir('..');
-				chdir($save_dir);
-			}
-		}
-
-		return $element_array;
-	}
-
-	/**
+                    if (!is_dir($element)) {
+                        $element_array[] = $directory.'/'.$element;
+                    }
+                }
+                closedir($handle);
+                chdir('..');
+                chdir($save_dir);
+            }
+        }
+
+        return $element_array;
+    }
+
+    /**
 		Loads contents of file $filename into memory and returns them as a string.
 		Function kept for compatibility with older PHP versions.
 		Function is binary safe (is needed on Windows)
-	*/
-	function compat_load_file($file_name)
+     */
+    function compat_load_file($file_name)
     {
-		$buffer = '';
-		if (file_exists($file_name)) {
-			$fp = fopen($file_name, 'rb');
-			$buffer = fread ($fp, filesize($file_name));
-			fclose ($fp);
-		}
-		return $buffer;
-	}
-
-	/**
-	 * Adds file/folder to document table in database
-	 * improvement from set_default_settings (see below):
-	 * take all info from function parameters
-	 * no global variables needed
-	 *
-	 * NOTE $glued_table should already have backticks around it
-	 * (get it from the database library, and it is done automatically)
-	 *
-	 * @param	path, filename, filetype,
-				$glued_table, default_visibility
+        $buffer = '';
+        if (file_exists($file_name)) {
+            $fp = fopen($file_name, 'rb');
+            $buffer = fread ($fp, filesize($file_name));
+            fclose ($fp);
+        }
+        return $buffer;
+    }
 
-	 * action:	Adds an entry to the document table with the default settings.
-	 * @author	Olivier Cauberghe <olivier.cauberghe@ugent.be>
-	 * @author	Roan Embrechts
-	 * @version 1.2
-	 */
-	function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
+    /**
+     * Adds file/folder to document table in database
+     * improvement from set_default_settings (see below):
+     * take all info from function parameters
+     * no global variables needed
+     *
+     * NOTE $glued_table should already have backticks around it
+     * (get it from the database library, and it is done automatically)
+     *
+     * @param	path, filename, filetype,
+				$glued_table, default_visibility
+     * action:	Adds an entry to the document table with the default settings.
+     * @author	Olivier Cauberghe <olivier.cauberghe@ugent.be>
+     * @author	Roan Embrechts
+     * @version 1.2
+     */
+    function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
     {
-		if (!$default_visibility) $default_visibility = 'v';
-
-		// Make sure path is not wrongly formed
-		$upload_path = !empty($upload_path) ? "/$upload_path" : '';
-
-		$endchar = substr($filename, strlen($filename) - 1, 1);
-		if ($endchar == "\\" || $endchar == '/') {
-			$filename = substr($filename, 0, strlen($filename) - 1);
-		}
-
-		$full_file_name = $upload_path.'/'.$filename;
-		$full_file_name = str_replace("//", '/', $full_file_name);
-
-		$sql_query = "SELECT count(*) as number_existing FROM $glued_table WHERE path='$full_file_name'";
-		$sql_result = Database::query($sql_query);
-		$result = Database::fetch_array($sql_result);
-		// Determine which query to execute
-		if ($result['number_existing'] > 0) {
-			// Entry exists, update
-			$query = "UPDATE $glued_table SET path='$full_file_name',visibility='$default_visibility', filetype='$filetype'
+        if (!$default_visibility) $default_visibility = 'v';
+
+        // Make sure path is not wrongly formed
+        $upload_path = !empty($upload_path) ? "/$upload_path" : '';
+
+        $endchar = substr($filename, strlen($filename) - 1, 1);
+        if ($endchar == "\\" || $endchar == '/') {
+            $filename = substr($filename, 0, strlen($filename) - 1);
+        }
+
+        $full_file_name = $upload_path.'/'.$filename;
+        $full_file_name = str_replace("//", '/', $full_file_name);
+
+        $sql_query = "SELECT count(*) as number_existing FROM $glued_table WHERE path='$full_file_name'";
+        $sql_result = Database::query($sql_query);
+        $result = Database::fetch_array($sql_result);
+        // Determine which query to execute
+        if ($result['number_existing'] > 0) {
+            // Entry exists, update
+            $query = "UPDATE $glued_table SET path='$full_file_name',visibility='$default_visibility', filetype='$filetype'
 			          WHERE path='$full_file_name'";
-		} else {
-			// No entry exists, create new one
-			$query = "INSERT INTO $glued_table (path,visibility,filetype)
+        } else {
+            // No entry exists, create new one
+            $query = "INSERT INTO $glued_table (path,visibility,filetype)
 			          VALUES ('$full_file_name','$default_visibility','$filetype')";
-		}
-		Database::query($query);
-	}
+        }
+        Database::query($query);
+    }
 }

main/inc/lib/formvalidator/Element/SelectLanguage.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
  */
 class SelectLanguage extends HTML_QuickForm_select
 {
-	/**
-	 * Class constructor
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
-	{
-		parent::__construct($elementName, $elementLabel, $options, $attributes);
-		// Get all languages
-		$languages = api_get_languages();
-		$this->_options = array();
-		$this->_values = array();
-		foreach ($languages['name'] as $index => $name) {
-			if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
-				$this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
-			} else {
-				$this->addOption($name, $languages['folder'][$index]);
-			}
-		}
-	}
+    /**
+     * Class constructor
+     */
+    public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
+    {
+        parent::__construct($elementName, $elementLabel, $options, $attributes);
+        // Get all languages
+        $languages = api_get_languages();
+        $this->_options = array();
+        $this->_values = array();
+        foreach ($languages['name'] as $index => $name) {
+            if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
+                $this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
+            } else {
+                $this->addOption($name, $languages['folder'][$index]);
+            }
+        }
+    }
 }

main/document/show_content.php

Indentation +4 added lines, -4 removed lines

@@ -91,11 +91,11 @@
 $pathinfo = pathinfo($header_file);
 
 if ($pathinfo['extension']=='swf') {
-	$width='83%';
-	$height='83%';
+    $width='83%';
+    $height='83%';
 } else {
-	$width='100%';
-	$height='100%';
+    $width='100%';
+    $height='100%';
 }
 
 echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';