chamilo / chamilo-lms

main/document/slideshowoptions.php

Indentation +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
                     if ($image_resizing == 'noresizing' || $image_resizing == '') {
                             echo ' checked';
                     }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
         </div>
@@ -87,7 +87,7 @@ 
                         if ($image_resizing == 'resizing_auto' || $image_resizing == '') {
                                 echo ' checked';
                         }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
 	</div>
@@ -99,7 +99,7 @@ 
                             $width = $_SESSION['image_resizing_width'];
                             $height = $_SESSION['image_resizing_height'];
                     }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
 	</div>
@@ -107,13 +107,13 @@ 
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
             <div class="col-sm-3">
                 <input class="form-control" name="width" type="text" id="width" <?php
-		if ($image_resizing == 'resizing') {
-			echo ' value="'.$width.'"';
-			echo ' class="enabled_input"';
+        if ($image_resizing == 'resizing') {
+            echo ' value="'.$width.'"';
+            echo ' class="enabled_input"';
                     } else {
                     echo ' class="disabled_input"';
                 }
-		?> >
+        ?> >
             </div>
             <div class="col-sm-8"></div>
         </div>
@@ -121,13 +121,13 @@ 
             <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label>
             <div class="col-sm-3">
                 <input class="form-control" name="height" type="text" id="height" <?php
-		if ($image_resizing == 'resizing') {
-			echo ' value="'.$height.'"';
-			echo ' class="enabled_input"';
-		} else {
+        if ($image_resizing == 'resizing') {
+            echo ' value="'.$height.'"';
+            echo ' class="enabled_input"';
+        } else {
                         echo ' class="disabled_input"';
                 }
-		?> >
+        ?> >
             </div>
             <div class="col-sm-8"></div>
         </div>

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
 // bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array
 $url = 'slideshowoptions.php?curdirpath='.$pathurl;
 $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>';
-$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname );
+$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname);
 
 Display::display_header($originalToolName, 'Doc');
 $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null;
@@ -63,8 +63,8 @@ 
 </script>
 
 <?php
-$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
+$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).'</a>';
 Display::toolbarAction('toolbar-slideshow', $content)
 ?>
 <div class="panel panel-default">
@@ -79,7 +79,7 @@ 
                     }
 		?>>
             </label>
-            <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
+            <?php echo '<b>'.get_lang('NoResizing').'</b>, '.get_lang('NoResizingComment'); ?>
         </div>
         <div class="radio">
             <label>
@@ -89,7 +89,7 @@ 
                         }
 		?>>
             </label>
-            <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
+            <?php echo '<b>'.get_lang('ResizingAuto').'</b>, '.get_lang('ResizingAutoComment'); ?>
 	</div>
 	<div class="radio">
             <label>
@@ -101,7 +101,7 @@ 
                     }
 		?>>
             </label>
-            <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
+            <?php echo '<b>'.get_lang('Resizing').'</b>, '.get_lang('ResizingComment'); ?>
 	</div>
         <div class="form-group">
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>

main/document/exit_pixlr.php

Indentation +7 added lines, -7 removed lines

@@ -24,12 +24,12 @@
 unset($_SESSION['temp_realpath_image']);
 
 if (!isset($_SESSION['exit_pixlr'])){
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	api_not_allowed(true);
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    api_not_allowed(true);
 } else {
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	unset($_SESSION['exit_pixlr']);
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    unset($_SESSION['exit_pixlr']);
 }

Spacing +3 added lines, -3 removed lines

@@ -23,13 +23,13 @@
 unset($_SESSION['whereami']);
 unset($_SESSION['temp_realpath_image']);
 
