Skip to content

Commit

Permalink
Merge pull request #198 from uplink42/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
uplink42 authored Jul 15, 2017
2 parents f51a924 + cf1da54 commit 659dd90
Show file tree
Hide file tree
Showing 59 changed files with 1,524 additions and 310 deletions.
Binary file added app-icons/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app-icons/android-chrome-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app-icons/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app-icons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app-icons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app-icons/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app-icons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions app-icons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions application/config/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,7 @@
define("MASK_PERSONAL_KEY", '82317323');
define("MASK_FULL_KEY", '1073741823');

define('PUSHBOTS_APPID', '5969d3bb4a9efaa3b08b4568');
define('PUSHBOTS_APPSECRET', 'cd811859684e489428e6c0be6eb98eef');


2 changes: 2 additions & 0 deletions application/controllers/Register.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ public function processCharacters(): void
'null_citadel_tax' => $this->input->post('null-citadel-tax', true),
'null_station_tax' => $this->input->post('null-station-tax', true),
'null_outpost_tax' => $this->input->post('null-outpost-tax', true),
'null_buy_tax' => $this->input->post('null-buy-tax', true),
'null_sell_tax' => $this->input->post('null-sell-tax', true),
];

$chars = array();
Expand Down
6 changes: 5 additions & 1 deletion application/controllers/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public function __construct()
$this->ignore_citadel_tax = $_REQUEST['ignore_citadel_tax'] ?? 0;
$this->ignore_station_tax = $_REQUEST['ignore_station_tax'] ?? 0;
$this->ignore_outpost_tax = $_REQUEST['ignore_outpost_tax'] ?? 0;
$this->ignore_buy_tax = $_REQUEST['ignore_buy_tax'] ?? 0;
$this->ignore_sell_tax = $_REQUEST['ignore_sell_tax'] ?? 0;
}

/**
Expand Down Expand Up @@ -155,7 +157,9 @@ public function changeTracking() : void
'cross_character_profits' => $this->cross_character_profits,
'ignore_citadel_tax' => $this->ignore_citadel_tax,
'ignore_station_tax' => $this->ignore_station_tax,
'ignore_outpost_tax' => $this->ignore_outpost_tax
'ignore_outpost_tax' => $this->ignore_outpost_tax,
'ignore_buy_tax' => $this->ignore_buy_tax,
'ignore_sell_tax' => $this->ignore_sell_tax
];

$result = $this->Settings_model->changeTrackingData($this->user_id, $data);
Expand Down
264 changes: 264 additions & 0 deletions application/libraries/Pushbots.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
<?php
/**
* PushBots Library v1.1b
*
* @category Library
* @author Abdullah Diaa [@Abdullahdiaa]
*/
class PushBots
{
private $appId ;
private $appSecret ;
private $pushData ;
private $pushOneData ;
private $aliasData;
private $deviceToken;
public $timeout = 0;
public $connectTimeout = 0;
public $sslVerifypeer = 0;
public function __construct() {
//set Default Push values
$this->pushData['msg'] = "Notification Message";
$this->pushData['badge'] = "+1";
$this->pushData['sound'] = "ping.aiff";
}

/**
* @param string $appId PushBots Applciation Id.
* @param string $appSecret PushBots Application Secret.
*/
public function App($appId, $appSecret) {
$this->appId = $appId;
$this->appSecret = $appSecret;
}

/**
* sendRequest
* @param string $host PushBots API.
* @param string $path API Path.
*/
private function sendRequest($method, $host, $path, $data) {
$jsonData = json_encode($data);
echo $jsonData;
$ci = curl_init();

//PushBots Headers
$headers = array(
'X-PUSHBOTS-APPID:' . $this->appId,
'X-PUSHBOTS-SECRET:' . $this->appSecret,
'Content-Type: application/json',
'Content-Length: ' . strlen($jsonData)
);

curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->sslVerifypeer);
curl_setopt($ci, CURLOPT_HTTPHEADER, $headers );
curl_setopt($ci, CURLOPT_HEADER, FALSE);
switch ($method) {
case 'POST':
curl_setopt($ci, CURLOPT_POST, TRUE);
if (!empty($jsonData)) {
curl_setopt($ci, CURLOPT_POSTFIELDS, $jsonData);
}
break;
case 'PUT':
curl_setopt($ci, CURLOPT_CUSTOMREQUEST, "PUT");
if (!empty($jsonData)) {
curl_setopt($ci, CURLOPT_POSTFIELDS, $jsonData);
}
break;
case 'DELETE':
curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
if (!empty($jsonData)) {
$url = "{$url}?{$jsonData}";
}
break;
}

curl_setopt($ci, CURLINFO_HEADER_OUT, TRUE );
curl_setopt($ci, CURLOPT_URL, $host . $path);
$content = curl_exec($ci);

$response = curl_getinfo($ci);
if($response['http_code'] != 200) {
$res['status'] = 'ERROR';
$res['code'] = $response['http_code'];
$res['data'] = $response['msg'];
}else{
$res['status'] = 'OK';
$res['code'] = $response['http_code'];
$res['data'] = $content;
}

curl_close ($ci);
return $res;

}
/**
* Push Notification
*/

public function Push() {
$response = $this->sendRequest( 'POST' ,'https://api.pushbots.com', '/push/all', $this->pushData);
return $response;
}

/**
* Push Notification to Single Device
*/

public function PushOne() {
$response = $this->sendRequest( 'POST' ,'https://api.pushbots.com', '/push/one', $this->pushOneData);
return $response;
}


/**
* Update Device Alias
*/

