Skouat / ext_paypal_donation

entity/currency.php

Doc Comments +2 added lines, -2 removed lines

@@ -138,7 +138,7 @@ 
 	 *
 	 * @param bool $enable
 	 *
-	 * @return bool
+	 * @return currency
 	 * @access public
 	 */
 	public function set_currency_enable($enable)
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param bool $on_left
 	 *
-	 * @return bool
+	 * @return currency
 	 * @access public
 	 */
 	public function set_currency_position($on_left)

Spacing +3 added lines, -3 removed lines

@@ -76,8 +76,8 @@ 
 	public function build_sql_data_exists($iso_code = '')
 	{
 		return 'SELECT currency_id
-			FROM ' . $this->currency_table . "
-			WHERE currency_iso_code = '" . $this->db->sql_escape($iso_code ? $iso_code : $this->data['currency_iso_code']) . "'";
+			FROM ' . $this->currency_table."
+			WHERE currency_iso_code = '" . $this->db->sql_escape($iso_code ? $iso_code : $this->data['currency_iso_code'])."'";
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 		if ($this->get_currency_enable())
 		{
 			// Return an error if the currency is enabled
-			trigger_error($this->user->lang['PPDE_DISABLE_BEFORE_DELETION'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['PPDE_DISABLE_BEFORE_DELETION'].adm_back_link($this->u_action), E_USER_WARNING);
 		}
 	}
 

language/en/donate.php

Spacing +3 added lines, -3 removed lines

@@ -61,9 +61,9 @@
 	'PPDE_DONORLIST_LAST_DATE'         => 'Made on',
 	'PPDE_DONORLIST_TOTAL_DONATION'    => 'Donation amount',
 	'PPDE_DONORS'                      => array(
-		0 => '',             // 0 - Used for pagination. Let this language key empty.
-		1 => '%d donor',     // 1
-		2 => '%d donors',    // 2+
+		0 => '', // 0 - Used for pagination. Let this language key empty.
+		1 => '%d donor', // 1
+		2 => '%d donors', // 2+
 	),
 	'PPDE_NO_DONORS'                   => 'No donors',
 

language/fr/donate.php

Spacing +3 added lines, -3 removed lines

@@ -61,9 +61,9 @@
 	'PPDE_DONORLIST_LAST_DATE'         => 'Effectué le',
 	'PPDE_DONORLIST_TOTAL_DONATION'    => 'Somme des dons',
 	'PPDE_DONORS'                      => array(
-		0 => '',                  // 0 - Used for pagination. Let this language key empty.
-		1 => '%d donateur',       // 1
-		2 => '%d donateurs',      // 2+
+		0 => '', // 0 - Used for pagination. Let this language key empty.
+		1 => '%d donateur', // 1
+		2 => '%d donateurs', // 2+
 	),
 	'PPDE_NO_DONORS'                   => 'Aucun donateur',
 

entity/transactions.php

Spacing +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 	public function transaction_exists()
 	{
 		$sql = 'SELECT txn_id
-			FROM ' . $this->transactions_log_table . "
-			WHERE txn_id = '" . $this->db->sql_escape($this->data['txn_id']) . "'";
+			FROM ' . $this->transactions_log_table."
+			WHERE txn_id = '" . $this->db->sql_escape($this->data['txn_id'])."'";
 		$this->db->sql_query($sql);
 
 		return $this->db->sql_fetchfield('txn_id');

entity/donation_pages.php

Spacing +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 		//Add language entries for displaying the vars
 		for ($i = 0, $size = sizeof($this->dp_vars); $i < $size; $i++)
 		{
-			$this->dp_vars[$i]['name'] = $this->user->lang[$this->lang_key_prefix . '_' . substr(substr($this->dp_vars[$i]['var'], 0, -1), 1)];
+			$this->dp_vars[$i]['name'] = $this->user->lang[$this->lang_key_prefix.'_'.substr(substr($this->dp_vars[$i]['var'], 0, -1), 1)];
 		}
 	}
 
@@ -395,8 +395,8 @@ 
 	public function build_sql_data_exists()
 	{
 		return 'SELECT page_id
-			FROM ' . $this->donation_pages_table . "
-			WHERE page_title = '" . $this->db->sql_escape($this->data['page_title']) . "'
+			FROM ' . $this->donation_pages_table."
+			WHERE page_title = '" . $this->db->sql_escape($this->data['page_title'])."'
 			AND page_lang_id = " . (int) $this->data['page_lang_id'];
 	}
 

entity/main.php

Spacing +16 added lines, -16 removed lines

@@ -62,7 +62,7 @@ 
 		if (!empty($this->data[$this->table_schema['item_id']['name']]))
 		{
 			// The page already exists
-			$this->display_error_message($this->lang_key_prefix . '_EXIST');
+			$this->display_error_message($this->lang_key_prefix.'_EXIST');
 		}
 
 		// Run some stuff before insert data in database
@@ -72,7 +72,7 @@ 
 		unset($this->data[$this->table_schema['item_id']['name']]);
 
 		// Insert the page data to the database
-		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $this->data);
+		$sql = 'INSERT INTO '.$this->table_name.' '.$this->db->sql_build_array('INSERT', $this->data);
 		$this->db->sql_query($sql);
 
 		// Set the page_id using the id created by the SQL insert
