[Phpgroupware-cvs] setup manageheader.php lang/phpgw_en.lang templ...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    setup
Changes by:     Sigurd Nes <sigurdne>   07/02/07 12:15:58

Modified files:
        .              : manageheader.php 
        lang           : phpgw_en.lang 
        templates/base : manageheader.tpl 

Log message:
        Making phpgw_handle_error optional

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/manageheader.php?cvsroot=phpgroupware&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/setup/lang/phpgw_en.lang?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/manageheader.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: manageheader.php
===================================================================
RCS file: /sources/phpgroupware/setup/manageheader.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- manageheader.php    6 Oct 2006 01:37:36 -0000       1.55
+++ manageheader.php    7 Feb 2007 12:15:58 -0000       1.56
@@ -5,7 +5,7 @@
        * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation, 
Inc. http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: manageheader.php,v 1.55 2006/10/06 01:37:36 skwashd Exp 
$
+       * @version $Id: manageheader.php,v 1.56 2007/02/07 12:15:58 sigurdne 
Exp $
        */
 
        $phpgw_info = array();
@@ -520,6 +520,15 @@
                                $setup_tpl->set_var('domain_from_host_no',' 
selected');
                        }
 
+                       
if(@$GLOBALS['phpgw_info']['server']['phpgw_handle_error'])
+                       {
+                               $setup_tpl->set_var('phpgw_handle_error_yes',' 
selected');
+                       }
+                       else
+                       {
+                               $setup_tpl->set_var('phpgw_handle_error_no',' 
selected');
+                       }
+
                        $errors = '';
                        if( !isset($found_dbtype) || !$found_dbtype )
                        {
@@ -576,6 +585,7 @@
                        $setup_tpl->set_var('lang_domselect',lang('Domain 
select box on login'));
                        $setup_tpl->set_var('lang_domain_from_host', 
lang('Automatically detect domain from hostname'));
                        $setup_tpl->set_var('lang_note_domain_from_host', 
lang('Note: This option will only work if show domain select box is off.'));
+                       
$setup_tpl->set_var('lang_phpgw_handle_error',lang('Enable custom error handle 
for heavy debugging'));
                        $setup_tpl->set_var('lang_finaldescr',lang('After 
retrieving the file, put it into place as the header.inc.php.  Then, click 
"continue".'));
                        $setup_tpl->set_var('lang_continue',lang('Continue'));
 

Index: lang/phpgw_en.lang
===================================================================
RCS file: /sources/phpgroupware/setup/lang/phpgw_en.lang,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- lang/phpgw_en.lang  24 Apr 2006 09:49:07 -0000      1.29
+++ lang/phpgw_en.lang  7 Feb 2007 12:15:58 -0000       1.30
@@ -111,6 +111,7 @@
 edit current configuration     setup   en      Edit Current Configuration
 edit your existing header.inc.php      setup   en      Edit your existing 
header.inc.php
 edit your header.inc.php       setup   en      Edit your header.inc.php
+Enable custom error handle for heavy debugging setup   en      Enable custom 
error handle for heavy debugging
 enable debug messages  setup   en      enable debug messages
 enable mcrypt  setup   en      Enable MCrypt
 enter some random text for app session encryption      setup   en      Enter 
some random text for app session encryption

Index: templates/base/manageheader.tpl
===================================================================
RCS file: /sources/phpgroupware/setup/templates/base/manageheader.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/manageheader.tpl     30 Dec 2004 11:35:10 -0000      1.1
+++ templates/base/manageheader.tpl     7 Feb 2007 12:15:58 -0000       1.2
@@ -68,6 +68,15 @@
        {lang_note_domain_from_host}
     </td>
   </tr>
+  <tr>
+    <td><b>{lang_phpgw_handle_error}</b><br>
+      <select name="setting[phpgw_handle_error]">
+        <option value="True"{phpgw_handle_error_yes}>True</option>
+        <option value="False"{phpgw_handle_error_no}>False</option>
+      </select></td><td>&nbsp;
+    </td>
+  </tr>
+
 {domains}{comment_l}
   <tr class="th">
     <td colspan="2"><input type="submit" name="adddomain" 
value="{lang_adddomain}"></td>