chamilo / chamilo-lms

main/upload/upload.document.php

Indentation +24 added lines, -24 removed lines

@@ -48,9 +48,9 @@ 
  */
 //user has submitted a file
 if (isset($_FILES['user_upload'])) {
-	$upload_ok = process_uploaded_file($_FILES['user_upload']);
-	if ($upload_ok) {
-		//file got on the server without problems, now process it
+    $upload_ok = process_uploaded_file($_FILES['user_upload']);
+    if ($upload_ok) {
+        //file got on the server without problems, now process it
         $new_path = handle_uploaded_document(
             $_course,
             $_FILES['user_upload'],
@@ -62,17 +62,17 @@ 
             $_POST['unzip'],
             $_POST['if_exists']
         );
-    	$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
-    	$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
+        $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
+        $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
-        	$table_document = Database::get_course_table(TABLE_DOCUMENT);
-        	$ct = '';
-        	if ($new_comment) $ct .= ", comment='$new_comment'";
-        	if ($new_title)   $ct .= ", title='$new_title'";
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
-    	}
+        if ($new_path && ($new_comment || $new_title))
+        if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+            $table_document = Database::get_course_table(TABLE_DOCUMENT);
+            $ct = '';
+            if ($new_comment) $ct .= ", comment='$new_comment'";
+            if ($new_title)   $ct .= ", title='$new_title'";
+            Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        }
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
         if ($missing_files)  {
@@ -128,8 +128,8 @@ 
 }
 //they want to create a directory
 if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
-	$added_slash = ($path=='/')?'':'/';
-	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
+    $added_slash = ($path=='/')?'':'/';
+    $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
         $_user['user_id'],
@@ -149,15 +149,15 @@ 
 }
 
 if (isset($_GET['createdir'])) {
-	//create the form that asks for the directory name
-	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
-	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
-	$new_folder_text .= '<input type="text" name="dirname"/>';
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
-	$new_folder_text .= '</form>';
-	//show the form
-	Display::display_normal_message($new_folder_text);
+    //create the form that asks for the directory name
+    $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
+    $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
+    $new_folder_text .= get_lang('NewDir') .' ';
+    $new_folder_text .= '<input type="text" name="dirname"/>';
+    $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
+    $new_folder_text .= '</form>';
+    //show the form
+    Display::display_normal_message($new_folder_text);
 } else {	//give them a link to create a directory
 ?>
 	<p>

main/document/slideshow.php

Indentation +248 added lines, -248 removed lines

@@ -15,15 +15,15 @@ 
 $slide_id = isset($_GET['slide_id']) ? Security::remove_XSS($_GET['slide_id']) : null;
 
 if (empty($slide_id)) {
-	$edit_slide_id = 1;
+    $edit_slide_id = 1;
 } else {
-	$edit_slide_id = $slide_id;
+    $edit_slide_id = $slide_id;
 }
 
 if ($path != '/') {
-	$folder = $path.'/';
+    $folder = $path.'/';
 } else {
-	$folder = '/';
+    $folder = '/';
 }
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
 
@@ -41,15 +41,15 @@ 
 
 // Loading the slides from the session
 if (isset($_SESSION['image_files_only'])) {
-	$image_files_only = $_SESSION['image_files_only'];
+    $image_files_only = $_SESSION['image_files_only'];
 }
 
 // Calculating the current slide, next slide, previous slide and the number of slides
 $slide = null;
 if ($slide_id != 'all') {
-	$slide = $slide_id ? $slide_id : 0;
-	$previous_slide = $slide - 1;
-	$next_slide = $slide + 1;
+    $slide = $slide_id ? $slide_id : 0;
+    $previous_slide = $slide - 1;
+    $next_slide = $slide + 1;
 }
 $total_slides = count($image_files_only);
 ?>
@@ -62,62 +62,62 @@ 
 <?php
 
 if ($slide_id != 'all') {
-	$image = null;
-	if (isset($image_files_only[$slide])) {
-		$image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
-	}
-	if (file_exists($image)) {
-		echo '<div class="actions-pagination">';
-
-		// Back forward buttons
-		if ($slide == 0) {
-			$imgp = 'action_prev_na.png';
-			$first = Display::return_icon('action_first_na.png');
-		} else {
-			$imgp = 'action_prev.png';
-			$first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
+    $image = null;
+    if (isset($image_files_only[$slide])) {
+        $image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
+    }
+    if (file_exists($image)) {
+        echo '<div class="actions-pagination">';
+
+        // Back forward buttons
+        if ($slide == 0) {
+            $imgp = 'action_prev_na.png';
+            $first = Display::return_icon('action_first_na.png');
+        } else {
+            $imgp = 'action_prev.png';
+            $first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
 			          '.Display::return_icon('action_first.png', get_lang('FirstSlide')).'
 			          </a>';
-		}
+        }
 
-		// First slide
-		echo $first;
+        // First slide
+        echo $first;
 
-		// Previous slide
-		if ($slide > 0) {
-			echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
-		}
+        // Previous slide
+        if ($slide > 0) {
+            echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
+        }
 
         echo Display::return_icon($imgp, get_lang('Previous'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Divider
-		echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
-
-		// Next slide
-		if ($slide < $total_slides - 1) {
-			echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
-		}
-		if ($slide == $total_slides - 1) {
-			$imgn = 'action_next_na.png';
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Divider
+        echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
+
+        // Next slide
+        if ($slide < $total_slides - 1) {
+            echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
+        }
+        if ($slide == $total_slides - 1) {
+            $imgn = 'action_next_na.png';
             $last = Display::return_icon('action_last_na.png', get_lang('LastSlide'));
-		} else {
-			$imgn = 'action_next.png';
-			$last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
+        } else {
+            $imgn = 'action_next.png';
+            $last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
 			        '.Display::return_icon('action_last.png', get_lang('LastSlide')).'
                 </a>';
-		}
+        }
         echo Display::return_icon($imgn, get_lang('Next'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Last slide
-		echo $last;
-		echo '</div>';
-	}
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Last slide
+        echo $last;
+        echo '</div>';
+    }
 }
 
 // Exit the slideshow
@@ -126,10 +126,10 @@ 
 
 // Show thumbnails
 if ($slide_id != 'all') {
-	echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
+    echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
         Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>';
 } else {
-	echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
+    echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
 }
 // Slideshow options
 echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
@@ -142,24 +142,24 @@ 
 
 // If we come from slideshowoptions.php we sessionize (new word !!! ;-) the options
 if (isset($_POST['Submit'])) {
-	// We come from slideshowoptions.php
-	//$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
-	$_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
-	if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
-		//echo "resizing";
-		$_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
-		$_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
-	} else {
-		//echo "unsetting the session heighte and width";
-		$_SESSION["image_resizing_width"] = null;
-		$_SESSION["image_resizing_height"] = null;
-	}
+    // We come from slideshowoptions.php
+    //$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
+    $_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
+    if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
+        //echo "resizing";
+        $_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
+        $_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
+    } else {
+        //echo "unsetting the session heighte and width";
+        $_SESSION["image_resizing_width"] = null;
+        $_SESSION["image_resizing_height"] = null;
+    }
 }
 $target_width = $target_height = null;
 // The target height and width depends if we choose resizing or no resizing
 if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == "resizing") {
-	$target_width = $_SESSION["image_resizing_width"];
-	$target_height = $_SESSION["image_resizing_height"];
+    $target_width = $_SESSION["image_resizing_width"];
+    $target_height = $_SESSION["image_resizing_height"];
 }
 
 /*	THUMBNAIL VIEW */
@@ -169,59 +169,59 @@ 
 $html = '';
 if ($slide_id == 'all') {
 
-	// Config for make thumbnails
+    // Config for make thumbnails
     $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
-	$max_thumbnail_width     = 250;
-	$max_thumbnail_height    = 250;
-	$png_compression	     = 0; // 0(none)-9
-	$jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
+    $max_thumbnail_width     = 250;
+    $max_thumbnail_height    = 250;
+    $png_compression	     = 0; // 0(none)-9
+    $jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
 
-	$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
+    $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
 
-	//Other parameters only for show tumbnails
-	$row_items 			     = 4;//only in slideshow.php
-	$number_image 			 = 7;//num icons cols to show
-	$thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
-	$thumbnail_height_frame = $max_thumbnail_height;
+    //Other parameters only for show tumbnails
+    $row_items 			     = 4;//only in slideshow.php
+    $number_image 			 = 7;//num icons cols to show
+    $thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
+    $thumbnail_height_frame = $max_thumbnail_height;
 
-	// Create the template_thumbnails folder (if no exist)
+    // Create the template_thumbnails folder (if no exist)
 
-	if (!file_exists($directory_thumbnails)) {
-		@mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
+    if (!file_exists($directory_thumbnails)) {
+        @mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
     }
 
-	// check files and thumbnails
-	if (is_array($image_files_only)) {
+    // check files and thumbnails
+    if (is_array($image_files_only)) {
 
-		foreach ($image_files_only as $one_image_file) {
-			$image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
-			$image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
+        foreach ($image_files_only as $one_image_file) {
+            $image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
+            $image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
 
-			if (file_exists($image)) {
-				//check thumbnail
-				$imagetype = explode(".", $image);
+            if (file_exists($image)) {
+                //check thumbnail
+                $imagetype = explode(".", $image);
                 //or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
-				$imagetype = strtolower($imagetype[count($imagetype)-1]);
+                $imagetype = strtolower($imagetype[count($imagetype)-1]);
 
-				if (in_array($imagetype,$allowed_thumbnail_types)) {
-					if (!file_exists($image_thumbnail)){
+                if (in_array($imagetype,$allowed_thumbnail_types)) {
+                    if (!file_exists($image_thumbnail)){
                         //run each once we view thumbnails is too heavy, then need move into  !file_exists($image_thumbnail, and only run when haven't the thumbnail
-						$original_image_size = api_getimagesize($image);
-
-						switch($imagetype) {
-							case 'gif':
-								$source_img = imagecreatefromgif($image);
-								break;
-							case 'jpg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'jpeg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'png':
-								$source_img = imagecreatefrompng($image);
-								break;
-						}
+                        $original_image_size = api_getimagesize($image);
+
+                        switch($imagetype) {
+                            case 'gif':
+                                $source_img = imagecreatefromgif($image);
+                                break;
+                            case 'jpg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'jpeg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'png':
+                                $source_img = imagecreatefrompng($image);
+                                break;
+                        }
 
                         $new_thumbnail_size = api_calculate_image_size(
                             $original_image_size['width'],
@@ -229,33 +229,33 @@ 
                             $max_thumbnail_width,
                             $max_thumbnail_height
                         );
-						if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
-							$new_thumbnail_size['width']=$original_image_size['width'];
-							$new_thumbnail_size['height']=$original_image_size['height'];
-						}
-
-						$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
-
-						// preserve transparency
-						if ($imagetype == "png"){
-							imagesavealpha($crop, true);
-							$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
-							imagefill($crop, 0, 0, $color);
-						}
-
-						if ($imagetype == "gif") {
-							$transindex = imagecolortransparent($source_img);
+                        if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
+                            $new_thumbnail_size['width']=$original_image_size['width'];
+                            $new_thumbnail_size['height']=$original_image_size['height'];
+                        }
+
+                        $crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
+
+                        // preserve transparency
+                        if ($imagetype == "png"){
+                            imagesavealpha($crop, true);
+                            $color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
+                            imagefill($crop, 0, 0, $color);
+                        }
+
+                        if ($imagetype == "gif") {
+                            $transindex = imagecolortransparent($source_img);
                             $palletsize = imagecolorstotal($source_img);
-							 //GIF89a for transparent and anim (first clip), either GIF87a
-							 if ($transindex >= 0 && $transindex < $palletsize){
-								 $transcol = imagecolorsforindex($source_img, $transindex);
-								 $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
-								 imagefill($crop, 0, 0, $transindex);
-								 imagecolortransparent($crop, $transindex);
-							 }
-						}
-
-						//resampled image
+                                //GIF89a for transparent and anim (first clip), either GIF87a
+                                if ($transindex >= 0 && $transindex < $palletsize){
+                                    $transcol = imagecolorsforindex($source_img, $transindex);
+                                    $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
+                                    imagefill($crop, 0, 0, $transindex);
+                                    imagecolortransparent($crop, $transindex);
+                                }
+                        }
+
+                        //resampled image
                         imagecopyresampled(
                             $crop,
                             $source_img,
@@ -269,69 +269,69 @@ 
                             $original_image_size['height']
                         );
 
-						switch ($imagetype) {
-							case 'gif':
-								imagegif($crop,$image_thumbnail);
-								break;
-							case 'jpg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'jpeg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'png':
-								imagepng($crop,$image_thumbnail,$png_compression);
-								break;
-						}
-
-						//clean memory
-						imagedestroy($crop);
-					}//end !exist thumbnail
-
-					//show thumbnail and link
-
-					$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
-					$image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
-				} else {
-					//if images aren't support by gd (not gif, jpg, jpeg, png)
-					if ($imagetype=="bmp") {
+                        switch ($imagetype) {
+                            case 'gif':
+                                imagegif($crop,$image_thumbnail);
+                                break;
+                            case 'jpg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'jpeg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'png':
+                                imagepng($crop,$image_thumbnail,$png_compression);
+                                break;
+                        }
+
+                        //clean memory
+                        imagedestroy($crop);
+                    }//end !exist thumbnail
+
+                    //show thumbnail and link
+
+                    $one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
+                    $image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
+                } else {
+                    //if images aren't support by gd (not gif, jpg, jpeg, png)
+                    if ($imagetype=="bmp") {
                         // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
-						$original_image_size = getimagesize($image);
-						if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
-							$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
-							$image_height = $thumbnail_size['height'];
-							$image_width  = $thumbnail_size['width'];
-						} else {
-							$image_height=$original_image_size[0];
-							$image_width=$original_image_size[1];
-						}
-					} else {
-						//example for svg files,...
-						$image_width=$max_thumbnail_width;
-						$image_height=$max_thumbnail_height;
-					}
-
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
-					$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
-
-				}//end allowed image types
-			}//end if exist file image
-		}//end foreach
-	}//end image files only
-
-	// Creating the table
-	$html_table = '';
-
-	$i = 0;
-	$count_image = count($image_tag);
-	$number_iteration = ceil($count_image/$number_image);
-	$p = 0;
+                        $original_image_size = getimagesize($image);
+                        if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
+                            $thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
+                            $image_height = $thumbnail_size['height'];
+                            $image_width  = $thumbnail_size['width'];
+                        } else {
+                            $image_height=$original_image_size[0];
+                            $image_width=$original_image_size[1];
+                        }
+                    } else {
+                        //example for svg files,...
+                        $image_width=$max_thumbnail_width;
+                        $image_height=$max_thumbnail_height;
+                    }
+
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
+                    $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
+
+                }//end allowed image types
+            }//end if exist file image
+        }//end foreach
+    }//end image files only
+
+    // Creating the table
+    $html_table = '';
+
+    $i = 0;
+    $count_image = count($image_tag);
+    $number_iteration = ceil($count_image/$number_image);
+    $p = 0;
     $html = '';
     $html .= '<div class="gallery">';
