chamilo / chamilo-lms

main/inc/global_error_message.inc.php

Indentation +89 added lines, -89 removed lines

@@ -56,40 +56,40 @@ 
         $theme = 'chamilo';
     }
 
-	$css_path = 'app/Resources/public/css/';
-	$css_web_assets = 'web/assets/';
-	$css_web_path = 'web/css/';
+    $css_path = 'app/Resources/public/css/';
+    $css_web_assets = 'web/assets/';
+    $css_web_path = 'web/css/';
     $themePath = $css_path.'themes/'.$theme.'/default.css';
     $css_web_fontawesome = $css_web_assets.'fontawesome/css/font-awesome.css';
-	$bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
-	$css_base_file = $css_web_path.'base.css';
+    $bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
+    $css_base_file = $css_web_path.'base.css';
 
     $css_list = array($bootstrap_file, $css_base_file, $themePath);
 
     $web_img = 'main/img';
-	$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
-	$root_rel = htmlentities($_SERVER['PHP_SELF']);
-	if (!empty($root_rel)) {
-		$pos = strrpos($root_rel, '/');
-		$root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1);
-		if (strpos($root_rel, '/main/') !== false) {
-			$pos = 0;
-			while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) {
-				$pos = $test_pos + 1;
-			}
-			$root_rel = substr($root_rel, 0, $pos);
-		} elseif (strpos($root_rel, '/courses/') !== false) {
-			$pos = 0;
-			while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) {
-				$pos = $test_pos + 1;
-			}
-			$root_rel = substr($root_rel, 0, $pos);
-		}
-	}
-
-	$installation_guide_url = $root_rel.'documentation/installation_guide.html';
-
-	$css_def = '';
+    $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
+    $root_rel = htmlentities($_SERVER['PHP_SELF']);
+    if (!empty($root_rel)) {
+        $pos = strrpos($root_rel, '/');
+        $root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1);
+        if (strpos($root_rel, '/main/') !== false) {
+            $pos = 0;
+            while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) {
+                $pos = $test_pos + 1;
+            }
+            $root_rel = substr($root_rel, 0, $pos);
+        } elseif (strpos($root_rel, '/courses/') !== false) {
+            $pos = 0;
+            while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) {
+                $pos = $test_pos + 1;
+            }
+            $root_rel = substr($root_rel, 0, $pos);
+        }
+    }
+
+    $installation_guide_url = $root_rel.'documentation/installation_guide.html';
+
+    $css_def = '';
     foreach ($css_list as $css_item) {
         $css_base_chamilo_file = $root_sys.$css_item;
         if (file_exists($css_base_chamilo_file)) {
@@ -97,33 +97,33 @@ 
         }
     }
 
-	$global_error_message = array();
-
-	switch ($global_error_code) {
-		case 1:
-			$global_error_message['section'] = $SectionSystemRequirementsProblem;
-			$global_error_message['title'] = $IncorrectPhpVersionTitle;
-			$php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : '');
-			$php_version = empty($php_version) ? '' : '(PHP '.$php_version.')';
-			$IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription);
-			$IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription);
-			$pos = strpos($IncorrectPhpVersionDescription, '%s3');
-			if ($pos !== false) {
-				$length = strlen($IncorrectPhpVersionDescription);
-				$read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
-				$IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
-				$IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
-			}
-			$global_error_message['description'] = $IncorrectPhpVersionDescription;
-			break;
-		case 2:
-			$global_error_message['section'] = $SectionInstallation;
-			$global_error_message['title'] = $InstallationTitle;
-			if (($pos = strpos($InstallationDescription, '%s')) === false) {
-				$InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide';
-			}
-			$read_installation_guide = substr($InstallationDescription, $pos + 2);
-			$InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
+    $global_error_message = array();
+
+    switch ($global_error_code) {
+        case 1:
+            $global_error_message['section'] = $SectionSystemRequirementsProblem;
+            $global_error_message['title'] = $IncorrectPhpVersionTitle;
+            $php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : '');
+            $php_version = empty($php_version) ? '' : '(PHP '.$php_version.')';
+            $IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription);
+            $IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription);
+            $pos = strpos($IncorrectPhpVersionDescription, '%s3');
+            if ($pos !== false) {
+                $length = strlen($IncorrectPhpVersionDescription);
+                $read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
+                $IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
+                $IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
+            }
+            $global_error_message['description'] = $IncorrectPhpVersionDescription;
+            break;
+        case 2:
+            $global_error_message['section'] = $SectionInstallation;
+            $global_error_message['title'] = $InstallationTitle;
+            if (($pos = strpos($InstallationDescription, '%s')) === false) {
+                $InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide';
+            }
+            $read_installation_guide = substr($InstallationDescription, $pos + 2);
+            $InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
 			<div class="row"><div class="col-md-12">
 
                     <div class="office">
