aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot.php42
-rw-r--r--index.php2
2 files changed, 24 insertions, 20 deletions
diff --git a/boot.php b/boot.php
index af510a808..001e3a540 100644
--- a/boot.php
+++ b/boot.php
@@ -1,9 +1,5 @@
<?php
-set_time_limit(0);
-ini_set('pcre.backtrack_limit', 250000);
-
-
define ( 'FRIENDIKA_VERSION', '2.2.1044' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1075 );
@@ -179,20 +175,28 @@ define ( 'GRAVITY_COMMENT', 6);
*
*/
-if (get_magic_quotes_gpc()) {
- $process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
- while (list($key, $val) = each($process)) {
- foreach ($val as $k => $v) {
- unset($process[$key][$k]);
- if (is_array($v)) {
- $process[$key][stripslashes($k)] = $v;
- $process[] = &$process[$key][stripslashes($k)];
- } else {
- $process[$key][stripslashes($k)] = stripslashes($v);
- }
- }
- }
- unset($process);
+function startup() {
+ error_reporting(E_ERROR | E_WARNING | E_PARSE);
+ set_time_limit(0);
+ ini_set('pcre.backtrack_limit', 250000);
+
+
+ if (get_magic_quotes_gpc()) {
+ $process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
+ while (list($key, $val) = each($process)) {
+ foreach ($val as $k => $v) {
+ unset($process[$key][$k]);
+ if (is_array($v)) {
+ $process[$key][stripslashes($k)] = $v;
+ $process[] = &$process[$key][stripslashes($k)];
+ } else {
+ $process[$key][stripslashes($k)] = stripslashes($v);
+ }
+ }
+ }
+ unset($process);
+ }
+
}
/*
@@ -260,6 +264,8 @@ class App {
$this->query_string = '';
+ startup();
+
$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'])) ? 'https' : 'http' );
if(x($_SERVER,'SERVER_NAME')) {
diff --git a/index.php b/index.php
index 2e24c5b01..3e72baddc 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,5 @@
<?php
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
/**
*
* Friendika