-	for ($k = 0; $k < $number_iteration; $k++) {
-		for ($i = 0; $i < $number_image; $i++) {
-			if (isset($image_tag[$p])) {
+    for ($k = 0; $k < $number_iteration; $k++) {
+        for ($i = 0; $i < $number_image; $i++) {
+            if (isset($image_tag[$p])) {
                             $html .= '<div class="col-xs-6 col-sm-3 col-md-2">';
                             $html .= '<div class="canvas-one">';
                             $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
@@ -343,10 +343,10 @@ 
                             $html .= '</a>';
                             $html .= '</div>';
                             $html .= '</div>';
-			}
-			$p++;
-		}
-	}
+            }
+            $p++;
+        }
+    }
     $html .= '</div>';
 
 }//end slide==all
@@ -357,43 +357,43 @@ 
 // This is for viewing all the images in the slideshow one at a time.
 
 if ($slide_id != 'all' && !empty($image_files_only)) {
-	if (file_exists($image) && is_file($image)) {
-		$image_height_width = resize_image($image, $target_width, $target_height);
-
-		$image_height = $image_height_width[0];
-		$image_width = $image_height_width[1];
-
-		$height_width_tags = null;
-		if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
-			$height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
-		}
-
-		// This is done really quickly and should be cleaned up a little bit using the API functions
-		$tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
-		if ($path == '/') {
-			$pathpart = '/';
-		} else {
-			$pathpart = $path.'/';
-		}
-		$sql = "SELECT * FROM $tbl_documents
+    if (file_exists($image) && is_file($image)) {
+        $image_height_width = resize_image($image, $target_width, $target_height);
+
+        $image_height = $image_height_width[0];
+        $image_width = $image_height_width[1];
+
+        $height_width_tags = null;
+        if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
+            $height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
+        }
+
+        // This is done really quickly and should be cleaned up a little bit using the API functions
+        $tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
+        if ($path == '/') {
+            $pathpart = '/';
+        } else {
+            $pathpart = $path.'/';
+        }
+        $sql = "SELECT * FROM $tbl_documents
 		        WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         echo '<div class="thumbnail">';
-		if ($slide < $total_slides - 1 && $slide_id != 'all') {
-			echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
-		} else {
-			echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
-		}
+        if ($slide < $total_slides - 1 && $slide_id != 'all') {
+            echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
+        } else {
+            echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
+        }
         if ($path == '/') {
-        	$path = '';
+            $path = '';
         }
 
-		list($width, $height) = getimagesize($image);
-		// Auto resize
-		if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
-		?>
+        list($width, $height) = getimagesize($image);
+        // Auto resize
+        if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
+        ?>
 
 		<script type="text/javascript">
 			var initial_width='<?php echo $width; ?>';
@@ -446,21 +446,21 @@ 
 
 		</script>
     <?php
-		} else {
-			echo "<img class=\"img-responsive\" src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
-		}
+        } else {
+            echo "<img class=\"img-responsive\" src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
+        }
 
