chamilo / chamilo-lms

main/document/save_pixlr.php

Spacing +34 added lines, -34 removed lines

@@ -16,36 +16,36 @@ 
 api_protect_course_script();
 api_block_anonymous_users();
 
-if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
+if ($_user['user_id'] != api_get_user_id() || api_get_user_id() == 0 || $_user['user_id'] == 0) {
 	api_not_allowed();
 	die();
 }
 
-if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
+if (!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
 	api_not_allowed();
 	die();
 }
 
-if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
+if (!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami'])) {
 	api_not_allowed();
 	die();
 }
 
 //pixlr return
 
-$filename=Security::remove_XSS($_GET['title']);//The user preferred file name of the image.
-$extension=Security::remove_XSS($_GET['type']);//The image type, "pdx", "jpg", "bmp" or "png".
-$urlcontents=Security::remove_XSS($_GET['image']);//A URL to the image on Pixlr.com server or the raw file post of the saved image.
+$filename = Security::remove_XSS($_GET['title']); //The user preferred file name of the image.
+$extension = Security::remove_XSS($_GET['type']); //The image type, "pdx", "jpg", "bmp" or "png".
+$urlcontents = Security::remove_XSS($_GET['image']); //A URL to the image on Pixlr.com server or the raw file post of the saved image.
 
 //make variables
 
-$title = Database::escape_string(str_replace('_',' ',$filename));
+$title = Database::escape_string(str_replace('_', ' ', $filename));
 $current_session_id = api_get_session_id();
-$groupId= api_get_group_id();
-$relativeUrlPath=$_SESSION['paint_dir'];
-$currentTool=$_SESSION['whereami'];
+$groupId = api_get_group_id();
+$relativeUrlPath = $_SESSION['paint_dir'];
+$currentTool = $_SESSION['whereami'];
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir=$dirBaseDocuments.$_SESSION['paint_dir'];
+$saveDir = $dirBaseDocuments.$_SESSION['paint_dir'];
 
 $contents = file_get_contents($urlcontents);
 
@@ -71,8 +71,8 @@ 
 $filename = api_replace_dangerous_char($filename);
 $filename = disable_dangerous_file($filename);
 
-if (strlen(trim($filename))==0) {
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
+if (strlen(trim($filename)) == 0) {
+	 echo "The title is empty"; //if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
 	 exit;
 }
 
@@ -83,11 +83,11 @@ 
 }
 
 // Extension security
-if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
+if ($extension != 'jpg' && $extension != 'png' && $extension != 'pxd') {
 	die();
 }