-if (!isset($_SESSION['exit_pixlr'])){
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
+if (!isset($_SESSION['exit_pixlr'])) {
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php';
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
 	api_not_allowed(true);
 } else {
 	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
+	$location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
 	echo '<script>window.parent.location.href="'.$location.'"</script>';
 	unset($_SESSION['exit_pixlr']);
 }

main/document/slideshow.inc.php

Indentation +11 added lines, -13 removed lines

@@ -15,8 +15,6 @@ 
 	This file has two large sections.
 	1. code that belongs in document.php, but to avoid clutter I put the code here
 	2. the function resize_image that handles the image resizing
-
-
  *	@author Patrick Cool
  *	@package chamilo.document
  *	@todo convert comments to be understandable to phpDocumentor
@@ -34,16 +32,16 @@ 
  *							view is also possible when you choose not to resize the source images
  */
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
-	// Modifications by Ivan Tcholakov, 04-MAY-2009.
-	$result = array();
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
-		$new_sizes = api_resize_image($image, $target_width, $target_height);
-		$result[] = $new_sizes['height'];
-		$result[] = $new_sizes['width'];
-	} else {		
+    // Modifications by Ivan Tcholakov, 04-MAY-2009.
+    $result = array();
+    if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
+        $new_sizes = api_resize_image($image, $target_width, $target_height);
+        $result[] = $new_sizes['height'];
+        $result[] = $new_sizes['width'];
+    } else {		
         $size = api_getimagesize($image);
-		$result[] = $size['height'];
-		$result[] = $size['width'];
-	}
-	return $result;
+        $result[] = $size['height'];
+        $result[] = $size['width'];
+    }
+    return $result;
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
 	// Modifications by Ivan Tcholakov, 04-MAY-2009.
 	$result = array();
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
+	if ((isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') or $slideshow == 1) {
 		$new_sizes = api_resize_image($image, $target_width, $target_height);
 		$result[] = $new_sizes['height'];
 		$result[] = $new_sizes['width'];

main/template/default/auth/courses_list.php

Indentation +8 added lines, -8 removed lines

@@ -28,11 +28,11 @@ 
 
 // COURSES WITH CATEGORIES
 if (!empty($user_course_categories)) {
-       foreach ($user_course_categories as $row) {
-           echo Display::page_subheader($row['title']);
-           echo '<a name="category'.$row['id'].'"></a>';
+        foreach ($user_course_categories as $row) {
+            echo Display::page_subheader($row['title']);
+            echo '<a name="category'.$row['id'].'"></a>';
 
-           if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
+            if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
             <!-- We display the edit form for the category -->
 
             <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
@@ -243,15 +243,15 @@ 
                     </a>
             <?php } else {
                     echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
-                  }
+                    }
 
-                  if ($key < $number_of_courses - 1) { ?>
+                    if ($key < $number_of_courses - 1) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
                     <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
                     </a>
             <?php } else {
                     echo Display::display_icon('down_na.png', get_lang('Down'),'',22);
-                  }?>
+                    }?>
                 </div>
                  <div style="float:left; margin-right:10px;">
                   <!-- cancel subscrioption-->
@@ -269,7 +269,7 @@ 
                     </div>
               <?php }
                 }
-              ?>
+                ?>
             </td>
             </tr>
             <?php

Spacing +23 added lines, -23 removed lines

@@ -18,7 +18,7 @@ 
 <div id="actions" class="actions">
     <?php if ($action != 'createcoursecategory') { ?>
 	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory">
-        <?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'),'','32'); ?></a>
+        <?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'), '', '32'); ?></a>
     <?php } ?>
 </div>
 
@@ -50,26 +50,26 @@ 
             $max_category_key = count($user_course_categories);
             if ($action != 'unsubscribe') { ?>
                 <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
-                <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+                <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
                 </a>
 
                 <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
                         <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                        <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
+                        <?php echo Display::return_icon('up.png', get_lang('Up'), '', 22); ?>
                         </a>
                 <?php } else { ?>
-                    <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?>
+                    <?php echo Display::return_icon('up_na.png', get_lang('Up'), '', 22); ?>
                <?php } ?>
 
                 <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                    <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
+                    <?php echo Display::return_icon('down.png', get_lang('Down'), '', 22); ?>
                     </a>
                 <?php } else { ?>
-                    <?php echo Display::return_icon('down_na.png', get_lang('Down'),'',22); ?>
+                    <?php echo Display::return_icon('down_na.png', get_lang('Down'), '', 22); ?>
                 <?php } ?>
                 <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