-		echo '</a>';
+        echo '</a>';
         echo '<div class="caption text-center">';
         echo Display::tag('h3', $row['title']);
         echo '<p>' . $row['comment'] . '</p>';
         echo '</div>';
         echo '</div>';
 
-		if (api_is_allowed_to_edit(null, true)) {
+        if (api_is_allowed_to_edit(null, true)) {
             echo '<ul class="list-unstyled">';
-			$aux = explode('.', htmlspecialchars($image_files_only[$slide]));
-			$ext = $aux[count($aux) - 1];
+            $aux = explode('.', htmlspecialchars($image_files_only[$slide]));
+            $ext = $aux[count($aux) - 1];
 
             if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
                 $resize_info = get_lang('Resizing').'<br />';
@@ -472,8 +472,8 @@ 
                 $resize_height = get_lang('Auto');
             } else {
                 $resize_info = get_lang('NoResizing').'<br />';
-				$resize_width = '';
-				$resize_height = '';
+                $resize_width = '';
+                $resize_height = '';
             }
 
             echo '<li class="text-center">';
@@ -493,16 +493,16 @@ 
             );
             echo '</li>';
             echo '<li class="text-center">' . $width.' x '.$height . '</li>';
-			echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
+            echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
             echo '<li class="text-center">' . $resize_info . '</li>';
