2 Commits

Author SHA1 Message Date
a7380841cf Move concerns to right places 2020-12-15 22:02:02 +01:00
28dd69e3a5 Write concerns 2020-12-15 21:55:39 +01:00
10 changed files with 57 additions and 63 deletions

1
.gitignore vendored
View File

@@ -2,7 +2,6 @@
.ftpconfig .ftpconfig
.ftpconfig2 .ftpconfig2
*.log *.log
*.bin
config.php config.php
_nemazat/index.html _nemazat/index.html

View File

@@ -21,24 +21,13 @@ if (isset($_POST) && !empty($_POST)){
$ga = new PHPGangsta_GoogleAuthenticator(); $ga = new PHPGangsta_GoogleAuthenticator();
$checkResult = $ga->verifyCode($otaSecret, $otaCode, 2); // 2 = 2*30sec clock tolerance $checkResult = $ga->verifyCode($otaSecret, $otaCode, 2); // 2 = 2*30sec clock tolerance
if ($checkResult) { if ($checkResult) {
$userManager->setOta($otaCode, $otaSecret); $userManager->setOta($otaCode, $otaSecret);
} }
header('Location: ' . BASEURL . 'setting'); header('Location: ' . BASEURL . 'setting');
die(); die();
} else if (isset ($_POST['userPermission']) && !empty ($_POST['userID'])) { } else if (isset ($_POST['userPermission']) && !empty ($_POST['userID'])) {
$userManager->setUserDataAdmin("permission", $_POST['userPermission'], $_POST['userID']); $userManager->setUserDataAdmin("permission", $_POST['userPermission'], $_POST['userID']);
header('Location: ' . BASEURL . 'setting');
die();
} else {
foreach ($_POST as $key => $value) {
if ($key == 'submit') continue;
$settingMng = new SettingsManager();
if ($settingMng->getByName($key)) {
$settingMng->update($key, $value);
}
}
header('Location: ' . BASEURL . 'setting'); header('Location: ' . BASEURL . 'setting');
die(); die();
} }

View File

@@ -26,7 +26,7 @@ class GoogleHome {
} }
} }
if ($traids < 1){ if ($traids < 0){
continue; continue;
} }

View File

@@ -14,23 +14,21 @@ class SettingsManager{
} }
public static function create ($name, $value, $type = '') { public static function create ($name, $value, $type = '') {
if (!self::getByName($name)){ $setting = array (
$setting = array ( 'name' => $name,
'name' => $name, 'value' => $value,
'value' => $value, 'type' => $type,
'type' => $type, );
); try {
try { Db::add ('settings', $setting);
Db::add ('settings', $setting); } catch(PDOException $error) {
} catch(PDOException $error) { echo $error->getMessage();
echo $error->getMessage(); die();
die();
}
} }
} }
public static function update ($name, $value, $type = '') { public static function update ($name, $value, $type = '') {
if (!self::getByName($name)){ if (self::getByName($name)){
self::create($name, $value, $type); self::create($name, $value, $type);
} else { } else {
try { try {

View File

@@ -9,14 +9,6 @@ class AirQuality extends VirtualDeviceManager
function make() function make()
{ {
//Register the settings
$settingMng = new SettingsManager();
if (!($settingField = $settingMng->getByName("airquality"))) {
$settingMng->create("token", "", "airquality");
} else {
$app_id = $settingField['value'];
}
try { try {
if (DeviceManager::registeret($this->virtual_device_name)) { if (DeviceManager::registeret($this->virtual_device_name)) {
$deviceId = DeviceManager::getDeviceByToken($this->virtual_device_name)['device_id']; $deviceId = DeviceManager::getDeviceByToken($this->virtual_device_name)['device_id'];
@@ -25,9 +17,9 @@ class AirQuality extends VirtualDeviceManager
sleep(1); sleep(1);
$subDevice = SubDeviceManager::getSubDeviceByMaster($deviceId, strtolower($this->subdevice_type)); $subDevice = SubDeviceManager::getSubDeviceByMaster($deviceId, strtolower($this->subdevice_type));
} }
//if (!$this->fetchEnabled($deviceId,$subDevice['subdevice_id'])) die(); //if (!$this->fetchEnabled($deviceId,$subDevice['subdevice_id'])) die();
$finalUrl = sprintf($this->api_uri, $this->city_sluig, $this->app_id); $finalUrl = sprintf($this->api_uri, $this->city_sluig, $this->app_id);
$json = json_decode(Utilities::CallAPI('GET', $finalUrl, ''), true); $json = json_decode(Utilities::CallAPI('GET', $finalUrl, ''), true);
RecordManager::create($deviceId, $this->subdevice_type, $json['data']['aqi']); RecordManager::create($deviceId, $this->subdevice_type, $json['data']['aqi']);

View File

@@ -33,8 +33,4 @@ class OpenWeatherMap extends VirtualDeviceManager
return 'exception: ' . $e->getMessage(); return 'exception: ' . $e->getMessage();
} }
} }
function enable(){
(new SettingsManager)->create('open_weather_api_token', '', 'open_weather');
}
} }

View File

@@ -70,8 +70,6 @@ class Setting extends Template
$result = $settingsManager->getSettingGroup($plugins[$key]['slug']); $result = $settingsManager->getSettingGroup($plugins[$key]['slug']);
if (count ($result) > 0) { if (count ($result) > 0) {
$plugins[$key]['settings'] = $result; $plugins[$key]['settings'] = $result;
} else {
unset($plugins[$key]);
} }
} }
} }

View File

@@ -202,23 +202,7 @@ $partial = new Partial('head');
</form> </form>
</div> </div>
<!--Plugins Settings-->
<?php foreach ($PLUGINSSETTINGS as $key => $pluginSeting) { ?>
<div class="col-12 col-sm-9 mx-auto mt-4">
<h4 class="mb-4"><?php echo $pluginSeting['name'] ?></h4>
<form method="post">
<?php foreach ($pluginSeting['settings'] as $key => $pluginSetingField) { ?>
<div class="field">
<div class="label"><?php echo $pluginSetingField['name'] ?>:</div>
<input type="text" class="input" name="<?php echo $pluginSetingField['name'] ?>" value="<?php echo $pluginSetingField['value'] ?>">
</div>
<?php } ?>
<div class="field">
<input type="submit" name="submitPlugins<?php echo $pluginSeting['name'] ?>Settings" class="button" value="<?php $LANGMNG->echo('b_save') ?>">
</div>
</form>
</div>
<?php } ?>
</div> </div>

View File

@@ -0,0 +1,24 @@
<?php
namespace Core\Configuration;
class ConfigurationLoader
{
private const CONFIGURATIONS_DIRECTORY = __DIR__ . DIRECTORY_SEPARATOR
. '..' . DIRECTORY_SEPARATOR
. '..' . DIRECTORY_SEPARATOR . 'config'
. DIRECTORY_SEPARATOR;
public function load(): array
{
return [];
}
/**
* Concerns
* -> Loading configuration files
* - Scan directory for files.
* - Filtering none config / php files.
* - Creating assoc array.
*/
}

View File

@@ -8,4 +8,18 @@ namespace Core\Configuration;
* @author Romano Schoonheim https://github.com/romano1996 * @author Romano Schoonheim https://github.com/romano1996
*/ */
class Configurations class Configurations
{} {
/** @var array */
private $configurations;
public function __construct(ConfigurationLoader $configurationLoader)
{
// Concern: Storing assoc array to this object.
$this->configurations = $configurationLoader->load();
}
public function get(string $path)
{
// Concern: Accessing configurations based on "paths" application.something For example.
}
}