Commit Graph
1376 Commits
Author SHA1 Message Date
Jacques Le Roux 2b15c0302c Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
This prevented to run the stable demo
2021-07-20 07:35:11 +02:00
Jacques Le Roux bbc63bc470 Fixed: Ampersand in Party not displayed correctly (OFBIZ-12140)
In the reported case, ModelFormField::getDescription double HTML encodes the
description when both the entity and the description contain an ampersand.

A solution is to test if the description is already HTML encoded before encoding
it again. If HTML encoded then only String encodes it.

BTW I'm not sure it's useful but it's harmless, the same solution can be applied
to OFBIZ-12026 and similarly in renderableFtlFormElementsBuilder::encode. I'll
do as improvements...

Thanks: Andrew Waters for report and help in analysis
2021-01-23 17:50:03 +01:00
Jacques Le Roux ce2f66b720 Fixed: Hyperlink title under form widget doesn't support character encoding for special characters (OFBIZ-12026)
When we use any title with special characters for hyperlink tag, it shows broken
string on UI, eg:
<hyperlink description="${uiLabelMap.CommonImportExport}"  target="ImportExport">
should render a button with the title "Import/Export. But it shows as
Import&#x2f;Export

jleroux: I have noticed that the same happens with special French characters.
So it's a general issue.
The title (description in code) is HTML encoded and that does not work for
special characters. I simply used a string encoder.

Thanks: Pradeep Choudhary for report, Sourabh Jain for a possible but not
general solution at OFBIZ-12023, ie using target-type="plain"
2020-12-11 13:43:15 +01:00
Jacques Le Roux 69828b37ad Fixed: Sorting of lists generates undesired results (OFBIZ-8302)
For this issue (OFBIZ-8302) I reverted the point 1 of
http://svn.apache.org/viewvc?view=revision&revision=1759555

As reported by Alvaro Munoz from GH security team it's not sufficient:
<<the second part of the fix was not effective, since the attacker can close the
raw string context with a double quote and write a new attribute or even close
the macro tag and write arbitrary FreeMarker code.>>

So this removes the 2nd part and add better solution to fix the OFBIZ-8302 issue
The solution is to encode only the QueryString and to handle it correctly in
UtilHttp::getParameterMap. I must say it was not a sinecure!

# Conflicts:
#	framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
#	framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
2020-10-31 20:01:35 +01:00
Jacques Le Roux 9a0bda00f8 Fixed: Server-Side Template Injection using Static (OFBIZ-11871)
Thanks to Alvaro's explanations, the problem was in MacroFormRenderer where, for
lookups, we retrieve _LAST_VIEW_NAME_ as a parameter without encoding it.

Got hard conflicts, all done by hand.

Thanks: Alvaro for advice
2020-08-03 10:43:56 +02:00
Pawan Verma 6b04468f45 Fixed: Theme files loading taking longer time
(OFBIZ-11665)

Thanks: Pierre and Jacques for the review.
2020-05-10 14:19:03 +05:30
Jacques Le Roux 0e20d16cfd Fixed: Compound-widget not works with condition
(OFBIZ-11606)

Fixes "<**:condition" not well managed and generating an error

Changes all the getNodeName() by getLocalName() in the ModelX****Condition.java

Thanks: Olivier
2020-04-27 17:45:28 +02:00
Jacques Le Roux 6189bd8ddd Fixed: Compound-widget not works with condition
(OFBIZ-11606)

rootElement is not correct for a compound file, it's necessary to do a
UtilXml.firstChildElement(rootElement, "forms"); to be correct.
It's done for screen, form but not for grid !

So correction is now added the correct read of rootElement.

jleroux: completely backported by hand

Thanks: Olivier
2020-04-27 15:08:40 +02:00
Nicolas Malin 9b9db9e511 Improved: Improve error message page to support Theming
(OFBIZ-10753)

When OFBiz raise an error, the framework use a jsp page to display it.
I improved the error page generation to support also ftl template rendering and by this way extend the theme engine to support to overide it

On controler.xml we can now use :
    <errorpage>/error/error.jsp</errorpage>
or
    <errorpage>component://common/webcommon/error/Error.ftl</errorpage> (default configuration)

