From e6b224aa2872d7d1030fa98bd30603e16f8f9604 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 14:04:27 +1000 Subject: Update obsolete contact address. Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern Reviewed-by: Alan Alpert --- examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml') diff --git a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml index b1924e7e7c..4126367dff 100644 --- a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** -- cgit v1.2.3 From 69920f4ddeaa5dbdee555e0a607fd21eb42e2bbc Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 19 Jan 2012 16:39:53 +1000 Subject: Encode user input before insertion into URLs Encode user input strings used to formulate URLs, to ensure they do not cause the structure of the URL to be subverted. Task-number: QTBUG-19925 Change-Id: I6173f4df67a4bc1676ac32be6072763fc16f9720 Reviewed-by: Martin Jones --- examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml') diff --git a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml index 4126367dff..9438637ebc 100644 --- a/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml +++ b/examples/declarative/photoviewer/PhotoViewerCore/RssModel.qml @@ -45,7 +45,9 @@ import QtQuick.XmlListModel 2.0 XmlListModel { property string tags : "" - source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "") + function encodeTags(x) { return encodeURIComponent(x.replace(' ',',')); } + + source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+encodeTags(tags)+"&" : "") query: "/feed/entry" namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom';" -- cgit v1.2.3