@@ -135,38 +135,38 @@ 
                           </p>
                     </div>
             </form>';
-			$global_error_message['description'] = $InstallationDescription;
-			break;
-		case 3:
-		case 4:
-		case 5:
-			$global_error_message['section'] = $SectionDatabaseUnavailable;
-			$global_error_message['title'] = $DatabaseUnavailableTitle;
-			$global_error_message['description'] = $DatabaseUnavailableDescription;
-			break;
-		case 6:
-			$global_error_message['section'] = $SectionProtection;
-			$global_error_message['title'] = $AlreadyInstalledTitle;
-			$global_error_message['description'] = $AlreadyInstalledDescription;
-			break;
-		default:
-			$global_error_message['section'] = $SectionTechnicalIssues;
-			$global_error_message['title'] = $TechnicalIssuesTitle;
-			$global_error_message['description'] = $TechnicalIssuesDescription;
-			break;
-	}
-
-	$show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2;
-	$global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : '';
-	$global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']);
-	$global_error_message['organisation'] = $Organisation;
-	$global_error_message['powered_by'] = $PoweredBy;
-	$global_error_message['encoding'] = 'UTF-8';
-	$global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png'));
+            $global_error_message['description'] = $InstallationDescription;
+            break;
+        case 3:
+        case 4:
+        case 5:
+            $global_error_message['section'] = $SectionDatabaseUnavailable;
+            $global_error_message['title'] = $DatabaseUnavailableTitle;
+            $global_error_message['description'] = $DatabaseUnavailableDescription;
+            break;
+        case 6:
+            $global_error_message['section'] = $SectionProtection;
+            $global_error_message['title'] = $AlreadyInstalledTitle;
+            $global_error_message['description'] = $AlreadyInstalledDescription;
+            break;
+        default:
+            $global_error_message['section'] = $SectionTechnicalIssues;
+            $global_error_message['title'] = $TechnicalIssuesTitle;
+            $global_error_message['description'] = $TechnicalIssuesDescription;
+            break;
+    }
+
+    $show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2;
+    $global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : '';
+    $global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']);
+    $global_error_message['organisation'] = $Organisation;
+    $global_error_message['powered_by'] = $PoweredBy;
+    $global_error_message['encoding'] = 'UTF-8';
+    $global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png'));
 
     $installChamiloImage = base64_encode(file_get_contents("$root_sys/main/img/install-chamilo.gif"));
 
-	$global_error_message_page =
+    $global_error_message_page =
 <<<EOM
 <!DOCTYPE html>
 <html>
@@ -236,9 +236,9 @@ 
 		</body>
 </html>
 EOM;
-	foreach ($global_error_message as $key => $value) {
-		$global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
-	}
-	header('Content-Type: text/html; charset='.$global_error_message['encoding']);
-	die($global_error_message_page);
+    foreach ($global_error_message as $key => $value) {
+        $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
+    }
+    header('Content-Type: text/html; charset='.$global_error_message['encoding']);
+    die($global_error_message_page);
 }

main/inc/ajax/exercise.ajax.php

Indentation +1 added lines, -1 removed lines

@@ -488,7 +488,7 @@
                     $remind_list
                 );
 
-                 // Destruction of the Question object
+                    // Destruction of the Question object
                 unset($objQuestionTmp);
                 if ($debug) {
                     error_log(" -- end question -- ");

main/inc/ajax/course.ajax.php

Indentation +6 added lines, -6 removed lines

@@ -258,13 +258,13 @@
                 ), 'first');
 
                 $coachName = api_get_person_name($userResult['firstname'], $userResult['lastname']);
-           }
+            }
 
-           $courses[] = array(
-               'id' => $courseId,
-               'name' => $course['title'],
-               'coachName' => $coachName,
-           );
+            $courses[] = array(
+                'id' => $courseId,
+                'name' => $course['title'],
+                'coachName' => $coachName,
+            );
         }
 
         echo json_encode($courses);

main/inc/ajax/thematic.ajax.php

Indentation +74 added lines, -74 removed lines

