Merge pull request #141 from marc1706/ticket/224

[ticket/224] Add possibility to append username to donation
board3 · Sep 21, 2013 · 3be38fa · 3be38fa
2 parents 71a7860 + 198e32e
commit 3be38fa
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 44 deletions.
diff --git a/root/language/de/mods/portal/portal_donation_module.php b/root/language/de/mods/portal/portal_donation_module.php
@@ -61,4 +61,5 @@
 	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'Hier kannst du die Paypal Einstellungen ändern.',
 	'PORTAL_PAY_ACC'							=> 'Paypal Account',
 	'PORTAL_PAY_ACC_EXP'					=> 'Gib deine e-mail-Adresse an, die du bei Paypal benutzt, z.B. xxx@xxx.com',
+	'PORTAL_PAY_CUSTOM'				=> 'Benutzername an die Paypal Zahlung anhängen',
 ));
diff --git a/root/language/en/mods/portal/portal_donation_module.php b/root/language/en/mods/portal/portal_donation_module.php
@@ -61,4 +61,5 @@
 	'ACP_PORTAL_PAYPAL_SETTINGS_EXP'		=> 'This is where you customize the Paypal block.',
 	'PORTAL_PAY_ACC'						=> 'Paypal account to use',
 	'PORTAL_PAY_ACC_EXP'					=> 'Enter your Paypal e-mail address eg. xxx@xxx.com',
+	'PORTAL_PAY_CUSTOM'				=> 'Append username to Paypal donation',
 ));
diff --git a/root/portal/modules/portal_donation.php b/root/portal/modules/portal_donation.php
@@ -49,18 +49,24 @@ class portal_donation_module
 
 	public function get_template_center($module_id)
 	{
-		global $config, $template;
+		global $config, $template, $user;
 
-		$template->assign_var('PAY_ACC_CENTER', $config['board3_pay_acc_' . $module_id]);
+		$template->assign_vars(array(
+			'PAY_ACC_CENTER'	=> $config['board3_pay_acc_' . $module_id],
+			'PAY_CUSTOM_CENTER'	=> (!empty($config['board3_pay_custom_' . $module_id])) ? $user->data['username_clean'] : false,
+		));
 
 		return 'donation_center.html';
 	}
 
 	public function get_template_side($module_id)
 	{
-		global $config, $template;
+		global $config, $template, $user;
 
-		$template->assign_var('PAY_ACC_SIDE', $config['board3_pay_acc_' . $module_id]);
+		$template->assign_vars(array(
+			'PAY_ACC_SIDE'	=> $config['board3_pay_acc_' . $module_id],
+			'PAY_CUSTOM_SIDE'	=> (!empty($config['board3_pay_custom_' . $module_id])) ? $user->data['username_clean'] : false,
+		));
 
 		return 'donation_side.html';
 	}
@@ -71,7 +77,8 @@ public function get_template_acp($module_id)
 			'title'	=> 'ACP_PORTAL_PAYPAL_SETTINGS',
 			'vars'	=> array(
 				'legend1'							=> 'ACP_PORTAL_PAYPAL_SETTINGS',
-				'board3_pay_acc_' . $module_id					=> array('lang' => 'PORTAL_PAY_ACC'						,	'validate' => 'string',		'type' => 'text:25:100',	 'explain' => true),
+				'board3_pay_acc_' . $module_id		=> array('lang' => 'PORTAL_PAY_ACC', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true),
+				'board3_pay_custom_' . $module_id	=> array('lang' => 'PORTAL_PAY_CUSTOM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
 			)
 		);
 	}
@@ -82,6 +89,7 @@ public function get_template_acp($module_id)
 	public function install($module_id)
 	{
 		set_config('board3_pay_acc_' . $module_id, 'your@paypal.com');
+		set_config('board3_pay_custom_' . $module_id, true);
 		return true;
 	}
 
@@ -91,6 +99,7 @@ public function uninstall($module_id)
 
 		$del_config = array(
 			'board3_pay_acc_' . $module_id,
+			'board3_pay_custom_' . $module_id,
 		);
 		$sql = 'DELETE FROM ' . CONFIG_TABLE . '
 			WHERE ' . $db->sql_in_set('config_name', $del_config);

diff --git a/root/styles/prosilver/template/portal/modules/donation_center.html b/root/styles/prosilver/template/portal/modules/donation_center.html
@@ -3,45 +3,48 @@
 		<li><dl>
 			<dd style="border-left: 0px">
 				<div style="text-align: left; margin: 5px 5px 5px 5px">
