[Phpgroupware-cvs] api core_functions.inc.php, 1.1.1.1.2.6, 1.1.1.1.2.7 starter.inc.php, 1.1.1.1.2.5, 1.1.1.1.2.6

[Dan Kuykendall <address@hidden>]

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

Modified Files:
      Tag: proposal-branch
        core_functions.inc.php starter.inc.php 
Log Message:
added some additional fallback measures for when the op is missing

Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.inc.php,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -C2 -d -r1.1.1.1.2.5 -r1.1.1.1.2.6
*** starter.inc.php     26 Oct 2003 07:43:06 -0000      1.1.1.1.2.5
--- starter.inc.php     27 Oct 2003 19:12:06 -0000      1.1.1.1.2.6
***************
*** 206,210 ****
        if($GLOBALS['missing_critical'] || 
$GLOBALS['phpgw']->acl->check($methodname, 1))
        {
!               $result = execmethod($methodname,$inputs);      
        }
        else
--- 206,229 ----
        if($GLOBALS['missing_critical'] || 
$GLOBALS['phpgw']->acl->check($methodname, 1))
        {
!               $result = execmethod($methodname,$inputs);
! 
!               /* If the method doesnt exist, then we try and keep the user in 
the app and class they requested */
!               if($result == '##NOMETHOD##')
!               {
!                       $methodname = 
$GLOBALS['phpgw_data']['flags']['req_app'].'.'.$GLOBALS['phpgw_data']['flags']['req_class'].'.start';
     
!                       $result = execmethod($methodname,$inputs);
! 
!                       /* If the method still doesnt exist, then we try and 
keep the user in the app they requested */
!                       if($result == '##NOMETHOD##')
!                       {
!                               $methodname = 
$GLOBALS['phpgw_data']['flags']['req_app'].'.base.start'; 
!                               $result = execmethod($methodname,$inputs);
!                               if($result == '##NOMETHOD##')
!                               {
!                                       /* If the method still doesnt exist, 
then just make sure result is empty */
!                                       $result = '';
!                               }
!                       }
!               }
        }
        else

Index: core_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/core_functions.inc.php,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -C2 -d -r1.1.1.1.2.6 -r1.1.1.1.2.7
*** core_functions.inc.php      27 Oct 2003 18:54:15 -0000      1.1.1.1.2.6
--- core_functions.inc.php      27 Oct 2003 19:12:06 -0000      1.1.1.1.2.7
***************
*** 115,118 ****
--- 115,120 ----
                                                
$GLOBALS['msgbox']->add($class.' '.$msg,__LINE__,__FILE__, 'warning');
                                        }
+                                       /* If method didnt exist */
+                                       return '##NOMETHOD##';                  
        
                                }
                        }
***************
*** 153,157 ****
                                        }
                                        
$GLOBALS['msgbox']->add($class.'::'.$methodname.' '.$msg,__LINE__,__FILE__, 
'warning'); 
!                               }                       
                        }
                }
--- 155,161 ----
                                        }
                                        
$GLOBALS['msgbox']->add($class.'::'.$methodname.' '.$msg,__LINE__,__FILE__, 
'warning'); 
!                               }
!                               /* If method didnt exist */
!                               return '##NOMETHOD##';
                        }
                }