From a2385a8c1c7d4d32c6c83bd6dc92b87d5974074f Mon Sep 17 00:00:00 2001
From: systopia <endres@systopia.de>
Date: Thu, 19 Mar 2015 15:21:18 +0100
Subject: [PATCH] fixed path issues

---
 proxy/TODO.txt                | 5 -----
 proxy/mailing/confirm.php     | 4 ++--
 proxy/mailing/mail.php        | 4 ++--
 proxy/mailing/resubscribe.php | 4 ++--
 proxy/mailing/subscribe.php   | 5 +++--
 proxy/mailing/unsubscribe.php | 4 ++--
 proxy/proxy.php               | 1 +
 7 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 proxy/TODO.txt

diff --git a/proxy/TODO.txt b/proxy/TODO.txt
deleted file mode 100644
index 1d794b2..0000000
--- a/proxy/TODO.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-TODO
-
-1) sanitize string values (mysql_escape_string?)
-2) better index page
-3) error page
diff --git a/proxy/mailing/confirm.php b/proxy/mailing/confirm.php
index 8f5d55b..4525905 100644
--- a/proxy/mailing/confirm.php
+++ b/proxy/mailing/confirm.php
@@ -7,7 +7,8 @@
 | http://www.systopia.de/                                 |
 +---------------------------------------------------------*/
 
-require_once "../proxy.php";
+ini_set('include_path', dirname(dirname(__FILE__)));
+require "proxy.php";
 
 // see if mail open tracking is enabled
 if (!$mail_subscription_user_key) civiproxy_http_error("Feature disabled", 405);
@@ -80,7 +81,6 @@ if (!empty($group_query['is_error'])) {
   <div id="container">
     <div id="info" class="center">
       <a href="https://www.systopia.de/"><?php echo $civiproxy_logo;?></a>
-      <p id="version">Subscribe to Newsletters</p>
     </div>
     <div id="content" class="center">
       <p>Thank you. You are now subscribed to the newsletter.</a>
diff --git a/proxy/mailing/mail.php b/proxy/mailing/mail.php
index da2d0e3..c4940bf 100644
--- a/proxy/mailing/mail.php
+++ b/proxy/mailing/mail.php
@@ -7,8 +7,8 @@
 | http://www.systopia.de/                                 |
 +---------------------------------------------------------*/
 
-require_once "../config.php";
-require_once "../proxy.php";
+ini_set('include_path', dirname(dirname(__FILE__)));
+require "proxy.php";
 
 // see if mail open tracking is enabled
 if (!$target_mail_view) civiproxy_http_error("Feature disabled", 405);
diff --git a/proxy/mailing/resubscribe.php b/proxy/mailing/resubscribe.php
index 52115ef..a89f4b3 100644
--- a/proxy/mailing/resubscribe.php
+++ b/proxy/mailing/resubscribe.php
@@ -7,7 +7,8 @@
 | http://www.systopia.de/                                 |
 +---------------------------------------------------------*/
 
-require_once "../proxy.php";
+ini_set('include_path', dirname(dirname(__FILE__)));
+require "proxy.php";
 
 // see if mail open tracking is enabled
 if (!$mail_subscription_user_key) civiproxy_http_error("Feature disabled", 405);
@@ -80,7 +81,6 @@ if (!empty($group_query['is_error'])) {
   <div id="container">
     <div id="info" class="center">
       <a href="https://www.systopia.de/"><?php echo $civiproxy_logo;?></a>
-      <p id="version">Subscribe to Newsletters</p>
     </div>
     <div id="content" class="center">
       <p>Thank you. You've been re-subscribed to the newsletter.</a>
diff --git a/proxy/mailing/subscribe.php b/proxy/mailing/subscribe.php
index 697ff20..761eeec 100644
--- a/proxy/mailing/subscribe.php
+++ b/proxy/mailing/subscribe.php
@@ -7,7 +7,8 @@
 | http://www.systopia.de/                                 |
 +---------------------------------------------------------*/
 
-require "../proxy.php";
+ini_set('include_path', dirname(dirname(__FILE__)));
+require "proxy.php";
 
 // see if mailing subscribe feature is enabled
 if (empty($mail_subscription_user_key)) civiproxy_http_error("Feature disabled", 405);
@@ -133,7 +134,7 @@ if (empty($_REQUEST['email']) || !empty($parameter_errors)) {
     <select name='group_id'>
     ";
   foreach ($groups as $group_id => $group) {
-    print "<option value='{$group_id}'>{$group['name']}</input>";
+    print "<option value='{$group_id}'>{$group['title']}</input>";
   }
   print "
     </select>
diff --git a/proxy/mailing/unsubscribe.php b/proxy/mailing/unsubscribe.php
index ef1d555..d4920dc 100644
--- a/proxy/mailing/unsubscribe.php
+++ b/proxy/mailing/unsubscribe.php
@@ -7,7 +7,8 @@
 | http://www.systopia.de/                                 |
 +---------------------------------------------------------*/
 
-require "../proxy.php";
+ini_set('include_path', dirname(dirname(__FILE__)));
+require "proxy.php";
 
 // see if mailing subscribe feature is enabled
 if (empty($mail_subscription_user_key)) civiproxy_http_error("Feature disabled", 405);
@@ -80,7 +81,6 @@ if (!empty($group_query['is_error'])) {
   <div id="container">
     <div id="info" class="center">
       <a href="https://www.systopia.de/"><?php echo $civiproxy_logo;?></a>
-      <p id="version">Subscribe to Newsletters</p>
     </div>
     <div id="content" class="center">
       <p>Thank you. You have been successfully unsubscribed.</a>
diff --git a/proxy/proxy.php b/proxy/proxy.php
index 1c164ee..613f6a8 100644
--- a/proxy/proxy.php
+++ b/proxy/proxy.php
@@ -193,6 +193,7 @@ function civiproxy_get_parameters($valid_parameters) {
 function civiproxy_http_error($message, $code = 404) {
   global $civiproxy_version;
   global $error_message;
+  global $civiproxy_logo;
 
   $civiproxy_error_message = $message;