From 74324078885049f3c65e981a3a952e8fb001ced6 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sun, 26 Jul 2009 16:52:38 +0000
Subject: [PATCH] Use gateway macro for survey.css link in default survery take
 template.

---
 ...ot_import_survey_default-survey-take.wgpkg | Bin 0 -> 1416 bytes
 t/rawHrefUrls.t                               |  84 ++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 docs/upgrades/packages-7.7.17/root_import_survey_default-survey-take.wgpkg
 create mode 100644 t/rawHrefUrls.t

diff --git a/docs/upgrades/packages-7.7.17/root_import_survey_default-survey-take.wgpkg b/docs/upgrades/packages-7.7.17/root_import_survey_default-survey-take.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..fa4603a266777a72a77b7ffcbd53484748e3b89f
GIT binary patch
literal 1416
zcmV;31$X)%iwFP!00000|Ls^^bK*7><#~UFho|jKiETa;%4TM}yJ^yf3=K)Q)6!;y
zErN(Gc_bM^I{V*yB^hjp30Vhr_932$<@ieXh%4QDj(kws|K&JNtJNr#RNJiU)~!Qp
zEib3!y470Ebs7z~Ub0-*acd<DhV1`}g+v^t=COd#yUlp9z+7xLs~-oK{&Bi}qU-l$
z(zABcd)+)Y4km)p9ZeLxH<NYGS%0@$uQk@zzg}~iB@3dt|7&0Cf3W|l?*ie!H;{y7
ziNh#B65k*xkv9%8m7;95t-t^IQQL)N9NpsVtBA7*b4jr7sNE<}9>?Iv|9P(ZmTP4_
zUKs);<fr?Haj?GEV`v-%OEYAl)c(s+JPe2!V?P~B@$569KAUN$PHGTy$|6A?yTkXA
zqf?ChD|9P*$h!k~YC;{A<QB)lyFppVd4K^3%R$+a^9aK`2?K3U2zWE*cm!|${iIxp
zxAU0T!<YoVJz@|YbFYMi9zgdWeu4q^@h-e0AuzZXcZ9+nh5G4b81`Ec^C_NZyrdyy
zGm7~&6t^=Iq0Ex41o0b$Z$Q6A01Khygm6FyG!3I(wj_l9;iTK`UiyCj_m-UX>Vf-L
z|7@1_jd`G>$r+P22~|$mW`%4Yk5C-Qiut!9(H&055pha<A5%Tp&A#t(CYjp8+LTF<
zTh8L>%>U#QX+~AkVT+{KhK^6BmIp~HV9&!|uc!@Jf&Diq9}lP^>XjZMLLTN|>qN&L
zTm8X!=$LesP)=^h$Wo+v;~{zlzoW1BAoNU(y7xe8*TUl@k}F9#K~rR2Luv``<)&gR
zNkCK$vX@UlTq+v@$Bb4mF9Y!)-w}Z<v6oLe?{^LaWjD6fZ9ndZv6PHL5mU{6AUqUc
z>LZ9$@~|Hm9AHIJcG6acSfc$P`A8zcV(wu(ecTU}5?r>rZE&v=WpQ<iCX6>m9N5J)
z6?_jAPE;sSuuoJKI*EpX38H@50QbUF<yephY@2335F#KxlmgRif+$vUW^6dYp0rJ+
zw2=?$f(Qxc4qZB-{Dk4I%G(yKT$p7g&2mM;RAbOuh7cA^V2ZBlN_;5Zrk^g%303G0
ziygi6O=uJ+Ofc4Lr-o~G?IAg~rYMN<yN>3NDdHAz>2X@(a|avbODrNr1-`^nA_$|8
zJn_V!-BCkmDOnOahE$Q)JUHPj>>&<Gvre{J!+sbedYdbNfkF}uT~5zijy`WKPF*RU
zrs4|}8b<$&hre8(wcGENIBd7C61kpsSL(XUd@>@5(1lagVYAw*H#1^D5*ZkOAC1hg
z`g&toik?$niDvkNV57HNsfh@sBvd9FHIZ6CE<_hh!UQ}dA-wB$MQc~j!&hO9wWKej
z2#y)k>`_4Pggzv>2B<quMh8WRgWk}F4FPMnPp`V?kHbgAIa6l@b8J~Tm=KW!YyB5x
zS6kbTj#@`YjaD@i@x`9{xH#P8Eep{Hl;zgQ#B|JNXY_>e&_pBiQ$bjnQ_bRxqi2vo
zrm%IiNYe(h&i3j$FZ5sbc$CfTH5K>_{b$m0o9-)2UQ3PlgxV|Ye5viWsJy}eDg!pF
zyTWd_tGdFj7b5OyHCNdEvsGMS1f@Hkr``%fJgwRayZuU?Rv1S`=sC))Fu-<2R@n7+
zCH9rBw`ih#{k2<+N4jgZ>T0^KtZ6OXB~N2nom@S%MNF+LA51+yk7O^0pd`9YK6%v7
zox|pclFIDFYdOD8M%R;v?rlnCMD*vNWW#lu(geBS-ExNDKxycYg?U;-e`5rVkzv(p
z3-pfLYNUuD20)@E(`yXr#e>8bty%4Y{&p0e)c+(OGSgeqX)-_c(euljFT41_`s(8~
W0<RHxjlg#rf&T%4Jeg_$9smF^(XVp=

literal 0
HcmV?d00001

diff --git a/t/rawHrefUrls.t b/t/rawHrefUrls.t
new file mode 100644
index 000000000..ae866606f
--- /dev/null
+++ b/t/rawHrefUrls.t
@@ -0,0 +1,84 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use warnings;
+use lib "$FindBin::Bin/lib"; ##t/lib
+
+use WebGUI::Test;
+use WebGUI::Session;
+use Data::Dumper;
+use WebGUI::Asset::Template;
+use HTML::Parser;
+
+#The goal of this test is to find CSS and JavaScript links that do not
+#use either the Extras macro, or the Gateway macro.
+
+use Test::More; # increment this value for each test you create
+my $numTests = 0;
+
+my $session = WebGUI::Test->session;
+my $lib = WebGUI::Test->lib;
+
+##Find the name of the International macro in the user's config file.
+
+#diag "International macro name = $international";
+
+##Regexp setup for parsing out the Macro calls.
+my $macro     = qr{
+                    \^
+                    /
+                    ;
+                }xms;
+
+# put your tests here
+
+$numTests = $session->db->quickScalar('select count(distinct(assetId)) from template');
+
+plan tests => $numTests;
+
+my $validLinks = 0;
+
+sub checkLinks {
+    my ($tag, $attrs) = @_;
+    if ($tag eq 'link' && $attrs->{href}) {
+        if ($attrs->{href} !~ /\s*\^(?:\/|Extras)/) {
+            $validLinks = 0;
+        }
+    }
+    elsif ($tag eq 'script' && $attrs->{src}) {
+        if ($attrs->{src} !~ /\s*\^(?:\/|Extras)/) {
+            $validLinks = 0;
+        }
+    }
+}
+
+my $parser = HTML::Parser->new(
+    api_version => 3,
+    report_tags => [ qw/link script/ ],
+    start_h     => [ \&checkLinks, 'tag, attr'],
+);
+
+my $getATemplate = WebGUI::Asset::Template->getIsa($session);
+
+TEMPLATE: while (my $templateAsset = $getATemplate->()) {
+    my $template = $templateAsset->get('template');
+    my $header   = $templateAsset->get('extraHeadTags');
+    if(! $header) {
+        ok(1, sprintf "%s: %s (%s) has no rooted link urls", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
+        next TEMPLATE;
+    }
+    $validLinks = 1;
+    $parser->parse($header);
+    ok($validLinks, sprintf "%s: %s (%s) has no rooted link urls", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
+}
+
+