Revision 1682
Added by darkviper over 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
03 May-2012 Build 1682 Werner v.d.Decken(DarkViper) |
|
| 15 |
! some little corrections ModLanguage/Database/initialize.php |
|
| 14 | 16 |
03 May-2012 Build 1681 Werner v.d.Decken(DarkViper) |
| 15 | 17 |
! reorganisation of default theme of oage-settings |
| 16 | 18 |
+ added menu_icon_0 and menu_icon_1 |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1681');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1682');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/initialize.php | ||
|---|---|---|
| 90 | 90 |
spl_autoload_register('CoreAutoloader'); // activate core autoloader
|
| 91 | 91 |
date_default_timezone_set('UTC');
|
| 92 | 92 |
// Create database class |
| 93 |
$database = new Database(); |
|
| 93 |
$sSqlUrl = DB_TYPE.'://'.DB_USERNAME.':'.DB_PASSWORD.'@'.DB_HOST.'/'.DB_NAME; |
|
| 94 |
$database = new Database($sSqlUrl); |
|
| 94 | 95 |
// disable all kind of magic_quotes |
| 95 | 96 |
if(get_magic_quotes_gpc() || get_magic_quotes_runtime()) {
|
| 96 | 97 |
@ini_set('magic_quotes_sybase', 0);
|
| branches/2.8.x/wb/framework/Database.php | ||
|---|---|---|
| 31 | 31 |
|
| 32 | 32 |
class Database {
|
| 33 | 33 |
|
| 34 |
// $sdb = 'mysql://user:password@demo.de:3604/datenbank';
|
|
| 34 |
// $sdb = 'mysql://user:password@demo.de:3306/datenbank';
|
|
| 35 | 35 |
|
| 36 | 36 |
private $_db_handle = null; // readonly from outside |
| 37 | 37 |
private $_scheme = 'mysql'; |
| 38 | 38 |
private $_hostname = 'localhost'; |
| 39 | 39 |
private $_username = ''; |
| 40 | 40 |
private $_password = ''; |
| 41 |
private $_hostport = '3406';
|
|
| 41 |
private $_hostport = '3306';
|
|
| 42 | 42 |
private $_db_name = ''; |
| 43 | 43 |
|
| 44 | 44 |
private $connected = false; |
| ... | ... | |
| 61 | 61 |
$this->_hostport = $this->_hostport == '3306' ? '' : ':'.$this->_hostport; |
| 62 | 62 |
$this->_db_name = ltrim(isset($aIni['path']) ? $aIni['path'] : '', '/\\'); |
| 63 | 63 |
}else {
|
| 64 |
$this->_hostname = DB_HOST; |
|
| 65 |
$this->_username = DB_USERNAME; |
|
| 66 |
$this->_password = DB_PASSWORD; |
|
| 67 |
$this->_hostport = ''; |
|
| 68 |
$this->_db_name = DB_NAME; |
|
| 64 |
throw new RuntimeException('Missing parameter: unable to connect database');
|
|
| 69 | 65 |
} |
| 70 | 66 |
// Connect to database |
| 71 | 67 |
$this->connect(); |
| branches/2.8.x/wb/framework/ModLanguage.php | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/** |
| 3 |
* @category Core
|
|
| 4 |
* @package Core_security
|
|
| 3 |
* @category WebsiteBaker
|
|
| 4 |
* @package WebsiteBaker_Core
|
|
| 5 | 5 |
* @author Werner v.d.Decken |
| 6 |
* @copyright ISTeasy-project(http://isteasy.de/)
|
|
| 7 |
* @license Creative Commons BY-SA 3.0 http://creativecommons.org/licenses/by-sa/3.0/
|
|
| 6 |
* @copyright WebsiteBaker Org e.V.
|
|
| 7 |
* @license http://www.gnu.org/licenses/gpl.html
|
|
| 8 | 8 |
* @version $Id$ |
| 9 | 9 |
* @filesource $HeadURL$ |
| 10 | 10 |
* @since Datei vorhanden seit Release 2.8.2 |
| ... | ... | |
| 56 | 56 |
$this->_sCurrentLanguage != $sLanguage || |
| 57 | 57 |
$this->_sDefaultLanguage != $sDefault) |
| 58 | 58 |
{
|
| 59 |
// only load language if not already loaded |
|
| 59 | 60 |
$this->_sLanguageDirectory = rtrim($sLangDir, '/').'/'; |
| 60 | 61 |
$this->_sCurrentLanguage = $sLanguage; |
| 61 | 62 |
$this->_sDefaultLanguage = $sDefault; |
Also available in: Unified diff
some little corrections ModLanguage/Database/initialize.php