On your theme you can add your own error page :
    <template>
      ...
      <template-file widget=menu location=component://common-theme/template/macro/HtmlMenuMacroLibrary.ftl/>
    + <template-file widget=error location=component://common-theme/template/ErrorPage.ftl/>
    </template>

The component://common/webcommon/error/Error.ftl contains the logic theming connection and to simplify source code, all framework old error page (error.jsp) have been removed to centralize all on this new page.

Thanks to Marine Desmarchelier for the error page design

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1856175 13f79535-47bb-0310-9956-ffa450edef68

# Conflicts:
#	framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
#	themes/common/template/ErrorPage.ftl
2020-02-01 11:08:21 +01:00
Nicolas Malin 571666c737 Fixed: Default option for ModelFormField.DateFindField doesn't work
(OFBIZ-11212)
When you use a date-find element on form, the defaut option are in code like to greater_than and less _than

        public DateFindField(int fieldSource, String type) {
            super(fieldSource, type);
            this.defaultOptionFrom = greaterThanEqualTo;
            this.defaultOptionThru = lessThanEqualTo;
        }

but on macro

<#macro renderDateFindField ...
      <option value=greaterThan<#if defaultOptionFrom==greaterThan> selected=selected</#if>></option><#rt/>
      ...
      <option value=opLessThan<#if defaultOptionThru==opLessThan> selected=selected</#if>></option><#rt/>
      ...
</#macro>

So the value java isn't correct with ftl values and default value never used.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1867584 13f79535-47bb-0310-9956-ffa450edef68
2019-09-26 15:36:18 +00:00
Suraj Khurana 8ae9012031 Applied fix from trunk for revision: 1859915
===

Fixed: Enable entity timestamp fields.
(OFBIZ-10959)
While working on a Production environment, it is found that for some reason entity timestamp fields are disabled at Search Results screen in Trunk and the previous release branch.

Thanks Pawan Verma for reporting the issue and providing the patch, Jacques, Gil, Mathieu for reviewing it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859917 13f79535-47bb-0310-9956-ffa450edef68
2019-05-25 08:28:36 +00:00
Jacques Le Roux bf73437f27 "Applied fix from trunk for revision: 1849165"
------------------------------------------------------------------------
r1849165 | jleroux | 2018-12-18 12:20:28 +0100 (mar. 18 déc. 2018) | 16 lignes

Fixed: Date-find error when used in two forms of a same screen
(OFBIZ-10722)

When we have more than one form, in a screen, that use a date-find field, 
the second date-find picker is not working.

To reproduce, you can add a new form with a date-find and call it below 
FindInvoices in FindInvoices screen

