[Phpgroupware-cvs] CVS: admin/inc class.soapplications.inc.php,1.5,1.6 class.uiapplications.inc.php,1.5,1.6 hook_after_navbar.inc.php,1.4,1.5

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv18808/inc

Modified Files:
        class.soapplications.inc.php class.uiapplications.inc.php 
        hook_after_navbar.inc.php 
Log Message:
removed app_title

Index: class.soapplications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.soapplications.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.soapplications.inc.php        14 Apr 2002 14:51:25 -0000      1.5
--- class.soapplications.inc.php        26 Oct 2002 22:40:09 -0000      1.6
***************
*** 29,33 ****
                        $app_info = array(
                                $this->db->f('app_name'),
!                               $this->db->f('app_title'),
                                $this->db->f('app_enabled'),
                                $this->db->f('app_name'),
--- 29,33 ----
                        $app_info = array(
                                $this->db->f('app_name'),
!                               $this->db->f('app_name'),
                                $this->db->f('app_enabled'),
                                $this->db->f('app_name'),
***************
*** 45,49 ****
                                {
                                        $apps[$this->db->f('app_name')] = array(
!                                               'title'  => 
$this->db->f('app_title'),
                                                'name'   => 
$this->db->f('app_name'),
                                                'status' => 
$this->db->f('app_enabled')
--- 45,49 ----
                                {
                                        $apps[$this->db->f('app_name')] = array(
!                                               'title'         => 
str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
                                                'name'   => 
$this->db->f('app_name'),
                                                'status' => 
$this->db->f('app_enabled')
***************
*** 64,69 ****
                        $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']) . 
"','"
                                . $data['n_app_status'] . "','" . 
$data['app_order'] . "')";
  
--- 64,69 ----
                        $this->db->next_record();
                        $app_id = $this->db->f(0) + 1;
!                       $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'] . "')";
  
***************
*** 75,80 ****
                {
                        $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'] . "'";
  
                        $this->db->query($sql,__LINE__,__FILE__);
--- 75,80 ----
                {
                        $sql = "UPDATE phpgw_applications SET app_name='" . 
addslashes($data['n_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__);

Index: class.uiapplications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiapplications.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiapplications.inc.php        28 Sep 2002 20:01:43 -0000      1.5
--- class.uiapplications.inc.php        26 Oct 2002 22:40:09 -0000      1.6
***************
*** 182,189 ****
                                        $error[$totalerrors++] = lang('You must 
enter an application name.');
                                }
-                               if (!$n_app_title)
-                               {
-                                       $error[$totalerrors++] = lang('You must 
enter an application title.');
-                               }
  
                                if (!$totalerrors)
--- 182,185 ----
***************
*** 191,195 ****
                                        $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
--- 187,190 ----
***************
*** 219,223 ****
  
                        $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))
--- 214,217 ----
***************
*** 258,262 ****
                                $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'];
  
--- 252,255 ----
***************
*** 283,287 ****
                                        $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,
--- 276,279 ----
***************
*** 313,317 ****
  
                        $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'));
--- 305,308 ----

Index: hook_after_navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_after_navbar.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hook_after_navbar.inc.php   17 Feb 2002 15:34:13 -0000      1.4
--- hook_after_navbar.inc.php   26 Oct 2002 22:40:09 -0000      1.5
***************
*** 37,41 ****
                                        /* echo '<br>' . $_versionfile . ','; */
                                        $_file_version = 
$setup_info[$app_name]['version'];
!                                       $_app_title    = 
$setup_info[$app_name]['title'];
                                        unset($setup_info);
  
--- 37,41 ----
                                        /* echo '<br>' . $_versionfile . ','; */
                                        $_file_version = 
$setup_info[$app_name]['version'];
!                                       $_app_title    = str_replace('- 
','-',ucwords(str_replace('_','- ',$setup_info[$app_name]['name']))),
                                        unset($setup_info);