Merge luxembourg-dev improvements into standard core
- Remove deprecated features: account/login system, scenarios, food module, offset/payment, estimation pages - Remove Italian language support and old backup files - Update core files: index.php (error reporting, bookmark include, scenario handlers) - Update _front_controller.php (remove deprecated routes, add extended page) - Update _content.php (remove offset link, remove scenario panel, remove estimation nav) - Add new files from luxembourg-dev: - _extended.php (informational pages) - includes/_functions_bookmark.php (enhanced bookmark handling) - language files for bookmarks and survey module (de_DE and en_GB) - Maintain full compatibility with client directories (jugend, waldorf-jugend-dev, xx_klima-arena-jugend)
This commit is contained in:
@ -12,8 +12,7 @@
|
||||
* Define variables
|
||||
*/
|
||||
define("DEBUG_FORMDATA", false);
|
||||
// error_reporting(-1);
|
||||
error_reporting(0);
|
||||
error_reporting(-1);
|
||||
|
||||
// $time_start = microtime(true);
|
||||
|
||||
@ -57,10 +56,10 @@ if(defined('CONTENT_LANGUAGE') === false)
|
||||
include_once('includes/_functions.inc.php');
|
||||
|
||||
/**
|
||||
* Include functions for login
|
||||
* Include functions for bookmarks
|
||||
* Dependencies:
|
||||
*/
|
||||
include_once('includes/_functions_login.inc.php');
|
||||
include_once('includes/_functions_bookmark.php');
|
||||
|
||||
/**
|
||||
* Input variables validation
|
||||
@ -187,37 +186,11 @@ if($do == "increase_mobility_cars_amount")
|
||||
);
|
||||
}
|
||||
|
||||
/* Scenario: Fahrzeug hinzufügen */
|
||||
if($do == "increase_sc_mobility_cars_amount")
|
||||
{
|
||||
// $temp_increase_mobility_cars_amount = count($_SESSION['data']['mobility_cars_values']) + 1;
|
||||
|
||||
$_SESSION['data']['sc_mobility_cars_values'][] = array(
|
||||
'name' => '',
|
||||
'type' => 'mittelklasse',
|
||||
'age' => '11_15', // 2020-06-15. Mantis 1766
|
||||
'energy_source' => 'benzin',
|
||||
'consumption' => $factor_mobility_cars_consumption_default["benzin"]["mittelklasse"]
|
||||
);
|
||||
}
|
||||
|
||||
/* Fahrzeug löschen */
|
||||
if($do == "delete_mobility_cars" && isset($key) && $key >= 0)
|
||||
{
|
||||
unset($_SESSION['data']['mobility_cars_values'][$key]);
|
||||
unset($_SESSION['data']['mobility_travel_general_performance'][$key]);
|
||||
|
||||
// Scenario
|
||||
if(isset($_SESSION['data']['sc_mobility_cars_values'][$key])) unset($_SESSION['data']['sc_mobility_cars_values'][$key]);
|
||||
if(isset($_SESSION['data']['sc_mobility_travel_general_performance'][$key])) unset($_SESSION['data']['sc_mobility_travel_general_performance'][$key]);
|
||||
|
||||
}
|
||||
|
||||
/* 2020-07-02: Scenario: Fahrzeug löschen */
|
||||
if($do == "delete_sc_mobility_cars" && isset($key) && $key >= 0)
|
||||
{
|
||||
unset($_SESSION['data']['sc_mobility_cars_values'][$key]);
|
||||
unset($_SESSION['data']['sc_mobility_travel_general_performance'][$key]);
|
||||
}
|
||||
|
||||
|
||||
@ -242,14 +215,6 @@ if($do == "delete_mobility_travel" && isset($key) && $key >= 0)
|
||||
unset($_SESSION['data']['mobility_travel_values'][$key]);
|
||||
|
||||
$_SESSION['data']['mobility_travel_values'] = array_values($_SESSION['data']['mobility_travel_values']);
|
||||
|
||||
// Scenario
|
||||
if(isset($_SESSION['data']['sc_mobility_travel_values'][$key]))
|
||||
{
|
||||
unset($_SESSION['data']['sc_mobility_travel_values'][$key]);
|
||||
|
||||
$_SESSION['data']['sc_mobility_travel_values'] = array_values($_SESSION['data']['sc_mobility_travel_values']);
|
||||
}
|
||||
}
|
||||
|
||||
/* Delete from flight data */
|
||||
@ -258,11 +223,6 @@ if($do == "delete_mobility_flight" && isset($key) && $key >= 0)
|
||||
unset($_SESSION['data']['mobility_air'][$key]);
|
||||
unset($_SESSION['emission']['td']['mobility_air']);
|
||||
$_SESSION['data']['mobility_air'] = array_values($_SESSION['data']['mobility_air']);
|
||||
|
||||
unset($_SESSION['data']['sc_mobility_air'][$key]);
|
||||
unset($_SESSION['emission']['td']['sc_mobility_air']);
|
||||
$_SESSION['data']['sc_mobility_air'] = array_values($_SESSION['data']['sc_mobility_air']);
|
||||
|
||||
}
|
||||
|
||||
/* Haustier hinzufügen / 2020-06-19 - Mantis 1769 */
|
||||
@ -272,22 +232,12 @@ if($do == "increase_consumption_animal_amount")
|
||||
'type' => ''
|
||||
);
|
||||
}
|
||||
if($do == "increase_sc_consumption_animal_amount")
|
||||
{
|
||||
$_SESSION['data']['sc_consumption_animal'][] = array(
|
||||
'type' => ''
|
||||
);
|
||||
}
|
||||
|
||||
/* Haustier löschen / 2020-06-19 - Mantis 1769 */
|
||||
if($do == "delete_consumption_animal" && isset($key) && $key >= 0)
|
||||
{
|
||||
unset($_SESSION['data']['consumption_animal'][$key]);
|
||||
}
|
||||
if($do == "delete_sc_consumption_animal" && isset($key) && $key >= 0)
|
||||
{
|
||||
unset($_SESSION['data']['sc_consumption_animal'][$key]);
|
||||
}
|
||||
|
||||
/* Reset input */
|
||||
if($do == "reset") JSkillSessionData();
|
||||
|
||||
Reference in New Issue
Block a user