-if($extension=='pxd') {
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
+if ($extension == 'pxd') {
+	echo "pxd file type does not supported"; // not secure because check security headers and finfo() return  Content-Type = application/octet-stream
     exit;
 }
 
@@ -101,9 +101,9 @@ 
 
 //Verify that the file is an image. Fileinfo method
 $finfo = new finfo(FILEINFO_MIME);
-$current_mime=$finfo->buffer($contents);
+$current_mime = $finfo->buffer($contents);
 finfo_close($finfo);
-if(strpos($current_mime, 'image')===false) {
+if (strpos($current_mime, 'image') === false) {
     echo "Invalid mime type file";
     exit;
 }
@@ -113,46 +113,46 @@ 
 $paintFileName = $filename.'.'.$extension;
 $title = $title.'.'.$extension;
 
-if($currentTool=='document/createpaint'){
+if ($currentTool == 'document/createpaint') {
 	//check save as and prevent rewrite an older file with same name
-	if (0 != $groupId){
-        $group_properties  = GroupManager :: get_group_properties($groupId);
+	if (0 != $groupId) {
+        $group_properties = GroupManager :: get_group_properties($groupId);
         $groupPath = $group_properties['directory'];
 	} else {
-		$groupPath ='';
+		$groupPath = '';
 	}
 
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
+	if (file_exists($saveDir.'/'.$filename.'.'.$extension)) {
 		$i = 1;
 		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
-		$title = $filename . '_' . $i . '.'.$extension;
+		$paintFileName = $filename.'_'.$i.'.'.$extension;
+		$title = $filename.'_'.$i.'.'.$extension;
 	}
 
 	//
 	$documentPath = $saveDir.'/'.$paintFileName;
 	//add new document to disk
-	file_put_contents( $documentPath, $contents );
+	file_put_contents($documentPath, $contents);
 	//add document to database
 	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
-}elseif($currentTool=='document/editpaint'){
+}elseif ($currentTool == 'document/editpaint') {
 
 	$documentPath = $saveDir.'/'.$paintFileName;
 	//add new document to disk
-	file_put_contents( $documentPath, $contents );
+	file_put_contents($documentPath, $contents);
 
 	//check path
-	if(!isset($_SESSION['paint_file'])){
+	if (!isset($_SESSION['paint_file'])) {
 		api_not_allowed();
 		die();
 	}
-	if($_SESSION['paint_file']==$paintFileName){
+	if ($_SESSION['paint_file'] == $paintFileName) {
 		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
 		update_existing_document($_course, $document_id, filesize($documentPath), null);
 		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
+	} else {
 		//add a new document
 		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
@@ -161,7 +161,7 @@ 
 
 
 //delete temporal file
-$temp_file_2delete=$_SESSION['temp_realpath_image'];
+$temp_file_2delete = $_SESSION['temp_realpath_image'];
 unlink($temp_file_2delete);
 
 //Clean sessions and return to Chamilo file list
@@ -171,12 +171,12 @@ 
 unset($_SESSION['temp_realpath_image']);
 
 if (!isset($_SESSION['exit_pixlr'])) {
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
+	$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']);
 }

Braces +5 added lines, -3 removed lines

@@ -124,7 +124,9 @@ 
 
 	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
 		$i = 1;
-		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
+		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) {
+		    $i++;
+		}
 		$paintFileName = $filename . '_' . $i . '.'.$extension;
 		$title = $filename . '_' . $i . '.'.$extension;
 	}
@@ -137,7 +139,7 @@ 
 	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
-}elseif($currentTool=='document/editpaint'){
+} elseif($currentTool=='document/editpaint'){
 
 	$documentPath = $saveDir.'/'.$paintFileName;
 	//add new document to disk
@@ -152,7 +154,7 @@ 
 		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
 		update_existing_document($_course, $document_id, filesize($documentPath), null);
 		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
+	} else{
 		//add a new document
 		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
 		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);

Indentation +58 added lines, -58 removed lines

@@ -17,18 +17,18 @@ 
 api_block_anonymous_users();
 
 if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
-	api_not_allowed();
-	die();
+    api_not_allowed();
+    die();
 }
 
 //pixlr return
@@ -72,22 +72,22 @@ 
 $filename = disable_dangerous_file($filename);
 
 if (strlen(trim($filename))==0) {
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
-	 exit;
+        echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
+        exit;
 }
 
 //check file_get_contents
 if ($contents === false) {
-	echo "I cannot read: ".$urlcontents;
+    echo "I cannot read: ".$urlcontents;
     exit;
 }
 
 // Extension security
 if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
-	die();
+    die();
 }
 if($extension=='pxd') {
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
+    echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
     exit;
 }
 
@@ -95,8 +95,8 @@ 
 $headers = get_headers($urlcontents, 1);
 $content_type = explode("/", $headers['Content-Type']);
 if ($content_type[0] != "image") {
-	echo "Invalid file type";
-	exit;
+    echo "Invalid file type";
+    exit;
 }
 
 //Verify that the file is an image. Fileinfo method
@@ -114,49 +114,49 @@ 
 $title = $title.'.'.$extension;
 
 if($currentTool=='document/createpaint'){
-	//check save as and prevent rewrite an older file with same name
-	if (0 != $groupId){
+    //check save as and prevent rewrite an older file with same name
+    if (0 != $groupId){
         $group_properties  = GroupManager :: get_group_properties($groupId);
         $groupPath = $group_properties['directory'];
-	} else {
-		$groupPath ='';
-	}
-
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
-		$i = 1;
-		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
-		$title = $filename . '_' . $i . '.'.$extension;
-	}
-
-	//
-	$documentPath = $saveDir.'/'.$paintFileName;
-	//add new document to disk
-	file_put_contents( $documentPath, $contents );
-	//add document to database
-	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
-	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    } else {
+        $groupPath ='';
+    }
+
+    if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
+        $i = 1;
+        while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
+        $paintFileName = $filename . '_' . $i . '.'.$extension;
+        $title = $filename . '_' . $i . '.'.$extension;
+    }
+
+    //
+    $documentPath = $saveDir.'/'.$paintFileName;
+    //add new document to disk
+    file_put_contents( $documentPath, $contents );
+    //add document to database
+    $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
+    api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
 
 }elseif($currentTool=='document/editpaint'){
 
-	$documentPath = $saveDir.'/'.$paintFileName;
-	//add new document to disk
-	file_put_contents( $documentPath, $contents );
-
-	//check path
-	if(!isset($_SESSION['paint_file'])){
-		api_not_allowed();
-		die();
-	}
-	if($_SESSION['paint_file']==$paintFileName){
-		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
-		update_existing_document($_course, $document_id, filesize($documentPath), null);
-		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}else{
-		//add a new document
-		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
-		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
-	}
+    $documentPath = $saveDir.'/'.$paintFileName;
+    //add new document to disk
+    file_put_contents( $documentPath, $contents );
+
+    //check path
+    if(!isset($_SESSION['paint_file'])){
+        api_not_allowed();
+        die();
+    }
+    if($_SESSION['paint_file']==$paintFileName){
+        $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
+        update_existing_document($_course, $document_id, filesize($documentPath), null);
+        api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    }else{
+        //add a new document
+        $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
+        api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
+    }
 }
 
 
@@ -171,12 +171,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']);
 }

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/document/document_quota.php