@@ -11,8 +11,8 @@ 
 $thematic = new Thematic();
 
 switch ($action) {
-	case 'save_thematic_plan':
-		/*$title_list         = $_REQUEST['title'];
+    case 'save_thematic_plan':
+        /*$title_list         = $_REQUEST['title'];
 		$description_list   = $_REQUEST['desc'];
 		//$description_list   = $_REQUEST['description'];
 		$description_type   = $_REQUEST['description_type'];
@@ -25,13 +25,13 @@ 
 		$thematic_plan_data = $thematic->get_thematic_plan_data();
 		$return = $thematic->get_thematic_plan_div($thematic_plan_data);
 		echo $return[$_REQUEST['thematic_id']];*/
-		break;
-	case 'save_thematic_advance':
-		if (!api_is_allowed_to_edit(null, true)) {
-			echo '';
-			exit;
-		}
-		/*
+        break;
+    case 'save_thematic_advance':
+        if (!api_is_allowed_to_edit(null, true)) {
+            echo '';
+            exit;
+        }
+        /*
         if (($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) || (!empty($_REQUEST['duration_in_hours']) && !is_numeric($_REQUEST['duration_in_hours'])) ) {
             if ($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) {
                 $start_date_error = true;
@@ -79,80 +79,80 @@ 
         $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true);
         $return = $thematic->get_thematic_advance_div($thematic_advance_data);
         echo $return[$_REQUEST['thematic_id']][$_REQUEST['thematic_advance_id']];*/
-		break;
-	case 'get_datetime_by_attendance':
-		$attendance_id       = intval($_REQUEST['attendance_id']);
-		$thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
+        break;
+    case 'get_datetime_by_attendance':
+        $attendance_id       = intval($_REQUEST['attendance_id']);
+        $thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
 
-		$label = '';
-		$input_select = '';
-		if (!empty($attendance_id)) {
-			$attendance = new Attendance();
-			$thematic   = new Thematic();
-			$thematic_list = $thematic->get_thematic_list();
+        $label = '';
+        $input_select = '';
+        if (!empty($attendance_id)) {
+            $attendance = new Attendance();
+            $thematic   = new Thematic();
+            $thematic_list = $thematic->get_thematic_list();
 
-			$my_list = $thematic_list_temp = array();
-			foreach ($thematic_list as $item) {
-				$my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
-				$thematic_list_temp = array_merge($my_list, $thematic_list_temp);
-			}
-			$new_thematic_list = array();
+            $my_list = $thematic_list_temp = array();
+            foreach ($thematic_list as $item) {
+                $my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
+                $thematic_list_temp = array_merge($my_list, $thematic_list_temp);
+            }
+            $new_thematic_list = array();
 
-			foreach($thematic_list_temp as $item) {
-				if (!empty($item['attendance_id']) ) {
-					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
-				}
-			}
+            foreach($thematic_list_temp as $item) {
+                if (!empty($item['attendance_id']) ) {
+                    $new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
+                }
+            }
 
-			$attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
+            $attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
 
-			$label = get_lang('StartDate');
-			if (!empty($attendance_calendar)) {
-				$input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
-				foreach ($attendance_calendar as $calendar) {
-					$selected = null;
-					$insert = true;
-					//checking if was already taken
-					foreach ($new_thematic_list as $key => $thematic_item) {
-						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
-							$insert = false;
-							if ($thematic_advance_id == $key) {
-								$insert = true;
-								$selected = 'selected';
-							}
-							break;
-						}
-					}
-					if ($insert == true) {
-						$input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
-					}
-				}
-				$input_select .= '</select>';
-			} else {
-				$input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
-			}
-		}
-		?>
+            $label = get_lang('StartDate');
+            if (!empty($attendance_calendar)) {
+                $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
+                foreach ($attendance_calendar as $calendar) {
+                    $selected = null;
+                    $insert = true;
+                    //checking if was already taken
+                    foreach ($new_thematic_list as $key => $thematic_item) {
+                        //if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
+                        if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
+                            $insert = false;
+                            if ($thematic_advance_id == $key) {
+                                $insert = true;
+                                $selected = 'selected';
+                            }
+                            break;
+                        }
+                    }
+                    if ($insert == true) {
+                        $input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
+                    }
+                }
+                $input_select .= '</select>';
+            } else {
+                $input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
+            }
+        }
+        ?>
 		<div class="form-group">
 			<label class="col-sm-2 control-label"><?php echo $label ?></label>
 			<div class="col-sm-10"><?php echo $input_select ?></div>
 		</div>
 		<?php
-		break;
-	case 'update_done_thematic_advance':
-		$thematic_advance_id = intval($_GET['thematic_advance_id']);
-		$total_average = 0;
-		if (!empty($thematic_advance_id)) {
-			$thematic = new Thematic();
-			$affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
-			//if ($affected_rows) {
-			$total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
-			//}
-		}
-		echo $total_average;
-		break;
-	default:
-		echo '';
+        break;
+    case 'update_done_thematic_advance':
+        $thematic_advance_id = intval($_GET['thematic_advance_id']);
+        $total_average = 0;
+        if (!empty($thematic_advance_id)) {
+            $thematic = new Thematic();
+            $affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
+            //if ($affected_rows) {
+            $total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
+            //}
+        }
+        echo $total_average;
+        break;
+    default:
+        echo '';
 }
 exit;

