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

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
This commit is contained in:
paolo
2016-04-20 17:57:55 +02:00
parent 0ffe7fbcc6
commit 78e4c2900b
23 changed files with 914 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nation.class.php
+10 -11
View File
@@ -24,12 +24,19 @@
* Klasse Nation (FAS-Online)
* @create 06-04-2006
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
require_once(dirname(__FILE__).'/datum.class.php');
class nation extends basis_db
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/Nation_model.php');
class nation extends Nation_model
{
use db_extra; //CI Hack
public $new; // boolean
public $nation = array(); // nation Objekt
public $errormsg; // string
//Tabellenspalten
public $code;
@@ -100,15 +107,7 @@ class nation extends basis_db
public function getAll($ohnesperre=false, $orderEnglish=false)
{
//Lesen der Daten aus der Datenbank
$qry = "SELECT * FROM bis.tbl_nation";
if($ohnesperre)
$qry .= " WHERE sperre is null";
if($orderEnglish == false)
$qry .=" ORDER BY kurztext";
else
$qry .=" ORDER BY engltext";
$qry.=';';
$qry = $this->_getNationQuery($ohnesperre, $orderEnglish);
if(!$this->db_query($qry))
{