[Phpgroupware-cvs] CVS: phpgwapi/inc class.translation_file.inc.php,1.2,1.3 class.setup_translation.inc.php,1.1,1.2 class.schema_proc_pgsql.inc.php,1.1,1.2

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv28098

Modified Files:
        class.translation_file.inc.php class.setup_translation.inc.php 
        class.schema_proc_pgsql.inc.php 
Log Message:
Use in_array()



Index: class.translation_file.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.translation_file.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.translation_file.inc.php      28 Sep 2001 21:32:44 -0000      1.2
--- class.translation_file.inc.php      8 Mar 2002 04:10:58 -0000       1.3
***************
*** 49,69 ****
                }
  
-               function isin_array($needle,$haystack)
-               {
-                       while (list ($k,$v) = each($haystack))
-                       {
-                               if ($v == $needle)
-                               {
-                                       return True;
-                               }
-                       }
-                       return False;
-               }
- 
                function translate($key, $vars=False) 
                {
                        global $lang;
  
!                       if 
(!$this->isin_array($GLOBALS['phpgw_info']['flags']['currentapp'],$this->loaded_apps)
 &&
                                $GLOBALS['phpgw_info']['flags']['currentapp'] 
!= 'home')
                        {
--- 49,57 ----
                }
  
                function translate($key, $vars=False) 
                {
                        global $lang;
  
!                       if 
(address@hidden($GLOBALS['phpgw_info']['flags']['currentapp'],$this->loaded_apps)
 &&
                                $GLOBALS['phpgw_info']['flags']['currentapp'] 
!= 'home')
                        {
***************
*** 80,84 ****
                                while(list($x,$app) = 
each($GLOBALS['phpgw_info']['apps']))
                                {
!                                       if 
(!$this->isin_array($app['name'],$this->loaded_apps))
                                        {
                                                //echo '<br>loading app "' . 
$app['name'] . '" for the first time.';
--- 68,72 ----
                                while(list($x,$app) = 
each($GLOBALS['phpgw_info']['apps']))
                                {
!                                       if 
(address@hidden($app['name'],$this->loaded_apps))
                                        {
                                                //echo '<br>loading app "' . 
$app['name'] . '" for the first time.';

Index: class.setup_translation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup_translation.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.setup_translation.inc.php     3 Mar 2002 21:47:30 -0000       1.1
--- class.setup_translation.inc.php     8 Mar 2002 04:10:58 -0000       1.2
***************
*** 172,176 ****
                {
                        $langs = $this->get_langs($DEBUG);
!                       if($force_en && !isinarray('en',$langs))
                        {
                                $langs[] = 'en';
--- 172,176 ----
                {
                        $langs = $this->get_langs($DEBUG);
!                       if($force_en && address@hidden('en',$langs))
                        {
                                $langs[] = 'en';

Index: class.schema_proc_pgsql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc_pgsql.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.schema_proc_pgsql.inc.php     3 Mar 2002 21:48:34 -0000       1.1
--- class.schema_proc_pgsql.inc.php     8 Mar 2002 04:10:58 -0000       1.2
***************
*** 520,524 ****
                                $indexes[] = $val['index_name'];
                        }
!                       if(isinarray($sOldTableName . '_pkey',$indexes))
                        {
                                $oProc->m_odb->query("DROP INDEX " . 
$sOldTableName . "_pkey",__LINE__,__FILE__);
--- 520,524 ----
                                $indexes[] = $val['index_name'];
                        }
!                       if(!in_array($sOldTableName . '_pkey',$indexes))
                        {
                                $oProc->m_odb->query("DROP INDEX " . 
$sOldTableName . "_pkey",__LINE__,__FILE__);