+                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"), 22) ?>
                 </a>
             <?php }
             echo '<br /><br />';
@@ -123,35 +123,35 @@ 
                     <div style="float:left;width:110px;">
                     <?php
                         if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-                            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
+                            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
                     ?>
                     <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
-                        <?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
+                        <?php echo Display::return_icon('info.png', $icon_title, '', '22') ?>
                        <?php } ?>
                     </a>
 
                     <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
-                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
+                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
                     <?php } else { ?>
                         <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
                             </a>
                     <?php } ?>
 
                     <?php if ($key > 0) { ?>
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                        <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
+                        <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22); ?>
                         </a>
                     <?php } else { ?>
-                        <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
+                        <?php echo Display::display_icon('up_na.png', get_lang('Up'), '', 22); ?>
                     <?php } ?>
 
                     <?php if ($key < $number_of_courses - 1) { ?>
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                        <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
+                        <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
                         </a>
                     <?php } else { ?>
-                        <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
+                        <?php echo Display::display_icon('down_na.png', get_lang('Down'), '', 22); ?>
                     <?php } ?>
 
                   </div>
@@ -219,36 +219,36 @@ 
             <div style="float:left; width:110px">
             <?php
             if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
+            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
             ?>
             <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
-                <?php echo Display::return_icon('info.png', $icon_title, '','22'); ?>
+                <?php echo Display::return_icon('info.png', $icon_title, '', '22'); ?>
             </a>
             <?php } ?>
 
              <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {   ?>
-                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
+                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
                   <?php } else { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                    <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+                    <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
                     </a>
              <?php } ?>
 
             <!-- up /down icons-->
             <?php if ($key > 0) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                    <?php echo Display::display_icon('up.png', get_lang('Up'),'',22) ?>
+                    <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22) ?>
                     </a>
             <?php } else {
-                    echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
+                    echo Display::display_icon('up_na.png', get_lang('Up'), '', 22);
                   }
 
                   if ($key < $number_of_courses - 1) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                    <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
+                    <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
                     </a>
             <?php } else {
-                    echo Display::display_icon('down_na.png', get_lang('Down'),'',22);
+                    echo Display::display_icon('down_na.png', get_lang('Down'), '', 22);
                   }?>
                 </div>
                  <div style="float:left; margin-right:10px;">

main/template/default/auth/categories_list.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 <!-- Actions: The menu with the different options in cathe course management -->
 <div id="actions" class="actions">
     <a href="<?php echo api_get_self() ?>?action=sortmycourses">
-        <?php echo Display::return_icon('back.png', get_lang('Back'),'','32'); ?>
+        <?php echo Display::return_icon('back.png', get_lang('Back'), '', '32'); ?>
     </a>
 </div>
 