Then load page [https://localhost:8443/accounting/control/findInvoices] . 
You should see  that there is no picker on the second date-find

The patch adds an id that allow renderDateFindField macro script to work for 
both fields

Thanks: Leila Mekika
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857484 13f79535-47bb-0310-9956-ffa450edef68
2019-04-13 17:35:05 +00:00
Nicolas Malin 1036f65934 Fixed: Disable widget verbose property on context doesn't works for rendering ftl template
Backport from trunk

When OFBiz render a platform specific with a ftl template file, the widget verbosity throw function ModelWidget.widgetBoundary() was called with parameters as context. However this function control if a parameters is already present, so if you set a context.widgetVerbose = false, it was ignored and widget verbosity was present for ftl rendering. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1852575 13f79535-47bb-0310-9956-ffa450edef68
2019-01-31 07:51:20 +00:00
Akash Jain d788a1b6a3 Fixed: Date format does not change on change of locale.
(OFBIZ-10736)
Length of date in any formate will always be 10 (2(DD)+1(/)+2(MM)+1(/)+4(YYYY))
Thanks, Aditi Patidar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1849543 13f79535-47bb-0310-9956-ffa450edef68
2018-12-22 11:40:38 +00:00
Michael Brohl e697cde814 Applied fix from trunk for revision: 1826674
===

Fixed: EmailServices.sendMailFromScreen attachment rendering broken.
(OFBIZ-10246)

Thanks Martin for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826675 13f79535-47bb-0310-9956-ffa450edef68
2018-03-13 19:47:09 +00:00
Deepak Dixit dbcb375a61 Fixed: Alert message : Developer: for lookups to work you must provide a form name! appears when try to select contentId from Lookup.
(OFBIZ-10012)
Applied slightly modified patch
Thanks  Sonal for reporting and Aditya Sharma for providing patch for the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1825210 13f79535-47bb-0310-9956-ffa450edef68
2018-02-24 10:48:51 +00:00
Michael Brohl 50c4bba4b2 Improved: Replace all "e.printStackTrace();" by calls to the Debug class.
(OFBIZ-10083)

Thanks Jacques Le Roux for reporting and Kyra Pritzel-Hentley 
for providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818921 13f79535-47bb-0310-9956-ffa450edef68
2017-12-21 12:33:04 +00:00
Deepak Dixit d24c956bf9 Improved: Moved plugins js from images to common/js (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818600 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 18:16:09 +00:00
Michael Brohl 4436e8b96f Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.renderer.html.
(OFBIZ-9933)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818541 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 09:35:36 +00:00
Michael Brohl dc73716549 Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.cache.
(OFBIZ-9948)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818479 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:38:15 +00:00
Michael Brohl e752662174 Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.renderer.
(OFBIZ-9950)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818477 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:32:01 +00:00
Michael Brohl 2a649a74ff Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.model.
(OFBIZ-9955)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818472 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:07:31 +00:00
Jacques Le Roux d1bdee2c6c Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

This completes the work done so far by removing double check in cases not using 
brackets, like
if (Debug.verboseOn())
  if (Debug.verboseOn()) Debug.logVerbose()

Thanks: Michael for reporting this case I missed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818445 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 19:00:19 +00:00
Michael Brohl 1b210f01ac Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.renderer.macro.
(OFBIZ-9960)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818443 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 18:00:42 +00:00
Jacques Le Roux 40e8be83df Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

This completes r1818010, there were much more cases.
Also few tabs automatically replaced by spaces

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818020 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 14:11:38 +00:00
Jacques Le Roux e0d2057456 Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

We discussed on this point: http://markmail.org/message/mplvusuqn7oshl4v 
and we agreed about better doing a check when using Debug.logVerbose().

I checked there are 300+ cases like that. Since it's an easy S/R 
This implements it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818005 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:43:05 +00:00
Michael Brohl 49c1a38107 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.
(OFBIZ-9724)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817571 13f79535-47bb-0310-9956-ffa450edef68
2017-12-08 21:19:32 +00:00
Jacques Le Roux 796d098e67 Fixed: Replace org.apache.commons.lang.StringEscapeUtils.unescapeHtml() method
by org.jsoup.parser.Parser.unescapeEntities()
(OFBIZ-10023)

StringEscapeUtils.unescapeHtml() is deprecated or at least not reliable

After few tests using the Parser.unescapeEntities() strict mode seems OK


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816461 13f79535-47bb-0310-9956-ffa450edef68
2017-11-27 15:19:47 +00:00
Jacques Le Roux 212a9c2a4e No functional change, simpler code is best
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1815302 13f79535-47bb-0310-9956-ffa450edef68
2017-11-15 10:54:28 +00:00
Jacques Le Roux a0e85e028a Fixed: Error on first access to Online Help
(OFBIZ-9925)

There are maybe better fixes but adding a default theme when it's null works

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1814116 13f79535-47bb-0310-9956-ffa450edef68
2017-11-02 21:58:37 +00:00
Deepak Dixit 982fe0c58a Added missing licence header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1813620 13f79535-47bb-0310-9956-ffa450edef68
2017-10-28 12:46:43 +00:00
Jacques Le Roux 3c6a52f7da Fixed: Not setting VIEW_INDEX for IterateSectionWidget.renderWidgetString causes
rendering error
(OFBIZ-9889)

A bug was introduced in OFBIZ-9710, that created a catch block for a 
RuntimeException that would be thrown again. Unfortunately the code block relied 
on catching a NumberFormatException in case VIEW_INDEX was not set, which in the
original code was not intuitively recognisable, because only Exception was caught.

In the provided patch I removed the catch block for the RTE und changed Exception 
to NumberFormatException, since it is the only Exception that is expected.

Thanks: Tobias Laufkötter

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1813067 13f79535-47bb-0310-9956-ffa450edef68
2017-10-23 19:28:32 +00:00
Michael Brohl 3ce6210e58 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.model.
(OFBIZ-9710)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812918 13f79535-47bb-0310-9956-ffa450edef68
2017-10-22 13:58:51 +00:00
Michael Brohl 75fd7fdde6 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.renderer.
(OFBIZ-9704)

Applied a modified version of the patch, the null check for menuWarapper 
in MenuWrapTransfor is needed.

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812908 13f79535-47bb-0310-9956-ffa450edef68
2017-10-22 12:46:33 +00:00
Michael Brohl 4dd37a8401 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.renderer.macro.
(OFBIZ-9702)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812899 13f79535-47bb-0310-9956-ffa450edef68
2017-10-22 11:53:14 +00:00
Deepak Dixit 761959d47d Inconsistent String Comparisons, Applied patch for framework entityext, webapp, webtools and widgets classes.
Thanks Devanshu Vyas for your contribution (OFBIZ-9254)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812279 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16 10:32:22 +00:00
Michael Brohl 934a0d86ff Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.cache.
(OFBIZ-9695)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812164 13f79535-47bb-0310-9956-ffa450edef68
2017-10-13 21:05:55 +00:00
Michael Brohl e3f932eb88 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.renderer.fo.
(OFBIZ-9685)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811700 13f79535-47bb-0310-9956-ffa450edef68
2017-10-10 13:50:41 +00:00
Michael Brohl 4934374b64 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.widget.renderer.html.
(OFBIZ-9686)

I modified the class further by removing all commented out code.

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811439 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 16:06:24 +00:00
Jacques Le Roux 1674e51b37 Fixed: Unable to run the MRP
(OFBIZ-9794)

This is only loosely related to this issue but I believe it could help and is 
needed anyway

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809821 13f79535-47bb-0310-9956-ffa450edef68
2017-09-27 09:43:10 +00:00
Deepak Dixit 69a3268067 Improved: Moved OfbizUtil.js and fieldlookup.js from images to common-theme and made changes accordingly. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809391 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 11:01:24 +00:00
Nicolas Malin dcdc3855a6 Fixed: Missing to convert a showDescription from widget.properties to modelTheme on the macroFormRendere.java to prepare the lookup macro (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806821 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 16:19:29 +00:00
Nicolas Malin de11d898ad Fixed: HtmlFormMacroLibary.ftl contains direct call to widget.properties (OFBIZ-9138 Create a common theme)
Instead of use the properties on the current theme, some ftl macro present in the file HtmlFormMacroLibary.ftl used a directl call to widget.properties.
To help the code reader, the modelTheme has been set on the root ftl context, and the previous widget.properties call replace by modelTheme call

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806742 13f79535-47bb-0310-9956-ffa450edef68
2017-08-30 21:40:33 +00:00
Nicolas Malin 2555742bf3 Fixed: the lookup property showDescription not present in common-theme (OFBIZ-9138 Create a common theme)
Display or not a description hasn't been loaded in the theme definition. I finished this migration to be sure to found all properties linked to lookups in the same place.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806741 13f79535-47bb-0310-9956-ffa450edef68
2017-08-30 21:33:47 +00:00
Nicolas Malin 0b33186d6f Fixed: Correct library ftl call to render the email body (OFBIZ-9138 Create a common theme)
add possibility to call the ThemeFactory.resolveTheme() with empty request if the visualTheme normaly present on the service context isn't found, so we return the default theme define in general.properties
Thanks to Jacques for raise this problem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806237 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 21:25:26 +00:00
Deepak Dixit 90abb7b919 Fixed: Warning related to duplicate type assignment for widget attribute in theme.xsd file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806209 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 18:21:59 +00:00
Nicolas Malin a5644da3e4 Fixed: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Forgot to complete the xsd with element common-screens as child of theme and the attribute name on the same element

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806169 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 13:12:22 +00:00
Nicolas Malin a728d0c3b0 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step
#10 when you missed a definition on your theme, improve the error message to understand what template failed
Now the common-theme would be functional

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806151 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 10:04:44 +00:00
Nicolas Malin 10af80b1a8 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step these step break all the UI
#2 The MacroScreenRenderer class now resolve the macro ftl library location from the model theme
The widget.properties lost all definition now managed by the theme definition

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806140 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 09:36:04 +00:00
Nicolas Malin 10fa4452b7 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Four step load the visualTheme in user session, freemarker, screen, groovy and service context
Add util to resolve easily a visualTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806134 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 08:18:35 +00:00