From 33f3ab588a0b61f5f42b131da00a6fe714bb879d Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 17 Oct 2013 16:04:10 -0700
Subject: Make homepage HTTPS friendly

---
 .gitignore                         |  4 ++++
 includes/common.php                |  6 +++---
 recaptcha-php/example-captcha.php  |  2 +-
 recaptcha-php/example-mailhide.php |  2 +-
 recaptcha-php/recaptchalib.php     | 24 +++++++++++++-----------
 5 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5f69a57
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# symlink to the update server
+/news.html
+# generated, I think
+/images/thumbs
diff --git a/includes/common.php b/includes/common.php
index fe530fd..11a3f04 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -89,7 +89,7 @@ function placeHeader($page_title)
                <li><a href="https://www.facebook.com/themanaworld">Facebook</a></li>
                <li><a href="https://github.com/themanaworld">Github</a></li>
                <li><a href="https://trello.com/themanaworld">Trello</a></li>
-               <li><a href="http://sourceforge.net/projects/themanaworld/"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=106790&amp;type=1" alt="SourceForge.net"/></a></li>
+               <li><a href="http://sourceforge.net/projects/themanaworld/"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=106790&amp;type=1" alt="SourceForge.net"/></a></li>
                <li><a href="http://www.gnu.org/copyleft/gpl.html"><img src="images/gpl.png" alt="GPLed project"/></a></li>
               </ul>
              </div>
@@ -104,7 +104,7 @@ function placeHeader($page_title)
             <div class="section_bottomright">
              <div class="section banners">
               Server status
-              <iframe src="http://server.themanaworld.org/status.php" width="130" height="30" frameborder="0" scrolling="no"></iframe>
+              <iframe src="https://server.themanaworld.org/status.php" width="130" height="30" frameborder="0" scrolling="no"></iframe>
               <a href="registration.php">Register new account</a>
              </div>
             </div>
@@ -161,7 +161,7 @@ function placeFooter()
   </div> <!-- /page -->
   </div>
 
-  <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+  <script src="https://www.google-analytics.com/urchin.js" type="text/javascript">
   </script>
   <script type="text/javascript">
   _uacct = "UA-380618-3";
diff --git a/recaptcha-php/example-captcha.php b/recaptcha-php/example-captcha.php
index 1c4ca5f..f6f7fa0 100644
--- a/recaptcha-php/example-captcha.php
+++ b/recaptcha-php/example-captcha.php
@@ -5,7 +5,7 @@
 
 require_once('recaptchalib.php');
 
-// Get a key from http://recaptcha.net/api/getkey
+// Get a key from https://www.google.com/recaptcha/admin/create
 $publickey = "";
 $privatekey = "";
 
diff --git a/recaptcha-php/example-mailhide.php b/recaptcha-php/example-mailhide.php
index e389eb9..d08622c 100644
--- a/recaptcha-php/example-mailhide.php
+++ b/recaptcha-php/example-mailhide.php
@@ -2,7 +2,7 @@
 <?
 require_once ("recaptchalib.php");
 
-// get a key at http://mailhide.recaptcha.net/apikey
+// get a key at http://www.google.com/recaptcha/mailhide/apikey
 $mailhide_pubkey = '';
 $mailhide_privkey = '';
 
diff --git a/recaptcha-php/recaptchalib.php b/recaptcha-php/recaptchalib.php
index 897c509..5e6e8e5 100644
--- a/recaptcha-php/recaptchalib.php
+++ b/recaptcha-php/recaptchalib.php
@@ -4,7 +4,7 @@
  *    - Documentation and latest version
  *          http://recaptcha.net/plugins/php/
  *    - Get a reCAPTCHA API Key
- *          http://recaptcha.net/api/getkey
+ *          https://www.google.com/recaptcha/admin/create
  *    - Discussion group
  *          http://groups.google.com/group/recaptcha
  *
@@ -35,9 +35,11 @@
 /**
  * The reCAPTCHA server URL's
  */
-define("RECAPTCHA_API_SERVER", "http://api.recaptcha.net");
-define("RECAPTCHA_API_SECURE_SERVER", "https://api-secure.recaptcha.net");
-define("RECAPTCHA_VERIFY_SERVER", "api-verify.recaptcha.net");
+// edited by o11c - it gets confused by the nginx proxy really being https
+//define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
+define("RECAPTCHA_API_SERVER", "https://www.google.com/recaptcha/api");
+define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
+define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
 
 /**
  * Encodes the given data into a query string format
@@ -106,7 +108,7 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 {
 	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
 	}
 	
 	if ($use_ssl) {
@@ -152,7 +154,7 @@ class ReCaptchaResponse {
 function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='http://recaptcha.net/api/getkey'>http://recaptcha.net/api/getkey</a>");
+		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
 	}
 
 	if ($remoteip == null || $remoteip == '') {
@@ -169,7 +171,7 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
                 return $recaptcha_response;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/verify",
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
                                           array (
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
@@ -200,7 +202,7 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
  * @param string $appname The name of your application
  */
 function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "http://recaptcha.net/api/getkey?" .  _recaptcha_qsencode (array ('domain' => $domain, 'app' => $appname));
+	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
 }
 
 function _recaptcha_aes_pad($val) {
@@ -230,14 +232,14 @@ function _recaptcha_mailhide_urlbase64 ($x) {
 function recaptcha_mailhide_url($pubkey, $privkey, $email) {
 	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
 		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://mailhide.recaptcha.net/apikey'>http://mailhide.recaptcha.net/apikey</a>");
+		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 	}
 	
 
 	$ky = pack('H*', $privkey);
 	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
 	
-	return "http://mailhide.recaptcha.net/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
 }
 
 /**
@@ -262,7 +264,7 @@ function _recaptcha_mailhide_email_parts ($email) {
  * Gets html to display an email address given a public an private key.
  * to get a key, go to:
  *
- * http://mailhide.recaptcha.net/apikey
+ * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
 	$emailparts = _recaptcha_mailhide_email_parts ($email);
-- 
cgit v1.2.3-60-g2f50