Admin Control Panel
@@ -51,5 +53,3 @@ class Login extends \View {
return $html;
}
}
-
-?>
diff --git a/core/constants.php b/core/constants.php
index 43e399c..a89eec7 100644
--- a/core/constants.php
+++ b/core/constants.php
@@ -2,5 +2,3 @@
const USER_GROUP_DEFAULT = 1;
const USER_GROUP_ADMIN = 2;
-
-?>
diff --git a/core/core.php b/core/core.php
index b4be22a..42fa3f6 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1,20 +1,5 @@
$max) return $max;
- return $val;
- }
-
- function downloadFile($url) {
- $ch = curl_init();
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_URL, $url);
- $data = curl_exec($ch);
- curl_close($ch);
- return $data;
- }
-
function getSubclassesOf($parent) {
$result = array();
foreach (get_declared_classes() as $class) {
@@ -28,30 +13,18 @@
return stripos($_SERVER['SERVER_PROTOCOL'],'https') === 0 ? 'https' : 'http';
}
- function includeDir($dir, $aIgnore = array(), $recursive = false) {
- $aIgnore[] = '.';
- $aIgnore[] = '..';
- $aFiles = array_diff(scandir($dir), $aIgnore);
-
- foreach($aFiles as $file) {
- $file = $dir . '/' . $file;
- if(is_dir($file)) {
- if($recursive) {
- includeDir($file, $aIgnore, true);
- }
- } else {
- require_once $file;
- }
- }
- }
-
- function generateRandomString($length) {
+ function generateRandomString($length) : string {
$randomString = '';
if($length > 0) {
$numCharacters = 26 + 26 + 10; // a-z + A-Z + 0-9
for ($i = 0; $i < $length; $i++)
{
- $num = random_int(0, $numCharacters - 1);
+ try {
+ $num = random_int(0, $numCharacters - 1);
+ } catch (Exception $e) {
+ $num = rand(0, $numCharacters - 1);
+ }
+
if($num < 26) $randomString .= chr(ord('a') + $num);
else if($num - 26 < 26) $randomString .= chr(ord('A') + $num - 26);
else $randomString .= chr(ord('0') + $num - 26 - 26);
@@ -61,20 +34,6 @@
return $randomString;
}
- function cleanPath($path) {
- if($path === '')
- return $path;
-
- $path = str_replace('\\', '/', $path);
- $path = str_replace('/./', '/', $path);
-
- if($path[0] !== '/')
- $path = '/' . $path;
-
- $path = str_replace('/../', '/', $path);
- return $path;
- }
-
function startsWith($haystack, $needle) {
$length = strlen($needle);
return (substr($haystack, 0, $length) === $needle);
@@ -88,21 +47,6 @@
return (substr($haystack, -$length) === $needle);
}
- function isCalledDirectly($file) {
- return $_SERVER['SCRIPT_FILENAME'] === $file;
- }
-
- function anonymzeEmail($mail) {
- if(($pos = strpos($mail, '@')) !== -1) {
- $name = substr($mail, 0, $pos);
- $host = substr($mail, $pos + 1);
- if(strlen($name) > 2) $mail = substr($name, 0, 2) . str_repeat('*', strlen($name) - 2) . "@$host";
- else $mail = $mail = str_repeat('*', strlen($name)) . "@$host";
- }
-
- return $mail;
- }
-
function intendCode($code, $escape=true) {
$newCode = "";
$first = true;
@@ -138,4 +82,13 @@
function replaceCssSelector($sel) {
return preg_replace("~[.#<>]~", "_", preg_replace("~[:\-]~", "", $sel));
}
-?>
+
+ function getClassPath($class, $suffix=true) {
+ $path = str_replace('\\', '/', $class);
+ $suffix = ($suffix ? ".class" : "");
+ return "core/$path$suffix.php";
+ }
+
+ function createError($msg) {
+ return json_encode(array("success" => false, "msg" => $msg));
+ }
diff --git a/core/datetime.php b/core/datetime.php
index 8b2ec23..9fa34f4 100644
--- a/core/datetime.php
+++ b/core/datetime.php
@@ -1,5 +1,26 @@
format($str);
}
-?>
+function getPeriodString($d) {
+ if(!is_a($d, "DateTime")) $d = new DateTime($d);
+ $diff = datetimeDiff(new DateTime(), $d);
+ $diff = abs($diff);
+
+
+ if ($diff < 60) {
+ $str = "< %d min";
+ $diff = 1;
+ } else if($diff < 60*60) {
+ $diff = intval($diff / 60);
+ $str = "%d min.";
+ } else if($diff < 60*60*24) {
+ $diff = intval($diff / (60*60));
+ $str = "%d h.";
+ } else {
+ $diff = intval($diff / (60*60*24));
+ $str = "%d d.";
+ }
+
+ return L(sprintf($str, $diff));
+}
diff --git a/index.php b/index.php
index 6cf38d3..7eed76c 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,8 @@
false, "msg" => $msg));
-}
+include_once 'core/core.php';
+include_once 'core/datetime.php';
+include_once 'core/constants.php';
spl_autoload_extensions(".php");
spl_autoload_register(function($class) {
@@ -19,10 +13,6 @@ spl_autoload_register(function($class) {
include_once getClassPath($class, false);
});
-include_once 'core/core.php';
-include_once 'core/datetime.php';
-include_once 'core/constants.php';
-
$config = new Configuration\Configuration();
$installation = (!$config->load());
$user = new Objects\User($config);