[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.3, 1.1.2.4 class.lang.php, 1.1.2.6, 1.1.2.7

[Joseph Engo <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv13762/api

Modified Files:
      Tag: proposal-branch
        class.account_mgr.php class.lang.php 
Log Message:
- Finished up user delete
- Apparently, PHP 4.2.0 and higher changed some naming for the PostgreSQL 
functions making db->affected_rows() break.  This is being looked into, this 
change is for now.


Index: class.account_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.account_mgr.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.account_mgr.php       26 Oct 2003 05:49:32 -0000      1.1.2.3
--- class.account_mgr.php       27 Oct 2003 08:54:08 -0000      1.1.2.4
***************
*** 154,158 ****
                                $GLOBALS['phpgw']->add_xsl('api.widgets');
                                $result['dialog'] = array(
!                                       'question' => lang('Are you sure you 
want to delete the user %1 ?',$account_lid),
                                        'yes_op'   => 'api.account_mgr.delete',
                                        'no_op'    => 'api.account_mgr.show',
--- 154,158 ----
                                $GLOBALS['phpgw']->add_xsl('api.widgets');
                                $result['dialog'] = array(
!                                       'question' => lang('Are you sure you 
want to delete the user %s ?',$account_lid),
                                        'yes_op'   => 'api.account_mgr.delete',
                                        'no_op'    => 'api.account_mgr.show',
***************
*** 169,173 ****
                        else if ($args['answer'] == 'Yes')
                        {
!                               $GLOBALS['msgbox']->add(lang('Account has been 
deleted successfully'),__LINE__,__FILE__, 'notice');
                        }
  
--- 169,180 ----
                        else if ($args['answer'] == 'Yes')
                        {
!                               if 
($GLOBALS['phpgw']->accounts->delete($args['account_id']))
!                               {
!                                       $GLOBALS['msgbox']->add(lang('The 
account %s has been deleted successfully',$account_lid),__LINE__,__FILE__, 
'notice');
!                               }
!                               else
!                               {
!                                       $GLOBALS['msgbox']->add(lang('There was 
a problem deleting the account %s',$account_lid),__LINE__,__FILE__, 'warning');
!                               }
                        }
  

Index: class.lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.lang.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** class.lang.php      26 Oct 2003 07:43:06 -0000      1.1.2.6
--- class.lang.php      27 Oct 2003 08:54:08 -0000      1.1.2.7
***************
*** 47,57 ****
                }
  
!               function _translate($msg)
                {
- 
  //echo '$this->language: '.$this->language."<br>\n";
                        if($this->language == 'en')
                        {
!                               return $msg;
                        }
                        $omsg = $msg;
--- 47,56 ----
                }
  
!               function _translate($msg,$p1)
                {
  //echo '$this->language: '.$this->language."<br>\n";
                        if($this->language == 'en')
                        {
!                               return sprintf($msg,$p1);
                        }
                        $omsg = $msg;
***************
*** 162,165 ****
--- 161,166 ----
                        $args = $args->get(func_get_args(),__LINE__,__FILE__);
  
+                       $v = func_get_args();
+ 
                        if(!isset($args['app']))
                        {
***************
*** 176,180 ****
                        $this->switchapp($args['app']);
  
!                       return $this->_translate($args['msg']);
                }
  
--- 177,181 ----
                        $this->switchapp($args['app']);
  
!                       return $this->_translate($args['msg'],$v[0][1]);
                }