Skouat / ext_paypal_donation

controller/admin_currency_controller.php

Spacing +17 added lines, -17 removed lines

@@ -82,12 +82,12 @@ 
 				'CURRENCY_NAME'    => $data['currency_name'],
 				'CURRENCY_ENABLED' => (bool) $data['currency_enable'],
 
-				'U_DELETE'         => $this->u_action . '&action=delete&' . $this->id_prefix_name . '_id=' . $data['currency_id'],
-				'U_EDIT'           => $this->u_action . '&action=edit&' . $this->id_prefix_name . '_id=' . $data['currency_id'],
-				'U_ENABLE_DISABLE' => $this->u_action . '&action=' . $enable_value . '&' . $this->id_prefix_name . '_id=' . $data['currency_id'],
+				'U_DELETE'         => $this->u_action.'&action=delete&'.$this->id_prefix_name.'_id='.$data['currency_id'],
+				'U_EDIT'           => $this->u_action.'&action=edit&'.$this->id_prefix_name.'_id='.$data['currency_id'],
+				'U_ENABLE_DISABLE' => $this->u_action.'&action='.$enable_value.'&'.$this->id_prefix_name.'_id='.$data['currency_id'],
 				'L_ENABLE_DISABLE' => $this->user->lang[$enable_lang],
-				'U_MOVE_DOWN'      => $this->u_action . '&action=move_down&' . $this->id_prefix_name . '_id=' . $data['currency_id'],
-				'U_MOVE_UP'        => $this->u_action . '&action=move_up&' . $this->id_prefix_name . '_id=' . $data['currency_id'],
+				'U_MOVE_DOWN'      => $this->u_action.'&action=move_down&'.$this->id_prefix_name.'_id='.$data['currency_id'],
+				'U_MOVE_UP'        => $this->u_action.'&action=move_up&'.$this->id_prefix_name.'_id='.$data['currency_id'],
 			));
 		}
 		unset($data_ary, $page);
@@ -126,7 +126,7 @@ 
 		$this->template->assign_vars(array(
 			'S_ADD'        => true,
 
-			'U_ADD_ACTION' => $this->u_action . '&action=add',
+			'U_ADD_ACTION' => $this->u_action.'&action=add',
 			'U_BACK'       => $this->u_action,
 		));
 	}
@@ -160,7 +160,7 @@ 
 
 		// Check some settings before submitting data
 		$errors = array_merge($errors,
-			$this->is_invalid_form('add_edit_' . $this->module_name, $this->submit_or_preview($this->submit)),
+			$this->is_invalid_form('add_edit_'.$this->module_name, $this->submit_or_preview($this->submit)),
 			$this->is_empty_data($entity, 'name', '', $this->submit_or_preview($this->submit)),
 			$this->is_empty_data($entity, 'iso_code', '', $this->submit_or_preview($this->submit)),
 			$this->is_empty_data($entity, 'symbol', '', $this->submit_or_preview($this->submit))
@@ -180,7 +180,7 @@ 
 			'CURRENCY_POSITION' => $entity->get_currency_position(),
 			'CURRENCY_ENABLE'   => $entity->get_currency_enable(),
 
-			'S_HIDDEN_FIELDS'   => '<input type="hidden" name="' . $this->id_prefix_name . '_id" value="' . $entity->get_id() . '" />',
+			'S_HIDDEN_FIELDS'   => '<input type="hidden" name="'.$this->id_prefix_name.'_id" value="'.$entity->get_id().'" />',
 		));
 	}
 
@@ -201,8 +201,8 @@ 
 
 			$log_action = $this->add_edit_data($entity, 'set_order');
 			// Log and show user confirmation of the saved item and provide link back to the previous page
-			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_' . $this->lang_key_prefix . '_' . strtoupper($log_action), time(), array($entity->get_name()));
-			trigger_error($this->user->lang[$this->lang_key_prefix . '_' . strtoupper($log_action)] . adm_back_link($this->u_action));
+			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_'.$this->lang_key_prefix.'_'.strtoupper($log_action), time(), array($entity->get_name()));
+			trigger_error($this->user->lang[$this->lang_key_prefix.'_'.strtoupper($log_action)].adm_back_link($this->u_action));
 		}
 	}
 
