[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14876] Merge 14872:14875 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14876] Merge 14872:14875 from trunk |
|
Date: |
Thu, 31 Mar 2016 06:31:29 +0000 |
Revision: 14876
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14876
Author: sigurdne
Date: 2016-03-31 06:31:27 +0000 (Thu, 31 Mar 2016)
Log Message:
-----------
Merge 14872:14875 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/preferences/preferences.php
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
+ /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
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2016-03-30 18:15:14 UTC (rev 14875)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2016-03-31 06:31:27 UTC (rev 14876)
@@ -357,7 +357,7 @@
* CREATE OPERATOR ~@| (LEFTARG = jsonb, RIGHTARG = text[], PROCEDURE =
jsonb_exists_any);
* CREATE OPERATOR ~@& (LEFTARG = jsonb, RIGHTARG = text[], PROCEDURE =
jsonb_exists_all);
*/
- self::sanitize($sql);
+// self::sanitize($sql);//killing performance
self::_get_fetchmode();
self::set_fetch_single($_fetch_single);
@@ -457,7 +457,7 @@
function limit_query($sql, $offset, $line = '', $file = '',
$num_rows = 0)
{
- self::sanitize($sql);
+// self::sanitize($sql);//killing performance
$this->_get_fetchmode();
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
2016-03-30 18:15:14 UTC (rev 14875)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
2016-03-31 06:31:27 UTC (rev 14876)
@@ -462,7 +462,7 @@
default:
$value = filter_var($value,
FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
$value =
htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
- $value = str_replace(array('(',
')', '=', ';'),array('(', ')', '=', ';'), $value); // prevent
SQL-injection
+ $value = str_replace(array('(',
')', ';', '=', '-'),array('(', ')', ';', '=','−'),
$value); // prevent SQL-injection
break;
case 'boolean':
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2016-03-30 18:15:14 UTC (rev 14875)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.sessions.inc.php
2016-03-31 06:31:27 UTC (rev 14876)
@@ -830,19 +830,6 @@
*/
public function phpgw_setcookie($cookiename, $cookievalue='',
$cookietime=0)
{
-/* $secure = phpgw::get_var('HTTPS', 'bool', 'SERVER');
-
- if( isset(
$GLOBALS['phpgw_info']['server']['webserver_url'] ) )
- {
- $webserver_url =
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/';
- }
- else
- {
- $webserver_url = '/';
- }
-*/
-// setcookie($cookiename, $cookievalue, $cookietime,
parse_url($webserver_url, PHP_URL_PATH),
-// $this->_cookie_domain, $secure, true);
setcookie($cookiename, $cookievalue, $cookietime);
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2016-03-30
18:15:14 UTC (rev 14875)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2016-03-31
06:31:27 UTC (rev 14876)
@@ -400,8 +400,19 @@
*/
function phpgw_handle_exception(Exception $e)
{
+ $help = 'Please contact your administrator for assistance';
+
+ if (!ini_get('display_errors'))
+ {
+ echo <<<HTML
+ <h1>Uncaught Exception</h1>
+ <p>{$help}</p>
+HTML;
+ exit;
+ }
+
$msg = $e->getMessage();
- $help = 'Please contact your administrator for assistance';
+ $help = 'Please contact your administrator for assistance.';
$trace = $e->getTraceAsString();
echo <<<HTML
<h1>Uncaught Exception: {$msg}</h1>
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-03-30 18:15:14 UTC (rev 14875)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-03-31 06:31:27 UTC (rev 14876)
@@ -91,7 +91,7 @@
<input class="toggle-box" id="header1" type="checkbox" />
<label for="header1">
- <xsl:value-of select="php:function('lang', 'toolbar')"/>
+ <xsl:value-of select="php:function('lang', 'filter')"/>
</label>
<div id="toolbar" class='dtable_custom_controls'>
@@ -844,7 +844,7 @@
JqueryPortico.buttons = [
{
extend: 'collection',
- text: "<xsl:value-of
select="php:function('lang', 'collection')"/>",
+ text: "<xsl:value-of
select="php:function('lang', 'toolbar')"/>",
collectionLayout:
'three-column',
buttons: button_def
}
Modified: branches/Version-2_0-branch/preferences/preferences.php
===================================================================
--- branches/Version-2_0-branch/preferences/preferences.php 2016-03-30
18:15:14 UTC (rev 14875)
+++ branches/Version-2_0-branch/preferences/preferences.php 2016-03-31
06:31:27 UTC (rev 14876)
@@ -531,7 +531,7 @@
$GLOBALS['type'] = 'user';
}
- $show_help = true;
+ $show_help = false;
if ( isset($session_data['show_help'])
&& $session_data['show_help'] != ''
&& $session_data['appname'] == $appname )
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14876] Merge 14872:14875 from trunk,
Sigurd Nes <=