main/inc/ajax/model.ajax.php

Indentation +2 added lines, -2 removed lines

@@ -731,7 +731,7 @@ 
         }
 
         break;
-	case 'get_user_skill_ranking':
+    case 'get_user_skill_ranking':
         $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
         $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition);
         $result = msort($result, 'skills_acquired', 'asc');
@@ -1281,7 +1281,7 @@ 
 
             if (!empty($item['certif_min_score']) && !empty($item['document_id'])) {
                 $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL);
-                 $item['has_certificates'] = '1';
+                    $item['has_certificates'] = '1';
             } else {
                 $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL);
                 $item['has_certificates'] = '0';

main/inc/local.inc.php

Indentation +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
     //    $gidReset = true;
 } // end else
 
- // Now check for anonymous user mode
+    // Now check for anonymous user mode
 if (isset($use_anonymous) && $use_anonymous) {
     //if anonymous mode is set, then try to set the current user as anonymous
     //if he doesn't have a login yet

main/inc/lib/usermanager.lib.php

Indentation +31 added lines, -31 removed lines

@@ -1229,13 +1229,13 @@ 
     }
 
     /**
-    * Get the users by ID
-    * @param array $ids student ids
-    * @param string $active
-    * @param string $order
-    * @param string $limit
-    * @return array $result student information
-    */
+     * Get the users by ID
+     * @param array $ids student ids
+     * @param string $active
+     * @param string $order
+     * @param string $limit
+     * @return array $result student information
+     */
     public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null)
     {
         if (empty($ids)) {
@@ -3332,12 +3332,12 @@ 
         if ($tag_id == 0) {
             //the tag doesn't exist
             $sql = "INSERT INTO $table_user_tag (tag, field_id,count) VALUES ('$tag','$field_id', count + 1)";
-             Database::query($sql);
+                Database::query($sql);
             $last_insert_id = Database::insert_id();
         } else {
             //the tag exists we update it
             $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id  = $tag_id";
-             Database::query($sql);
+                Database::query($sql);
             $last_insert_id = $tag_id;
         }
 
@@ -3532,9 +3532,9 @@ 
     }
 
     /**
-      * Get extra filtrable user fields (only type select)
-      * @return array
-      */
+     * Get extra filtrable user fields (only type select)
+     * @return array
+     */
     public static function get_extra_filtrable_fields()
     {
         $extraFieldList = UserManager::get_extra_fields();
@@ -3559,9 +3559,9 @@ 
     }
 
     /**
-      * Get extra where clauses for finding users based on extra filtrable user fields (type select)
-      * @return string With AND clauses based on user's ID which have the values to search in extra user fields
-      */
+     * Get extra where clauses for finding users based on extra filtrable user fields (type select)
+     * @return string With AND clauses based on user's ID which have the values to search in extra user fields
+     */
     public static function get_search_form_where_extra_fields()
     {
         $useExtraFields = false;
@@ -3869,23 +3869,23 @@ 
     }
 
     /**
-    * Get users followed by human resource manager
-    * @param int $userId
-    * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
-    * @param bool $getOnlyUserId
-    * @param bool $getSql
-    * @param bool $getCount
-    * @param int $from
-    * @param int $numberItems
-    * @param int $column
-    * @param string $direction
-    * @param int $active
-    * @param string $lastConnectionDate
-    * @param int $status the function is called by who? COURSEMANAGER, DRH?
-    * @param string $keyword
+     * Get users followed by human resource manager
+     * @param int $userId
+     * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
+     * @param bool $getOnlyUserId
+     * @param bool $getSql
+     * @param bool $getCount
+     * @param int $from
+     * @param int $numberItems
+     * @param int $column
+     * @param string $direction
+     * @param int $active
+     * @param string $lastConnectionDate
+     * @param int $status the function is called by who? COURSEMANAGER, DRH?
+     * @param string $keyword
      *
-    * @return array user list
-    */
+     * @return array user list
+     */
     public static function getUsersFollowedByUser(
         $userId,
         $userStatus = null,

main/inc/lib/svg-edit/extensions/fileopen.php

Indentation +18 added lines, -18 removed lines

@@ -10,29 +10,29 @@
  * Copyright(c) 2010 Alexis Deveria
  *
  */
-	// Very minimal PHP file, all we do is Base64 encode the uploaded file and
-	// return it to the editor
+    // Very minimal PHP file, all we do is Base64 encode the uploaded file and
+    // return it to the editor
 
-	$type = $_REQUEST['type'];
-	if (!in_array($type, array('load_svg', 'import_svg', 'import_img'))) {
-		exit;
-	}
-	require('allowedMimeTypes.php');
+    $type = $_REQUEST['type'];
+    if (!in_array($type, array('load_svg', 'import_svg', 'import_img'))) {
+        exit;
+    }
+    require('allowedMimeTypes.php');
 
-	$file = $_FILES['svg_file']['tmp_name'];
+    $file = $_FILES['svg_file']['tmp_name'];
 
-	$output = file_get_contents($file);
+    $output = file_get_contents($file);
 
-	$prefix = '';
+    $prefix = '';
 
-	// Make Data URL prefix for import image
-	if ($type == 'import_img') {
-		$info = getimagesize($file);
-		if (!in_array($info['mime'], $allowedMimeTypesBySuffix)) {
-			exit;
-		}
-		$prefix = 'data:' . $info['mime'] . ';base64,';
-	}
+    // Make Data URL prefix for import image
+    if ($type == 'import_img') {
+        $info = getimagesize($file);
+        if (!in_array($info['mime'], $allowedMimeTypesBySuffix)) {
+            exit;
+        }
+        $prefix = 'data:' . $info['mime'] . ';base64,';
+    }
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>

main/inc/lib/svg-edit/extensions/filesave.php

Indentation +15 added lines, -15 removed lines

@@ -10,12 +10,12 @@ 
  */
 exit;
 function encodeRFC5987ValueChars ($str) {
-	// See http://tools.ietf.org/html/rfc5987#section-3.2.1
-	// For better readability within headers, add back the characters escaped by rawurlencode but still allowable
-	// Although RFC3986 reserves "!" (%21), RFC5987 does not
-	return preg_replace_callback('@%(2[1346B]|5E|60|7C)@', function ($matches) {
-		return chr('0x' . $matches[1]);
-	}, rawurlencode($str));
+    // See http://tools.ietf.org/html/rfc5987#section-3.2.1
+    // For better readability within headers, add back the characters escaped by rawurlencode but still allowable
+    // Although RFC3986 reserves "!" (%21), RFC5987 does not
+    return preg_replace_callback('@%(2[1346B]|5E|60|7C)@', function ($matches) {
+        return chr('0x' . $matches[1]);
+    }, rawurlencode($str));
 }
 
 require('allowedMimeTypes.php');
@@ -23,7 +23,7 @@ 
 $mime = !isset($_POST['mime']) || !in_array($_POST['mime'], $allowedMimeTypesBySuffix) ? 'image/svg+xml;charset=UTF-8' : $_POST['mime'];
 
 if (!isset($_POST['output_svg']) && !isset($_POST['output_img'])) {
-	die('post fail');
+    die('post fail');
 }
 
 $file = '';
@@ -31,17 +31,17 @@ 
 $suffix = '.' . array_search($mime, $allowedMimeTypesBySuffix);
 
 if (isset($_POST['filename']) && strlen($_POST['filename']) > 0) {
-	$file = $_POST['filename'] . $suffix;
+    $file = $_POST['filename'] . $suffix;
 } else {
-	$file = 'image' . $suffix;
+    $file = 'image' . $suffix;
 }
 
 if ($suffix == '.svg') {
-	$contents = $_POST['output_svg'];
+    $contents = $_POST['output_svg'];
 } else {
-	$contents = $_POST['output_img'];
-	$pos = (strpos($contents, 'base64,') + 7);
-	$contents = base64_decode(substr($contents, $pos));
+    $contents = $_POST['output_img'];
+    $pos = (strpos($contents, 'base64,') + 7);
+    $contents = base64_decode(substr($contents, $pos));
 }
 
 header("Cache-Control: public");
@@ -49,8 +49,8 @@ 
 
 // See http://tools.ietf.org/html/rfc6266#section-4.1
 header("Content-Disposition: attachment; filename*=UTF-8''" . encodeRFC5987ValueChars(
-	// preg_replace('@[\\\\/:*?"<>|]@', '', $file) // If we wanted to strip Windows-disallowed characters server-side (but not a security issue, so we can strip client-side instead)
-	$file
+    // preg_replace('@[\\\\/:*?"<>|]@', '', $file) // If we wanted to strip Windows-disallowed characters server-side (but not a security issue, so we can strip client-side instead)
+    $file
 ));
 header("Content-Type: " .  $mime);
 header("Content-Transfer-Encoding: binary");