From 790e5d67db6080c02ca393cbff069127992d3242 Mon Sep 17 00:00:00 2001 From: scholzDaSense Date: Fri, 10 May 2013 13:18:16 +0200 Subject: [PATCH] changed namespace --- api/apiloginclass.php | 6 +-- page/PageApi.php | 2 +- sai/sai/page/default_page/default_page.php | 2 +- security/Security.php | 48 +++++++++++----------- system/locale.php | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/apiloginclass.php b/api/apiloginclass.php index 80d7bf8..4e7c3aa 100644 --- a/api/apiloginclass.php +++ b/api/apiloginclass.php @@ -20,13 +20,13 @@ class apiloginclass extends \SYSTEM\API\apiclass { */ public static function call_account_action_login($username, $password_sha, $password_md5){ - return \SYSTEM\SECURITY\Security::login(new \DBD\SYSTEM\systemPostgres(), $username, $password_sha, $password_md5);} + return \SYSTEM\SECURITY\Security::login(new \SYSTEM\DBD\systemPostgres(), $username, $password_sha, $password_md5);} public static function call_account_action_logout(){ return \SYSTEM\SECURITY\Security::logout();} public static function call_account_action_isloggedin(){ return \SYSTEM\SECURITY\Security::isLoggedIn();} public static function call_account_action_check($rightid){ - return \SYSTEM\SECURITY\Security::check(new \DBD\SYSTEM\systemPostgres(),$rightid);} + return \SYSTEM\SECURITY\Security::check(new \SYSTEM\DBD\systemPostgres(),$rightid);} public static function call_account_action_create($username, $password_sha, $email, $locale){ - return \SYSTEM\SECURITY\Security::create(new \DBD\SYSTEM\systemPostgres(), $username, $password_sha, $email, $locale);} + return \SYSTEM\SECURITY\Security::create(new \SYSTEM\DBD\systemPostgres(), $username, $password_sha, $email, $locale);} } \ No newline at end of file diff --git a/page/PageApi.php b/page/PageApi.php index 7b6ad3d..6b8f20e 100644 --- a/page/PageApi.php +++ b/page/PageApi.php @@ -81,7 +81,7 @@ class PageApi { if( !method_exists($this->m_verifyclass, $item[\SYSTEM\DBD\PAGETable::FIELD_ALLOWEDVALUES]) || !$this->m_verifyclass->$item[\SYSTEM\DBD\PAGETable::FIELD_ALLOWEDVALUES]($call[$item[\SYSTEM\DBD\PAGETable::FIELD_NAME]])){ - throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\DBD\PAGETable::FIELD_NAME].' Verifier: '.$item[\DBD\SYSTEM\PAGETable::FIELD_ALLOWEDVALUES]);} + throw new \SYSTEM\LOG\ERROR('Parameter type missmacht or Missing Verifier. Param: '.$item[\SYSTEM\DBD\PAGETable::FIELD_NAME].' Verifier: '.$item[\SYSTEM\DBD\PAGETable::FIELD_ALLOWEDVALUES]);} $parameters[] = array($item, $call[$item[\SYSTEM\DBD\PAGETable::FIELD_NAME]]); } diff --git a/sai/sai/page/default_page/default_page.php b/sai/sai/page/default_page/default_page.php index c17a7a6..61c6f59 100644 --- a/sai/sai/page/default_page/default_page.php +++ b/sai/sai/page/default_page/default_page.php @@ -70,7 +70,7 @@ class default_page extends \SYSTEM\PAGE\Page { //$vars['PATH_IMG'] = SYSTEM\WEBPATH(new PPAGE(),'default_developer/img/'); //$vars['PATH_LIB'] = SYSTEM\WEBPATH(new PLIB()); //$vars['PATH_JS'] = SYSTEM\WEBPATH(new PJS()); - //$vars = array_merge($vars, SYSTEM\locale::getStrings(\DBD\SYSTEM\locale_string::VALUE_CATEGORY_DASENSE)); + //$vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'sai/page/default_page/sai.tpl'), $vars); } } \ No newline at end of file diff --git a/security/Security.php b/security/Security.php index 290f7a0..255dcc0 100644 --- a/security/Security.php +++ b/security/Security.php @@ -23,9 +23,9 @@ class Security { return self::REGISTER_FAIL;} $con = new \SYSTEM\DB\Connection($dbinfo); - $result = $con->prepare('createAccountStmt','INSERT INTO '.\DBD\SYSTEM\UserTable::NAME. - ' ('.\DBD\SYSTEM\UserTable::FIELD_USERNAME.','.\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA.',' - .\DBD\SYSTEM\UserTable::FIELD_EMAIL.','.\DBD\SYSTEM\UserTable::FIELD_LOCALE.','.\DBD\SYSTEM\UserTable::FIELD_ACCOUNT_FLAG.')'. + $result = $con->prepare('createAccountStmt','INSERT INTO '.\SYSTEM\DBD\UserTable::NAME. + ' ('.\SYSTEM\DBD\UserTable::FIELD_USERNAME.','.\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA.',' + .\SYSTEM\DBD\UserTable::FIELD_EMAIL.','.\SYSTEM\DBD\UserTable::FIELD_LOCALE.','.\SYSTEM\DBD\UserTable::FIELD_ACCOUNT_FLAG.')'. ' VALUES ($1, $2, $3, $4, $5) RETURNING *;', array( $username , $password, $email, $locale, 1 )); @@ -47,15 +47,15 @@ class Security { $con = new \SYSTEM\DB\Connection($dbinfo); if(isset($password_md5)){ $result = $con->prepare('loginAccountStmt', - 'SELECT * FROM '.\DBD\SYSTEM\UserTable::NAME. - ' WHERE lower('.\DBD\SYSTEM\UserTable::FIELD_USERNAME.') LIKE lower($1)'. - ' AND ('.\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA.' = $2 OR '.\DBD\SYSTEM\UserTable::FIELD_PASSWORD_MD5.' = $3 );', + 'SELECT * FROM '.\SYSTEM\DBD\UserTable::NAME. + ' WHERE lower('.\SYSTEM\DBD\UserTable::FIELD_USERNAME.') LIKE lower($1)'. + ' AND ('.\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA.' = $2 OR '.\SYSTEM\DBD\UserTable::FIELD_PASSWORD_MD5.' = $3 );', array($username, $password_sha, $password_md5) ); }else{ $result = $con->prepare('loginAccountStmtSHA', - 'SELECT * FROM '.\DBD\SYSTEM\UserTable::NAME. - ' WHERE lower('.\DBD\SYSTEM\UserTable::FIELD_USERNAME.') LIKE lower($1)'. - ' AND '.\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA.' = $2;', + 'SELECT * FROM '.\SYSTEM\DBD\UserTable::NAME. + ' WHERE lower('.\SYSTEM\DBD\UserTable::FIELD_USERNAME.') LIKE lower($1)'. + ' AND '.\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA.' = $2;', array($username, $password_sha) ); } @@ -72,19 +72,19 @@ class Security { return self::LOGIN_FAIL;} // set password_sha if it is empty - if(!$row[\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA]){ + if(!$row[\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA]){ $res = $con->prepare( 'updatePasswordSHAStmt', - 'UPDATE '.\DBD\SYSTEM\UserTable::NAME.' SET '.\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA.' = $1 WHERE '.\DBD\SYSTEM\UserTable::FIELD_ID.' = $2'.' RETURNING '.\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA.';', - array($password_sha,$row[\DBD\SYSTEM\UserTable::FIELD_ID])); + 'UPDATE '.\SYSTEM\DBD\UserTable::NAME.' SET '.\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA.' = $1 WHERE '.\SYSTEM\DBD\UserTable::FIELD_ID.' = $2'.' RETURNING '.\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA.';', + array($password_sha,$row[\SYSTEM\DBD\UserTable::FIELD_ID])); $res = $res->next(); - $row[\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA] = $res[\DBD\SYSTEM\UserTable::FIELD_PASSWORD_SHA]; + $row[\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA] = $res[\SYSTEM\DBD\UserTable::FIELD_PASSWORD_SHA]; } // set session variables - $_SESSION['user'] = new User( $row[\DBD\SYSTEM\UserTable::FIELD_ID], - $row[\DBD\SYSTEM\UserTable::FIELD_USERNAME], - $row[\DBD\SYSTEM\UserTable::FIELD_EMAIL], - $row[\DBD\SYSTEM\UserTable::FIELD_JOINDATE], + $_SESSION['user'] = new User( $row[\SYSTEM\DBD\UserTable::FIELD_ID], + $row[\SYSTEM\DBD\UserTable::FIELD_USERNAME], + $row[\SYSTEM\DBD\UserTable::FIELD_EMAIL], + $row[\SYSTEM\DBD\UserTable::FIELD_JOINDATE], time(), getenv('REMOTE_ADDR'), 0, @@ -93,15 +93,15 @@ class Security { if(isset($locale)){ \SYSTEM\locale::set($locale);} // track succesful user login - self::trackLogins($dbinfo, $row[\DBD\SYSTEM\UserTable::FIELD_ID], self::LOGIN_OK); + self::trackLogins($dbinfo, $row[\SYSTEM\DBD\UserTable::FIELD_ID], self::LOGIN_OK); return ($advancedResult ? $row : self::LOGIN_OK); } private static function trackLogins(\SYSTEM\DB\DBInfo $dbinfo, $userID, $succ){ $con = new \SYSTEM\DB\Connection($dbinfo); $con->prepare( 'trackLoginAccountStmt', - 'INSERT INTO '.\DBD\SYSTEM\UserLoginsTable::NAME.' ("'.\DBD\SYSTEM\UserLoginsTable::FIELD_USERID.'","'. - \DBD\SYSTEM\UserLoginsTable::FIELD_IP.'",'.\DBD\SYSTEM\UserLoginsTable::FIELD_SUCC.') VALUES ($1,$2,$3)', + 'INSERT INTO '.\SYSTEM\DBD\UserLoginsTable::NAME.' ("'.\SYSTEM\DBD\UserLoginsTable::FIELD_USERID.'","'. + \SYSTEM\DBD\UserLoginsTable::FIELD_IP.'",'.\SYSTEM\DBD\UserLoginsTable::FIELD_SUCC.') VALUES ($1,$2,$3)', array(isset($userID) ? $userID : -1, getenv('REMOTE_ADDR'), (int)$succ )); } @@ -118,8 +118,8 @@ class Security { public static function available(\SYSTEM\DB\DBInfo $dbinfo, $username){ $con = new \SYSTEM\DB\Connection($dbinfo); $res = $con->prepare( 'availableStmt', - 'SELECT COUNT(*) as count FROM '.\DBD\SYSTEM\UserTable::NAME. - ' WHERE lower('.\DBD\SYSTEM\UserTable::FIELD_USERNAME.') like lower($1) ;', + 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\UserTable::NAME. + ' WHERE lower('.\SYSTEM\DBD\UserTable::FIELD_USERNAME.') like lower($1) ;', array($username)); if(!($res = $res->next())){ @@ -185,8 +185,8 @@ class Security { $con = new \SYSTEM\DB\Connection($dbinfo); $res = $con->prepare( 'updateUserLocaleStmt', - 'UPDATE '.\DBD\SYSTEM\UserTable::NAME.' SET '.\DBD\SYSTEM\UserTable::FIELD_LOCALE.' = $1 '. - 'WHERE '.\DBD\SYSTEM\UserTable::FIELD_ID.' = $2'.' RETURNING '.\DBD\SYSTEM\UserTable::FIELD_LOCALE.';', + 'UPDATE '.\SYSTEM\DBD\UserTable::NAME.' SET '.\SYSTEM\DBD\UserTable::FIELD_LOCALE.' = $1 '. + 'WHERE '.\SYSTEM\DBD\UserTable::FIELD_ID.' = $2'.' RETURNING '.\SYSTEM\DBD\UserTable::FIELD_LOCALE.';', array($lang, $user->id)); if(!$res->next()){ throw new \SYSTEM\LOG\ERROR("Problem updating the User!");} diff --git a/system/locale.php b/system/locale.php index eca1dcf..8bbfa8b 100644 --- a/system/locale.php +++ b/system/locale.php @@ -15,7 +15,7 @@ class locale { \SYSTEM\SECURITY\Security::save(self::SESSION_KEY, $lang); if(\SYSTEM\SECURITY\Security::isLoggedIn()){ - \SYSTEM\SECURITY\Security::_db_setLocale(new \DBD\SYSTEM\systemPostgres(), $lang);} //TODO: connection def move somewhere? + \SYSTEM\SECURITY\Security::_db_setLocale(new \SYSTEM\DBD\systemPostgres(), $lang);} //TODO: connection def move somewhere? return true; }