[Phpgroupware-cvs] CVS: phpgwapi/inc class.asyncservice.inc.php,1.1.2.3,1.1.2.4

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.asyncservice.inc.php 
Log Message:
fix to find php(4) for debian

Index: class.asyncservice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.asyncservice.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** class.asyncservice.inc.php  31 May 2003 23:47:44 -0000      1.1.2.3
--- class.asyncservice.inc.php  4 Jun 2003 19:14:35 -0000       1.1.2.4
***************
*** 8,22 ****
        * http://www.phpgroupware.org/                                          
   *
        * 
------------------------------------------------------------------------ *
!       * This library is free software; you can redistribute it and/or modify 
it  *
!       * under the terms of the GNU Lesser General Public License as published 
by *
!       * the Free Software Foundation; either version 2.1 of the License,      
   *
!       * or any later version.                                                 
   *
!       * This library is distributed in the hope that it will be useful, but   
   *
!       * WITHOUT ANY WARRANTY; without even the implied warranty of            
   *
!       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  
   *
!       * See the GNU Lesser General Public License for more details.           
   *
!       * You should have received a copy of the GNU Lesser General Public 
License *
!       * along with this library; if not, write to the Free Software 
Foundation,  *
!       * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA         
   *
        
\**************************************************************************/
  
--- 8,15 ----
        * http://www.phpgroupware.org/                                          
   *
        * 
------------------------------------------------------------------------ *
!       *  This program is free software; you can redistribute it and/or modify 
it *
!       *  under the terms of the GNU General Public License as published by 
the   *
!       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
!       *  option) any later version.                                           
   *
        
\**************************************************************************/
  
***************
*** 387,390 ****
--- 380,385 ----
                {
                        flush();
+                       
+                       unset($GLOBALS['phpgw_info']['user']);  // if we run 
via the fallback, we dont want to be treated as that user
  
                        if (!$this->last_check_run(True,False,$run_by))
***************
*** 511,515 ****
                        else
                        {
!                               $binarys = array('php' => 
'/usr/bin/php','crontab' => '/usr/bin/crontab');
                                foreach ($binarys as $name => $path)
                                {
--- 506,514 ----
                        else
                        {
!                               $binarys = array(
!                                       'php'  => '/usr/bin/php',
!                                       'php4' => '/usr/bin/php4',              
// this is for debian
!                                       'crontab' => '/usr/bin/crontab'
!                               );
                                foreach ($binarys as $name => $path)
                                {
***************
*** 533,536 ****
--- 532,539 ----
                                        //echo "<p>$name = 
'".$this->$name."'</p>\n";
                                }
+                               if ($this->php4[0] == '/')      // we found a 
php4 binary
+                               {
+                                       $this->php = $this->php4;
+                               }
                        }
                
***************
*** 565,569 ****
                                        $parts = split(' ',$line,6);
  
!                                       if ($line[0] == '#' || count($parts) < 
6 || $parts[5][0] != '/')
                                        {
                                                // ignore comments
--- 568,572 ----
                                        $parts = split(' ',$line,6);
  
!                                       if ($line[0] == '#' || count($parts) < 
6 || ($parts[5][0] != '/' && substr($parts[5],0,3) != 'php')) 
                                        {
                                                // ignore comments