franzz/objects
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup code

Browse Source
This commit is contained in:
Franzz
2019-09-07 11:05:02 +02:00
parent 8cd00d77c1
commit 1d9576856b
1 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
inc/main.php
View File

@@ -13,7 +13,6 @@ abstract class Main extends PhpObject
const UNAUTHORIZED = 'unauthorized'; const UNAUTHORIZED = 'unauthorized';
const NOT_FOUND = 'unknown action'; const NOT_FOUND = 'unknown action';
const NO_DATA = 'No Data'; const NO_DATA = 'No Data';
//...
const ACTIVE = 1; const ACTIVE = 1;
const INACTIVE = 0; const INACTIVE = 0;
@@ -21,11 +20,17 @@ abstract class Main extends PhpObject
//Folders //Folders
const MASKS_FOLDER = 'masks/'; const MASKS_FOLDER = 'masks/';
//Objects /**
* Class Management
* @var ClassManagement
*/
protected $oClassManagement; protected $oClassManagement;
/**
* DB Handle
* @var Db
*/
protected $oDb; protected $oDb;
//private $oTranslator;
//...
//Dates format //Dates format
const URL_DATE_FORMAT = 'Ymd'; const URL_DATE_FORMAT = 'Ymd';
@@ -34,10 +39,8 @@ abstract class Main extends PhpObject
const LAYOUT_TIME_FORMAT = 'G:i'; const LAYOUT_TIME_FORMAT = 'G:i';
//Variables //Variables
//private $sLang;
protected $asMasks; protected $asMasks;
protected $asContext; protected $asContext;
//...
/** /**
* Main constructor * Main constructor
@@ -55,14 +58,8 @@ abstract class Main extends PhpObject
foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']); foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']);
$this->setContext($sProcessPage); $this->setContext($sProcessPage);
//$this->oClassManagement->incClass('translator');
//$this->oClassManagement->incClass('auth');
//...
//Init objects //Init objects
//$this->setLanguage($sLang);
//$this->oTranslator = new Translator($this->getLanguage());
if($bDb) { if($bDb) {
$this->oDb = new Db(Settings::DB_SERVER, Settings::DB_LOGIN, Settings::DB_PASS, Settings::DB_NAME, $this->getSqlOptions() , Settings::DB_ENC); $this->oDb = new Db(Settings::DB_SERVER, Settings::DB_LOGIN, Settings::DB_PASS, Settings::DB_NAME, $this->getSqlOptions() , Settings::DB_ENC);
if(in_array($this->oDb->sDbState, array(Db::DB_NO_DATA, Db::DB_NO_TABLE))) $this->install(); if(in_array($this->oDb->sDbState, array(Db::DB_NO_DATA, Db::DB_NO_TABLE))) $this->install();
@@ -141,26 +138,6 @@ abstract class Main extends PhpObject
protected abstract function getSqlOptions(); protected abstract function getSqlOptions();
/*
private function getLanguage()
{
return $this->sLang;
}
private function setLanguage($sLang='')
{
if($sLang!='') $this->sLang = $sLang;
else
{
//$_SERVER['REMOTE_ADDR'] = '193.106.178.41'; //Spain
//$_SERVER['REMOTE_ADDR'] = '160.92.167.193'; //France
//$_SERVER['REMOTE_ADDR'] = '74.125.230.216'; //US
$asIpInfo = json_decode(file_get_contents('http://api.ipinfodb.com/v3/ip-country/?key='.self::LOC_API_KEY.'&format=json&ip='.$_SERVER['REMOTE_ADDR']), true);
if($asIpInfo['statusCode'] == 'OK') $this->sLang = $asIpInfo['countryCode'];
}
}
*/
private function setMasks() private function setMasks()
{ {
//List all available masks //List all available masks
@@ -178,6 +155,4 @@ abstract class Main extends PhpObject
header('HTTP/1.1 403 Forbidden'); header('HTTP/1.1 403 Forbidden');
exit; exit;
} }
} }
?>