diff --git a/addressbook/help/addressbook.php b/addressbook/help/addressbook.php new file mode 100755 index 0000000000..63e2190151 --- /dev/null +++ b/addressbook/help/addressbook.php @@ -0,0 +1,60 @@ + "manual", "enable_utilities_class" => True); + include("../../header.inc.php"); +?> + + +

+A searchable address book for keeping contact information of business +associates or friends and family. +

+Access can be restricted to, private, group readable (that is the members of the +same groups as you are in, will be able to see the too, and globally readable, all +users to the system will be able to see the entry. +

+Users can only edit their own entries, regardless of readability settings. +common->phpgw_footer(); ?> + diff --git a/addressbook/inc/hook_manual.inc.php b/addressbook/inc/hook_manual.inc.php new file mode 100755 index 0000000000..da569fcabc --- /dev/null +++ b/addressbook/inc/hook_manual.inc.php @@ -0,0 +1,21 @@ + * + * -------------------------------------------- * + * 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. * + \**************************************************************************/ + + /* $Id$ */ + + if (floor(phpversion()) == 4) { + global $phpgw, $phpgw_info, $treemenu; + } + + $treemenu .= '..'.ucwords($appname).''.ucwords($appname).'|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php')."\n"; +// Modify the $treemenu variables from here down..... +?> diff --git a/admin/inc/hook_manual.inc.php b/admin/inc/hook_manual.inc.php new file mode 100755 index 0000000000..14f69f7fb7 --- /dev/null +++ b/admin/inc/hook_manual.inc.php @@ -0,0 +1,24 @@ + * + * -------------------------------------------- * + * 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. * + \**************************************************************************/ + + /* $Id$ */ + + if (floor(phpversion()) == 4) { + global $phpgw, $phpgw_info, $treemenu; + } + + $treemenu .= '..'.ucwords($appname).''.ucwords($appname).'|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php')."\n"; +// Modify the $treemenu variables from here down..... + $treemenu .= '...Account Management|'.$phpgw->link('/'.$appname.'/help/account.php')."\n"; + $treemenu .= '...Session Management|'.$phpgw->link('/'.$appname.'/help/session.php')."\n"; + $treemenu .= '...Other|'.$phpgw->link('/'.$appname.'/help/other.php')."\n"; +?> diff --git a/calendar/help/add.php b/calendar/help/add.php new file mode 100755 index 0000000000..ae2b8d7252 --- /dev/null +++ b/calendar/help/add.php @@ -0,0 +1,56 @@ + 'manual', + 'enable_utilities_class' => True + ); + $phpgw_info['flags'] = $phpgw_flags; + include('../../header.inc.php'); +?> + + +

+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events. +
+

+
Note: Access can be set as with other applications in this suite, Private,Group Readable,Globally +Readable. +

+common->phpgw_footer(); ?> diff --git a/calendar/help/calendar.php b/calendar/help/calendar.php new file mode 100755 index 0000000000..24bfc75116 --- /dev/null +++ b/calendar/help/calendar.php @@ -0,0 +1,76 @@ + 'manual', + 'enable_utilities_class' => True + ); + $phpgw_info['flags'] = $phpgw_flags; + include('../../header.inc.php'); +?> + + +

+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events. +
For viewing in either hourly/day,current week or monthly option, click on the relevant +icons at the top left hand corner. +
+

+common->phpgw_footer(); ?> diff --git a/calendar/help/edit_delete.php b/calendar/help/edit_delete.php new file mode 100755 index 0000000000..62f3eafebb --- /dev/null +++ b/calendar/help/edit_delete.php @@ -0,0 +1,35 @@ + 'manual', + 'enable_utilities_class' => True + ); + $phpgw_info['flags'] = $phpgw_flags; + include('../../header.inc.php'); +?> + + +

+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events. +
+

    +

    +

  • Edit:Delete   +
    To edit an entry group click on the small icon as shown above. +A form page will be presented, where you can edit the relevant fields. +Chose edit or delete from the bottom of the page. +

    Note:You can only make changes or delete those calendar entries created by you. +

    +

+common->phpgw_footer(); ?> diff --git a/calendar/help/view.php b/calendar/help/view.php new file mode 100755 index 0000000000..ec324d126b --- /dev/null +++ b/calendar/help/view.php @@ -0,0 +1,40 @@ + 'manual', + 'enable_utilities_class' => True + ); + $phpgw_info['flags'] = $phpgw_flags; + include('../../header.inc.php'); +?> + + +

+A searchable daily,weekly,monthly calendar/scheduling application with alerts for high priority events. +
For viewing in either hourly/day,current week or monthly option, click on the relevant +icons at the top left hand corner. +
+

    +
  • Viewing:Day Week Month Year +

    Day: +
    Current day is displayed, broken down in hour slots. Start and end time of the day +can be set in the preferences. +

    Week: +
    Current week is displayed. Start day of week can be set in preferences. +

    Month: +
    Default entry is to the current month, viewed in monthly option, with both prior and future +months easily accessible with one click. +

    +