-			echo '<li class="text-center">' . $resize_width . '</li>';
-			echo '<li class="text-center">' . $resize_height . '</li>';
+            echo '<li class="text-center">' . $resize_width . '</li>';
+            echo '<li class="text-center">' . $resize_height . '</li>';
             echo '</ul>';
-		}
+        }
 
-	} else {
-		Display::display_warning_message(get_lang('FileNotFound'));
-	}
+    } else {
+        Display::display_warning_message(get_lang('FileNotFound'));
+    }
 } else {
     if ($slide_id != 'all') {
         Display::display_warning_message(get_lang('NoDataAvailable'));

main/permissions/permissions_functions.inc.php

Indentation +401 added lines, -401 removed lines

@@ -25,38 +25,38 @@ 
 function store_permissions($content, $id) {
     $course_id = api_get_course_int_id();
     
-	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = group_id;
-	}
-	if ($content=='role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = role_id;
-	}
-
-	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
-
-	// looping through the post values to find the permission (containing the string permission* )
-	foreach ($_POST as $key => $value)
-	{
-		if (strstr($key,"permission*"))
-		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
-		}
-	}
-	return get_lang('PermissionsStored');
+    // Which database are we using (depending on the $content parameter)
+    if ($content=='user')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = group_id;
+    }
+    if ($content=='role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = role_id;
+    }
+
+    // We first delete all the existing permissions for that user/group/role
+    $sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+    $result=Database::query($sql);
+
+    // looping through the post values to find the permission (containing the string permission* )
+    foreach ($_POST as $key => $value)
+    {
+        if (strstr($key,"permission*"))
+        {
+            list($brol,$tool,$action)=explode("*",$key);
+            $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+            $result=Database::query($sql);
+        }
+    }
+    return get_lang('PermissionsStored');
 }
 
 /**
@@ -70,50 +70,50 @@ 
 * @version 1.0
 */
 function store_one_permission($content, $action, $id, $tool,$permission) {
-	global $rights_full;
+    global $rights_full;
     $course_id = api_get_course_int_id();
-	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
+    // for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
 
-	// check
-	//if(!in_array($permission, $rights_full))
-	//{
-	//	return get_lang('Error');
-	//}
+    // check
+    //if(!in_array($permission, $rights_full))
+    //{
+    //	return get_lang('Error');
+    //}
 
-	// Which database are we using (depending on the $content parameter)
+    // Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = group_id;
-	}
-	if ($content=='role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = role_id;
-	}
-
-	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
-		}
-	}
-	if ($action=='revoke')
-	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
-		}
-	}
-	return $result_message;
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = group_id;
+    }
+    if ($content=='role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = role_id;
+    }
+
+    // grating a right
+    if ($action=='grant') {
+        $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+        $result=Database::query($sql);
+        if($result) {
+            $result_message=get_lang('PermissionGranted');
+        }
+    }
+    if ($action=='revoke')
+    {
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+        $result=Database::query($sql);
+        if($result) {
+            $result_message=get_lang('PermissionRevoked');
+        }
+    }
+    return $result_message;
 }
 
 /**
@@ -125,47 +125,47 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
-	// Which database are we using (depending on the $content parameter)
+    $currentpermissions=array();
+    // Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
-	if ($content == 'user')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = 'user_id';
-	}
-	elseif ($content == 'group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = 'group_id';
-	}
-	elseif ($content == 'role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = 'role_id';
-	}
-	elseif ($content == 'platform_role')
-	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
-		$id_field = 'role_id';
+    if ($content == 'user')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = 'user_id';
+    }
+    elseif ($content == 'group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = 'group_id';
+    }
+    elseif ($content == 'role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = 'role_id';
+    }
+    elseif ($content == 'platform_role')
+    {
+        $table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+        $id_field = 'role_id';
         $course_id_condition = '';
-	}
-	elseif ($content == 'task')
-	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
-		$id_field = 'task_id';
-	}
-
-	// finding all the permissions. We store this in a multidimensional array
-	// where the first dimension is the tool.
-	$sql="
+    }
+    elseif ($content == 'task')
+    {
+        $table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+        $id_field = 'task_id';
+    }
+
+    // finding all the permissions. We store this in a multidimensional array
+    // where the first dimension is the tool.
+    $sql="
 		SELECT * FROM " . $table . "
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
-		$currentpermissions[$row['tool']][] = $row['action'];
+    while($row = Database::fetch_array($result))
+        $currentpermissions[$row['tool']][] = $row['action'];
 
-	return $currentpermissions;
+    return $currentpermissions;
 }
 
 /**
@@ -179,38 +179,38 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
-	{
-		foreach ($current_permissions as $tool=>$tool_rights)
-		{
-			// we loop through the possible permissions of a tool and unset the entry if it is view
-			// if it is visibility or move we have to grant the edit right
-			foreach ($tool_rights as $key=>$value)
-			{
-				if ($value=='View')
-				{
-					unset($current_permissions[$tool][$key]);
-				}
-				if ($value=='Visibility' OR $value=='Move')
-				{
-					if (!in_array('Edit',$current_permissions[$tool]))
-					{
-						$current_permissions[$tool][]='Edit';
-					}
-					unset($current_permissions[$tool][$key]);
-				}
-				//else
-				//{
-				//	$current_permissions[$tool][]=$value;
-				//}
-			}
-		}
-		return $current_permissions;
-	}
-	if (api_get_setting('permissions')=='full')
-	{
-		return $current_permissions;
-	}
+    if (api_get_setting('permissions')=='limited')
+    {
+        foreach ($current_permissions as $tool=>$tool_rights)
+        {
+            // we loop through the possible permissions of a tool and unset the entry if it is view
+            // if it is visibility or move we have to grant the edit right
+            foreach ($tool_rights as $key=>$value)
+            {
+                if ($value=='View')
+                {
+                    unset($current_permissions[$tool][$key]);
+                }
+                if ($value=='Visibility' OR $value=='Move')
+                {
+                    if (!in_array('Edit',$current_permissions[$tool]))
+                    {
+                        $current_permissions[$tool][]='Edit';
+                    }
+                    unset($current_permissions[$tool][$key]);
+                }
+                //else
+                //{
+                //	$current_permissions[$tool][]=$value;
+                //}
+            }
+        }
+        return $current_permissions;
+    }
+    if (api_get_setting('permissions')=='full')
+    {
+        return $current_permissions;
+    }
 }
 /**
 * This function displays a checked or unchecked checkbox. The checkbox will be checked if the
@@ -224,12 +224,12 @@ 
 */
 function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
