From: Roland Häder <roland@mxchange.org>
Date: Thu, 5 Nov 2009 13:19:07 +0000 (+0000)
Subject: Fixes for rallye, thanks to WernisMan
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=6809d445c472e918ac3bf8a6cb0914b3a996764d

Fixes for rallye, thanks to WernisMan
---

diff --git a/.gitattributes b/.gitattributes
index fdbcdc6c97..dd9e87a3ad 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -326,6 +326,7 @@ inc/modules/admin/action-logout.php -text
 inc/modules/admin/action-menu.php -text
 inc/modules/admin/action-misc.php -text
 inc/modules/admin/action-mods.php -text
+inc/modules/admin/action-network.php -text
 inc/modules/admin/action-newsletter.php -text
 inc/modules/admin/action-payouts.php -text
 inc/modules/admin/action-primera.php -text
@@ -428,6 +429,7 @@ inc/modules/admin/what-list_country.php -text
 inc/modules/admin/what-list_doubler.php -text
 inc/modules/admin/what-list_holiday.php -text
 inc/modules/admin/what-list_links.php -text
+inc/modules/admin/what-list_networks.php -text
 inc/modules/admin/what-list_notifications.php -text
 inc/modules/admin/what-list_payouts.php -text
 inc/modules/admin/what-list_primera.php -text
diff --git a/inc/modules/admin/action- b/inc/modules/admin/action-
index e18db953c2..cfe4520556 100644
--- a/inc/modules/admin/action-
+++ b/inc/modules/admin/action-
@@ -50,7 +50,7 @@ if (isIncludeReadable($inc)) {
 	// Ok, we finally load the admin action module
 	loadInclude($inc);
 } else {
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_404_ACTION'), getWhat()));
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_WHAT_404'), getWhat()));
 }
 
 // [EOF]
diff --git a/inc/modules/admin/action-network.php b/inc/modules/admin/action-network.php
new file mode 100644
index 0000000000..68ec2d7f84
--- /dev/null
+++ b/inc/modules/admin/action-network.php
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 11/04/2009 *
+ * ===============                              Last change: 11/04/2009 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : action-network.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Sponsor networks                                 *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Werbenetzwerke                                   *
+ * -------------------------------------------------------------------- *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
+
+// Add description as navigation point
+addMenuDescription('admin', __FILE__);
+
+// Load the include file
+$inc = sprintf("inc/modules/admin/what-%s.php", getWhat());
+if (isIncludeReadable($inc)) { 
+	// Ok, we finally load the admin action module
+	loadInclude($inc);
+} else {
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_WHAT_404'), getWhat()));
+}
+
+// [EOF]
+?>
diff --git a/inc/modules/admin/what- b/inc/modules/admin/what-
index ee740024aa..6cf74f572f 100644
--- a/inc/modules/admin/what-
+++ b/inc/modules/admin/what-
@@ -37,7 +37,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!is_admin())) {
+if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
 } // END - if
 
diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 854f207ef9..96cefc7879 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -188,7 +188,7 @@ VALUES ('%s','%s','%s','%s')",
 		}
 	} else {
 		// a rallye was selected, so check if there are already prices assigned...
-		$result = SQL_QUERY_ESC("SELECT `id`, `price_level`, points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC",
+		$result = SQL_QUERY_ESC("SELECT `id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC",
 			array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
 
 		if (SQL_NUMROWS($result) > 0) {
diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php
new file mode 100644
index 0000000000..c0b4623a15
--- /dev/null
+++ b/inc/modules/admin/what-list_networks.php
@@ -0,0 +1,105 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 11/04/2009 *
+ * ================                             Last change: 11/04/2009 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_networks.php                           *
+ * -------------------------------------------------------------------- *
+ * Short description : List all supported sponsor networks              *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Listet alle supportierten Werbenetzwerke auf     *
+ * -------------------------------------------------------------------- *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
+
+// Add description as navigation point
+addMenuDescription('admin', __FILE__);
+
+// By default we should display list/add new forms
+$GLOBALS['network_display'] = true;
+
+// Was the form sent?
+if ((isFormSent()) || (isPostRequestElementSet('edit')) || (isPostRequestElementSet('del'))) {
+	// Do we have a 'do'?
+	if (isGetRequestElementSet('do')) {
+		// Process the request
+		doAdminNetworkProcessForm();
+	} else {
+		// No 'do' found
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
+	}
+} // END - if
+
+// Display forms?
+if ($GLOBALS['network_display'] === false) {
+	// Abort here
+	return;
+} // END - if
+
+// Query for networks
+$result = SQL_QUERY('SELECT
+	`network_id`, `network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`
+FROM
+	`{?_MYSQL_PREFIX?}_network_data`
+ORDER BY
+	`network_title` ASC', __FILE__, __LINE__);
+
+// Do we have entries?
+if (SQL_NUMROWS($result) > 0) {
+	// List all
+	$SW = 2; $OUT = '';
+	while ($content = SQL_FETCHARRAY($result)) {
+		// Add/translate entries
+		$content['sw'] = $SW;
+
+		// Load row template
+		$OUT .= loadTemplate('admin_list_networks_row', true, $content);
+
+		// Switch color
+		$SW = 3 - $SW;
+	} // END - while
+
+	// Load main template
+	loadTemplate('admin_list_networks', false, $OUT);
+} else {
+	// Display a message that there are sponsor networks supported, yet
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NONE_SUPPORTED'));
+}
+
+// Free result
+SQL_FREERESULT($result);
+
+// Add form for adding new entry
+loadTemplate('admin_add_network');
+
+// [EOF]
+?>
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index f7fdcdc321..0ebeb5e4a4 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -274,58 +274,60 @@ LIMIT 1",
 	}
 } else {
 	// Start listing rallyes
-	$result = SQL_QUERY("SELECT id, admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify, notified, min_users, min_prices
-FROM `{?_MYSQL_PREFIX?}_rallye_data`
-ORDER BY start_time DESC",
-	__FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT
+	`id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices
+FROM
+	`{?_MYSQL_PREFIX?}_rallye_data`
+ORDER BY
+	`start_time` DESC", __FILE__, __LINE__);
+
+	// Records found?
 	if (SQL_NUMROWS($result) > 0) {
 		// List found rallyes
 		$OUT = ''; $SW = 2;
-		while ($row = SQL_FETCHARRAY($result)) {
+		while ($data = SQL_FETCHARRAY($result)) {
 			// Load admin login
-			$row['login'] = getAdminLogin($row['admin_id']);
+			$data['login'] = getAdminLogin($data['admin_id']);
 
 			// Count joined userids
-			$joined = countSumTotalData($row['id'], "rallye_users", 'id', "rallye_id", true);
+			$joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
 			// Did some users joined this rallye?
 			if ($joined > 0) {
 				// List joined users
-				$joined = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$row['id']."\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$joined."</a>";
+				$joined = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$data['id']."\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$joined."</a>";
 			} // END - if
 
 			// Alter some variables
-			if (empty($row['login']))   $row['login']    = '???';
-			if (empty($row['template'])) $row['template']  = '---';
-			if (empty($row['descr']))    $row['descr']     = '---';
+			if (empty($data['login']))    $data['login']     = '???';
+			if (empty($data['template'])) $data['template']  = '---';
+			if (empty($data['descr']))    $data['descr']     = '---';
 
 			// Transfer data into array for the template
-			// @TODO Rewritings: admin_id->admin_id in template
 			$row = array(
-				'select'     => "<input type=\"checkbox\" name=\"sel[".$row['id']."]\" class=\"admin_normal\" value=\"1\" />",
-				'admin_id'        => $row['admin_id'],
-				'email_link' => generateEmailLink($row['admin_id']),
-				'login'      => $row['login'],
-				'id'         => $row['id'],
+				'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
+				'admin_id'   => $data['admin_id'],
+				'email_link' => generateEmailLink($data['admin_id']),
+				'login'      => $data['login'],
+				'id'         => $data['id'],
 				'sw'         => $SW,
-				'title'      => $row['title'],
-				'template'   => $row['template'],
+				'title'      => $data['title'],
+				'template'   => $data['template'],
 				'joined'     => $joined,
-				'start_date' => generateDateTime($row['start_time'], 2),
-				'end_date'   => generateDateTime($row['end_time']  , 2),
-				'active_lnk' => translateYesNo($row['is_active']),
-				'notify_lnk' => translateYesNo($row['send_notify']),
-				'auto_lnk'   => translateYesNo($row['auto_add_new_user']),
-				'notified'   => translateYesNo($row['notified']),
-				'prices_cnt' => translateComma(countSumTotalData($row['id'], 'rallye_prices', 'id', 'rallye_id', true)),
-				'descr'      => $row['descr'],
-				'min_users'  => $row['min_users'],
-				'min_prices' => $row['min_prices'],
+				'start_date' => generateDateTime($data['start_time'], 2),
+				'end_date'   => generateDateTime($data['end_time']  , 2),
+				'active_lnk' => translateYesNo($data['is_active']),
+				'notify_lnk' => translateYesNo($data['send_notify']),
+				'auto_lnk'   => translateYesNo($data['auto_add_new_user']),
+				'notified'   => translateYesNo($data['notified']),
+				'prices_cnt' => translateComma(countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true)),
+				'descr'      => $data['descr'],
+				'min_users'  => $data['min_users'],
+				'min_prices' => $data['min_prices'],
 			);
 
 			// Is the rallye active or not?
-			switch ($row['is_active'])
-			{
+			switch ($data['is_active']) {
 				case 'Y':
 					// Rallye is active so do not edit it!
 					$row['select'] = "<div class=\"big\">".$row['id']."</div>";
@@ -340,8 +342,7 @@ ORDER BY start_time DESC",
 			}
 
 			// Notification to members?
-			switch ($row['send_notify'])
-			{
+			switch ($data['send_notify']) {
 				case 'Y':
 					$row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
 					$row['notify'] = 0;
@@ -354,8 +355,7 @@ ORDER BY start_time DESC",
 			}
 
 			// Auto-add of new joined members?
-			switch ($row['auto_add_new_user'])
-			{
+			switch ($data['auto_add_new_user']) {
 				case 'Y':
 					$row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
 					$row['auto'] = 0;
@@ -370,7 +370,7 @@ ORDER BY start_time DESC",
 			// Output row
 			$OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
 			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index a715f5548f..8ba7890dd8 100644
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -37,7 +37,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!is_admin())) {
+if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
 }
 
@@ -45,9 +45,13 @@ if ((!defined('__SECURITY')) || (!is_admin())) {
 addMenuDescription('admin', __FILE__);
 
 // Load all actions
-$result = SQL_QUERY("SELECT `id`,`status`,`action`,`new_status`
-FROM `{?_MYSQL_PREFIX?}_surfbar_actions`
-ORDER BY `status` ASC, `action` ASC", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT
+	`id`, `status`, `action`, `new_status`
+FROM
+	`{?_MYSQL_PREFIX?}_surfbar_actions`
+ORDER BY
+	`status` ASC,
+	`action` ASC", __FILE__, __LINE__);
 
 // Entries found?
 if (SQL_NUMROWS($result) > 0) {
@@ -87,5 +91,5 @@ if (SQL_NUMROWS($result) > 0) {
 // Free result
 SQL_FREERESULT($result);
 
-//
+// [EOF]
 ?>