From 3793bac3009edf02ecbe3932890ee3934c9c3301 Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Thu, 23 Jan 2014 23:08:42 -0500 Subject: [PATCH] Use http:// or https:// in URLs based on URL of current page --- acal/index.php | 7 +++++-- aclindsa-wordpress-theme/404.php | 3 ++- aclindsa-wordpress-theme/common.php | 1 + aclindsa-wordpress-theme/header.php | 5 +++-- common.php | 11 +++++++++++ errors/400.php | 7 +++++-- errors/401.php | 9 ++++++--- errors/403.php | 9 ++++++--- errors/404.php | 9 ++++++--- errors/500.php | 7 +++++-- header_bottom.php | 8 +++++--- index.php | 9 ++++++--- projects/index.php | 7 +++++-- resume/index.php | 13 ++++++++----- svgparser/index.php | 9 ++++++--- tabs.php | 9 +++++---- wedding/ceremony/index.php | 7 +++++-- wedding/common.php | 1 + wedding/header_bottom.php | 19 ++++++++++--------- wedding/index.php | 2 +- wedding/wedding_party/index.php | 16 ++++++++-------- 21 files changed, 110 insertions(+), 58 deletions(-) create mode 120000 aclindsa-wordpress-theme/common.php create mode 100644 common.php create mode 120000 wedding/common.php diff --git a/acal/index.php b/acal/index.php index d5203eb..7f6dc35 100644 --- a/acal/index.php +++ b/acal/index.php @@ -1,4 +1,7 @@ - + aCal - aclindsay.com @@ -29,7 +32,7 @@ diff --git a/aclindsa-wordpress-theme/404.php b/aclindsa-wordpress-theme/404.php index da331e8..b462769 100644 --- a/aclindsa-wordpress-theme/404.php +++ b/aclindsa-wordpress-theme/404.php @@ -1,4 +1,5 @@

Error 404 - Page Not Found

-

Oops, the page you are looking for does not exist. You may search using the search box, or visit the homepage to get back on track.

+

Oops, the page you are looking for does not exist. You may search using the search box, or visit the homepage to get back on track.

diff --git a/aclindsa-wordpress-theme/common.php b/aclindsa-wordpress-theme/common.php new file mode 120000 index 0000000..b363edb --- /dev/null +++ b/aclindsa-wordpress-theme/common.php @@ -0,0 +1 @@ +../common.php \ No newline at end of file diff --git a/aclindsa-wordpress-theme/header.php b/aclindsa-wordpress-theme/header.php index db39f19..d1c3c17 100644 --- a/aclindsa-wordpress-theme/header.php +++ b/aclindsa-wordpress-theme/header.php @@ -1,4 +1,5 @@ Blog - aclindsay.com - + @@ -22,7 +23,7 @@ > diff --git a/common.php b/common.php new file mode 100644 index 0000000..14178c8 --- /dev/null +++ b/common.php @@ -0,0 +1,11 @@ + diff --git a/errors/400.php b/errors/400.php index 079634d..93e305c 100644 --- a/errors/400.php +++ b/errors/400.php @@ -1,11 +1,14 @@ - + Bad Request - aclindsay.com

Error 400 - Bad Request

This HTTP request was malformed, and could not be processed. You may attempt to reload this page, but the software you are using (your browser) may be at fault.

-

If you believe you are seeing this page in error, please contact me.

+

If you believe you are seeing this page in error, please contact me.

diff --git a/errors/401.php b/errors/401.php index 835a26b..3c4d6ee 100644 --- a/errors/401.php +++ b/errors/401.php @@ -1,11 +1,14 @@ - + Authorization Required - aclindsay.com

Error 401 - Authorization Required

-

The page you are requesting requires authorization. Please refresh this page and provide your login credentials, if you have them, or continue browsing with our homepage.

-

If you believe you are seeing this page in error, please contact me.

+

The page you are requesting requires authorization. Please refresh this page and provide your login credentials, if you have them, or continue browsing with our homepage.

+

If you believe you are seeing this page in error, please contact me.

diff --git a/errors/403.php b/errors/403.php index 3131528..f02f2c5 100644 --- a/errors/403.php +++ b/errors/403.php @@ -1,11 +1,14 @@ - + Forbidden - aclindsay.com

Error 403 - Forbidden

-

The page you are requesting will not be returned. Refreshing the page won't help either. Please use your browser's back buttons to return to the page you came from, or continue browsing with our homepage.

-

If you believe you are seeing this page in error, please contact me.

+

The page you are requesting will not be returned. Refreshing the page won't help either. Please use your browser's back buttons to return to the page you came from, or continue browsing with our homepage.

+

If you believe you are seeing this page in error, please contact me.

diff --git a/errors/404.php b/errors/404.php index 9e6c874..c3e2c2c 100644 --- a/errors/404.php +++ b/errors/404.php @@ -1,11 +1,14 @@ - + Page Not Found - aclindsay.com

Error 404 - Page Not Found

-

Oops, the page you are looking for does not exist. You may use your browser's back button to return to the page from which you came, or visit the homepage.