@@ -92,7 +92,7 @@ 
 	 */
 	protected function display_error_message($lang_key, $args = '')
 	{
-		$message = call_user_func_array(array($this->user, 'lang'), array_merge(array(strtoupper($lang_key), $args))) . adm_back_link($this->u_action);
+		$message = call_user_func_array(array($this->user, 'lang'), array_merge(array(strtoupper($lang_key), $args))).adm_back_link($this->u_action);
 		trigger_error($message, E_USER_WARNING);
 	}
 
@@ -131,12 +131,12 @@ 
 		if ($required_fields)
 		{
 			// The page already exists
-			$this->display_error_message($this->lang_key_prefix . '_NO_' . $this->lang_key_suffix);
+			$this->display_error_message($this->lang_key_prefix.'_NO_'.$this->lang_key_suffix);
 		}
 
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->db->sql_build_array('UPDATE', $this->data) . '
-			WHERE ' . $this->table_schema['item_id']['name'] . ' = ' . $this->get_id();
+		$sql = 'UPDATE '.$this->table_name.'
+			SET ' . $this->db->sql_build_array('UPDATE', $this->data).'
+			WHERE ' . $this->table_schema['item_id']['name'].' = '.$this->get_id();
 		$this->db->sql_query($sql);
 
 		return $this;