main/group/settings.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 /**
  *	This script displays an area where teachers can edit the group properties and member list.
-  *
+ *
  *	@author various contributors
  *	@author Roan Embrechts (VUB), partial code cleanup, initial virtual course support
  *	@package chamilo.group

Spacing +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_GROUP;
+$current_course_tool = TOOL_GROUP;
 
 // Notice for unauthorized people.
 api_protect_course_script(true);
@@ -83,7 +83,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . '<span>' . get_lang('GroupSelfRegistration') . '</span>',
+    Display::return_icon('user.png', get_lang('GroupSelfRegistration')).'<span>'.get_lang('GroupSelfRegistration').'</span>',
     null,
     false
 );
@@ -97,7 +97,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('folder.png', get_lang('GroupDocument')) . '<span>' . get_lang('GroupDocument') . '</span>',
+    Display::return_icon('folder.png', get_lang('GroupDocument')).'<span>'.get_lang('GroupDocument').'</span>',
     null,
     false
 );
@@ -111,7 +111,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('works.png', get_lang('GroupWork')) . '<span>' . get_lang('GroupWork') . '</span>',
+    Display::return_icon('works.png', get_lang('GroupWork')).'<span>'.get_lang('GroupWork').'</span>',
     null,
     false
 );
@@ -125,7 +125,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('agenda.png', get_lang('GroupCalendar')) . '<span>' . get_lang('GroupCalendar') . '</span>',
+    Display::return_icon('agenda.png', get_lang('GroupCalendar')).'<span>'.get_lang('GroupCalendar').'</span>',
     null,
     false
 );
@@ -142,7 +142,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . '<span>' . get_lang('GroupAnnouncements') . '</span>',
+    Display::return_icon('announce.png', get_lang('GroupAnnouncements')).'<span>'.get_lang('GroupAnnouncements').'</span>',
     null,
     false
 );
@@ -156,7 +156,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('forum.png', get_lang('GroupForum')) . '<span>' . get_lang('GroupForum') . '</span>',
+    Display::return_icon('forum.png', get_lang('GroupForum')).'<span>'.get_lang('GroupForum').'</span>',
     null,
     false
 );
@@ -183,7 +183,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('chat.png', get_lang('Chat')) . '<span>' . get_lang('Chat') . '</span>',
+    Display::return_icon('chat.png', get_lang('Chat')).'<span>'.get_lang('Chat').'</span>',
     null,
     false
 );

main/dropbox/dropbox_download.php

Indentation +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
             'error'
         )
     );
-	exit;
+    exit;
 } else {
     /*      DOWNLOAD THE FILE */
     // the user is allowed to download the file

Spacing +7 added lines, -7 removed lines

@@ -32,8 +32,8 @@ 
     if ($_GET['sent_received'] == 'sent') {
         // here we also incorporate the person table to make sure that deleted sent documents are not included.
         $sql = "SELECT DISTINCT file.id, file.filename, file.title
-                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." file
-                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." person
+                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)." file
+                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON)." person
                 ON (person.file_id=file.id AND file.c_id = $course_id AND person.c_id = $course_id)
                 WHERE
                     file.uploader_id = $user_id AND
@@ -43,14 +43,14 @@ 
 
     if ($_GET['sent_received'] == 'received') {
         $sql = "SELECT DISTINCT file.id, file.filename, file.title
-                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." file
-                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." person
+                FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)." file
+                INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON)." person
                 ON (person.file_id=file.id AND file.c_id = $course_id AND person.c_id = $course_id)
                 INNER JOIN ".Database::get_course_table(TABLE_DROPBOX_POST)." post
                 ON (post.file_id = file.id AND post.c_id = $course_id AND file.c_id = $course_id)
                 WHERE
                     post.cat_id = ".intval($_GET['cat_id'])." AND
-                    post.dest_user_id = $user_id" ;
+                    post.dest_user_id = $user_id";
     }
     $files_to_download = array();
     $result = Database::query($sql);
@@ -97,9 +97,9 @@ 
 
     $work = new Dropbox_Work($_GET['id']);
 
-    $path = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/' . $work -> filename; //path to file as stored on server
+    $path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/'.$work -> filename; //path to file as stored on server
 