public function setAlias() {
$response = $this->sendRequest( 'PUT' ,'https://api.pushbots.com', '/alias' , $this->aliasData);
return $response;
}
/**
* Remove devices by Alias
*/

public function removeByAlias($alias) {
$response = $this->sendRequest( 'PUT' ,'https://api.pushbots.com', '/alias/del' , array("alias"=> $alias ));
return $response;
}
/**
* set Platforms
* @param array $platform Platforms array 0=>iOS , 1=>Android
*/
public function Platform($platform) {
if(is_array($platform) != true){
$platform = array($platform);
}
$this->pushData['platform'] = $platform;
}

public function Alert($alert) {
$this->pushData['msg'] = $alert;
}
public function Badge($badge) {
$this->pushData['badge'] = $badge;
}

public function Sound($sound) {
$this->pushData['sound'] = $sound;
}

public function Alias($alias) {
$this->pushData['alias'] = $alias;
}

public function exceptAlias($alias) {
$this->pushData['except_alias'] = $alias;
}

/**
* set Tags
* @param array $tags Tags Array.
*/

public function Tags($tags) {
if(is_array($tags) != true){
$tags = array($tags);
}
if(count($tags) > 0){
$this->pushData['tags'] = $tags;
}
}

/**
* set Alias Data
* @param integer $platform 0=> iOS or 1=> Android.
* @param String $token Device Registration ID.
* @param String $alias New Alias.
*/

public function AliasData($platform, $token, $alias) {
$this->aliasData['platform'] = $platform;
$this->aliasData['token'] = $token;
$this->aliasData['alias'] = $alias;
}

/**
* set Single device Push Data
*/

// * @param String $platform 0=> iOS or 1=> Android.
public function PlatformOne($platform) {
$this->pushOneData['platform'] = $platform;
}
public function TokenOne($token) {
$this->pushOneData['token'] = $token;
}

public function AlertOne($alert) {
$this->pushOneData['msg'] = $alert;
}
public function BadgeOne($badge) {
$this->pushOneData['badge'] = $badge;
}

public function SoundOne($sound) {
$this->pushOneData['sound'] = $sound;
}

/**
* set Payload for sending to single device
* @param array $payload Custom fields Array.
*/
public function PayloadOne($customfields) {
if(is_array($customfields) != true){
$customfields = array($customfields);
}
if(count($customfields) > 0){
$this->pushOneData['payload'] = $customfields;
}
}

/**
* set Payload
* @param array $payload Custom fields Array.
*/

public function Payload($customfields) {
if(is_array($customfields) != true){
$customfields = array($customfields);
}
if(count($customfields) > 0){
$this->pushData['payload'] = $customfields;
}
}

/**
* set Geolocation Data
* @param string $country Country.
* @param string $gov Governorate or State.
*/

public function Geo($country , $gov=null) {
$this->pushData["geo"] = array();

if($country)
$this->pushData["geo"]["country"] = $country;

if($gov)
$this->pushData["geo"]["gov"] = $gov;

}
/**
* set Schedule time
* @param string $schedule The time to send the notification, in UTC e.g. 2015-04-02T11:33:00.
*/
public function Schedule($schedule) {
$this->pushData['schedule'] = $schedule;
}
}
2 changes: 2 additions & 0 deletions application/models/Register_model.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ public function createAccount(array $data): array
"ignore_citadel_tax" => $data['null_citadel_tax'],
"ignore_station_tax" => $data['null_station_tax'],
"ignore_outpost_tax" => $data['null_outpost_tax'],
"ignore_buy_tax" => $data['null_buy_tax'],
"ignore_sell_tax" => $data['null_sell_tax'],
"login_count" => 0,
"updating" => 0,
);
Expand Down
2 changes: 1 addition & 1 deletion application/models/Settings_model.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function changePassword(int $id_user, string $password): bool
public function getProfitTrackingData(int $id_user)
{
$this->db->select('default_buy_behaviour, default_sell_behaviour, cross_character_profits, ignore_citadel_tax,
ignore_station_tax, ignore_outpost_tax');
ignore_station_tax, ignore_outpost_tax, ignore_buy_tax, ignore_sell_tax');
$this->db->where('iduser', $id_user);
$query = $this->db->get('user');
$result = $query->row();
Expand Down
12 changes: 12 additions & 0 deletions application/models/Tax_Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public function __construct()
private $ignoreCitadelTax;
private $ignoreOutpostTax;
private $ignoreStationTax;
private $ignoreAllBuyTax;
private $ignoreAllSellTax;

/**
* Starts the tax calculation process. Dispatches to other
Expand All @@ -49,6 +51,8 @@ public function tax(string $stationFromID, string $stationToID, string $characte
$this->ignoreCitadelTax = $settings['citadel_tax_ignore'];
$this->ignoreOutpostTax = $settings['outpost_tax_ignore'];
$this->ignoreStationTax = $settings['station_tax_ignore'];
$this->ignoreBuyTax = $settings['buy_tax_ignore'];
$this->ignoreSellTax = $settings['sell_tax_ignore'];

// non citadels use standings
if ($this->stationFromID < 1000000000000) {
Expand Down Expand Up @@ -239,11 +243,19 @@ public function calculateBroker(string $type): float
case 'from':
$characterID = $this->characterFromID;
$stationID = $this->stationFromID;
if ($this->ignoreBuyTax) {
return 1;
}

break;

case 'to':
$characterID = $this->characterToID;
$stationID = $this->stationToID;
if ($this->ignoreSellTax) {
return 1;
}

break;
}

Expand Down
Loading

0 comments on commit 659dd90

Please sign in to comment.