@@ -192,9 +192,9 @@ 
 	 */
 	public function build_sql_data_exists()
 	{
-		return 'SELECT ' . $this->table_schema['item_id']['name'] . '
- 			FROM ' . $this->table_name . '
-			WHERE ' . $this->table_schema['item_id']['name'] . ' = ' . $this->data[$this->table_name['item_id']['name']];
+		return 'SELECT '.$this->table_schema['item_id']['name'].'
+ 			FROM ' . $this->table_name.'
+			WHERE ' . $this->table_schema['item_id']['name'].' = '.$this->data[$this->table_name['item_id']['name']];
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	public function load($id)
 	{
 		$sql = 'SELECT *
-			FROM ' . $this->table_name . '
-			WHERE ' . $this->table_schema['item_id']['name'] . ' = ' . (int) $id;
+			FROM ' . $this->table_name.'
+			WHERE ' . $this->table_schema['item_id']['name'].' = '.(int) $id;
 		$result = $this->db->sql_query($sql);
 		$this->data = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -217,7 +217,7 @@ 
 		if ($this->data === false)
 		{
 			// A item does not exist
-			$this->display_error_message($this->lang_key_prefix . '_NO_' . $this->lang_key_suffix);
+			$this->display_error_message($this->lang_key_prefix.'_NO_'.$this->lang_key_suffix);
 		}
 
 		return $this;
@@ -301,14 +301,14 @@ 
 		if ($this->disallow_deletion($id) && empty($sql_where))
 		{
 			// The item selected does not exists
-			$this->display_error_message($this->lang_key_prefix . '_NO_' . $this->lang_key_suffix);
+			$this->display_error_message($this->lang_key_prefix.'_NO_'.$this->lang_key_suffix);
 		}
 
 		$this->run_function_before_action($action_before_delete);
 
-		$where_clause = !empty($sql_where) ? $sql_where : ' WHERE ' . $this->table_schema['item_id']['name'] . ' = ' . (int) $id;
+		$where_clause = !empty($sql_where) ? $sql_where : ' WHERE '.$this->table_schema['item_id']['name'].' = '.(int) $id;
 		// Delete data from the database
-		$sql = 'DELETE FROM ' . $this->table_name . $where_clause;
+		$sql = 'DELETE FROM '.$this->table_name.$where_clause;
 		$this->db->sql_query($sql);
 
 		return (bool) $this->db->sql_affectedrows();

exception/base.php

Spacing +2 added lines, -2 removed lines

@@ -141,10 +141,10 @@
 		foreach ($message_portions as &$message)
 		{
 			// Attempt to translate each portion
-			$translated_message = $user->lang('EXCEPTION_' . $message);
+			$translated_message = $user->lang('EXCEPTION_'.$message);
 
 			// Check if translating did anything
-			if ($translated_message !== 'EXCEPTION_' . $message)
+			if ($translated_message !== 'EXCEPTION_'.$message)
 			{
 				// It did, so replace message with the translated version
 				$message = $translated_message;

controller/admin_settings_controller.php

Spacing +3 added lines, -3 removed lines

@@ -127,11 +127,11 @@ 
 
 			// Add option settings change action to the admin log
 			$phpbb_log = $this->container->get('log');
-			$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_' . $this->lang_key_prefix . '_UPDATED');
+			$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_'.$this->lang_key_prefix.'_UPDATED');
 
 			// Option settings have been updated and logged
 			// Confirm this to the user and provide link back to previous page
-			trigger_error($this->user->lang($this->lang_key_prefix . '_SAVED') . adm_back_link($this->u_action));
+			trigger_error($this->user->lang($this->lang_key_prefix.'_SAVED').adm_back_link($this->u_action));
 		}
 	}
 
@@ -239,7 +239,7 @@ 
 	{
 		if (empty($settings) && $depend_on == true)
 		{
-			trigger_error($this->user->lang($this->lang_key_prefix . '_MISSING') . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang($this->lang_key_prefix.'_MISSING').adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		return $settings;

controller/admin_donation_pages_controller.php

Spacing +17 added lines, -17 removed lines

@@ -97,8 +97,8 @@ 
 					'DONATION_PAGE_TITLE' => $this->user->lang[strtoupper($data['page_title'])],
 					'DONATION_PAGE_LANG'  => (string) $lang,
 
-					'U_DELETE'            => $this->u_action . '&action=delete&' . $this->id_prefix_name . '_id=' . $data['page_id'],
-					'U_EDIT'              => $this->u_action . '&action=edit&' . $this->id_prefix_name . '_id=' . $data['page_id'],
+					'U_DELETE'            => $this->u_action.'&action=delete&'.$this->id_prefix_name.'_id='.$data['page_id'],
+					'U_EDIT'              => $this->u_action.'&action=edit&'.$this->id_prefix_name.'_id='.$data['page_id'],
 				));
 			}
 			unset($data_ary, $data);
@@ -136,7 +136,7 @@ 
 	public function add_donation_page()
 	{
 		// Add form key
-		add_form_key('add_edit_' . $this->module_name);
+		add_form_key('add_edit_'.$this->module_name);
 
 		// Initiate a page donation entity
 		/** @type \skouat\ppde\entity\donation_pages $entity */
@@ -162,7 +162,7 @@ 
 		$this->template->assign_vars(array(
 			'S_ADD_DONATION_PAGE' => true,
 
-			'U_ADD_ACTION'        => $this->u_action . '&action=add',
+			'U_ADD_ACTION'        => $this->u_action.'&action=add',
 			'U_BACK'              => $this->u_action,
 		));
 	}
@@ -219,7 +219,7 @@ 
 		{
 			try
 			{
-				call_user_func(array($entity, ($enabled ? 'message_enable_' : 'message_disable_') . $function));
+				call_user_func(array($entity, ($enabled ? 'message_enable_' : 'message_disable_').$function));
 			}
 			catch (\skouat\ppde\exception\base $e)
 			{
@@ -240,7 +240,7 @@ 
 
 		// Check some settings before loading and submitting form
 		$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, 'lang_id', 0, $this->submit_or_preview($this->submit))
 		);
@@ -261,14 +261,14 @@ 
 			'ERROR_MSG'                      => (sizeof($errors)) ? implode('<br />', $errors) : '',
 
 			'L_DONATION_PAGES_TITLE'         => $this->user->lang[strtoupper($entity->get_name())],
-			'L_DONATION_PAGES_TITLE_EXPLAIN' => $this->user->lang[strtoupper($entity->get_name()) . '_EXPLAIN'],
+			'L_DONATION_PAGES_TITLE_EXPLAIN' => $this->user->lang[strtoupper($entity->get_name()).'_EXPLAIN'],
 			'DONATION_BODY'                  => $entity->get_message_for_edit(),
 
 			'S_BBCODE_DISABLE_CHECKED'       => !$entity->message_bbcode_enabled(),
 			'S_SMILIES_DISABLE_CHECKED'      => !$entity->message_smilies_enabled(),
 			'S_MAGIC_URL_DISABLE_CHECKED'    => !$entity->message_magic_url_enabled(),
 
-			'BBCODE_STATUS'                  => $this->user->lang('BBCODE_IS_ON', '<a href="' . append_sid("{$this->phpbb_root_path}faq.{$this->php_ext}", 'mode=bbcode') . '">', '</a>'),
+			'BBCODE_STATUS'                  => $this->user->lang('BBCODE_IS_ON', '<a href="'.append_sid("{$this->phpbb_root_path}faq.{$this->php_ext}", 'mode=bbcode').'">', '</a>'),
 			'SMILIES_STATUS'                 => $this->user->lang['SMILIES_ARE_ON'],
 			'IMG_STATUS'                     => $this->user->lang['IMAGES_ARE_ON'],
 			'FLASH_STATUS'                   => $this->user->lang['FLASH_IS_ON'],
@@ -279,11 +279,11 @@ 
 			'S_BBCODE_IMG'                   => true,
 			'S_BBCODE_FLASH'                 => true,
 			'S_LINKS_ALLOWED'                => true,
-			'S_HIDDEN_FIELDS'                => '<input type="hidden" name="page_title" value="' . $entity->get_name() . '" />',
+			'S_HIDDEN_FIELDS'                => '<input type="hidden" name="page_title" value="'.$entity->get_name().'" />',
 		));
 
 		// Assigning custom bbcodes
