[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14843] Merge 14837:14838 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14843] Merge 14837:14838 from trunk |
Date: |
Wed, 16 Mar 2016 10:09:17 +0000 |
Revision: 14843
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14843
Author: sigurdne
Date: 2016-03-16 10:09:17 +0000 (Wed, 16 Mar 2016)
Log Message:
-----------
Merge 14837:14838 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/templates/base/config.tpl
branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/booking/templates/base/css/base.css
branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/CSSDefinition.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Config.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Filter/YouTube.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Injector/RemoveEmpty.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/DOMLex.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Lexer/PH5P.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.composer.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.includes.php
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier.php
Added Paths:
-----------
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
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
+ /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
Modified: branches/Version-2_0-branch/admin/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/admin/templates/base/config.tpl 2016-03-16
10:07:32 UTC (rev 14842)
+++ branches/Version-2_0-branch/admin/templates/base/config.tpl 2016-03-16
10:09:17 UTC (rev 14843)
@@ -274,15 +274,6 @@
</select>
</td>
</tr>
- <tr class="pure-table-odd">
- <td>{lang_use_HTML_Filtering}:<br>
- <td>
- <select name="newsettings[html_filtering]">
- <option value="" {selected_html_filtering_}>NO</option>
- <option value="1" {selected_html_filtering_1}>YES</option>
- </select>
- </td>
- </tr>
<tr>
<td>{lang_support_email_address}:</td>
<td>
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838
+ /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842
Modified: branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
2016-03-16 10:07:32 UTC (rev 14842)
+++ branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
2016-03-16 10:09:17 UTC (rev 14843)
@@ -962,8 +962,6 @@
unset($application['frontend_modified']);
}
- $errors = $this->validate($application);
-
foreach ($_POST['from_'] as &$from)
{
$from = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($from));
@@ -975,6 +973,7 @@
$application['dates'] = array_map(array(self,
'_combine_dates'), $_POST['from_'], $_POST['to_']);
+ $errors = $this->validate($application);
if (!$errors)
{
Modified: branches/Version-2_0-branch/booking/templates/base/css/base.css
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/css/base.css
2016-03-16 10:07:32 UTC (rev 14842)
+++ branches/Version-2_0-branch/booking/templates/base/css/base.css
2016-03-16 10:09:17 UTC (rev 14843)
@@ -262,7 +262,9 @@
width: 25px;
height: 15px;
cursor: pointer;
- color: white;
+ color: black;
+ font-weight: normal;
+ font-size: 400%;
}
#agegroup {
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-16 10:07:32 UTC (rev 14842)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
2016-03-16 10:09:17 UTC (rev 14843)
@@ -145,12 +145,6 @@
*/
public static function clean_html($html, $base_url = '')
{
- if (
!isset($GLOBALS['phpgw_info']['server']['html_filtering'])
- ||
!$GLOBALS['phpgw_info']['server']['html_filtering'])
- {
- return $html;
- }
-
if ( !$base_url )
{
$base_url =
$GLOBALS['phpgw_info']['server']['webserver_url'];
Modified:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
2016-03-16 10:07:32 UTC (rev 14842)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/CSS/Multiple.php
2016-03-16 10:09:17 UTC (rev 14843)
@@ -44,7 +44,7 @@
*/
public function validate($string, $config, $context)
{
- $string = $this->parseCDATA($string);
+ $string = $this->mungeRgb($this->parseCDATA($string));
if ($string === '') {
return false;
}
Modified:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
2016-03-16 10:07:32 UTC (rev 14842)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/AttrDef/HTML/Bool.php
2016-03-16 10:09:17 UTC (rev 14843)
@@ -32,9 +32,6 @@
*/
public function validate($string, $config, $context)
{
- if (empty($string)) {
- return false;
- }
return $this->name;
}
Modified:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/CSSDefinition.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/CSSDefinition.php
2016-03-16 10:07:32 UTC (rev 14842)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/CSSDefinition.php
2016-03-16 10:09:17 UTC (rev 14843)
@@ -350,8 +350,7 @@
$this->info['scrollbar-highlight-color'] = new
HTMLPurifier_AttrDef_CSS_Color();
$this->info['scrollbar-shadow-color'] = new
HTMLPurifier_AttrDef_CSS_Color();
- // technically not proprietary, but CSS3, and no one supports it
- $this->info['opacity'] = new
HTMLPurifier_AttrDef_CSS_AlphaValue();
+ // vendor specific prefixes of opacity
$this->info['-moz-opacity'] = new
HTMLPurifier_AttrDef_CSS_AlphaValue();
$this->info['-khtml-opacity'] = new
HTMLPurifier_AttrDef_CSS_AlphaValue();
@@ -404,6 +403,7 @@
array('visible', 'hidden', 'collapse')
);
$this->info['overflow'] = new
HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
+ $this->info['opacity'] = new HTMLPurifier_AttrDef_CSS_AlphaValue();
}
/**
Modified:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Config.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Config.php
2016-03-16 10:07:32 UTC (rev 14842)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/Config.php
2016-03-16 10:09:17 UTC (rev 14843)
@@ -21,7 +21,7 @@
* HTML Purifier's version
* @type string
*/
- public $version = '4.6.0';
+ public $version = '4.7.0';
/**
* Whether or not to automatically finalize
@@ -646,16 +646,25 @@
return $this->getDefinition($name, true, true);
}
+ /**
+ * @return HTMLPurifier_HTMLDefinition
+ */
public function maybeGetRawHTMLDefinition()
{
return $this->getDefinition('HTML', true, true);
}
+ /**
+ * @return HTMLPurifier_CSSDefinition
+ */
public function maybeGetRawCSSDefinition()
{
return $this->getDefinition('CSS', true, true);
}
+ /**
+ * @return HTMLPurifier_URIDefinition
+ */
public function maybeGetRawURIDefinition()
{
return $this->getDefinition('URI', true, true);
Copied:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
(from rev 14842,
trunk/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt)
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
(rev 0)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.Predicate.txt
2016-03-16 10:09:17 UTC (rev 14843)
@@ -0,0 +1,14 @@
+AutoFormat.RemoveEmpty.Predicate
+TYPE: hash
+VERSION: 4.7.0
+DEFAULT: array('colgroup' => array(), 'th' => array(), 'td' => array(),
'iframe' => array('src'))
+--DESCRIPTION--
+<p>
+ Given that an element has no contents, it will be removed by default, unless
+ this predicate dictates otherwise. The predicate can either be an
associative
+ map from tag name to list of attributes that must be present for the element
+ to be considered preserved: thus, the default always preserves
<code>colgroup</code>,
+ <code>th</code> and <code>td</code>, and also <code>iframe</code> if it
+ has a <code>src</code>.
+</p>
+--# vim: et sw=4 sts=4
Modified:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
2016-03-16 10:07:32 UTC (rev 14842)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
2016-03-16 10:09:17 UTC (rev 14843)
@@ -4,6 +4,6 @@
DEFAULT: NULL
--DESCRIPTION--
-A custom doctype for power-users who defined there own document
+A custom doctype for power-users who defined their own document
type. This directive only applies when %HTML.Doctype is blank.
--# vim: et sw=4 sts=4
Modified:
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
2016-03-16 10:07:32 UTC (rev 14842)
+++
branches/Version-2_0-branch/phpgwapi/inc/htmlpurifier/HTMLPurifier/ConfigSchema/schema.ser
2016-03-16 10:09:17 UTC (rev 14843)
@@ -1 +1 @@
-O:25:"HTMLPurifier_ConfigSchema":3:{s:8:"defaults";a:118:{s:19:"Attr.AllowedClasses";N;s:24:"Attr.AllowedFrameTargets";a:0:{}s:15:"Attr.AllowedRel";a:0:{}s:15:"Attr.AllowedRev";a:0:{}s:18:"Attr.ClassUseCDATA";N;s:20:"Attr.DefaultImageAlt";N;s:24:"Attr.DefaultInvalidImage";s:0:"";s:27:"Attr.DefaultInvalidImageAlt";s:13:"Invalid
image";s:19:"Attr.DefaultTextDir";s:3:"ltr";s:13:"Attr.EnableID";b:0;s:21:"Attr.ForbiddenClasses";a:0:{}s:16:"Attr.IDBlacklist";a:0:{}s:22:"Attr.IDBlacklistRegexp";N;s:13:"Attr.IDPrefix";s:0:"";s:18:"Attr.IDPrefixLocal";s:0:"";s:24:"AutoFormat.AutoParagraph";b:0;s:17:"AutoFormat.Custom";a:0:{}s:25:"AutoFormat.DisplayLinkURI";b:0;s:18:"AutoFormat.Linkify";b:0;s:33:"AutoFormat.PurifierLinkify.DocURL";s:3:"#%s";s:26:"AutoFormat.PurifierLinkify";b:0;s:44:"AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions";a:2:{s:2:"td";b:1;s:2:"th";b:1;}s:33:"AutoFormat.RemoveEmpty.RemoveNbsp";b:0;s:22:"AutoFormat.RemoveEmpty";b:0;s:39:"AutoFormat.RemoveSpansWithoutAttributes";b:0;s:18:"CSS.AllowImportant";b:0;s:15:"CSS.AllowTricky";b:0;s:16:"CSS.AllowedFonts";N;s:21:"CSS.AllowedProperties";N;s:17:"CSS.DefinitionRev";i:1;s:23:"CSS.ForbiddenProperties";a:0:{}s:16:"CSS.MaxImgLength";s:6:"1200px";s:15:"CSS.Proprietary";b:0;s:11:"CSS.Trusted";b:0;s:20:"Cache.DefinitionImpl";s:10:"Serializer";s:20:"Cache.SerializerPath";N;s:27:"Cache.SerializerPermissions";i:493;s:22:"Core.AggressivelyFixLt";b:1;s:28:"Core.AllowHostnameUnderscore";b:0;s:18:"Core.CollectErrors";b:0;s:18:"Core.ColorKeywords";a:17:{s:6:"maroon";s:7:"#800000";s:3:"red";s:7:"#FF0000";s:6:"orange";s:7:"#FFA500";s:6:"yellow";s:7:"#FFFF00";s:5:"olive";s:7:"#808000";s:6:"purple";s:7:"#800080";s:7:"fuchsia";s:7:"#FF00FF";s:5:"white";s:7:"#FFFFFF";s:4:"lime";s:7:"#00FF00";s:5:"green";s:7:"#008000";s:4:"navy";s:7:"#000080";s:4:"blue";s:7:"#0000FF";s:4:"aqua";s:7:"#00FFFF";s:4:"teal";s:7:"#008080";s:5:"black";s:7:"#000000";s:6:"silver";s:7:"#C0C0C0";s:4:"gray";s:7:"#808080";}s:30:"Core.ConvertDocumentToFragment";b:1;s:36:"Core.DirectLexLineNumberSyncInterval";i:0;s:20:"Core.DisableExcludes";b:0;s:15:"Core.EnableIDNA";b:0;s:13:"Core.Encoding";s:5:"utf-8";s:26:"Core.EscapeInvalidChildren";b:0;s:22:"Core.EscapeInvalidTags";b:0;s:29:"Core.EscapeNonASCIICharacters";b:0;s:19:"Core.HiddenElements";a:2:{s:6:"script";b:1;s:5:"style";b:1;}s:13:"Core.Language";s:2:"en";s:14:"Core.LexerImpl";N;s:24:"Core.MaintainLineNumbers";N;s:22:"Core.NormalizeNewlines";b:1;s:21:"Core.RemoveInvalidImg";b:1;s:33:"Core.RemoveProcessingInstructions";b:0;s:25:"Core.RemoveScriptContents";N;s:13:"Filter.Custom";a:0:{}s:34:"Filter.ExtractStyleBlocks.Escaping";b:1;s:31:"Filter.ExtractStyleBlocks.Scope";N;s:34:"Filter.ExtractStyleBlocks.TidyImpl";N;s:25:"Filter.ExtractStyleBlocks";b:0;s:14:"Filter.YouTube";b:0;s:12:"HTML.Allowed";N;s:22:"HTML.AllowedAttributes";N;s:20:"HTML.AllowedComments";a:0:{}s:26:"HTML.AllowedCommentsRegexp";N;s:20:"HTML.AllowedElements";N;s:19:"HTML.AllowedModules";N;s:23:"HTML.Attr.Name.UseCDATA";b:0;s:17:"HTML.BlockWrapper";s:1:"p";s:16:"HTML.CoreModules";a:7:{s:9:"Structure";b:1;s:4:"Text";b:1;s:9:"Hypertext";b:1;s:4:"List";b:1;s:22:"NonXMLCommonAttributes";b:1;s:19:"XMLCommonAttributes";b:1;s:16:"CommonAttributes";b:1;}s:18:"HTML.CustomDoctype";N;s:17:"HTML.DefinitionID";N;s:18:"HTML.DefinitionRev";i:1;s:12:"HTML.Doctype";N;s:25:"HTML.FlashAllowFullScreen";b:0;s:24:"HTML.ForbiddenAttributes";a:0:{}s:22:"HTML.ForbiddenElements";a:0:{}s:17:"HTML.MaxImgLength";i:1200;s:13:"HTML.Nofollow";b:0;s:11:"HTML.Parent";s:3:"div";s:16:"HTML.Proprietary";b:0;s:14:"HTML.SafeEmbed";b:0;s:15:"HTML.SafeIframe";b:0;s:15:"HTML.SafeObject";b:0;s:18:"HTML.SafeScripting";a:0:{}s:11:"HTML.Strict";b:0;s:16:"HTML.TargetBlank";b:0;s:12:"HTML.TidyAdd";a:0:{}s:14:"HTML.TidyLevel";s:6:"medium";s:15:"HTML.TidyRemove";a:0:{}s:12:"HTML.Trusted";b:0;s:10:"HTML.XHTML";b:1;s:28:"Output.CommentScriptContents";b:1;s:19:"Output.FixInnerHTML";b:1;s:18:"Output.FlashCompat";b:0;s:14:"Output.Newline";N;s:15:"Output.SortAttr";b:0;s:17:"Output.TidyFormat";b:0;s:17:"Test.ForceNoIconv";b:0;s:18:"URI.AllowedSchemes";a:6:{s:4:"http";b:1;s:5:"https";b:1;s:6:"mailto";b:1;s:3:"ftp";b:1;s:4:"nntp";b:1;s:4:"news";b:1;}s:8:"URI.Base";N;s:17:"URI.DefaultScheme";s:4:"http";s:16:"URI.DefinitionID";N;s:17:"URI.DefinitionRev";i:1;s:11:"URI.Disable";b:0;s:19:"URI.DisableExternal";b:0;s:28:"URI.DisableExternalResources";b:0;s:20:"URI.DisableResources";b:0;s:8:"URI.Host";N;s:17:"URI.HostBlacklist";a:0:{}s:16:"URI.MakeAbsolute";b:0;s:9:"URI.Munge";N;s:18:"URI.MungeResources";b:0;s:18:"URI.MungeSecretKey";N;s:26:"URI.OverrideAllowedSchemes";b:1;s:20:"URI.SafeIframeRegexp";N;}s:12:"defaultPlist";O:25:"HTMLPurifier_PropertyList":3:{s:7:"