+ prepare('item', 'log');
+ $partial->prepare('langMng',$LANGMNG);
+ $partial->prepare('debugMod',$DEBUGMOD);
+ $partial->render();
+ ?>
+
+
+
+
+ render();
+ //TODO js do main.js
+ ?>
+
+
diff --git a/app/views/templates/login.phtml b/app/views/templates/login.phtml
new file mode 100644
index 0000000..ae0636b
--- /dev/null
+++ b/app/views/templates/login.phtml
@@ -0,0 +1,27 @@
+
+
+
+ render();
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ';
+ foreach ($file_lines as $line) {
+ echo $line;
+ }
+ echo '';
+ }
+ ?>
+
+
+
diff --git a/app/views/templates/part/automationCreate.phtml b/app/views/templates/part/automationCreate.phtml
new file mode 100644
index 0000000..44a731a
--- /dev/null
+++ b/app/views/templates/part/automationCreate.phtml
@@ -0,0 +1,69 @@
+
diff --git a/app/views/templates/part/automationCreateFinal.phtml b/app/views/templates/part/automationCreateFinal.phtml
new file mode 100644
index 0000000..0eb48c3
--- /dev/null
+++ b/app/views/templates/part/automationCreateFinal.phtml
@@ -0,0 +1,44 @@
+
diff --git a/app/views/templates/part/automationEdit.phtml b/app/views/templates/part/automationEdit.phtml
new file mode 100644
index 0000000..6411388
--- /dev/null
+++ b/app/views/templates/part/automationEdit.phtml
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+ + type) { + case 'sunSet': + echo''; + break; + + case 'sunRise': + echo' '; + break; + + case 'inHome': + echo''; + break; + + case 'outHome': + echo''; + break; + + case 'outDevice': + echo''; + break; + + default: + echo''; + break; + } + ?> +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/templates/part/footer.phtml b/app/views/templates/part/footer.phtml
new file mode 100644
index 0000000..0fcb4bf
--- /dev/null
+++ b/app/views/templates/part/footer.phtml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/views/templates/part/head.phtml b/app/views/templates/part/head.phtml
new file mode 100644
index 0000000..1555607
--- /dev/null
+++ b/app/views/templates/part/head.phtml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/templates/part/loginForm.phtml b/app/views/templates/part/loginForm.phtml
new file mode 100644
index 0000000..c06b535
--- /dev/null
+++ b/app/views/templates/part/loginForm.phtml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ echo('t_createAutomation');?>
+ + +
+
diff --git a/app/views/templates/part/loginOta.phtml b/app/views/templates/part/loginOta.phtml
new file mode 100644
index 0000000..3e8d294
--- /dev/null
+++ b/app/views/templates/part/loginOta.phtml
@@ -0,0 +1,13 @@
+
+
+Login
+ +
+
diff --git a/app/views/templates/part/menu.phtml b/app/views/templates/part/menu.phtml
new file mode 100644
index 0000000..79c3fa4
--- /dev/null
+++ b/app/views/templates/part/menu.phtml
@@ -0,0 +1,35 @@
+
diff --git a/app/views/templates/part/test.phtml b/app/views/templates/part/test.phtml
new file mode 100644
index 0000000..002c703
--- /dev/null
+++ b/app/views/templates/part/test.phtml
@@ -0,0 +1,3 @@
+
+
+OTA
+ ++ TEST - TEST +
\ No newline at end of file diff --git a/app/views/templates/setting.phtml b/app/views/templates/setting.phtml new file mode 100644 index 0000000..18ac4f2 --- /dev/null +++ b/app/views/templates/setting.phtml @@ -0,0 +1,203 @@ + + + + prepare('baseDir', $BASEDIR); + $partial->render(); + ?> +
+
+
+ render();
+ ?>
+
+
+
+
diff --git a/app/views/templates/template.phtml b/app/views/templates/template.phtml
new file mode 100644
index 0000000..090cd1b
--- /dev/null
+++ b/app/views/templates/template.phtml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+ prepare('item', 'setting');
+ $partial->prepare('langMng',$LANGMNG);
+ $partial->prepare('debugMod',$DEBUGMOD);
+ $partial->render();
+ ?>
+
+
+
+
+
+
+
+
+ + + echo('t_pageAfterLogIn') ?> +
+
+
+ echo('t_profile') ?>
+
+ 
+
+ echo('l_userAvatar') ?>:
+ * providet by Gavatar
+
+
+ echo('l_userName') ?>:
+
+
+
+
+ echo('l_userEmail') ?>:
+
+
+
+ echo('t_notification') ?>
+ +echo('l_notificationStatus') ?>
+
+
+
+ echo('t_experimental') ?>
+ +
+
+ echo('t_changePassword') ?>
+ +
+ 
+
+
+
+
+
+
+ echo('t_ota') ?>
+ +
+
+
+
+
+ echo('t_listUsers') ?>
+| echo('t_avatar');?> | +echo('t_userName');?> | +echo('t_ota');?> | +echo('t_action');?> | +
|---|---|---|---|
| + | ' : ''); ?> | ++ |
+
+
+
+ echo('t_createuser') ?>
+ +
+
+
+
+
+
+
+ echo('t_listRooms') ?>
+| echo('t_roomName');?> | +echo('t_action');?> | +
|---|---|
| + | + + + | +
+
+
+
+ echo('t_createRoom') ?>
+ +'; + echo 'PHTML: Parial File ' . $path . ' not found'; + echo ''; + die(); + } + } + + function prepare($searchS, $repleaceS) { + if (!empty($searchS)) { + $this->assignedValues[strtoupper($searchS)] = $repleaceS; + } + echo ($this->debug == true ? var_dump($this->assignedValues) : ''); + } + + function render() { + if (!empty($this->assignedValues)){ + extract($this->assignedValues); + } + + require('../app/views/templates/part/' . $this->path . '.phtml'); + } +} diff --git a/www/library/Router.php b/library/Router.php similarity index 100% rename from www/library/Router.php rename to library/Router.php diff --git a/www/library/Template.php b/library/Template.php similarity index 100% rename from www/library/Template.php rename to library/Template.php diff --git a/www/library/View.php b/library/View.php similarity index 100% rename from www/library/View.php rename to library/View.php diff --git a/www/library/vendor/PHPGangsta_GoogleAuthenticator.php b/library/vendor/GoogleAuthenticator.php similarity index 100% rename from www/library/vendor/PHPGangsta_GoogleAuthenticator.php rename to library/vendor/GoogleAuthenticator.php diff --git a/library/vendor/PHPGangsta_GoogleAuthenticator.php b/library/vendor/PHPGangsta_GoogleAuthenticator.php new file mode 100644 index 0000000..bf7d116 --- /dev/null +++ b/library/vendor/PHPGangsta_GoogleAuthenticator.php @@ -0,0 +1,252 @@ +_getBase32LookupTable(); + + // Valid secret lengths are 80 to 640 bits + if ($secretLength < 16 || $secretLength > 128) { + throw new Exception('Bad secret length'); + } + $secret = ''; + $rnd = false; + if (function_exists('random_bytes')) { + $rnd = random_bytes($secretLength); + } elseif (function_exists('mcrypt_create_iv')) { + $rnd = mcrypt_create_iv($secretLength, MCRYPT_DEV_URANDOM); + } elseif (function_exists('openssl_random_pseudo_bytes')) { + $rnd = openssl_random_pseudo_bytes($secretLength, $cryptoStrong); + if (!$cryptoStrong) { + $rnd = false; + } + } + if ($rnd !== false) { + for ($i = 0; $i < $secretLength; ++$i) { + $secret .= $validChars[ord($rnd[$i]) & 31]; + } + } else { + throw new Exception('No source of secure random'); + } + + return $secret; + } + + /** + * Calculate the code, with given secret and point in time. + * + * @param string $secret + * @param int|null $timeSlice + * + * @return string + */ + public function getCode($secret, $timeSlice = null) + { + if ($timeSlice === null) { + $timeSlice = floor(time() / 30); + } + + $secretkey = $this->_base32Decode($secret); + + // Pack time into binary string + $time = chr(0).chr(0).chr(0).chr(0).pack('N*', $timeSlice); + // Hash it with users secret key + $hm = hash_hmac('SHA1', $time, $secretkey, true); + // Use last nipple of result as index/offset + $offset = ord(substr($hm, -1)) & 0x0F; + // grab 4 bytes of the result + $hashpart = substr($hm, $offset, 4); + + // Unpak binary value + $value = unpack('N', $hashpart); + $value = $value[1]; + // Only 32 bits + $value = $value & 0x7FFFFFFF; + + $modulo = pow(10, $this->_codeLength); + + return str_pad($value % $modulo, $this->_codeLength, '0', STR_PAD_LEFT); + } + + /** + * Get QR-Code URL for image, from google charts. + * + * @param string $name + * @param string $secret + * @param string $title + * @param array $params + * + * @return string + */ + public function getQRCodeGoogleUrl($name, $secret, $title = null, $params = array()) + { + $width = !empty($params['width']) && (int) $params['width'] > 0 ? (int) $params['width'] : 200; + $height = !empty($params['height']) && (int) $params['height'] > 0 ? (int) $params['height'] : 200; + $level = !empty($params['level']) && array_search($params['level'], array('L', 'M', 'Q', 'H')) !== false ? $params['level'] : 'M'; + + $urlencoded = urlencode('otpauth://totp/'.$name.'?secret='.$secret.''); + if (isset($title)) { + $urlencoded .= urlencode('&issuer='.urlencode($title)); + } + + return "https://api.qrserver.com/v1/create-qr-code/?data=$urlencoded&size=${width}x${height}&ecc=$level"; + } + + /** + * Check if the code is correct. This will accept codes starting from $discrepancy*30sec ago to $discrepancy*30sec from now. + * + * @param string $secret + * @param string $code + * @param int $discrepancy This is the allowed time drift in 30 second units (8 means 4 minutes before or after) + * @param int|null $currentTimeSlice time slice if we want use other that time() + * + * @return bool + */ + public function verifyCode($secret, $code, $discrepancy = 1, $currentTimeSlice = null) + { + if ($currentTimeSlice === null) { + $currentTimeSlice = floor(time() / 30); + } + + if (strlen($code) != 6) { + return false; + } + + for ($i = -$discrepancy; $i <= $discrepancy; ++$i) { + $calculatedCode = $this->getCode($secret, $currentTimeSlice + $i); + if ($this->timingSafeEquals($calculatedCode, $code)) { + return true; + } + } + + return false; + } + + /** + * Set the code length, should be >=6. + * + * @param int $length + * + * @return PHPGangsta_GoogleAuthenticator + */ + public function setCodeLength($length) + { + $this->_codeLength = $length; + + return $this; + } + + /** + * Helper class to decode base32. + * + * @param $secret + * + * @return bool|string + */ + protected function _base32Decode($secret) + { + if (empty($secret)) { + return ''; + } + + $base32chars = $this->_getBase32LookupTable(); + $base32charsFlipped = array_flip($base32chars); + + $paddingCharCount = substr_count($secret, $base32chars[32]); + $allowedValues = array(6, 4, 3, 1, 0); + if (!in_array($paddingCharCount, $allowedValues)) { + return false; + } + for ($i = 0; $i < 4; ++$i) { + if ($paddingCharCount == $allowedValues[$i] && + substr($secret, -($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i])) { + return false; + } + } + $secret = str_replace('=', '', $secret); + $secret = str_split($secret); + $binaryString = ''; + for ($i = 0; $i < count($secret); $i = $i + 8) { + $x = ''; + if (!in_array($secret[$i], $base32chars)) { + return false; + } + for ($j = 0; $j < 8; ++$j) { + $x .= str_pad(base_convert(@$base32charsFlipped[@$secret[$i + $j]], 10, 2), 5, '0', STR_PAD_LEFT); + } + $eightBits = str_split($x, 8); + for ($z = 0; $z < count($eightBits); ++$z) { + $binaryString .= (($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48) ? $y : ''; + } + } + + return $binaryString; + } + + /** + * Get array with all 32 characters for decoding from/encoding to base32. + * + * @return array + */ + protected function _getBase32LookupTable() + { + return array( + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 7 + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15 + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23 + 'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31 + '=', // padding char + ); + } + + /** + * A timing safe equals comparison + * more info here: http://blog.ircmaxell.com/2014/11/its-all-about-time.html. + * + * @param string $safeString The internal (safe) value to be checked + * @param string $userString The user submitted (unsafe) value + * + * @return bool True if the two strings are identical + */ + private function timingSafeEquals($safeString, $userString) + { + if (function_exists('hash_equals')) { + return hash_equals($safeString, $userString); + } + $safeLen = strlen($safeString); + $userLen = strlen($userString); + + if ($userLen != $safeLen) { + return false; + } + + $result = 0; + + for ($i = 0; $i < $userLen; ++$i) { + $result |= (ord($safeString[$i]) ^ ord($userString[$i])); + } + + // They are only identical strings if $result is exactly 0... + return $result === 0; + } +} diff --git a/www/logs/.gitkeep b/logs/.gitkeep similarity index 100% rename from www/logs/.gitkeep rename to logs/.gitkeep diff --git a/www/manifest.json b/manifest.json similarity index 100% rename from www/manifest.json rename to manifest.json diff --git a/www/public/.htaccess b/public/.htaccess similarity index 100% rename from www/public/.htaccess rename to public/.htaccess diff --git a/www/public/Elementum/scss/elements/_buttons.scss b/public/Elementum/scss/elements/_buttons.scss similarity index 100% rename from www/public/Elementum/scss/elements/_buttons.scss rename to public/Elementum/scss/elements/_buttons.scss diff --git a/www/public/css/font-awesome.min.css b/public/css/font-awesome.min.css similarity index 100% rename from www/public/css/font-awesome.min.css rename to public/css/font-awesome.min.css diff --git a/public/css/loading.css b/public/css/loading.css new file mode 100644 index 0000000..6c58598 --- /dev/null +++ b/public/css/loading.css @@ -0,0 +1,19 @@ +.loader { + border: 16px solid #f3f3f3; + border-radius: 50%; + border-top: 16px solid rgb(101, 30, 122);; + width: 100%; + height: 100%; + -webkit-animation: spin 2s linear infinite; /* Safari */ + animation: spin 2s linear infinite; +} + +@-webkit-keyframes spin { + 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); } +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} \ No newline at end of file diff --git a/www/public/css/main.css b/public/css/main.css similarity index 100% rename from www/public/css/main.css rename to public/css/main.css diff --git a/www/public/css/main.css.map b/public/css/main.css.map similarity index 100% rename from www/public/css/main.css.map rename to public/css/main.css.map diff --git a/www/public/css/modal.css b/public/css/modal.css similarity index 100% rename from www/public/css/modal.css rename to public/css/modal.css diff --git a/www/public/css/override.css b/public/css/override.css similarity index 100% rename from www/public/css/override.css rename to public/css/override.css diff --git a/www/public/css/pre.css b/public/css/pre.css similarity index 100% rename from www/public/css/pre.css rename to public/css/pre.css diff --git a/www/public/fonts/FontAwesome.otf b/public/fonts/FontAwesome.otf similarity index 100% rename from www/public/fonts/FontAwesome.otf rename to public/fonts/FontAwesome.otf diff --git a/www/public/fonts/Metropolis-Medium.otf b/public/fonts/Metropolis-Medium.otf similarity index 100% rename from www/public/fonts/Metropolis-Medium.otf rename to public/fonts/Metropolis-Medium.otf diff --git a/www/public/fonts/Metropolis-Regular.otf b/public/fonts/Metropolis-Regular.otf similarity index 100% rename from www/public/fonts/Metropolis-Regular.otf rename to public/fonts/Metropolis-Regular.otf diff --git a/www/public/fonts/Metropolis-SemiBold.otf b/public/fonts/Metropolis-SemiBold.otf similarity index 100% rename from www/public/fonts/Metropolis-SemiBold.otf rename to public/fonts/Metropolis-SemiBold.otf diff --git a/www/public/fonts/fontawesome-webfont.eot b/public/fonts/fontawesome-webfont.eot similarity index 100% rename from www/public/fonts/fontawesome-webfont.eot rename to public/fonts/fontawesome-webfont.eot diff --git a/www/public/fonts/fontawesome-webfont.svg b/public/fonts/fontawesome-webfont.svg similarity index 100% rename from www/public/fonts/fontawesome-webfont.svg rename to public/fonts/fontawesome-webfont.svg diff --git a/www/public/fonts/fontawesome-webfont.ttf b/public/fonts/fontawesome-webfont.ttf similarity index 100% rename from www/public/fonts/fontawesome-webfont.ttf rename to public/fonts/fontawesome-webfont.ttf diff --git a/www/public/fonts/fontawesome-webfont.woff b/public/fonts/fontawesome-webfont.woff similarity index 100% rename from www/public/fonts/fontawesome-webfont.woff rename to public/fonts/fontawesome-webfont.woff diff --git a/www/public/fonts/fontawesome-webfont.woff2 b/public/fonts/fontawesome-webfont.woff2 similarity index 100% rename from www/public/fonts/fontawesome-webfont.woff2 rename to public/fonts/fontawesome-webfont.woff2 diff --git a/www/public/images/icon-192x192.png b/public/images/icon-192x192.png similarity index 100% rename from www/public/images/icon-192x192.png rename to public/images/icon-192x192.png diff --git a/www/public/images/icon-512x512.png b/public/images/icon-512x512.png similarity index 100% rename from www/public/images/icon-512x512.png rename to public/images/icon-512x512.png diff --git a/www/public/index.php b/public/index.php similarity index 100% rename from www/public/index.php rename to public/index.php diff --git a/www/public/js/automation.js b/public/js/automation.js similarity index 100% rename from www/public/js/automation.js rename to public/js/automation.js diff --git a/www/public/js/jquery.js b/public/js/jquery.js similarity index 100% rename from www/public/js/jquery.js rename to public/js/jquery.js diff --git a/www/public/js/jquery.redirect.js b/public/js/jquery.redirect.js similarity index 100% rename from www/public/js/jquery.redirect.js rename to public/js/jquery.redirect.js diff --git a/www/public/js/post.js b/public/js/post.js similarity index 100% rename from www/public/js/post.js rename to public/js/post.js diff --git a/www/public/js/script.js b/public/js/script.js similarity index 100% rename from www/public/js/script.js rename to public/js/script.js diff --git a/www/public/js/setting.js b/public/js/setting.js similarity index 100% rename from www/public/js/setting.js rename to public/js/setting.js diff --git a/www/serviceWorker.js b/serviceWorker.js similarity index 100% rename from www/serviceWorker.js rename to serviceWorker.js diff --git a/www/update.php b/update.php similarity index 100% rename from www/update.php rename to update.php diff --git a/www/updater/.gitkeep b/updater/.gitkeep similarity index 100% rename from www/updater/.gitkeep rename to updater/.gitkeep