+common->phpgw_footer(); ?> diff --git a/calendar/inc/hook_manual.inc.php b/calendar/inc/hook_manual.inc.php new file mode 100755 index 0000000000..c621e0ae99 --- /dev/null +++ b/calendar/inc/hook_manual.inc.php @@ -0,0 +1,24 @@ + * + * -------------------------------------------- * + * 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. * + \**************************************************************************/ + + /* $Id$ */ + + if (floor(phpversion()) == 4) { + global $phpgw, $phpgw_info, $treemenu; + } + + $treemenu .= '..'.ucwords($appname).''.ucwords($appname).'|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php')."\n"; +// Modify the $treemenu variables from here down..... + $treemenu .= '...Viewing|'.$phpgw->link('/'.$appname.'/help/view.php')."\n"; + $treemenu .= '...Adding|'.$phpgw->link('/'.$appname.'/help/add.php')."\n"; + $treemenu .= '...Edit/Deleting|'.$phpgw->link('/'.$appname.'/help/edit_delete.php')."\n"; +?> diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index b2fc98ea52..e09ef217dd 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -643,6 +643,57 @@ return False; } } + + function find_image($appname,$image) + { + global $phpgw_info; + + $imagedir = '/'.$appname.'/templates/'.$phpgw_info['server']['template_set'].'/images'; + $imagedir_default = '/'.$appname.'/templates/default/images'; + $imagedir_olddefault = '/'.$appname.'/images'; + + if(file_exists(PHPGW_SERVER_ROOT.$imagedir.'/'.$image)) + { + $imgfile = $phpgw_info['server']['webserver_url'].$imagedir.'/'.$image; + } + elseif(file_exists(PHPGW_SERVER_ROOT.$imagedir_default.'/'.$image)) + { + $imgfile = $phpgw_info['server']['webserver_url'].$imagedir_default.'/'.$image; + } + elseif(file_exists(PHPGW_SERVER_ROOT.$imagedir_olddefault.'/'.$image)) + { + $imgfile = $phpgw_info['server']['webserver_url'].$imagedir_olddefault.'/'.$image; + } + else + { + $imgfile = ''; + } + return $imgfile; + } + + function image($appname,$image='') + { + if(is_array($image)) + { + $i = 0; + $image_found = $this->find_image($appname,$image[$i]); + $c_image = count($image); + while($image_found == '' && $i<$c_image) + { + $image_found = $this->find_image($appname,$image[$i]); + $i++; + } + return $image_found; + } + elseif($image != '') + { + return $this->find_image($appname,$image); + } + else + { + return ''; + } + } /*! @function navbar @abstract none yet diff --git a/phpgwapi/inc/class.menutree.inc.php b/phpgwapi/inc/class.menutree.inc.php index 7406fb791e..2212971e83 100644 --- a/phpgwapi/inc/class.menutree.inc.php +++ b/phpgwapi/inc/class.menutree.inc.php @@ -29,22 +29,32 @@ class menutree { var $read_from_file; // You can send the tree info from a string or file var $root_level_value; // This is what the top level name or image will be - function menutree() + function menutree($read_from_file='T') { - $this->read_from_file = True; + if($read_from_file == 'T') + { + settype($read_from_file,'integer'); + $read_from_file = 1; + } + elseif($read_from_file == 'F') + { + settype($read_from_file,'integer'); + $read_from_file = 0; + } + $this->read_from_file = $read_from_file; } function showtree($treefile, $expandlevels='', $num_menus = 50, $invisible_menus = Null) { - global $phpgw_info, $phpgw, $SCRIPT_FILENAME; + global $phpgw_info, $phpgw, $SCRIPT_FILENAME, $REQUEST_URI; - $img_expand = 'templates/default/images/tree_expand.gif'; - $img_collapse = 'templates/default/images/tree_collapse.gif'; - $img_line = 'templates/default/images/tree_vertline.gif'; - $img_split = 'templates/default/images/tree_split.gif'; - $img_end = 'templates/default/images/tree_end.gif'; - $img_leaf = 'templates/default/images/tree_leaf.gif'; - $img_spc = 'templates/default/images/tree_space.gif'; + $img_expand = $phpgw->common->image('manual','tree_expand.gif'); + $img_collapse = $phpgw->common->image('manual','tree_collapse.gif'); + $img_line = $phpgw->common->image('manual','tree_vertline.gif'); + $img_split = $phpgw->common->image('manual','tree_split.gif'); + $img_end = $phpgw->common->image('manual','tree_end.gif'); + $img_leaf = $phpgw->common->image('manual','tree_leaf.gif'); + $img_spc = $phpgw->common->image('manual','tree_space.gif'); /*********************************************/ /* Read text file with tree structure */ @@ -260,6 +270,11 @@ var $root_level_value; // This is what the top level name or image will b $params=''; } + if($params != '') + { + $params = '&'.$params; + } + /****************************************/ /* Always display the extreme top level */ /****************************************/ @@ -316,13 +331,21 @@ var $root_level_value; // This is what the top level name or image will b /********************************************/ if($tree[$cnt+1][0]>$tree[$cnt][0]) { + $src = $REQUEST_URI; + if(strpos($src,'&p=') != 0) + { + $src = str_replace(substr($REQUEST_URI,strpos($src,'&p=')),'',$REQUEST_URI); + } +// echo 'Src = '.$src."
\n"; if($expand[$cnt]==0) { - $str .= '+'; +// $str .= '+'; + $str .= '+'; } else { - $str .= '-'; +// $str .= '-'; + $str .= '-'; } } elseif(isset($tree[$cnt+1][0])) @@ -342,7 +365,7 @@ var $root_level_value; // This is what the top level name or image will b } else { - $str .= ''.$tree[$cnt][1].''; + $str .= ''.$tree[$cnt][1].''; } /****************************************/ diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index 1868301814..25de376bb5 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -395,8 +395,6 @@ } } - error_reporting(E_ERROR | E_WARNING | E_PARSE); - /************************************************************************\ * This function will return a properly formatted account_id. * * This needs to be placed here, or some classes will have a problem * @@ -435,4 +433,5 @@ } } + error_reporting(E_ERROR | E_WARNING | E_PARSE);