-		include_once($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		include_once($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 
 		display_custom_bbcodes();
 	}
@@ -300,7 +300,7 @@ 
 	 */
 	private function get_message_parse_options($entity, $data, $type)
 	{
-		return array($type => $this->submit_or_preview($this->submit, $this->preview) ? $data[$type] : (bool) call_user_func(array($entity, 'message_' . $type . '_enabled')));
+		return array($type => $this->submit_or_preview($this->submit, $this->preview) ? $data[$type] : (bool) call_user_func(array($entity, 'message_'.$type.'_enabled')));
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 
 			$log_action = $this->add_edit_data($entity);
 			// 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($this->user->lang(strtoupper($entity->get_name())), $this->lang_local_name));
-			trigger_error($this->user->lang($this->lang_key_prefix . '_' . strtoupper($log_action), $this->lang_local_name) . 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($this->user->lang(strtoupper($entity->get_name())), $this->lang_local_name));
+			trigger_error($this->user->lang($this->lang_key_prefix.'_'.strtoupper($log_action), $this->lang_local_name).adm_back_link($this->u_action));
 		}
 	}
 
@@ -396,7 +396,7 @@ 
 	public function edit_donation_page($page_id)
 	{
 		// Add form key
-		add_form_key('add_edit_' . $this->module_name);
+		add_form_key('add_edit_'.$this->module_name);
 
 		// Initiate a page donation entity
 		/** @type \skouat\ppde\entity\donation_pages $entity */
@@ -424,7 +424,7 @@ 
 		$this->template->assign_vars(array(
 			'S_EDIT_DONATION_PAGE' => true,
 
-			'U_EDIT_ACTION'        => $this->u_action . '&amp;action=edit&amp;' . $this->id_prefix_name . '_id=' . $page_id,
+			'U_EDIT_ACTION'        => $this->u_action.'&amp;action=edit&amp;'.$this->id_prefix_name.'_id='.$page_id,
 			'U_BACK'               => $this->u_action,
 		));
 	}
@@ -450,10 +450,10 @@ 
 		$entity->delete($page_id);
 
 		// Log the action
-		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG' . $this->lang_key_prefix . '_DELETED', time(), array($this->user->lang(strtoupper($entity->get_name())), $this->lang_local_name));
+		$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG'.$this->lang_key_prefix.'_DELETED', time(), array($this->user->lang(strtoupper($entity->get_name())), $this->lang_local_name));
 
 		// If AJAX was used, show user a result message
-		$message = $this->user->lang($this->lang_key_prefix . '_DELETED', $this->lang_local_name);
+		$message = $this->user->lang($this->lang_key_prefix.'_DELETED', $this->lang_local_name);
 		$this->ajax_delete_result_message($message);
 	}
 }