-    if (!Security::check_abs_path($path, api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/')) {
+    if (!Security::check_abs_path($path, api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/')) {
         exit;
     }
     $file = $work->title;

main/dropbox/dropbox_functions.inc.php

Indentation +4 added lines, -4 removed lines

@@ -83,11 +83,11 @@
     if (strstr($_POST['action'], 'move_')) {
         // check move_received_n or move_sent_n command
         if (strstr($_POST['action'], 'received')) {
-              $part = 'received';
-              $to_cat_id = str_replace('move_received_', '', $_POST['action']);
+                $part = 'received';
+                $to_cat_id = str_replace('move_received_', '', $_POST['action']);
         } else {
-              $part = 'sent';
-              $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
+                $part = 'sent';
+                $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
         }
 
         foreach ($checked_file_ids as $value) {

Braces +9 added lines, -4 removed lines

@@ -750,10 +750,15 @@
             ";
     $result = Database::query($sql);
 
-    if (!($res = Database::fetch_array($result)))
-        die(get_lang('GeneralError').' (code 901)');
-    if ($owner == 0) return $res['uploader_id'];
-    if ($res['uploader_id'] == $owner) return true;
+    if (!($res = Database::fetch_array($result))) {
+            die(get_lang('GeneralError').' (code 901)');
+    }
+    if ($owner == 0) {
+        return $res['uploader_id'];
+    }
+    if ($res['uploader_id'] == $owner) {
+        return true;
+    }
     die(get_lang('GeneralError').' (code '.$or_die.')');
 }
 

Spacing +42 added lines, -42 removed lines

@@ -42,7 +42,7 @@ 
 
     // STEP 2: at least one file has to be selected. If not we return an error message
     $ids = isset($_GET['id']) ? $_GET['id'] : array();
-    if (count($ids)>0) {
+    if (count($ids) > 0) {
         $checked_file_ids = $_POST['id'];
     } else {
         foreach ($_POST as $key => $value) {
@@ -133,7 +133,7 @@ 
     }
 
     $cat = get_dropbox_category($id);
-    if (count($cat)==0) {
+    if (count($cat) == 0) {
         return false;
     }
 
@@ -157,7 +157,7 @@ 
     }
 
     // step 1: delete the category
-    $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+    $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
             WHERE c_id = $course_id AND cat_id='".intval($id)."' AND $sentreceived='1'";
     Database::query($sql);
 
@@ -235,7 +235,7 @@ 
             $return_message = get_lang('ReceivedFileMoved');
         }
         if ($part == 'sent') {
-            $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+            $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)."
                     SET cat_id = ".intval($target)."
                     WHERE
                         c_id = $course_id AND
@@ -270,7 +270,7 @@ 
     $session_id = api_get_session_id();
     $condition_session = api_get_session_condition($session_id);
 
-    $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+    $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
             WHERE c_id = $course_id AND user_id='".$_user['user_id']."' $condition_session";
 
     $result = Database::query($sql);
@@ -292,7 +292,7 @@ 
 {
     $course_id = api_get_course_int_id();
     if (empty($id) or $id != intval($id)) { return array(); }
-    $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+    $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
             WHERE c_id = $course_id AND cat_id='".$id."'";
     $res = Database::query($sql);
     if ($res === false) {
@@ -341,7 +341,7 @@ 
     if (!isset($_POST['edit_id'])) {
         $session_id = api_get_session_id();
         // step 3a, we check if the category doesn't already exist
-        $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+        $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
                 WHERE
                     c_id = $course_id AND
                     user_id='".$_user['user_id']."' AND
@@ -364,7 +364,7 @@ 
             ];
             $id = Database::insert(Database::get_course_table(TABLE_DROPBOX_CATEGORY), $params);
             if ($id) {
-                $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ." SET cat_id = iid WHERE iid = $id";
+                $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)." SET cat_id = iid WHERE iid = $id";
                 Database::query($sql);
             }
 
@@ -413,7 +413,7 @@ 
 
     if (isset($id) && $id != '') {
         // retrieve the category we are editing
-        $sql = "SELECT * FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+        $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)."
                 WHERE c_id = $course_id AND cat_id = ".intval($id);
         $result = Database::query($sql);
         $row = Database::fetch_array($result);
@@ -602,7 +602,7 @@ 
 
                 $full_name = $userInfo['complete_name'].$groupNameListToString;
                 $current_user_id = $current_user['user_id'];
-                $options['user_' . $current_user_id] = $full_name;
+                $options['user_'.$current_user_id] = $full_name;
             }
         }
     }
@@ -702,8 +702,8 @@ 
 
     // select all files that aren't referenced anymore
     $sql = "SELECT DISTINCT f.id, f.filename
-            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE) . " f
-            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_PERSON) . " p
+            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE)." f
+            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_PERSON)." p
             ON (f.id = p.file_id)
             WHERE p.user_id IS NULL AND
                   f.c_id = $course_id
