Skouat / ext_paypal_donation

controller/ipn_listener.php

Spacing +19 added lines, -19 removed lines

@@ -263,14 +263,14 @@ 
 			foreach ($args as $key => $value)
 			{
 				$value = urlencode($value);
-				$message .= $key . ' = ' . $value . ";\n";
+				$message .= $key.' = '.$value.";\n";
 			}
 			unset($value);
 		}
 
 		if ($log_in_file)
 		{
-			error_log(sprintf('[%s] %s %s', $error_timestamp, $message, $backtrace), 3, $this->root_path . 'store/ppde_transactions.log');
+			error_log(sprintf('[%s] %s %s', $error_timestamp, $message, $backtrace), 3, $this->root_path.'store/ppde_transactions.log');
 		}
 
 		if ($exit)
@@ -489,13 +489,13 @@ 
 		foreach ($this->get_post_data() as $key => $value)
 		{
 			$encoded = urlencode(stripslashes($value));
-			$values[] = $key . '=' . $encoded;
+			$values[] = $key.'='.$encoded;
 
 			$this->transaction_data[$key] = $value;
 		}
 
 		// implode the array into a string URI
-		$this->args_return_uri .= '&' . implode('&', $values);
+		$this->args_return_uri .= '&'.implode('&', $values);
 	}
 
 	/**
@@ -556,7 +556,7 @@ 
 		if (curl_errno($ch) != 0)
 		{
 			// cURL error
-			$this->log_error($this->user->lang['CURL_ERROR'] . curl_errno($ch) . ' (' . curl_error($ch) . ')', $this->use_log_error);
+			$this->log_error($this->user->lang['CURL_ERROR'].curl_errno($ch).' ('.curl_error($ch).')', $this->use_log_error);
 			curl_close($ch);
 		}
 		else
@@ -593,20 +593,20 @@ 
 		// post back to PayPal system to validate
 		$header = "POST /cgi-bin/webscr HTTP/1.1\r\n";
 		$header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-		$header .= 'Host: ' . $parse_url['host'] . "\r\n";
-		$header .= 'Content-Length: ' . strlen($encoded_data) . "\r\n";
+		$header .= 'Host: '.$parse_url['host']."\r\n";
+		$header .= 'Content-Length: '.strlen($encoded_data)."\r\n";
 		$header .= "Connection: Close\r\n\r\n";
 
-		$fp = fsockopen('ssl://' . $parse_url['host'], 443, $errno, $errstr, $this->timeout);
+		$fp = fsockopen('ssl://'.$parse_url['host'], 443, $errno, $errstr, $this->timeout);
 
 		if (!$fp)
 		{
-			$this->log_error($this->user->lang['FSOCK_ERROR'] . $errno . ' (' . $errstr . ')', $this->use_log_error);
+			$this->log_error($this->user->lang['FSOCK_ERROR'].$errno.' ('.$errstr.')', $this->use_log_error);
 		}
 		else
 		{
 			// Send the data to PayPal
-			fputs($fp, $header . $encoded_data);
+			fputs($fp, $header.$encoded_data);
 
 			// Loop through the response
 			while (!feof($fp))
@@ -641,17 +641,17 @@ 
 		if ($this->txn_is_verified())
 		{
 			$this->verified = $this->transaction_data['confirmed'] = true;
-			$this->log_error("DEBUG VERIFIED:\n" . $this->get_text_report(), $this->use_log_error);
+			$this->log_error("DEBUG VERIFIED:\n".$this->get_text_report(), $this->use_log_error);
 		}
 		else if ($this->txn_is_invalid())
 		{
 			$this->verified = $this->transaction_data['confirmed'] = false;
-			$this->log_error("DEBUG INVALID:\n" . $this->get_text_report(), $this->use_log_error, true);
+			$this->log_error("DEBUG INVALID:\n".$this->get_text_report(), $this->use_log_error, true);
 		}
 		else
 		{
 			$this->verified = $this->transaction_data['confirmed'] = false;
-			$this->log_error("DEBUG OTHER:\n" . $this->get_text_report(), $this->use_log_error);
+			$this->log_error("DEBUG OTHER:\n".$this->get_text_report(), $this->use_log_error);
 			$this->log_error($this->user->lang['UNEXPECTED_RESPONSE'], $this->use_log_error, true);
 		}
 
@@ -711,12 +711,12 @@ 
 
 		// Date and POST url
 		$this->text_report_insert_line($r);
-		$r .= "\n[" . date('m/d/Y g:i A') . '] - ' . $this->u_paypal . ' ( ' . $this->get_curl_fsock() . " )\n";
+		$r .= "\n[".date('m/d/Y g:i A').'] - '.$this->u_paypal.' ( '.$this->get_curl_fsock()." )\n";
 
 		// HTTP Response
 		$this->text_report_insert_line($r);
-		$r .= "\n" . $this->get_report_response() . "\n";
-		$r .= "\n" . $this->get_response_status() . "\n";
+		$r .= "\n".$this->get_report_response()."\n";
+		$r .= "\n".$this->get_response_status()."\n";
 		$this->text_report_insert_line($r);
 
 		// POST vars
@@ -782,7 +782,7 @@ 
 	{
 		foreach ($this->transaction_data as $key => $value)
 		{
-			$r .= str_pad($key, 25) . $value . "\n";
+			$r .= str_pad($key, 25).$value."\n";
 		}
 	}
 
@@ -960,7 +960,7 @@ 
 		{
 			if (!function_exists('group_user_add'))
 			{
-				include($this->root_path . 'includes/functions_user.' . $this->php_ext);
+				include($this->root_path.'includes/functions_user.'.$this->php_ext);
 			}
 
 			// add the user to the donors group and set as default.
@@ -1054,7 +1054,7 @@ 
 	private function update_raised_amount()
 	{
 		$ipn_suffix = $this->ppde_controller_transactions_admin->get_suffix_ipn();
-		$this->config->set('ppde_raised' . $ipn_suffix, (float) $this->config['ppde_raised' . $ipn_suffix] + (float) $this->net_amount($this->transaction_data['mc_gross'], $this->transaction_data['mc_fee']), true);
+		$this->config->set('ppde_raised'.$ipn_suffix, (float) $this->config['ppde_raised'.$ipn_suffix] + (float) $this->net_amount($this->transaction_data['mc_gross'], $this->transaction_data['mc_fee']), true);
 	}
 
 	/**

controller/admin_overview_controller.php

Spacing +3 added lines, -3 removed lines

@@ -97,8 +97,8 @@ 
 			'S_FSOCKOPEN'               => $this->config['ppde_fsock_detected'],
 			'TRANSACTIONS_COUNT'        => $this->config['ppde_transactions_count'],
 			'TRANSACTIONS_PER_DAY'      => $this->per_day_stats('ppde_transactions_count'),
-			'U_PPDE_MORE_INFORMATION'   => append_sid("index.$this->php_ext", 'i=acp_extensions&mode=main&action=details&ext_name=' . urlencode($this->ext_meta['name'])),
-			'U_PPDE_VERSIONCHECK_FORCE' => $this->u_action . '&versioncheck_force=1',
+			'U_PPDE_MORE_INFORMATION'   => append_sid("index.$this->php_ext", 'i=acp_extensions&mode=main&action=details&ext_name='.urlencode($this->ext_meta['name'])),
+			'U_PPDE_VERSIONCHECK_FORCE' => $this->u_action.'&versioncheck_force=1',
 			'U_ACTION'                  => $this->u_action,
 		));
 
@@ -191,7 +191,7 @@ 
 	{
 		if (!$this->auth->acl_get('a_ppde_manage'))
 		{
-			trigger_error($this->user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_AUTH_OPERATION'].adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		switch ($action)

controller/admin_transactions_controller.php

Spacing +25 added lines, -25 removed lines

@@ -71,7 +71,7 @@ 
 		$this->template = $template;
 		$this->user = $user;
 		$this->adm_relative_path = $adm_relative_path;
-		$this->phpbb_admin_path = $phpbb_root_path . $adm_relative_path;
+		$this->phpbb_admin_path = $phpbb_root_path.$adm_relative_path;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->table_ppde_transactions = $table_ppde_transactions;
@@ -125,7 +125,7 @@ 
 					$entity->delete(0, '', $where_sql);
 					$this->update_stats();
 					$this->update_stats(true);
-					$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_' . $this->lang_key_prefix . '_PURGED', time());
+					$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_'.$this->lang_key_prefix.'_PURGED', time());
 				}
 			}
 			else
@@ -162,10 +162,10 @@ 
 
 			// Define where and sort sql for use in displaying transactions
 			$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-			$sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
+			$sql_sort = $sort_by_sql[$sort_key].' '.(($sort_dir == 'd') ? 'DESC' : 'ASC');
 
 			$keywords = utf8_normalize_nfc($this->request->variable('keywords', '', true));
-			$keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : '';
+			$keywords_param = !empty($keywords) ? '&keywords='.urlencode(htmlspecialchars_decode($keywords)) : '';
 
 			// Grab log data
 			$log_data = array();
@@ -173,7 +173,7 @@ 
 
 			$this->view_txn_log($log_data, $log_count, $this->config['topics_per_page'], $start, $sql_where, $sql_sort, $keywords);
 
-			$base_url = $this->u_action . '&' . $u_sort_param . $keywords_param;
+			$base_url = $this->u_action.'&'.$u_sort_param.$keywords_param;
 			$pagination->generate_template_pagination($base_url, 'pagination', 'start', $log_count, $this->config['topics_per_page'], $start);
 
 			$this->template->assign_vars(array(
@@ -183,7 +183,7 @@ 
 				'S_SORT_KEY'   => $s_sort_key,
 				'S_SORT_DIR'   => $s_sort_dir,
 				'S_TXN'        => $mode,
-				'U_ACTION'     => $this->u_action . '&' . $u_sort_param . $keywords_param . '&start=' . $start,
+				'U_ACTION'     => $this->u_action.'&'.$u_sort_param.$keywords_param.'&start='.$start,
 			));
 
 			foreach ($log_data as $row)
@@ -215,9 +215,9 @@ 
 	public function update_stats($ipn_stats = false)
 	{
 		$this->set_ipn_test_properties($ipn_stats);
-		$this->config->set('ppde_known_donors_count' . $this->suffix_ipn, $this->sql_query_update_stats('ppde_known_donors_count' . $this->suffix_ipn), true);
-		$this->config->set('ppde_anonymous_donors_count' . $this->suffix_ipn, $this->sql_query_update_stats('ppde_anonymous_donors_count' . $this->suffix_ipn));
-		$this->config->set('ppde_transactions_count' . $this->suffix_ipn, $this->sql_query_update_stats('ppde_transactions_count' . $this->suffix_ipn), true);
+		$this->config->set('ppde_known_donors_count'.$this->suffix_ipn, $this->sql_query_update_stats('ppde_known_donors_count'.$this->suffix_ipn), true);
+		$this->config->set('ppde_anonymous_donors_count'.$this->suffix_ipn, $this->sql_query_update_stats('ppde_anonymous_donors_count'.$this->suffix_ipn));
+		$this->config->set('ppde_transactions_count'.$this->suffix_ipn, $this->sql_query_update_stats('ppde_transactions_count'.$this->suffix_ipn), true);
 	}
 
 	/**
@@ -293,21 +293,21 @@ 
 			case 'ppde_transactions_count':
 			case 'ppde_transactions_count_ipn':
 				$sql = $this->make_stats_sql_select('txn_id');
-				$sql .= " WHERE confirmed = 1 AND payment_status = 'Completed' AND txn.test_ipn = " . (int) $this->is_ipn_test;
+				$sql .= " WHERE confirmed = 1 AND payment_status = 'Completed' AND txn.test_ipn = ".(int) $this->is_ipn_test;
 
 				return $sql;
 			case 'ppde_known_donors_count':
 			case 'ppde_known_donors_count_ipn':
 				$sql = $this->make_stats_sql_select('payer_id');
-				$sql .= ' LEFT JOIN ' . USERS_TABLE . ' u
+				$sql .= ' LEFT JOIN '.USERS_TABLE.' u
 				 					ON txn.user_id = u.user_id
-								WHERE (u.user_type = ' . USER_NORMAL . ' OR u.user_type = ' . USER_FOUNDER . ") AND txn.test_ipn = " . (int) $this->is_ipn_test;
+								WHERE (u.user_type = ' . USER_NORMAL.' OR u.user_type = '.USER_FOUNDER.") AND txn.test_ipn = ".(int) $this->is_ipn_test;
 
 				return $sql;
 			case 'ppde_anonymous_donors_count':
 			case 'ppde_anonymous_donors_count_ipn':
 				$sql = $this->make_stats_sql_select('payer_id');
-				$sql .= ' WHERE txn.user_id = ' . ANONYMOUS . ' AND txn.test_ipn = ' . (int) $this->is_ipn_test;
+				$sql .= ' WHERE txn.user_id = '.ANONYMOUS.' AND txn.test_ipn = '.(int) $this->is_ipn_test;
 
 				return $sql;
 			default:
@@ -325,8 +325,8 @@ 
 	 */
 	private function make_stats_sql_select($field_name)
 	{
-		return 'SELECT COUNT(DISTINCT txn.' . $field_name . ') AS count_result
-				FROM ' . $this->table_ppde_transactions . ' txn';
+		return 'SELECT COUNT(DISTINCT txn.'.$field_name.') AS count_result
+				FROM ' . $this->table_ppde_transactions.' txn';
 	}
 
 	/**
@@ -362,14 +362,14 @@ 
 
 				$this->template->assign_vars(array(
 					'BOARD_USERNAME' => $data['username'],
-					'EXCHANGE_RATE'  => '1 ' . $data['mc_currency'] . ' = ' . $data['exchange_rate'] . ' ' . $data['settle_currency'],
+					'EXCHANGE_RATE'  => '1 '.$data['mc_currency'].' = '.$data['exchange_rate'].' '.$data['settle_currency'],
 					'ITEM_NAME'      => $data['item_name'],
 					'ITEM_NUMBER'    => $data['item_number'],
-					'MC_CURRENCY'    => $data['net_amount'] . ' ' . $data['mc_currency'],
-					'MC_GROSS'       => $data['mc_gross'] . ' ' . $data['mc_currency'],
-					'MC_FEE'         => '-' . $data['mc_fee'] . ' ' . $data['mc_currency'],
-					'MC_NET'         => $data['net_amount'] . ' ' . $data['mc_currency'],
-					'NAME'           => $data['first_name'] . ' ' . $data['last_name'],
+					'MC_CURRENCY'    => $data['net_amount'].' '.$data['mc_currency'],
+					'MC_GROSS'       => $data['mc_gross'].' '.$data['mc_currency'],
+					'MC_FEE'         => '-'.$data['mc_fee'].' '.$data['mc_currency'],
+					'MC_NET'         => $data['net_amount'].' '.$data['mc_currency'],
+					'NAME'           => $data['first_name'].' '.$data['last_name'],
 					'PAYER_EMAIL'    => $data['payer_email'],
 					'PAYER_ID'       => $data['payer_id'],
 					'PAYER_STATUS'   => ($data['payer_status']) ? $this->user->lang['PPDE_DT_VERIFIED'] : $this->user->lang['PPDE_DT_UNVERIFIED'],
@@ -377,7 +377,7 @@ 
 					'PAYMENT_STATUS' => $payment_status_ary[strtolower($data['payment_status'])],
 					'RECEIVER_EMAIL' => $data['receiver_email'],
 					'RECEIVER_ID'    => $data['receiver_id'],
-					'SETTLE_AMOUNT'  => $data['settle_amount'] . ' ' . $data['settle_currency'],
+					'SETTLE_AMOUNT'  => $data['settle_amount'].' '.$data['settle_currency'],
 					'TXN_ID'         => $data['txn_id'],
 
 					'L_PPDE_DT_SETTLE_AMOUNT'         => $this->user->lang('PPDE_DT_SETTLE_AMOUNT', $data['settle_currency']),
@@ -439,13 +439,13 @@ 
 
 		if ($this->get_container_entity()->is_in_admin() && $this->phpbb_admin_path)
 		{
-			$url_ary['profile_url'] = append_sid($this->phpbb_admin_path . 'index.' . $this->php_ext, 'i=users&mode=overview');
-			$url_ary['txn_url'] = append_sid($this->phpbb_admin_path . 'index.' . $this->php_ext, 'i=-skouat-ppde-acp-ppde_module&mode=transactions');
+			$url_ary['profile_url'] = append_sid($this->phpbb_admin_path.'index.'.$this->php_ext, 'i=users&mode=overview');
+			$url_ary['txn_url'] = append_sid($this->phpbb_admin_path.'index.'.$this->php_ext, 'i=-skouat-ppde-acp-ppde_module&mode=transactions');
 
 		}
 		else
 		{
-			$url_ary['profile_url'] = append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile');
+			$url_ary['profile_url'] = append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile');
 			$url_ary['txn_url'] = '';
 		}