[Fmsystem-commits] [14899] Merge 14897:14898 from trunk

[Sigurd Nes]

Revision: 14899
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14899
Author:   sigurdne
Date:     2016-04-06 14:01:02 +0000 (Wed, 06 Apr 2016)
Log Message:
-----------
Merge 14897:14898 from trunk

Modified Paths:
--------------
    
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
    
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898

Modified: 
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- 
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
   2016-04-06 13:59:51 UTC (rev 14898)
+++ 
branches/Version-2_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
   2016-04-06 14:01:02 UTC (rev 14899)
@@ -38,6 +38,16 @@
 
                public function test_sql_injection()
                {
+                       $c = createobject('phpgwapi.config', 
'activitycalendarfrontend');
+                       $c->read();
+                       $config = $c->config_data;
+
+                       $allow_test = $c->config_data['allow_test'];
+                       if($allow_test != 1)
+                       {
+                               echo "<H1>Test not activated in config</H>";
+                               exit;
+                       }
                        $GLOBALS['phpgw_info']['flags']['noheader'] = true;
                        $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;

Modified: 
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl
===================================================================
--- 
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl  
    2016-04-06 13:59:51 UTC (rev 14898)
+++ 
branches/Version-2_0-branch/activitycalendarfrontend/templates/base/config.tpl  
    2016-04-06 14:01:02 UTC (rev 14899)
@@ -30,6 +30,15 @@
                        <td><input type="password" 
name="newsettings[anonymous_passwd]" value="{value_anonymous_passwd}"></td>
                </tr>
                <tr bgcolor="{row_on}">
+                       <td>{lang_allow_test_for_sql_injection}:</td>
+                       <td>
+                               <select name="newsettings[allow_test]">
+                                       <option value="" 
{selected_allow_test_}>NO</option>
+                                       <option value="1" 
{selected_allow_test_1}>YES</option>
+                               </select>
+                       </td>
+               </tr>
+               <tr bgcolor="{row_on}">
 
                        <!-- END body -->