-

If you believe you are seeing this page in error, or are searching for a page which no longer exists (but may still be linked to by other sites), please contact me. I will do my best to point you in the right direction.

+

Oops, the page you are looking for does not exist. You may use your browser's back button to return to the page from which you came, or visit the homepage.

+

If you believe you are seeing this page in error, or are searching for a page which no longer exists (but may still be linked to by other sites), please contact me. I will do my best to point you in the right direction.

diff --git a/errors/500.php b/errors/500.php index a53104d..c89138d 100644 --- a/errors/500.php +++ b/errors/500.php @@ -1,10 +1,13 @@ - + Internal Server Error - aclindsay.com

Error 500 - Internal Server Error

-

Oops, the server encountered an error while processing your request for this page. Please refresh the page and try again. If the error persists, please contact me.

+

Oops, the server encountered an error while processing your request for this page. Please refresh the page and try again. If the error persists, please contact me.

diff --git a/header_bottom.php b/header_bottom.php index 294f5f8..08c3bb2 100644 --- a/header_bottom.php +++ b/header_bottom.php @@ -1,3 +1,5 @@ + + @@ -6,8 +8,8 @@ - - + + @@ -15,7 +17,7 @@ diff --git a/index.php b/index.php index f4ca43a..6f26009 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,7 @@ - + The Homepage of Aaron Lindsay - aclindsay.com @@ -7,13 +10,13 @@

The Homepage of Aaron Lindsay

Welcome to my personal website!

-

Here you will find assorted digital things associated with me: a blog about personal, technological and programming-related topics, a few of the projects on which I have worked, and other miscellany which includes my resume, calendar, and contact information.

+

Here you will find assorted digital things associated with me: a blog about personal, technological and programming-related topics, a few of the projects on which I have worked, and other miscellany which includes my resume, calendar, and contact information.

About Me

The ten-word summary: I am a Lutheran Eagle Scout who enjoys tinkering with hacking things.

diff --git a/svgparser/index.php b/svgparser/index.php index 390e38f..f1ee19b 100644 --- a/svgparser/index.php +++ b/svgparser/index.php @@ -1,4 +1,7 @@ - + SVG Parser - aclindsay.com @@ -11,7 +14,7 @@ but didn't cover many cases (example: gradient transformations). Therefore, if you wanted to use existing SVG files with dojox.gfx, you had to convert the file by hand. This was extremely tedious, so I have developed a converter tool with which you may convert existing SVG files into Javascript code ready to be used with dojox.gfx. If you have any comments or - suggestions for improvement, feel free to contact me.

+ suggestions for improvement, feel free to contact me.

SVG (XML) @@ -23,7 +26,7 @@ function submit(){ var data = dojo.byId("input").value; dojo.rawXhrPost({ - url: "http://aclindsay.com/svgparser/parser/index.php", + url: "/svgparser/parser/index.php", handleAs: "text", postData: data, diff --git a/tabs.php b/tabs.php index ec1e4a4..c7c608c 100644 --- a/tabs.php +++ b/tabs.php @@ -1,3 +1,4 @@ +
    $url) { if ($url == "/") { if ($base_domain && $_SERVER['REQUEST_URI'] == "/") - echo "\t\t
  • Home
    • \n"; + echo "\t\t
  • Home
    • \n"; else - echo "\t\t
  • Home
    • \n"; + echo "\t\t
  • Home
    • \n"; } else if (strncmp($url, $_SERVER['REQUEST_URI'], strlen($url)) == 0) - echo "\t\t
  • ".$name."
    • \n"; + echo "\t\t
  • ".$name."
    • \n"; else - echo "\t\t
  • ".$name."
    • \n"; + echo "\t\t
  • ".$name."
    • \n"; } ?>
diff --git a/wedding/ceremony/index.php b/wedding/ceremony/index.php index be3dbf8..9ad1741 100644 --- a/wedding/ceremony/index.php +++ b/wedding/ceremony/index.php @@ -1,11 +1,14 @@ - + The Wedding of Aaron Lindsay and Elizabeth Pressman

Ceremony

-The ceremony will be held in Asheville at the church Aaron grew up in, St. Mark's Lutheran Church, and will be presided over by the Rev. Christopher Webb and the Rev. Jim Abbott. The ceremony will begin at 4pm. +The ceremony will be held in Asheville at the church Aaron grew up in, St. Mark's Lutheran Church, and will be presided over by the Rev. Christopher Webb and the Rev. Jim Abbott. The ceremony will begin at 4pm.

diff --git a/wedding/common.php b/wedding/common.php new file mode 120000 index 0000000..b363edb --- /dev/null +++ b/wedding/common.php @@ -0,0 +1 @@ +../common.php \ No newline at end of file diff --git a/wedding/header_bottom.php b/wedding/header_bottom.php index 667b0e7..9533b45 100644 --- a/wedding/header_bottom.php +++ b/wedding/header_bottom.php @@ -1,3 +1,4 @@ + @@ -6,13 +7,13 @@ - - + +