-                   <strong>{SITENAME}</strong> {L_DONATION_TEXT}
-                   <br />
-                   <div style="float: left; padding: 5px 5px 5px 5px"><img src="{T_THEME_PATH}/images/portal/paypal.gif" alt="" /></div>
-                <form action="https://www.paypal.com/cgi-bin/webscr" method="post" style="padding-top:15px">
-                <div>
-                   <input type="hidden" name="cmd" value="_xclick" />
-                   <input type="hidden" name="business" value="{PAY_ACC_CENTER}" />
-                   <input type="hidden" name="item_name" value="{L_PAY_ITEM}" />
-                   <input type="hidden" name="no_note" value="1" />
-                   <input type="hidden" name="no_shipping" value="2" />
-                   <input type="hidden" name="bn" value="PP-DonationsBF" />
-                   <input type="hidden" name="tax" value="0" />
-                   <input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
-                   <select name="currency_code" class="autowidth">
-                        <option value="USD">{L_USD}</option>
-                      <option value="AUD">{L_AUD}</option>
-                      <option value="CAD">{L_CAD}</option>
-                      <option value="CZK">{L_CZK}</option>
-                      <option value="DKK">{L_DKK}</option>
-                      <option value="EUR" selected="selected">{L_EUR}</option>
-                      <option value="HKD">{L_HKD}</option>
-                      <option value="HUF">{L_HUF}</option>
-                      <option value="NZD">{L_NZD}</option>
-                      <option value="NOK">{L_NOK}</option>
-                      <option value="PLN">{L_PLN}</option>
-                      <option value="GBP">{L_GBP}</option>
-                      <option value="SGD">{L_SGD}</option>
-                      <option value="SEK">{L_SEK}</option>
-                      <option value="CHF">{L_CHF}</option>
-                      <option value="JPY">{L_JPY}</option>
-                      <option value="MXN">{L_MXN}</option>
-                      <option value="ILS">{L_ILS}</option>
-                   </select>
-                   <input type="submit" name="submit" value="{L_DONATION}" class="button1" />
-                </div>
-                </form>
-                   <br />
-                   <strong>{L_PAY_MSG}</strong>
-                </div>
+			<strong>{SITENAME}</strong> {L_DONATION_TEXT}
+			<br />
+			<div style="float: left; padding: 5px 5px 5px 5px"><img src="{T_THEME_PATH}/images/portal/paypal.gif" alt="" /></div>
+		<form action="https://www.paypal.com/cgi-bin/webscr" method="post" style="padding-top:15px">
+		<div>
+			<input type="hidden" name="cmd" value="_xclick" />
+			<input type="hidden" name="business" value="{PAY_ACC_CENTER}" />
+			<input type="hidden" name="item_name" value="{L_PAY_ITEM}" />
+			<input type="hidden" name="no_note" value="1" />
+			<input type="hidden" name="no_shipping" value="2" />
+			<input type="hidden" name="bn" value="PP-DonationsBF" />
+			<input type="hidden" name="tax" value="0" />
+			<!-- IF PAY_CUSTOM_CENTER -->
+			<input type="hidden" name="custom" value="{PAY_CUSTOM_CENTER}">
+			<!-- ENDIF -->
+			<input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
+			<select name="currency_code" class="autowidth">
+				<option value="USD">{L_USD}</option>
+				<option value="AUD">{L_AUD}</option>
+				<option value="CAD">{L_CAD}</option>
+				<option value="CZK">{L_CZK}</option>
+				<option value="DKK">{L_DKK}</option>
+				<option value="EUR" selected="selected">{L_EUR}</option>
+				<option value="HKD">{L_HKD}</option>
+				<option value="HUF">{L_HUF}</option>
+				<option value="NZD">{L_NZD}</option>
+				<option value="NOK">{L_NOK}</option>
+				<option value="PLN">{L_PLN}</option>
+				<option value="GBP">{L_GBP}</option>
+				<option value="SGD">{L_SGD}</option>
+				<option value="SEK">{L_SEK}</option>
+				<option value="CHF">{L_CHF}</option>
+				<option value="JPY">{L_JPY}</option>
+				<option value="MXN">{L_MXN}</option>
+				<option value="ILS">{L_ILS}</option>
+			</select>
+			<input type="submit" name="submit" value="{L_DONATION}" class="button1" />
+		</div>
+		</form>
+			<br />
+			<strong>{L_PAY_MSG}</strong>
+		</div>
 			</dd>
 		</dl></li>
 	</ul>

diff --git a/root/styles/prosilver/template/portal/modules/donation_side.html b/root/styles/prosilver/template/portal/modules/donation_side.html
@@ -9,6 +9,9 @@
 		<input type="hidden" name="no_shipping" value="2" />
 		<input type="hidden" name="bn" value="PP-DonationsBF" />
 		<input type="hidden" name="tax" value="0" />
+		<!-- IF PAY_CUSTOM_SIDE -->
+		<input type="hidden" name="custom" value="{PAY_CUSTOM_SIDE}">
+		<!-- ENDIF -->
 		<input type="text" tabindex="10" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
 		<select name="currency_code" class="autowidth">
         	<option value="USD">USD</option>

diff --git a/root/styles/subsilver2/template/portal/modules/donation_center.html b/root/styles/subsilver2/template/portal/modules/donation_center.html
@@ -16,6 +16,9 @@
 					<input type="hidden" name="no_shipping" value="2" />
 					<input type="hidden" name="bn" value="PP-DonationsBF" />
 					<input type="hidden" name="tax" value="0" />
+					<!-- IF PAY_CUSTOM_CENTER -->
+					<input type="hidden" name="custom" value="{PAY_CUSTOM_CENTER}">
+					<!-- ENDIF -->
 					<input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
 					<select name="currency_code" class="autowidth">
         				<option value="USD">{L_USD}</option>

diff --git a/root/styles/subsilver2/template/portal/modules/donation_side.html b/root/styles/subsilver2/template/portal/modules/donation_side.html
@@ -11,6 +11,9 @@
 				<input type="hidden" name="no_shipping" value="2" />
 				<input type="hidden" name="bn" value="PP-DonationsBF" />
 				<input type="hidden" name="tax" value="0" />
+				<!-- IF PAY_CUSTOM_SIDE -->
+				<input type="hidden" name="custom" value="{PAY_CUSTOM_SIDE}">
+				<!-- ENDIF -->
 				<input type="text" tabindex="10" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
 				<select name="currency_code" class="autowidth">
         			<option value="USD">USD</option>