diff options
4 files changed, 19 insertions, 18 deletions
diff --git a/gentoobrowse-api/service/notifications/xslt/base.xslt b/gentoobrowse-api/service/notifications/xslt/base.xslt index cbd704d..ee21294 100644 --- a/gentoobrowse-api/service/notifications/xslt/base.xslt +++ b/gentoobrowse-api/service/notifications/xslt/base.xslt @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:project2="http://project2.randomdan.homeip.net" exclude-result-prefixes="project2" > +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" /> <xsl:template match="/*"> @@ -8,9 +7,9 @@ <html lang="en"> <head> <meta charset="utf-8" /> - <link href="http://gentoobrowse.randomdan.homeip.net/css/bootstrap.min.css" rel="stylesheet" media="screen" /> - <link href="http://gentoobrowse.randomdan.homeip.net/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen" /> - <link href="http://gentoobrowse.randomdan.homeip.net/css/general.css" rel="stylesheet" media="screen" /> + <link href="https://gentoobrowse.randomdan.homeip.net/css/bootstrap.min.css" rel="stylesheet" media="screen" /> + <link href="https://gentoobrowse.randomdan.homeip.net/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen" /> + <link href="https://gentoobrowse.randomdan.homeip.net/css/general.css" rel="stylesheet" media="screen" /> <title><xsl:call-template name="title" /></title> </head> <body data-spy="scroll" data-target=".bs-docs-sidebar"> @@ -18,7 +17,7 @@ <nav class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="brand" href="http://gentoobrowse.randomdan.homeip.net/">Gentoo Browse</a> + <a class="brand" href="https://gentoobrowse.randomdan.homeip.net/">Gentoo Browse</a> </div> </div> </nav> @@ -68,9 +67,9 @@ </div> </footer> - <script src="http://code.jquery.com/jquery-latest.js"></script> - <script src="http://gentoobrowse.randomdan.homeip.net/js/bootstrap.min.js"></script> - <script src="http://gentoobrowse.randomdan.homeip.net/js/js.js"></script> + <script src="https://code.jquery.com/jquery-latest.min.js"></script> + <script src="https://gentoobrowse.randomdan.homeip.net/js/bootstrap.min.js"></script> + <script src="https://gentoobrowse.randomdan.homeip.net/js/js.js"></script> </body> </html> </xsl:template> diff --git a/gentoobrowse-api/service/notifications/xslt/news.xslt b/gentoobrowse-api/service/notifications/xslt/news.xslt index 04ff36e..a5d1c04 100644 --- a/gentoobrowse-api/service/notifications/xslt/news.xslt +++ b/gentoobrowse-api/service/notifications/xslt/news.xslt @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fn="http://exslt.org/strings" xmlns:project2="http://project2.randomdan.homeip.net" version="1.0" exclude-result-prefixes="project2 fn"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fn="http://exslt.org/strings" version="1.0" exclude-result-prefixes="fn"> <xsl:import href="base.xslt"/> <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes"/> @@ -16,7 +16,7 @@ <xsl:sort select="name" data-type="text" order="ascending"/> <li> <a> - <xsl:attribute name="href">http://gentoobrowse.randomdan.homeip.net/packages/<xsl:value-of select="name" /></xsl:attribute> + <xsl:attribute name="href">https://gentoobrowse.randomdan.homeip.net/packages/<xsl:value-of select="name" /></xsl:attribute> <i class="icon-chevron-right"> </i> <xsl:value-of select="name" /> </a> @@ -33,12 +33,12 @@ <xsl:variable name="package" select="." /> <p> <a> - <xsl:attribute name="href">http://gentoobrowse.randomdan.homeip.net/packages/<xsl:value-of select="$category/name" /></xsl:attribute> + <xsl:attribute name="href">https://gentoobrowse.randomdan.homeip.net/packages/<xsl:value-of select="$category/name" /></xsl:attribute> <xsl:value-of select="$category/name" /> </a> / <a> - <xsl:attribute name="href">http://gentoobrowse.randomdan.homeip.net/packages/<xsl:value-of select="$category/name" />/<xsl:value-of select="name" /></xsl:attribute> + <xsl:attribute name="href">https://gentoobrowse.randomdan.homeip.net/packages/<xsl:value-of select="$category/name" />/<xsl:value-of select="name" /></xsl:attribute> <xsl:value-of select="name" /> </a> : diff --git a/gentoobrowse-api/service/notifications/xslt/signup.xslt b/gentoobrowse-api/service/notifications/xslt/signup.xslt index e579835..d6c94b5 100644 --- a/gentoobrowse-api/service/notifications/xslt/signup.xslt +++ b/gentoobrowse-api/service/notifications/xslt/signup.xslt @@ -10,10 +10,10 @@ <p> Click <a> <xsl:attribute name="href"> - <xsl:text>http://gentoobrowse.randomdan.homeip.net/user/verify/</xsl:text> + <xsl:text>https://gentoobrowse.randomdan.homeip.net/user/verify/</xsl:text> <xsl:value-of select="verifyguid" /> </xsl:attribute> - <xsl:text>http://gentoobrowse.randomdan.homeip.net/user/verify/</xsl:text> + <xsl:text>https://gentoobrowse.randomdan.homeip.net/user/verify/</xsl:text> <xsl:value-of select="verifyguid" /> </a> to confirm your account. </p> diff --git a/gentoobrowse-api/unittests/testNotifications.cpp b/gentoobrowse-api/unittests/testNotifications.cpp index 8759e85..357a29e 100644 --- a/gentoobrowse-api/unittests/testNotifications.cpp +++ b/gentoobrowse-api/unittests/testNotifications.cpp @@ -40,6 +40,8 @@ commonAssert(Gentoo::EmailPtr e) BOOST_REQUIRE(!isHtml(e->body[0]->payload)); BOOST_REQUIRE_EQUAL(e->body[1]->mimetype, "text/html"); BOOST_REQUIRE(isHtml(e->body[1]->payload)); + BOOST_REQUIRE_EQUAL(e->body[0]->payload.find("http://gentoobrowse.randomdan.homeip.net"), std::string::npos); + BOOST_REQUIRE_EQUAL(e->body[1]->payload.find("http://gentoobrowse.randomdan.homeip.net"), std::string::npos); } BOOST_AUTO_TEST_CASE( testSend ) @@ -64,7 +66,7 @@ BOOST_AUTO_TEST_CASE( testSignup ) save("signup", e); for (auto p : e->body) { BOOST_REQUIRE(p->payload.find("Welcome to Gentoo Browse") != std::string::npos); - BOOST_REQUIRE(p->payload.find("http://gentoobrowse.randomdan.homeip.net/user/verify/some-guid") != std::string::npos); + BOOST_REQUIRE(p->payload.find("https://gentoobrowse.randomdan.homeip.net/user/verify/some-guid") != std::string::npos); BOOST_REQUIRE(p->payload.find("confirmation page: some-guid") != std::string::npos); } } @@ -99,8 +101,8 @@ BOOST_AUTO_TEST_CASE( testNews ) save("news", e); for (auto p : e->body) { BOOST_REQUIRE(p->payload.find("Latest news") != std::string::npos); - BOOST_REQUIRE(p->payload.find("http://gentoobrowse.randomdan.homeip.net/packages/app-test") != std::string::npos); - BOOST_REQUIRE(p->payload.find("http://gentoobrowse.randomdan.homeip.net/packages/app-test/app") != std::string::npos); + BOOST_REQUIRE(p->payload.find("https://gentoobrowse.randomdan.homeip.net/packages/app-test") != std::string::npos); + BOOST_REQUIRE(p->payload.find("https://gentoobrowse.randomdan.homeip.net/packages/app-test/app") != std::string::npos); BOOST_REQUIRE(p->payload.find("no-show") == std::string::npos); } } |