diff --git a/admin/install-dev.php b/admin/install.php similarity index 100% rename from admin/install-dev.php rename to admin/install.php diff --git a/apps/SimplePages/install-dev.php b/apps/SimplePages/install.php similarity index 100% rename from apps/SimplePages/install-dev.php rename to apps/SimplePages/install.php diff --git a/apps/logfiles/install-dev.php b/apps/logfiles/install.php similarity index 100% rename from apps/logfiles/install-dev.php rename to apps/logfiles/install.php diff --git a/apps/meta/install-dev.php b/apps/meta/install.php similarity index 100% rename from apps/meta/install-dev.php rename to apps/meta/install.php diff --git a/apps/sidebar/install-dev.php b/apps/sidebar/install.php similarity index 100% rename from apps/sidebar/install-dev.php rename to apps/sidebar/install.php diff --git a/apps/testing/config.php b/apps/testing/config.php deleted file mode 100644 index 55c0d49..0000000 --- a/apps/testing/config.php +++ /dev/null @@ -1,11 +0,0 @@ - 'test.php', 'watr-andres' => 'test.php']; - -$_CONF['domain'] = 'sub.mowie'; \ No newline at end of file diff --git a/apps/testing/test.php b/apps/testing/test.php deleted file mode 100644 index 50fdff8..0000000 --- a/apps/testing/test.php +++ /dev/null @@ -1,4 +0,0 @@ -setResponseCode(200); -$page->setContent('Hallo Welr'); -$page->setTitle('tset'); \ No newline at end of file diff --git a/inc/libs/functions.php b/inc/libs/functions.php index 19274e7..6bfad27 100755 --- a/inc/libs/functions.php +++ b/inc/libs/functions.php @@ -128,7 +128,6 @@ function is_loggedin() { if (isset($_SESSION['user'], $_SESSION['token'])) { - $GLOBALS['db']->setCol('system_loggedin'); $GLOBALS['db']->data['token'] = $_SESSION['token']; $GLOBALS['db']->data['user'] = $_SESSION['userid']; @@ -141,14 +140,13 @@ function is_loggedin() { if ($token == $_SESSION['token']) { - //Session nach 30 min inaktivität löschen + //last request was more than 30 minutes ago if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 1800)) { $GLOBALS['db']->setCol('system_loggedin'); $GLOBALS['db']->data['token'] = $_SESSION['token']; $GLOBALS['db']->delete(); - // last request was more than 30 minutes ago session_unset(); // unset $_SESSION variable for the run-time session_destroy(); // destroy session data in storage