-	{
-		$checked="checked";
-	}
-	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
+    $checked="";
+    if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+    {
+        $checked="checked";
+    }
+    echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
 }
 
@@ -245,62 +245,62 @@ 
 */
 function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
 {
-	if ($course_admin) {
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
-				if ($editable) {
-					$url=api_get_self();
-					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
-				if ($editable) {
-					echo "</a>";
-				}
-			} else {
-				if ($editable)
-				{
-					$url=api_get_self();
-					$urlparameters = '';
-					foreach ($_GET as $key=>$value)
-					{
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					foreach ($parameter as $key=>$value)
-					{
-						$urlparameters.=$key.'='.$value.'&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
-				if ($editable)
-				{
-					echo "</a>";
-				}
-			}
-		}
-	}
+    if ($course_admin) {
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+    } else {
+        if (in_array($permission,$inherited_permissions[$tool])) {
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+        } else {
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+                if ($editable) {
+                    $url=api_get_self();
+                    $urlparameters = '';
+                    foreach($_GET as $key=>$value) {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='revoke';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    foreach ($parameter as $key=>$value) {
+                        $urlparameters.=$key.'='.$value.'&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
+                if ($editable) {
+                    echo "</a>";
+                }
+            } else {
+                if ($editable)
+                {
+                    $url=api_get_self();
+                    $urlparameters = '';
+                    foreach ($_GET as $key=>$value)
+                    {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='grant';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    foreach ($parameter as $key=>$value)
+                    {
+                        $urlparameters.=$key.'='.$value.'&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
+                if ($editable)
+                {
+                    echo "</a>";
+                }
+            }
+        }
+    }
 }
 
 
@@ -318,72 +318,72 @@ 
 function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
 {
 
-	if ($course_admin)
-	{
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	}
-	else
-	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
-		{
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		}
-		else
-		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
-			{
-				if ($editable)
-				{
-					$url = api_get_self();
-					$urlparameters = '';
-					foreach($_GET as $key => $value)
-					{
-						$parameter[$key] = $value;
-					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
-					foreach ($parameter as $key=>$value)
-					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
-					}
-					$url = $url . '?' . $urlparameters;
-
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
-				if ($editable) {
-					echo "</a>";
-				}
-			} else {
-				if ($editable) {
-					$url = api_get_self();
-					$urlparameters = '';
-					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
-					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
-				if ($editable) {
-					echo "</a>";
-				}
-			}
-		}
-	}
+    if ($course_admin)
+    {
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+    }
+    else
+    {
+        if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+        {
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+        }
+        else
+        {
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+            {
+                if ($editable)
+                {
+                    $url = api_get_self();
+                    $urlparameters = '';
+                    foreach($_GET as $key => $value)
+                    {
+                        $parameter[$key] = $value;
+                    }
+                    $parameter['action']='manage_rights';
+                    $parameter['do']='revoke';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    $parameter['user_id']=$user_id;
+                    foreach ($parameter as $key=>$value)
+                    {
+                        $urlparameters .= $key . '=' . $value . '&amp;';
+                    }
+                    $url = $url . '?' . $urlparameters;
+
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
+                if ($editable) {
+                    echo "</a>";
+                }
+            } else {
+                if ($editable) {
+                    $url = api_get_self();
+                    $urlparameters = '';
+                    foreach ($_GET as $key=>$value) {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='manage_rights';
+                    $parameter['do']='grant';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    $parameter['user_id']=$user_id;
+                    foreach ($parameter as $key=>$value) {
+                        $urlparameters .= $key . '=' . $value . '&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
+                if ($editable) {
+                    echo "</a>";
+                }
+            }
+        }
+    }
 }
 
 
@@ -394,41 +394,41 @@ 
 */
 function display_role_list($current_course_roles, $current_platform_roles)
 {
-	global $setting_visualisation;
+    global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
-
-	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		if (in_array($row['role_id'], $current_course_roles))
-		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
-		}
-		else
-		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
-		}
-		if ($setting_visualisation=='checkbox')
-		{
-			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
-		}
-		if ($setting_visualisation=='image')
-		{
-			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
-		}
-
-
-		echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
-		echo $row['role_comment']."<br />\n";
-	}
+    $coures_roles_table=Database::get_course_table(TABLE_ROLE);
+
+    // course roles
+    $sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        if (in_array($row['role_id'], $current_course_roles))
+        {
+            $checked='checked';
+            $image='checkbox_on2.gif';
+            $action='revoke';
+        }
+        else
+        {
+            $checked='';
+            $image='wrong.gif';
+            $action='grant';
+        }
+        if ($setting_visualisation=='checkbox')
+        {
+            echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
+        }
+        if ($setting_visualisation=='image')
+        {
+            echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
+        }
+
+
+        echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
+        echo $row['role_comment']."<br />\n";
+    }
 }
 
 /**
@@ -442,24 +442,24 @@ 
 */
 function get_roles($content,$id, $scope='course') {
     $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
-
-	$current_roles=array();
-	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
-	}
-	return $current_roles;
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group') {
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    }
+    $table_role=Database::get_course_table(TABLE_ROLE);
+
+    $current_roles=array();
+    //$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
+    $sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result)) {
+        $current_roles[]=$row['role_id'];
+    }
+    return $current_roles;
 }
 
 /**
@@ -472,25 +472,25 @@ 
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
-	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
-	}
-	if ($content=='platform')
-	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
-		$course_id_condition = '';
-	}
-
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		$roles[]=$row;
-	}
-
-	return $roles;
+    if ($content=='course')
+    {
+        $table_role=Database::get_course_table(TABLE_ROLE);
+    }
+    if ($content=='platform')
+    {
+        $table_role=Database::get_main_table(TABLE_ROLE);
+        $course_id_condition = '';
+    }
+
+    $current_roles=array();
+    $sql="SELECT * FROM $table_role $course_id_condition ";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        $roles[]=$row;
+    }
+
+    return $roles;
 }
 
 
@@ -506,34 +506,34 @@ 
 */
 function get_roles_permissions($content,$id, $scope='course') {
     $course_id = api_get_course_int_id();
-	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = 'user_id';
-	}
-
-	if ($content == 'group') {
-		$table = Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	}
-
-	// course roles or platform roles
-	$scope = 'course';
-	if ($scope == 'course') {
-		$table_role = Database::get_course_table(TABLE_ROLE);
-		$table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
+    if ($content == 'user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = 'user_id';
+    }
+
+    if ($content == 'group') {
+        $table = Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    }
+
+    // course roles or platform roles
+    $scope = 'course';
+    if ($scope == 'course') {
+        $table_role = Database::get_course_table(TABLE_ROLE);
+        $table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
         
         $role_condition = " role.c_id = $course_id AND role_permissions.c_id = $course_id AND ";
-	}
+    }
 
-	if ($scope == 'platform') {
-		$table_role = Database::get_main_table(TABLE_ROLE);
-		$table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
+    if ($scope == 'platform') {
+        $table_role = Database::get_main_table(TABLE_ROLE);
+        $table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
         $role_condition = '';
-	}
+    }
 
-	$current_roles = array();
+    $current_roles = array();
 
-	$sql = "
+    $sql = "
 		SELECT *
 		FROM
 			" . $table . " role_group_user,
@@ -547,12 +547,12 @@ 
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+    while ($row=Database::fetch_array($result)) {
+        $current_role_permissions[$row['tool']][]=$row['action'];
     }
-	return $current_role_permissions;
+    return $current_role_permissions;
 }
 
 /**
@@ -566,34 +566,34 @@ 
 
 function assign_role($content, $action, $id, $role_id, $scope='course') {
     $course_id = api_get_course_int_id();
-	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	} else {
-		return  get_lang('Error');
-	}
-
-	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
-		if ($result) {
-			$result_message=get_lang('RoleGranted');
-		}
-	}
+    // Which database are we using (depending on the $content parameter)
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = 'user_id';
+    } elseif($content=='group') {
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    } else {
+        return  get_lang('Error');
+    }
+
+    // grating a right
+    if ($action=='grant') {
+        $sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+        $result=Database::query($sql);
+        if ($result) {
+            $result_message=get_lang('RoleGranted');
+        }
+    }
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
-		if ($result) {
-			$result_message=get_lang('RoleRevoked');
-		}
-	}
-	return $result_message;
+    if ($action=='revoke') {
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+        $result=Database::query($sql);
+        if ($result) {
+            $result_message=get_lang('RoleRevoked');
+        }
+    }
+    return $result_message;
 }
 
 
@@ -603,21 +603,21 @@ 
 */
 function permission_array_merge($array1, $array2)
 {
-	foreach ($array2 as $tool=>$permissions)
-	{
-		foreach ($permissions as $permissionkey=>$permissionvalue)
-		{
-			$array1[$tool][]=$permissionvalue;
-		}
-	}
-	return $array1;
+    foreach ($array2 as $tool=>$permissions)
+    {
+        foreach ($permissions as $permissionkey=>$permissionvalue)
+        {
+            $array1[$tool][]=$permissionvalue;
+        }
+    }
+    return $array1;
 }
 
 
 function my_print_r($array)
 {
-	echo '<pre>';
-	print_r($array);
-	echo '</pre>';
+    echo '<pre>';
+    print_r($array);
+    echo '</pre>';
 }
 ?>

main/inc/lib/upload.xajax.php

Indentation +12 added lines, -12 removed lines

@@ -17,17 +17,17 @@
  */
 function updateProgress($div_id, $upload_id, $waitAfterupload = false) {
 
-	$objResponse = new xajaxResponse();
-	$ul_info = uploadprogress_get_info($upload_id);
-	$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
-	if($waitAfterupload && $ul_info['est_sec']<2) {
-		$percent = 100;
-		$objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-		$objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
-		$objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
-	}
-	$objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-	$objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
+    $objResponse = new xajaxResponse();
+    $ul_info = uploadprogress_get_info($upload_id);
+    $percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
+    if($waitAfterupload && $ul_info['est_sec']<2) {
+        $percent = 100;
+        $objResponse->addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+        $objResponse->addAssign($div_id.'_waiter_frame','innerHTML', Display::return_icon('progress_bar.gif'));
+        $objResponse->addScript('clearInterval("myUpload.__progress_bar_interval")');
+    }
+    $objResponse->addAssign($div_id.'_label', 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+    $objResponse->addAssign($div_id.'_filled', 'style.width', $percent.'%');
 
-	return $objResponse;
+    return $objResponse;
 }