diff --git a/inc/main.php b/inc/main.php index 7c61d1b..555b2f5 100755 --- a/inc/main.php +++ b/inc/main.php @@ -13,7 +13,6 @@ abstract class Main extends PhpObject const UNAUTHORIZED = 'unauthorized'; const NOT_FOUND = 'unknown action'; const NO_DATA = 'No Data'; - //... const ACTIVE = 1; const INACTIVE = 0; @@ -21,11 +20,17 @@ abstract class Main extends PhpObject //Folders const MASKS_FOLDER = 'masks/'; - //Objects + /** + * Class Management + * @var ClassManagement + */ protected $oClassManagement; + + /** + * DB Handle + * @var Db + */ protected $oDb; - //private $oTranslator; - //... //Dates format const URL_DATE_FORMAT = 'Ymd'; @@ -34,10 +39,8 @@ abstract class Main extends PhpObject const LAYOUT_TIME_FORMAT = 'G:i'; //Variables - //private $sLang; protected $asMasks; protected $asContext; - //... /** * Main constructor @@ -55,14 +58,8 @@ abstract class Main extends PhpObject foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']); $this->setContext($sProcessPage); - - //$this->oClassManagement->incClass('translator'); - //$this->oClassManagement->incClass('auth'); - //... - + //Init objects - //$this->setLanguage($sLang); - //$this->oTranslator = new Translator($this->getLanguage()); if($bDb) { $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(); @@ -141,26 +138,6 @@ abstract class Main extends PhpObject 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() { //List all available masks @@ -178,6 +155,4 @@ abstract class Main extends PhpObject header('HTTP/1.1 403 Forbidden'); exit; } -} - -?> \ No newline at end of file +} \ No newline at end of file