@@ -242,7 +242,7 @@ 
 		$this->template->assign_vars(array(
 			'S_EDIT'        => true,
 
-			'U_EDIT_ACTION' => $this->u_action . '&amp;action=edit&amp;' . $this->id_prefix_name . '_id=' . $currency_id,
+			'U_EDIT_ACTION' => $this->u_action.'&amp;action=edit&amp;'.$this->id_prefix_name.'_id='.$currency_id,
 			'U_BACK'        => $this->u_action,
 		));
 	}
@@ -278,7 +278,7 @@ 
 		// Log action if data was moved
 		if ($move_executed)
 		{
-			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_' . $this->lang_key_prefix . '_' . strtoupper($direction), time(), array($entity->get_name()));
+			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_'.$this->lang_key_prefix.'_'.strtoupper($direction), time(), array($entity->get_name()));
 		}
 
 		if ($this->request->is_ajax())
@@ -304,13 +304,13 @@ 
 		// Return an error if no currency
 		if (!$currency_id)
 		{
-			trigger_error($this->user->lang[$this->lang_key_prefix . '_NO_CURRENCY'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang[$this->lang_key_prefix.'_NO_CURRENCY'].adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		// Return an error if it's the last enabled currency
 		if ($this->ppde_operator->last_currency_enabled($action) && ($action == 'disable'))
 		{
-			trigger_error($this->user->lang['PPDE_CANNOT_DISABLE_ALL_CURRENCIES'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['PPDE_CANNOT_DISABLE_ALL_CURRENCIES'].adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		// Load selected currency
@@ -323,7 +323,7 @@ 
 		// Save data to the database
 		$entity->save($entity->check_required_field());
 		// Log action
-		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_' . $this->lang_key_prefix . '_' . strtoupper($action) . 'D', time(), array($entity->get_name()));
+		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_'.$this->lang_key_prefix.'_'.strtoupper($action).'D', time(), array($entity->get_name()));
 
 		if ($this->request->is_ajax() && ($action == 'enable' || $action == 'disable'))
 		{
@@ -351,7 +351,7 @@ 
 		$entity->delete($currency_id, 'check_currency_enable');
 
 		// Log the action
-		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_' . $this->lang_key_prefix . '_DELETED', time(), array($entity->get_name()));
-		trigger_error($this->user->lang[$this->lang_key_prefix . '_DELETED'] . adm_back_link($this->u_action));
+		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_'.$this->lang_key_prefix.'_DELETED', time(), array($entity->get_name()));
+		trigger_error($this->user->lang[$this->lang_key_prefix.'_DELETED'].adm_back_link($this->u_action));
 	}
 }

acp/ppde_module.php

Spacing +3 added lines, -3 removed lines

@@ -39,16 +39,16 @@
 			case 'transactions':
 				// Get an instance of the admin controller
 				/** @type \skouat\ppde\controller\admin_main $admin_controller */
-				$admin_controller = $phpbb_container->get('skouat.ppde.controller.admin.' . $mode);
+				$admin_controller = $phpbb_container->get('skouat.ppde.controller.admin.'.$mode);
 
 				// Make the $u_action url available in the admin overview controller
 				$admin_controller->set_page_url($this->u_action);
 
 				// Set the page title for our ACP page
-				$this->page_title = 'PPDE_ACP_' . strtoupper($mode);
+				$this->page_title = 'PPDE_ACP_'.strtoupper($mode);
 
 				// Load a template from adm/style for our ACP page
-				$this->tpl_name = 'ppde_' . strtolower($mode);
+				$this->tpl_name = 'ppde_'.strtolower($mode);
 
 				switch ($mode)
 				{

migrations/v10x/v1_0_0_schema.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 	{
 		return array(
 			'add_tables' => array(
-				$this->table_prefix . 'ppde_currency'       => array(
+				$this->table_prefix.'ppde_currency'       => array(
 					'COLUMNS'     => array(
 						'currency_id'       => array('UINT', null, 'auto_increment'),
 						'currency_name'     => array('VCHAR:50', ''),
@@ -35,7 +35,7 @@ 
 					'PRIMARY_KEY' => array('currency_id'),
 				),
 
-				$this->table_prefix . 'ppde_donation_pages' => array(
+				$this->table_prefix.'ppde_donation_pages' => array(
 					'COLUMNS'     => array(
 						'page_id'                      => array('UINT', null, 'auto_increment'),
 						'page_title'                   => array('VCHAR:50', ''),
@@ -49,7 +49,7 @@ 
 					'PRIMARY_KEY' => array('page_id'),
 				),
 
-				$this->table_prefix . 'ppde_txn_log'        => array(
+				$this->table_prefix.'ppde_txn_log'        => array(
 					'COLUMNS'     => array(
 						'transaction_id'    => array('UINT', null, 'auto_increment'),
 						// Receiver information
@@ -106,9 +106,9 @@ 
 	{
 		return array(
 			'drop_tables' => array(
-				$this->table_prefix . 'ppde_currency',
-				$this->table_prefix . 'ppde_donation_pages',
-				$this->table_prefix . 'ppde_txn_log',
+				$this->table_prefix.'ppde_currency',
+				$this->table_prefix.'ppde_donation_pages',
+				$this->table_prefix.'ppde_txn_log',
 			),
 		);
 	}

operators/donation_pages.php

Spacing +6 added lines, -6 removed lines

@@ -46,9 +46,9 @@ 
 	public function build_sql_data($lang_id = 0, $mode = 'all_pages')
 	{
 		return 'SELECT *
-				FROM ' . $this->ppde_donation_pages_table . '
-				WHERE page_lang_id = ' . (int) ($lang_id) .
-					$this->build_sql_and_page_title($mode) . '
+				FROM ' . $this->ppde_donation_pages_table.'
+				WHERE page_lang_id = ' . (int) ($lang_id).
+					$this->build_sql_and_page_title($mode).'
 				ORDER BY page_title';
 	}
 
@@ -68,7 +68,7 @@ 
 			case 'body':
 			case 'cancel':
 			case 'success':
-				return " AND page_title = 'donation_" . $mode . "'";
+				return " AND page_title = 'donation_".$mode."'";
 			default:
 				return '';
 		}
@@ -88,11 +88,11 @@ 
 	public function get_languages($lang_id = 0)
 	{
 		// Request by id if provided, otherwise default to request all
-		$sql_where = ($lang_id <> 0) ? 'WHERE lang_id = ' . (int) $lang_id : '';
+		$sql_where = ($lang_id <> 0) ? 'WHERE lang_id = '.(int) $lang_id : '';
 
 		$langs = array();
 
-		$sql = 'SELECT * FROM ' . LANG_TABLE . ' ' . $sql_where;
+		$sql = 'SELECT * FROM '.LANG_TABLE.' '.$sql_where;
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{

operators/currency.php

Spacing +11 added lines, -11 removed lines

@@ -58,13 +58,13 @@ 
 		// Use WHERE clause when $currency_id is different from 0
 		if ((int) $currency_id)
 		{
-			$sql_ary['WHERE'] = 'c.currency_id = ' . (int) $currency_id;
+			$sql_ary['WHERE'] = 'c.currency_id = '.(int) $currency_id;
 		}
 
 		// Use WHERE clause when $only_enabled is true
 		if ($only_enabled)
 		{
-			$sql_ary['WHERE'] = !empty($sql_ary['WHERE']) ? $sql_ary['WHERE'] . ' AND c.currency_enable = 1' : 'c.currency_enable = 1';
+			$sql_ary['WHERE'] = !empty($sql_ary['WHERE']) ? $sql_ary['WHERE'].' AND c.currency_enable = 1' : 'c.currency_enable = 1';
 		}
 
 		// Return all page entities
@@ -88,8 +88,8 @@ 
 
 			if ($row['currency_order'] != $order)
 			{
-				$this->db->sql_query('UPDATE ' . $this->ppde_currency_table . '
-						SET currency_order = ' . $order . '
+				$this->db->sql_query('UPDATE '.$this->ppde_currency_table.'
+						SET currency_order = ' . $order.'
 						WHERE currency_id = ' . $row['currency_id']);
 			}
 		}
@@ -107,7 +107,7 @@ 
 	{
 		// By default, check that image_order is valid and fix it if necessary
 		return 'SELECT currency_id, currency_order
-				FROM ' . $this->ppde_currency_table . '
+				FROM ' . $this->ppde_currency_table.'
 				ORDER BY currency_order';
 	}
 
@@ -124,9 +124,9 @@ 
 	public function move($switch_order_id, $current_order, $id)
 	{
 		// Update the entry
-		$sql = 'UPDATE ' . $this->ppde_currency_table . '
-					SET currency_order = ' . (int) $current_order . '
-					WHERE currency_order = ' . (int) $switch_order_id . '
+		$sql = 'UPDATE '.$this->ppde_currency_table.'
+					SET currency_order = ' . (int) $current_order.'
+					WHERE currency_order = ' . (int) $switch_order_id.'
 						AND currency_id <> ' . (int) $id;
 		$this->db->sql_query($sql);
 
@@ -135,9 +135,9 @@ 
 		// Only update the other entry too if the previous entry got updated
 		if ($move_executed)
 		{
-			$sql = 'UPDATE ' . $this->ppde_currency_table . '
-						SET currency_order = ' . (int) $switch_order_id . '
-						WHERE currency_order = ' . (int) $current_order . '
+			$sql = 'UPDATE '.$this->ppde_currency_table.'
+						SET currency_order = ' . (int) $switch_order_id.'
+						WHERE currency_order = ' . (int) $current_order.'
 							AND currency_id = ' . (int) $id;
 			$this->db->sql_query($sql);
 		}

ext.php

Doc Comments +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
 	 * @license       GNU General Public License, version 2 (GPL-2.0)
 	 *
 	 * @param string $step               The step (enable, disable, purge)
-	 * @param array  $notification_types The notification type names
+	 * @param string[]  $notification_types The notification type names
 	 *
 	 * @return string Return notifications as temporary state
 	 * @access        protected
@@ -131,7 +131,7 @@ 
 	/**
 	 * Returns the list of notification types
 	 *
-	 * @return array
+	 * @return string[]
 	 * @access protected
 	 */
 	protected function notification_types()

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 
 		foreach ($notification_types as $notification_type)
 		{
-			call_user_func(array($phpbb_notifications, $step . '_notifications'), $notification_type);
+			call_user_func(array($phpbb_notifications, $step.'_notifications'), $notification_type);
 		}
 
 		return 'notifications';

event/listener.php

Spacing +2 added lines, -2 removed lines

@@ -130,13 +130,13 @@
 	{
 		if ($event['on_page'][1] == 'app')
 		{
-			if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/donate') === 0)
+			if (strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/donate') === 0)
 			{
 				$event['location'] = $this->user->lang('PPDE_VIEWONLINE');
 				$event['location_url'] = $this->controller_helper->route('skouat_ppde_donate');
 			}
 
-			if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/donorlist') === 0)
+			if (strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/donorlist') === 0)
 			{
 				$event['location'] = $this->user->lang('PPDE_VIEWONLINE_DONORLIST');
 				$event['location_url'] = $this->controller_helper->route('skouat_ppde_donorlist');

migrations/v10x/v1_0_0_currency_data.php

Spacing +1 added lines, -1 removed lines

@@ -164,6 +164,6 @@
 		);
 
 		// Insert data
-		$this->db->sql_multi_insert($this->table_prefix . 'ppde_currency', $currency_data);
+		$this->db->sql_multi_insert($this->table_prefix.'ppde_currency', $currency_data);
 	}
 }

operators/transactions.php

Spacing +15 added lines, -15 removed lines

@@ -60,7 +60,7 @@ 
 		// Use WHERE clause when $currency_id is different from 0
 		if ((int) $transaction_id)
 		{
-			$sql_ary['WHERE'] = 'txn.transaction_id = ' . (int) $transaction_id;
+			$sql_ary['WHERE'] = 'txn.transaction_id = '.(int) $transaction_id;
 		}
 
 		// Return all transactions entities
@@ -88,7 +88,7 @@ 
 					'ON'   => 'u.user_id = txn.user_id',
 				),
 			),
-			'WHERE'     => 'txn.user_id <> ' . ANONYMOUS . "
+			'WHERE'     => 'txn.user_id <> '.ANONYMOUS."
 							AND txn.payment_status = 'Completed'",
 			'GROUP_BY'  => 'txn.user_id',
 			'ORDER_BY'  => 'txn.transaction_id DESC',
@@ -101,7 +101,7 @@ 
 
 		if ($max_txn_id)
 		{
-			$donorlist_sql_ary['WHERE'] = 'txn.transaction_id = ' . $max_txn_id;
+			$donorlist_sql_ary['WHERE'] = 'txn.transaction_id = '.$max_txn_id;
 			unset($donorlist_sql_ary['GROUP_BY'], $donorlist_sql_ary['ORDER_BY']);
 		}
 
@@ -132,11 +132,11 @@ 
 	 */
 	public function query_sql_count($count_sql_ary, $selected_field)
 	{
-		$count_sql_ary['SELECT'] = 'COUNT(' . $selected_field . ') AS total_entries';
+		$count_sql_ary['SELECT'] = 'COUNT('.$selected_field.') AS total_entries';
 
 		if (array_key_exists('GROUP_BY', $count_sql_ary))
 		{
-			$count_sql_ary['SELECT'] = 'COUNT(DISTINCT ' . $count_sql_ary['GROUP_BY'] . ') AS total_entries';
+			$count_sql_ary['SELECT'] = 'COUNT(DISTINCT '.$count_sql_ary['GROUP_BY'].') AS total_entries';
 		}
 		unset($count_sql_ary['ORDER_BY'], $count_sql_ary['GROUP_BY']);
 
@@ -171,13 +171,13 @@ 
 				$this->ppde_transactions_log_table => 'txn',
 				USERS_TABLE                        => 'u',
 			),
-			'WHERE'    => 'txn.user_id = u.user_id ' . $sql_keywords,
+			'WHERE'    => 'txn.user_id = u.user_id '.$sql_keywords,
 			'ORDER_BY' => $sort_by,
 		);
 
 		if ($log_time)
 		{
-			$get_logs_sql_ary['WHERE'] = 'txn.payment_date >= ' . (int) $log_time . '
+			$get_logs_sql_ary['WHERE'] = 'txn.payment_date >= '.(int) $log_time.'
 					AND ' . $get_logs_sql_ary['WHERE'];
 		}
 
@@ -210,12 +210,12 @@ 
 			for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
 			{
 				$keywords_pattern[] = preg_quote($keywords[$i], '#');
-				$keywords[$i] = $this->db->sql_like_expression($this->db->get_any_char() . $keywords[$i] . $this->db->get_any_char());
+				$keywords[$i] = $this->db->sql_like_expression($this->db->get_any_char().$keywords[$i].$this->db->get_any_char());
 			}
 
-			$sql_keywords = ' ' . $statement_operator . ' (';
+			$sql_keywords = ' '.$statement_operator.' (';
 			$sql_lower = $this->db->sql_lower_text('txn.txn_id');
-			$sql_keywords .= ' ' . $sql_lower . ' ' . implode(' OR ' . $sql_lower . ' ', $keywords) . ')';
+			$sql_keywords .= ' '.$sql_lower.' '.implode(' OR '.$sql_lower.' ', $keywords).')';
 		}
 
 		return $sql_keywords;
@@ -236,17 +236,17 @@ 
 		switch ($type)
 		{
 			case 'user':
-				$sql_where = ' WHERE user_id = ' . (int) $arg;
+				$sql_where = ' WHERE user_id = '.(int) $arg;
 				break;
 			case 'email':
-				$sql_where = ' WHERE user_email_hash = ' . crc32(strtolower($arg)) . strlen($arg);
+				$sql_where = ' WHERE user_email_hash = '.crc32(strtolower($arg)).strlen($arg);
 				break;
 			default:
 				$sql_where = '';
 		}
 
 		$sql = 'SELECT user_id, username
-			FROM ' . USERS_TABLE .
+			FROM ' . USERS_TABLE.
 			$sql_where;
 		$result = $this->db->sql_query($sql);
 
@@ -319,7 +319,7 @@ 
 		$txn_url = '';
 		if ($txn_id)
 		{
-			$txn_url = ($custom_url !== '') ? $custom_url . '&amp;action=view&amp;id=' . $id : $txn_id;
+			$txn_url = ($custom_url !== '') ? $custom_url.'&amp;action=view&amp;id='.$id : $txn_id;
 		}
 
 		// Return
@@ -348,6 +348,6 @@ 
 			$sql_in[] = $mark;
 		}
 
-		return ' WHERE ' . $this->db->sql_in_set('transaction_id', $sql_in);
+		return ' WHERE '.$this->db->sql_in_set('transaction_id', $sql_in);
 	}
 }