Spacing +13 added lines, -13 removed lines

@@ -32,11 +32,11 @@ 
 $session = array();
 $user_name = $user_info['complete_name'];
 
-$course_list = SessionManager::get_course_list_by_session_id ($session_id);
+$course_list = SessionManager::get_course_list_by_session_id($session_id);
 $session_list = SessionManager::get_session_by_course($course_id);
 $total_quota_bytes = DocumentManager::get_course_quota();
-$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0);
-$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+$quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0);
+$quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
 
 $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage);
 
@@ -46,11 +46,11 @@ 
     foreach ($session_list as $session_data) {
         $quota_percentage = 0;
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id']));
-        if (!empty($quota_bytes))  {
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        if (!empty($quota_bytes)) {
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
         }
         if ($session_id == $session_data['id']) {
-            $session_data['name'] = $session_data['name'] . ' * ';
+            $session_data['name'] = $session_data['name'].' * ';
         }
         $used_quota_bytes += $quota_bytes;
         $session[] = array(
@@ -66,11 +66,11 @@ 
         $quota_percentage = 0;
         $my_group_id = $group_data['id'];
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0));
-        if (!empty($quota_bytes))  {
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        if (!empty($quota_bytes)) {
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
         }
         if ($group_id == $my_group_id) {
-            $group_data['name'] = $group_data['name'] . ' * ';
+            $group_data['name'] = $group_data['name'].' * ';
         }
         $used_quota_bytes += $quota_bytes;
         $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -85,7 +85,7 @@ 
         }
     }
     if ($quota_bytes != 0) {
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+       $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
     }
 
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -98,15 +98,15 @@ 
                 $total_quota_bytes += DocumentManager::get_course_quota($course_data['id']);
             }
             if ($quota_bytes != 0) {
-                $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+                $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
             }
         }
-        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
+        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage);
 
    }
 }
 
-$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
+$quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100;
 $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage);
 $quota_data = json_encode($session);
 

Indentation +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
         }
     }
     if ($quota_bytes != 0) {
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
     }
 
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -103,7 +103,7 @@ 
         }
         $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
 
-   }
+    }
 }
 
 $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;

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

@@ -17,7 +17,7 @@ 
 <!-- Actions: The menu with the different options in cathe course management -->
 <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>
+	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'), '', '32'); ?></a>
     <?php } ?>
 </div>
 
@@ -49,26 +49,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 />';
@@ -122,35 +122,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>
@@ -221,36 +221,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/upload/upload.php

Switch Indentation +10 added lines, -10 removed lines

@@ -26,14 +26,14 @@
  * Redirect to the correct script to handle this type of upload
  */
 switch ($_SESSION['my_tool']) {
-    case TOOL_LEARNPATH:
-        require 'upload.scorm.php';
-        break;
-    //the following cases need to be distinguished later on
-    case TOOL_DROPBOX:
-    case TOOL_STUDENTPUBLICATION:
-    case TOOL_DOCUMENT:
-    default:
-        require 'upload.document.php';
-        break;
+        case TOOL_LEARNPATH:
+            require 'upload.scorm.php';
+            break;
+        //the following cases need to be distinguished later on
+        case TOOL_DROPBOX:
+        case TOOL_STUDENTPUBLICATION:
+        case TOOL_DOCUMENT:
+        default:
+            require 'upload.document.php';
+            break;
 }

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 '../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);
@@ -81,7 +81,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
 );
@@ -95,7 +95,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
 );
@@ -109,7 +109,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
 );
@@ -123,7 +123,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
 );
@@ -140,7 +140,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
 );
@@ -154,7 +154,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
 );
@@ -181,7 +181,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
 );