diff --git a/app/main/controller/api/access.php b/app/main/controller/api/access.php index 6db026aa..e21ff90d 100644 --- a/app/main/controller/api/access.php +++ b/app/main/controller/api/access.php @@ -58,7 +58,7 @@ class Access extends \Controller\AccessController { $accessList = $accessModel->find( array( "LOWER(name) LIKE :token AND " . "active = 1 AND " . - "sharing = 1 ", + "shared = 1 ", ':token' => '%' . $searchToken . '%' )); diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php index c3b3207e..fc18a886 100644 --- a/app/main/controller/api/map.php +++ b/app/main/controller/api/map.php @@ -318,7 +318,7 @@ class Map extends \Controller\AccessController { if( !$tempUser->dry() && - $tempUser->sharing == 1 // check if map sharing is enabled + $tempUser->shared == 1 // check if map shared is enabled ){ $map->setAccess($tempUser); } @@ -355,7 +355,7 @@ class Map extends \Controller\AccessController { if( !$tempCorporation->dry() && - $tempCorporation->sharing == 1 // check if map sharing is enabled + $tempCorporation->shared == 1 // check if map shared is enabled ){ $map->setAccess($tempCorporation); } @@ -393,7 +393,7 @@ class Map extends \Controller\AccessController { if( !$tempAlliance->dry() && - $tempAlliance->sharing == 1 // check if map sharing is enabled + $tempAlliance->shared == 1 // check if map shared is enabled ){ $map->setAccess($tempAlliance); } diff --git a/app/main/controller/api/user.php b/app/main/controller/api/user.php index ff2b1bd7..ffd1445e 100644 --- a/app/main/controller/api/user.php +++ b/app/main/controller/api/user.php @@ -198,7 +198,7 @@ class User extends Controller\Controller{ } } - $user->sharing = $privateSharing; + $user->shared = $privateSharing; $user->save(); // update corp/ally --------------------------------------------------------------- @@ -210,12 +210,12 @@ class User extends Controller\Controller{ $alliance = $activeUserCharacter->getCharacter()->getAlliance(); if(is_object($corporation)){ - $corporation->sharing = $corporationSharing; + $corporation->shared = $corporationSharing; $corporation->save(); } if(is_object($alliance)){ - $alliance->sharing = $allianceSharing; + $alliance->shared = $allianceSharing; $alliance->save(); } } diff --git a/app/main/model/alliancemodel.php b/app/main/model/alliancemodel.php index e81ff788..abc25e37 100644 --- a/app/main/model/alliancemodel.php +++ b/app/main/model/alliancemodel.php @@ -26,7 +26,7 @@ class AllianceModel extends BasicModel { 'nullable' => false, 'default' => '' ], - 'sharing' => [ + 'shared' => [ 'type' => Schema::DT_BOOL, 'nullable' => false, 'default' => 0 @@ -48,7 +48,7 @@ class AllianceModel extends BasicModel { $allianceData->id = $this->id; $allianceData->name = $this->name; - $allianceData->sharing = $this->sharing; + $allianceData->shared = $this->shared; return $allianceData; } diff --git a/app/main/model/corporationmodel.php b/app/main/model/corporationmodel.php index da0390b8..c9b7aa09 100644 --- a/app/main/model/corporationmodel.php +++ b/app/main/model/corporationmodel.php @@ -26,7 +26,7 @@ class CorporationModel extends BasicModel { 'nullable' => false, 'default' => '' ], - 'sharing' => [ + 'shared' => [ 'type' => Schema::DT_BOOL, 'nullable' => false, 'default' => 0 @@ -48,7 +48,7 @@ class CorporationModel extends BasicModel { $cooperationData->id = $this->id; $cooperationData->name = $this->name; - $cooperationData->sharing = $this->sharing; + $cooperationData->shared = $this->shared; return $cooperationData; } diff --git a/app/main/model/usermodel.php b/app/main/model/usermodel.php index 1b18615f..daa85cf2 100644 --- a/app/main/model/usermodel.php +++ b/app/main/model/usermodel.php @@ -96,8 +96,8 @@ class UserModel extends BasicModel { // add sensitive user data $userData->email = $this->email; - // user sharing info - $userData->sharing = $this->sharing; + // user shared info + $userData->shared = $this->shared; // api data $APIs = $this->getAPIs(); diff --git a/public/templates/dialog/sharing_settings.html b/public/templates/dialog/sharing_settings.html index 7317cb41..b506fd2c 100644 --- a/public/templates/dialog/sharing_settings.html +++ b/public/templates/dialog/sharing_settings.html @@ -23,7 +23,7 @@
@@ -41,7 +41,7 @@
@@ -60,7 +60,7 @@