chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor - remove warnings

Browse Source
skala
Laurent Opprecht 14 years ago
parent 82bfd016bc
commit 9c962b3354
2 changed files with 5 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      main/install/index.php
  2. 2
      main/install/install.lib.php

13
main/install/index.php
Unescape View File

@ -102,11 +102,6 @@ api_set_internationalization_default_encoding($charset);
header('Content-Type: text/html; charset='. api_get_system_encoding()); header('Content-Type: text/html; charset='. api_get_system_encoding());
// Setting the error reporting levels. // Setting the error reporting levels.
error_reporting(E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR);
/**
* @todo: remove that
*/
error_reporting(E_ALL); error_reporting(E_ALL);
// Overriding the timelimit (for large campusses that have to be migrated). // Overriding the timelimit (for large campusses that have to be migrated).
@ -148,7 +143,7 @@ if (is_already_installed_system()) {
/* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */ /* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */
// Is valid request // Is valid request
$is_valid_request = $_REQUEST['is_executable']; $is_valid_request = isset($_REQUEST['is_executable']) ? $_REQUEST['is_executable'] : null;
foreach ($_POST as $request_index => $request_value) { foreach ($_POST as $request_index => $request_value) {
if (substr($request_index, 0, 4) == 'step') { if (substr($request_index, 0, 4) == 'step') {
if ($request_index != $is_valid_request) { if ($request_index != $is_valid_request) {
@ -209,8 +204,8 @@ if (@$_POST['step2_install'] || @$_POST['step2_update_8'] || @$_POST['step2_upda
$updateFromConfigFile = ''; $updateFromConfigFile = '';
unset($_GET['running']); unset($_GET['running']);
} else { } else {
$installType = $_GET['installType']; $installType = isset($_GET['installType']) ? $_GET['installType'] : null;
$updateFromConfigFile = $_GET['updateFromConfigFile']; $updateFromConfigFile = isset($_GET['updateFromConfigFile']) ? $_GET['updateFromConfigFile'] : false;
} }
if ($installType == 'update' && in_array($my_old_version, $update_from_version_8)) { if ($installType == 'update' && in_array($my_old_version, $update_from_version_8)) {
@ -827,7 +822,7 @@ if (@$_POST['step2']) {
$current_step = 7; $current_step = 7;
display_after_install_message($installType); display_after_install_message($installType);
} elseif ($_POST['step1'] || $badUpdatePath) { } elseif (@$_POST['step1'] || $badUpdatePath) {
//STEP 1 : REQUIREMENTS //STEP 1 : REQUIREMENTS
//make sure that proposed path is set, shouldn't be necessary but... //make sure that proposed path is set, shouldn't be necessary but...
if (empty($proposedUpdatePath)) { $proposedUpdatePath = $_POST['updatePath']; } if (empty($proposedUpdatePath)) { $proposedUpdatePath = $_POST['updatePath']; }

2
main/install/install.lib.php
Unescape View File

@ -640,7 +640,7 @@ function fill_track_countries_table($track_countries_table) {
$countries = file($file_path); $countries = file($file_path);
$add_country_sql = "INSERT INTO $track_countries_table (id, code, country, counter) VALUES "; $add_country_sql = "INSERT INTO $track_countries_table (id, code, country, counter) VALUES ";
foreach ($countries as $line) { foreach ($countries as $line) {
$elems = split(',',$line); $elems = explode(',',$line);
$add_country_sql .= '('.intval($elems[0]).',\''.Database::escape_string($elems[1]).'\',\''.Database::escape_string($elems[2]).'\','.intval($elems[3]).'),'; $add_country_sql .= '('.intval($elems[0]).',\''.Database::escape_string($elems[1]).'\',\''.Database::escape_string($elems[2]).'\','.intval($elems[3]).'),';
} }
$add_country_sql = substr($add_country_sql,0,-1); $add_country_sql = substr($add_country_sql,0,-1);

Write Preview
Loading…
Cancel
Save