removed app_title

This commit is contained in:
ceb 2002-10-26 22:40:09 +00:00
parent 6d142e0c7c
commit 405e2b5c65
5 changed files with 11 additions and 20 deletions

View File

@ -28,7 +28,7 @@
$this->db->next_record();
$app_info = array(
$this->db->f('app_name'),
$this->db->f('app_title'),
$this->db->f('app_name'),
$this->db->f('app_enabled'),
$this->db->f('app_name'),
$this->db->f('app_order')
@ -44,7 +44,7 @@
while ($this->db->next_record())
{
$apps[$this->db->f('app_name')] = array(
'title' => $this->db->f('app_title'),
'title' => str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
'name' => $this->db->f('app_name'),
'status' => $this->db->f('app_enabled')
);
@ -63,8 +63,8 @@
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$app_id = $this->db->f(0) + 1;
$sql = 'INSERT INTO phpgw_applications (app_id,app_name,app_title,app_enabled,app_order) VALUES('
. $app_id . ",'" . addslashes($data['n_app_name']) . "','" . addslashes($data['n_app_title']) . "','"
$sql = 'INSERT INTO phpgw_applications (app_id,app_name,app_enabled,app_order) VALUES('
. $app_id . ",'" . addslashes($data['n_app_name']) . "','"
. $data['n_app_status'] . "','" . $data['app_order'] . "')";
$this->db->query($sql,__LINE__,__FILE__);
@ -74,8 +74,8 @@
function save($data)
{
$sql = "UPDATE phpgw_applications SET app_name='" . addslashes($data['n_app_name']) . "',"
. "app_title='" . addslashes($data['n_app_title']) . "', app_enabled='"
. $data['n_app_status'] . "',app_order='" . $data['app_order'] . "' WHERE app_name='" . $data['old_app_name'] . "'";
. "app_enabled='" . $data['n_app_status'] . "',app_order='" . $data['app_order']
. "' WHERE app_name='" . $data['old_app_name'] . "'";
$this->db->query($sql,__LINE__,__FILE__);
return True;

View File

@ -181,16 +181,11 @@
{
$error[$totalerrors++] = lang('You must enter an application name.');
}
if (!$n_app_title)
{
$error[$totalerrors++] = lang('You must enter an application title.');
}
if (!$totalerrors)
{
$this->bo->add(array(
'n_app_name' => $n_app_name,
'n_app_title' => $n_app_title,
'n_app_status' => $n_app_status,
'app_order' => $app_order
));
@ -218,7 +213,6 @@
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
$this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
$this->display_row(lang('application title'),'<input name="n_app_title" value="' . $n_app_title . '">');
if(!isset($n_app_status))
{
@ -257,7 +251,6 @@
$old_app_name = $GLOBALS['HTTP_POST_VARS']['old_app_name'];
$app_order = $GLOBALS['HTTP_POST_VARS']['app_order'] ? $GLOBALS['HTTP_POST_VARS']['app_order'] : 0;
$n_app_name = chop($GLOBALS['HTTP_POST_VARS']['n_app_name']);
$n_app_title = chop($GLOBALS['HTTP_POST_VARS']['n_app_title']);
$n_app_status = $GLOBALS['HTTP_POST_VARS']['n_app_status'];
if (! $n_app_name)
@ -282,7 +275,6 @@
{
$this->bo->save(array(
'n_app_name' => $n_app_name,
'n_app_title' => $n_app_title,
'n_app_status' => $n_app_status,
'app_order' => $app_order,
'old_app_name' => $old_app_name
@ -312,7 +304,6 @@
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit'));
$this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
$this->display_row(lang('application title'),'<input name="n_app_title" value="' . $n_app_title . '">');
$GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
$GLOBALS['phpgw']->template->set_var('lang_submit_button',lang('edit'));

View File

@ -36,7 +36,7 @@
include($_versionfile);
/* echo '<br>' . $_versionfile . ','; */
$_file_version = $setup_info[$app_name]['version'];
$_app_title = $setup_info[$app_name]['title'];
$_app_title = str_replace('- ','-',ucwords(str_replace('_','- ',$setup_info[$app_name]['name']))),
unset($setup_info);
/* echo '<br>' . $app_name . ',' . $_db_version . ',' . $_file_version; */

View File

@ -128,10 +128,10 @@
$group_info = array();
}
$GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
$GLOBALS['phpgw_setup']->db->query("SELECT app_name FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
while ($GLOBALS['phpgw_setup']->db->next_record())
{
$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = $GLOBALS['phpgw_setup']->db->f('app_title');
$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = lang($GLOBALS['phpgw_setup']->db->f('app_name'));
}
if ($cancel)

View File

@ -110,10 +110,10 @@
$group_info = array();
}
$GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
$GLOBALS['phpgw_setup']->db->query("SELECT app_name FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
while ($GLOBALS['phpgw_setup']->db->next_record())
{
$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = $GLOBALS['phpgw_setup']->db->f('app_title');
$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = lang($GLOBALS['phpgw_setup']->db->f('app_name'));
}
if ($cancel)