@@ -711,14 +711,14 @@ 
     $result = Database::query($sql);
     while ($res = Database::fetch_array($result)) {
         //delete the selected files from the post and file tables
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_DROPBOX_POST) . "
-                WHERE c_id = $course_id AND file_id = '" . $res['id'] . "'";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
+                WHERE c_id = $course_id AND file_id = '".$res['id']."'";
         Database::query($sql);
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_DROPBOX_FILE) . "
-                WHERE c_id = $course_id AND id ='" . $res['id'] . "'";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
+                WHERE c_id = $course_id AND id ='".$res['id']."'";
         Database::query($sql);
         //delete file from server
-        @unlink( api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/' . $res['filename']);
+        @unlink(api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/'.$res['filename']);
     }
 }
 
@@ -740,11 +740,11 @@ 
 
     $mailingPseudoId = intval($mailingPseudoId);
     $sql = "SELECT f.uploader_id
-            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE) . " f
-            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_POST) . " p
+            FROM " . Database::get_course_table(TABLE_DROPBOX_FILE)." f
+            LEFT JOIN " . Database::get_course_table(TABLE_DROPBOX_POST)." p
             ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id)
             WHERE
-                p.dest_user_id = '" . $mailingPseudoId . "' AND
+                p.dest_user_id = '".$mailingPseudoId."' AND
                 p.c_id = $course_id
             ";
     $result = Database::query($sql);
@@ -770,21 +770,21 @@ 
     //    for all content files, replace mailingPseudoId by owner as uploader
     $file_id = intval($file_id);
     $sql = "SELECT p.dest_user_id
-            FROM " . Database::get_course_table(TABLE_DROPBOX_POST) . " p
-            WHERE c_id = $course_id AND p.file_id = '" . $file_id . "'";
+            FROM " . Database::get_course_table(TABLE_DROPBOX_POST)." p
+            WHERE c_id = $course_id AND p.file_id = '".$file_id."'";
     $result = Database::query($sql);
 
     if ($res = Database::fetch_array($result)) {
         $mailingPseudoId = $res['dest_user_id'];
         $mailId = get_mail_id_base();
         if ($mailingPseudoId > $mailId) {
-            $sql = "DELETE FROM " . Database::get_course_table(TABLE_DROPBOX_PERSON) . "
-                    WHERE c_id = $course_id AND user_id='" . $mailingPseudoId . "'";
+            $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
+                    WHERE c_id = $course_id AND user_id='".$mailingPseudoId."'";
             Database::query($sql);
 
-            $sql = "UPDATE " . Database::get_course_table(TABLE_DROPBOX_FILE) ."
-                    SET uploader_id='" . api_get_user_id() . "'
-                    WHERE c_id = $course_id AND uploader_id='" . $mailingPseudoId . "'";
+            $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)."
+                    SET uploader_id='" . api_get_user_id()."'
+                    WHERE c_id = $course_id AND uploader_id='".$mailingPseudoId."'";
             Database::query($sql);
         }
     }
@@ -925,7 +925,7 @@ 
             }
         }
     } else {  // rename file to login_filename_uniqueId format
-        $dropbox_filename = $_user['username'] . "_" . $dropbox_filename . "_".uniqid('');
+        $dropbox_filename = $_user['username']."_".$dropbox_filename."_".uniqid('');
     }
 
     // creating the array that contains all the users who will receive the file
@@ -944,7 +944,7 @@ 
         }
     }
 
-    @move_uploaded_file($dropbox_filetmpname, api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox/' . $dropbox_filename);
+    @move_uploaded_file($dropbox_filetmpname, api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox/'.$dropbox_filename);
 
     $b_send_mail = api_get_course_setting('email_alert_on_new_doc_dropbox');
 
@@ -965,14 +965,14 @@ 
                 ),
                 $recipent_temp['email'],
                 get_lang('NewDropboxFileUploaded'),
-                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?' . api_get_cidreq() . '">'.get_lang('SeeFile').'</a>'.
+                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq().'">'.get_lang('SeeFile').'</a>'.
                 "\n\n".
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
                     null,
                     PERSON_NAME_EMAIL_ADDRESS
-                )."\n".  get_lang('Email') ." : ".$_user['mail'],
+                )."\n".get_lang('Email')." : ".$_user['mail'],
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
@@ -1068,12 +1068,12 @@ 
     $id = intval($id);
     $user_id = intval($user_id);
 
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
             WHERE c_id = $course_id AND user_id = $user_id AND file_id = ".$id;
     $result = Database::query($sql);
     $number_users_who_see_file = Database::num_rows($result);
 
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_POST) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
             WHERE c_id = $course_id AND dest_user_id = $user_id AND file_id = ".$id;
     $result = Database::query($sql);
     $count = Database::num_rows($result);
