blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ci

Browse Source 
Conflicts:
	composer.json
	composer.lock
	phpci.yml
	system/checksystem.php
	system/dbupdate_3.2.php
	tests/codeception/_data/dump.sql
	tests/codeception/tests/acceptance/CISLoginPage.php
This commit is contained in:
oesi
2017-01-20 11:05:08 +01:00
parent 51b8a15f27 b8ad2dfd0c
commit b8177b58e8
83 changed files with 5390 additions and 5860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/statistik.class.php
+1 -13
View File
@@ -32,8 +32,6 @@ class statistik extends basis_db
public $bezeichnung;
public $url;
public $sql;
public $php;
public $r;
public $gruppe;
public $publish;
public $insertamum;
@@ -92,8 +90,6 @@ class statistik extends basis_db
$this->bezeichnung = $row->bezeichnung;
$this->url = $row->url;
$this->sql = $row->sql;
$this->php = $row->php;
$this->r = $row->r;
$this->gruppe = $row->gruppe;
$this->publish = $this->db_parse_bool($row->publish);
$this->insertamum = $row->insertamum;
@@ -141,8 +137,6 @@ class statistik extends basis_db
$obj->bezeichnung = $row->bezeichnung;
$obj->url = $row->url;
$obj->sql = $row->sql;
$obj->php = $row->php;
$obj->r = $row->r;
$obj->gruppe = $row->gruppe;
$obj->publish = $this->db_parse_bool($row->publish);
$obj->insertamum = $row->insertamum;
@@ -187,8 +181,6 @@ class statistik extends basis_db
$obj->bezeichnung = $row->bezeichnung;
$obj->url = $row->url;
$obj->sql = $row->sql;
$obj->php = $row->php;
$obj->r = $row->r;
$obj->gruppe = $row->gruppe;
$obj->publish = $this->db_parse_bool($row->publish);
$obj->insertamum = $row->insertamum;
@@ -267,14 +259,12 @@ class statistik extends basis_db
if($new)
{
$qry = 'INSERT INTO public.tbl_statistik(statistik_kurzbz, content_id, bezeichnung, url, sql,
php, r, gruppe, publish, insertamum, insertvon, updateamum, updatevon, preferences, berechtigung_kurzbz) VALUES('.
gruppe, publish, insertamum, insertvon, updateamum, updatevon, preferences, berechtigung_kurzbz) VALUES('.
$this->db_add_param($this->statistik_kurzbz).','.
$this->db_add_param($this->content_id,FHC_INTEGER).','.
$this->db_add_param($this->bezeichnung).','.
$this->db_add_param($this->url).','.
$this->db_add_param($this->sql).','.
$this->db_add_param($this->php).','.
$this->db_add_param($this->r).','.
$this->db_add_param($this->gruppe).','.
$this->db_add_param($this->publish, FHC_BOOLEAN).','.
$this->db_add_param($this->insertamum).','.
@@ -294,8 +284,6 @@ class statistik extends basis_db
' statistik_kurzbz='.$this->db_add_param($this->statistik_kurzbz).','.
' url='.$this->db_add_param($this->url).','.
' sql='.$this->db_add_param($this->sql).','.
' php='.$this->db_add_param($this->php).','.
' r='.$this->db_add_param($this->r).','.
' gruppe='.$this->db_add_param($this->gruppe).','.
' publish='.$this->db_add_param($this->publish, FHC_BOOLEAN).','.
' insertamum='.$this->db_add_param($this->insertamum).','.