[Phpgroupware-cvs] manual inc/class.help.inc.php inc/class.uimanua...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    manual
Changes by:     Sigurd Nes <sigurdne>   06/10/25 19:00:36

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

Log message:
        Try to make it work

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/manual/inc/class.help.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/manual/inc/class.uimanual.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/manual/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11

Patches:
Index: inc/class.help.inc.php
===================================================================
RCS file: /sources/phpgroupware/manual/inc/class.help.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/class.help.inc.php      25 Oct 2006 13:53:34 -0000      1.1
+++ inc/class.help.inc.php      25 Oct 2006 19:00:36 -0000      1.2
@@ -22,7 +22,7 @@
        * along with this program; if not, write to the Free Software       *
        * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         *
        \*******************************************************************/
-       /* $Id: class.help.inc.php,v 1.1 2006/10/25 13:53:34 sigurdne Exp $ */
+       /* $Id: class.help.inc.php,v 1.2 2006/10/25 19:00:36 sigurdne Exp $ */
 
        class help
        {
@@ -123,8 +123,8 @@
                                        break;
                                default:
                                        
$this->setvar('intro',$GLOBALS['phpgw']->link('/help.php'));
-                                       
$this->setvar('app_intro',$GLOBALS['phpgw']->link('/help.php','app=' . 
$this->app_name));
-                                       
$this->setvar('note',$GLOBALS['phpgw']->link('/help.php','note=True'));
+                                       
$this->setvar('app_intro',$GLOBALS['phpgw']->link('/help.php',array('app'=> 
$this->app_name)));
+                                       
$this->setvar('note',$GLOBALS['phpgw']->link('/help.php',array('note'=>'True')));
                                        break;
                        }
                }
@@ -234,6 +234,25 @@
 
                        if ($help_file)
                        {
+                               return $GLOBALS['phpgw']->link('/index.php', 
array('menuaction'=>'manual.uimanual.help','help_file'=>urlencode($help_file)));
+                       }
+
+                       return False;
+               }
+
+               function check_help_file_org($file)
+               {
+                       $lang = strtoupper($this->lang);
+
+                       $help_file = $this->check_file('/' . $this->app_name . 
'/help/'. $lang . '/' . $file);
+
+                       if($help_file == '')
+                       {
+                               $help_file = $this->check_file('/' . 
$this->app_name . '/help/EN/' . $file);
+                       }
+
+                       if ($help_file)
+                       {
                                return $GLOBALS['phpgw']->link($help_file);
                        }
 

Index: inc/class.uimanual.inc.php
===================================================================
RCS file: /sources/phpgroupware/manual/inc/class.uimanual.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/class.uimanual.inc.php  25 Oct 2006 13:53:34 -0000      1.1
+++ inc/class.uimanual.inc.php  25 Oct 2006 19:00:36 -0000      1.2
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.uimanual.inc.php,v 1.1 2006/10/25 13:53:34 
sigurdne Exp $
+       * @version $Id: class.uimanual.inc.php,v 1.2 2006/10/25 19:00:36 
sigurdne Exp $
        */
 
        /**
@@ -28,7 +28,8 @@
 
                var $public_functions = array
                (
-                       'index'  => True
+                       'index'  => True,
+                       'help'  => True
                );
 
                function uimanual()
@@ -36,16 +37,16 @@
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
                        $GLOBALS['phpgw']->help = 
CreateObject('manual.help_helper');
 
+               }
+
+               function index()
+               {
                        $this->currentapp               = 
get_var('app',array('POST','GET'));
 
                        if (!$this->currentapp)
                        {
                                $this->currentapp = 'help';
                        }
-               }
-
-               function index()
-               {
 
                        if ($this->currentapp == 'help')
                        {
@@ -62,8 +63,23 @@
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
$appname . ' - ' . $appname;
 
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('help' => 
$GLOBALS['phpgw']->help->output));
+               }
+
+               function help()
+               {
+
+                       $help_file              = 
urldecode(get_var('help_file',array('POST','GET')));
+
+                       $appname                = lang('Help');
+                       $function_msg   = lang($this->currentapp);
        
+                       include(PHPGW_SERVER_ROOT . $help_file);
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
$appname . ' - ' . $appname;
+                       
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('help' => 
$GLOBALS['phpgw']->help->output));  
                }
 
+
        }
 ?>

Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/manual/setup/setup.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- setup/setup.inc.php 11 Mar 2006 23:20:48 -0000      1.10
+++ setup/setup.inc.php 25 Oct 2006 19:00:36 -0000      1.11
@@ -6,14 +6,14 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package manual
        * @subpackage setup
-       * @version $Id: setup.inc.php,v 1.10 2006/03/11 23:20:48 skwashd Exp $
+       * @version $Id: setup.inc.php,v 1.11 2006/10/25 19:00:36 sigurdne Exp $
        */
 
        // Basic information about this app
        $setup_info['manual']['name']      = 'manual';
        $setup_info['manual']['version']   = '0.9.13.002';
        $setup_info['manual']['app_order'] = 5;
-       $setup_info['manual']['enable']    = 3;
+       $setup_info['manual']['enable']    = 1;
        $setup_info['manual']['app_group']      = 'accessories';
 
        // The hooks this app includes, needed for hooks registration