[Phpgroupware-cvs] manual/inc class.uimanual.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    manual
Changes by:     Sigurd Nes <sigurdne>   07/04/08 17:36:52

Modified files:
        inc            : class.uimanual.inc.php 

Log message:
        manual entry fetched from reffered page (current function) - allowed to 
be overrided

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/manual/inc/class.uimanual.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8

Patches:
Index: class.uimanual.inc.php
===================================================================
RCS file: /sources/phpgroupware/manual/inc/class.uimanual.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.uimanual.inc.php      29 Mar 2007 13:14:06 -0000      1.7
+++ class.uimanual.inc.php      8 Apr 2007 17:36:52 -0000       1.8
@@ -7,7 +7,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package manual
-       * @version $Id: class.uimanual.inc.php,v 1.7 2007/03/29 13:14:06 
sigurdne Exp $
+       * @version $Id: class.uimanual.inc.php,v 1.8 2007/04/08 17:36:52 
sigurdne Exp $
        */
 
        /**
@@ -68,23 +68,36 @@
                function help()
                {
                        $odt2xhtml      = CreateObject('manual.odt2xhtml');
-
                        $app = get_var('app',array('GET'));
                        $section = get_var('section',array('GET'));
-                       $app            = $app?$app:'manual';
                        
+                       if(!$section)
+                       {
                        $referer = parse_url($_SERVER['HTTP_REFERER']);
                        parse_str($referer[query]);
 
                        if(isset($menuaction) && $menuaction)
                        {
-                               list($app,$class,$method) = 
explode('.',$menuaction);
+                                       list($app_from_referer,$class,$method) 
= explode('.',$menuaction);
                                if(strpos($class,'ui')== 0 )
                                {
                                        $class = ltrim($class,'ui');
                                }
                                $section = $class . '.' . $method;
                        }       
+                       }       
+
+                       if(!$app)
+                       {
+                               if(isset($app_from_referer) && 
$app_from_referer)
+                               {
+                                       $app = $app_from_referer;
+                               }
+                               else
+                               {
+                                       $app = 'manual';
+                               }
+                       }
 
                        $section        = $section?$section:'overview';
                        $lang           = 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] ? 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']: 'en';