diff --git a/config/config_ids.php b/config/config_ids.php index 61848f5..a59f2aa 100644 --- a/config/config_ids.php +++ b/config/config_ids.php @@ -24,6 +24,8 @@ class config_ids { const SYS_CONFIG_LANGS = 21; const SYS_CONFIG_DEFAULT_LANG = 22; + const SYS_CRON_LOG2SQLITE_PATH = 30; + const SYS_SAI_CONFIG_BASEURL = 50; const SYS_SAI_CONFIG_NAVIMG = 51; const SYS_SAI_CONFIG_TITLE = 52; diff --git a/cron/cron_log2sqlite.php b/cron/cron_log2sqlite.php index d626edf..76af1c4 100644 --- a/cron/cron_log2sqlite.php +++ b/cron/cron_log2sqlite.php @@ -10,9 +10,9 @@ class cron_log2sqlite extends \SYSTEM\CRON\cronjob{ $oldest['month'] >= $now_month){ return cronstatus::CRON_STATUS_SUCCESFULLY;} - $filename = '/home/web/webdir/mojotrollz/mojotrollz/files/log/'.$oldest['year'].'.'.$oldest['month'].'.db'; + $filename = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$oldest['year'].'.'.$oldest['month'].'.db'; //extract whole month to file - $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite($filename,0666)); + $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite($filename)); //create table $con->query('CREATE TABLE IF NOT EXISTS `system_log` ('. @@ -36,7 +36,7 @@ class cron_log2sqlite extends \SYSTEM\CRON\cronjob{ ' `thrown` BIT(1) NOT NULL,'. ' PRIMARY KEY (`ID`)'.');'); - //write data + //write data as trasaction $con->exec('begin transaction'); $res = \SYSTEM\DBD\SYS_LOG_MONTH::QQ(array($oldest['month'],$oldest['year'])); $i = 0; diff --git a/db/connection/ConnectionSQLite.php b/db/connection/ConnectionSQLite.php index 8a45dc9..78c195e 100644 --- a/db/connection/ConnectionSQLite.php +++ b/db/connection/ConnectionSQLite.php @@ -48,10 +48,6 @@ class ConnectionSQLite extends ConnectionAbstr { } public function exec($query){ - $result = false; - - $result = $this->connection->exec($query); - - return $result; + return $this->connection->exec($query); } } \ No newline at end of file diff --git a/db/dbinfo/DBInfoSQLite.php b/db/dbinfo/DBInfoSQLite.php index 3861dac..815e821 100644 --- a/db/dbinfo/DBInfoSQLite.php +++ b/db/dbinfo/DBInfoSQLite.php @@ -2,9 +2,9 @@ namespace SYSTEM\DB; class DBInfoSQLite extends \SYSTEM\DB\DBInfo { - public function __construct($database , $permissions , $password = null, $host = null, $port = null){ + public function __construct($database , $user = null , $password = null, $host = null, $port = null){ $this->m_database = $database; - $this->m_user = $permissions; + $this->m_user = $user; $this->m_password = $password; $this->m_host = $host; $this->m_port = $port;