commit dc23d18007b6f92d3089e2ce6875f1b54e0b331f
parent 9f28c5a3487d1a573c830252ae2ab9d153a0c8dd
Author: Jan Dankert <devnull@localhost>
Date: Fri, 10 Nov 2017 21:15:02 +0100
Das Beschreibungsfeld der Datenbank heißt jetzt 'description', weil das sprechender ist.
Diffstat:
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/action/LoginAction.class.php b/action/LoginAction.class.php
@@ -110,7 +110,7 @@ class LoginAction extends Action
if ( !$db->available )
{
- $this->addNotice('database',$db->conf['comment'],'DATABASE_CONNECTION_ERROR',OR_NOTICE_ERROR,array(),array('Database Error: '.$db->error));
+ $this->addNotice('database',$db->conf['description'],'DATABASE_CONNECTION_ERROR',OR_NOTICE_ERROR,array(),array('Database Error: '.$db->error));
//$this->callSubAction('showlogin');
return false;
}
@@ -399,7 +399,7 @@ class LoginAction extends Action
if ( is_array($dbconf) && $dbconf['enabled'] )
$dbids[$dbname] = array('key' =>$dbname,
'value'=>Text::maxLength($dbconf['description']),
- 'title'=>$dbconf['comment'].(isset($dbconf['host'])?' ('.$dbconf['host'].')':'') );
+ 'title'=>$dbconf['description'].(isset($dbconf['host'])?' ('.$dbconf['host'].')':'') );
}
$openid_provider = array();
@@ -1745,7 +1745,7 @@ class LoginAction extends Action
foreach( $conf['database'] as $dbname=>$dbconf )
{
if ( is_array($dbconf) && $dbconf['enabled'] )
- $dbids[$dbname] = $dbconf['comment'];
+ $dbids[$dbname] = $dbconf['description'];
}
$this->setTemplateVar( 'dbids',$dbids );
@@ -1869,7 +1869,7 @@ class LoginAction extends Action
foreach( $conf['database'] as $dbname=>$dbconf )
{
if ( is_array($dbconf) && $dbconf['enabled'] )
- $dbids[$dbname] = $dbconf['comment'];
+ $dbids[$dbname] = $dbconf['description'];
}
$this->setTemplateVar( 'dbids',$dbids );
diff --git a/action/ProjectAction.class.php b/action/ProjectAction.class.php
@@ -270,7 +270,7 @@ class ProjectAction extends Action
foreach( $conf['database'] as $dbname=>$dbconf )
{
if ( is_array($dbconf) && $dbconf['enabled'])
- $dbids[$dbname] = $dbconf['comment'];
+ $dbids[$dbname] = $dbconf['description'];
}
$this->setTemplateVar( 'dbids',$dbids );
diff --git a/action/StartAction.class.php b/action/StartAction.class.php
@@ -99,7 +99,7 @@ class StartAction extends Action
if ( !$db->available )
{
- $this->addNotice('database',$db->conf['comment'],'DATABASE_CONNECTION_ERROR',OR_NOTICE_ERROR,array(),array('Database Error: '.$db->error));
+ $this->addNotice('database',$db->conf['description'],'DATABASE_CONNECTION_ERROR',OR_NOTICE_ERROR,array(),array('Database Error: '.$db->error));
$this->callSubAction('showlogin');
return false;
}
@@ -283,8 +283,8 @@ class StartAction extends Action
{
if ( is_array($dbconf) && $dbconf['enabled'] )
$dbids[$dbname] = array('key' =>$dbname,
- 'value'=>Text::maxLength($dbconf['comment']),
- 'title'=>$dbconf['comment'].' ('.$dbconf['host'].')' );
+ 'value'=>Text::maxLength($dbconf['description']),
+ 'title'=>$dbconf['description'].' ('.$dbconf['host'].')' );
}
$openid_provider = array();
@@ -1379,7 +1379,7 @@ class StartAction extends Action
foreach( $conf['database'] as $dbname=>$dbconf )
{
if ( is_array($dbconf) && $dbconf['enabled'] )
- $dbids[$dbname] = $dbconf['comment'];
+ $dbids[$dbname] = $dbconf['description'];
}
$this->setTemplateVar( 'dbids',$dbids );
@@ -1462,7 +1462,7 @@ class StartAction extends Action
foreach( $conf['database'] as $dbname=>$dbconf )
{
if ( is_array($dbconf) && $dbconf['enabled'] )
- $dbids[$dbname] = $dbconf['comment'];
+ $dbids[$dbname] = $dbconf['description'];
}
$this->setTemplateVar( 'dbids',$dbids );
diff --git a/model/Value.class.php b/model/Value.class.php
@@ -1343,7 +1343,7 @@ SQL
$inhalt = $SESS['dbid'];
break;
case 'db_name':
- $inhalt = $conf['database_'.$SESS['dbid']]['comment'];
+ $inhalt = $conf['database_'.$SESS['dbid']]['description'];
break;
case 'project_id':
$inhalt = $this->page->projectid;
diff --git a/util/Preferences.class.php b/util/Preferences.class.php
@@ -142,7 +142,7 @@ class Preferences
$defaultDatabaseConfig = array(
'enabled' =>true,
- 'comment2' =>'',
+ 'description2' =>'',
'user' =>'',
'password' => '',
'host' =>'localhost',