@@ -1087,12 +1087,12 @@ 
 {
     $id = intval($id);
     $course_id = api_get_course_int_id();
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)."
             WHERE c_id = $course_id AND file_id = ".$id;
     $result = Database::query($sql);
     $number_users_who_see_file = Database::num_rows($result);
 
-    $sql = "SELECT file_id FROM ". Database::get_course_table(TABLE_DROPBOX_POST) ."
+    $sql = "SELECT file_id FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
             WHERE c_id = $course_id AND file_id = ".$id;
     $result = Database::query($sql);
     $count = Database::num_rows($result);
@@ -1124,7 +1124,7 @@ 
 
         $id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FEEDBACK), $params);
         if ($id) {
-            $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK) ." SET feedback_id = iid WHERE iid = $id";
+            $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FEEDBACK)." SET feedback_id = iid WHERE iid = $id";
             Database::query($sql);
         }
 
@@ -1151,10 +1151,10 @@ 
 
     // note: we also have to add the check if the user has received or sent this file.
     $sql = "SELECT DISTINCT file.filename, file.title, file.author, file.description
-            FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ." file
-            INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON) ." person
+            FROM ". Database::get_course_table(TABLE_DROPBOX_FILE)." file
+            INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_PERSON)." person
             ON (person.file_id=file.id AND file.c_id = $course_id AND person.c_id = $course_id)
-            INNER JOIN ". Database::get_course_table(TABLE_DROPBOX_POST) ." post
+            INNER JOIN ".Database::get_course_table(TABLE_DROPBOX_POST)." post
             ON (post.file_id = file.id AND post.c_id = $course_id AND file.c_id = $course_id)
             WHERE
                 file.id IN (".implode(', ', $fileList).") AND
@@ -1248,7 +1248,7 @@ 
         // Adding the content.
         $return .= "\n<tr>";
         foreach ($column as $column_key => $column_value) {
-            if (!in_array($column_value,$dont_show_columns)) {
+            if (!in_array($column_value, $dont_show_columns)) {
                 $return .= "\n\t<td>";
                 if (in_array($column_value, $make_link)) {
                     $return .= '<a href="'.$value[$column_value].'">'.$value[$column_value].'</a>';
@@ -1276,11 +1276,11 @@ 
 {
     $course_id = api_get_course_int_id();
     $sql = "SELECT COUNT(feedback_id) AS total, file_id
-            FROM ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK) ."
+            FROM ". Database::get_course_table(TABLE_DROPBOX_FEEDBACK)."
             WHERE c_id = $course_id GROUP BY file_id";
     $result = Database::query($sql);
     $return = array();
-    while ($row=Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         $return[$row['file_id']] = $row['total'];
     }
     return $return;

main/cron/cleanup.php

Spacing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
 $a_dir = realpath($dir.'/../../archive/');
 $list = scandir($a_dir);
 // calculate 7 days
-$t = time()-(86400*7);
+$t = time() - (86400 * 7);
 foreach ($list as $item) {
-    if (substr($item,0,1) == '.') {
+    if (substr($item, 0, 1) == '.') {
         continue;
     }
     $stat = @stat($a_dir.'/'.$item);
@@ -34,11 +34,11 @@ 
  * Delete a file or recursively delete a directory
  * @param string $str Path to file or directory
  */
-function recursive_delete($str){
+function recursive_delete($str) {
     if (is_file($str)) {
         return @unlink($str);
     } elseif (is_dir($str)) {
-        $scan = glob(rtrim($str,'/').'/*');
+        $scan = glob(rtrim($str, '/').'/*');
         foreach ($scan as $index=>$path) {
             recursive_delete($path);
         }