AndyShade
diff --git a/‎Dockerfile
+92 b/‎Dockerfile
+92
diff --git a/‎app/Controller/Api/Rest/Connection.php
+3-1 b/‎app/Controller/Api/Rest/Connection.php
+3-1
diff --git a/‎app/Controller/Ccp/Sso.php
+28-19 b/‎app/Controller/Ccp/Sso.php
+28-19
diff --git a/‎app/Controller/Controller.php
+1 b/‎app/Controller/Controller.php
+1
diff --git a/‎app/environment.ini
+2-2 b/‎app/environment.ini
+2-2
diff --git a/‎app/pathfinder.ini
+3-3 b/‎app/pathfinder.ini
+3-3
diff --git a/‎img/icons/grid_left.png
61 Bytes b/‎img/icons/grid_left.png
61 Bytes
diff --git a/‎img/icons/grid_right.png
58 Bytes b/‎img/icons/grid_right.png
58 Bytes
diff --git a/‎js/app/conf/signature_type.js
+50-14 b/‎js/app/conf/signature_type.js
+50-14
diff --git a/‎js/app/init.js
+5-1 b/‎js/app/init.js
+5-1
diff --git a/‎js/app/map/layout.js
+1-1 b/‎js/app/map/layout.js
+1-1
diff --git a/‎js/app/map/local.js
+1-1 b/‎js/app/map/local.js
+1-1
@@ -0,0 +1,92 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN adduser --disabled-password --gecos '' pathfinder
+
+# INSTALL PACKAGES
+RUN apt-get update --fix-missing && \
+        apt-get install -y software-properties-common && \
+        LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
+        apt-get update && \
+        apt-get update --fix-missing
+
+RUN apt-get install -y \
+        sudo \
+        php7.2 \
+        php7.2-gd \
+        php7.2-xml \
+        php7.2-fpm \
+        php7.2-mysql \
+        php7.2-mbstring \
+        php7.2-curl \
+        php7.2-redis \
+        php7.2-dev \
+        gzip \
+        wget \
+        nginx \
+        zip \
+        git \
+        redis-server \
+        curl \
+        cron \
+        libjpeg-dev \
+        libpng-dev \
+        graphicsmagick
+
+# ADD NODE
+RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -
+RUN apt-get install -y \
+        nodejs
+
+# COPY PATHFINDER
+ARG VERSION
+RUN mkdir /var/www/pathfinder
+RUN mkdir /var/log/cron-www/
+RUN git clone https://github.com/fish-vending-machine/pathfinder.git /var/www/pathfinder
+COPY ./config/composer.json /root/.composer/config.json
+RUN chown -R www-data:www-data /var/www/pathfinder
+RUN mkdir /tmp/cache/
+RUN mkdir /var/www/pathfinder/conf/
+RUN chmod -R 766 /tmp/cache/ /var/www/pathfinder/logs/
+
+# COMPOSER INSTALL - NOTE: there is an issue with composer 1.10.x and above working withe Pathfinder v 2.0 so we need to use version 1.9.3
+RUN curl -sS https://getcomposer.org/installer | php -- --version=1.9.3
+RUN mv composer.phar /usr/local/bin/composer
+RUN composer install -d /var/www/pathfinder/
+
+# COPY PATHFINDER Websocket Server
+RUN mkdir /var/www/pathfinder_websocket
+RUN git clone https://github.com/exodus4d/pathfinder_websocket.git /var/www/pathfinder_websocket
+RUN chown -R www-data:www-data /var/www/pathfinder_websocket
+
+# COPY PATHFINDER Websocket Server service script
+COPY ./config/pathfinder-websocket /etc/init.d/
+RUN chmod +x /etc/init.d/pathfinder-websocket
+
+# COMPOSER INSTALL Pathfinder Websocket server
+RUN composer install -d /var/www/pathfinder_websocket/
+
+# CONFIGURE NGINX
+COPY ./config/default /etc/nginx/sites-available/
+COPY ./config/www.conf /etc/php/7.2/fpm/pool.d/
+
+# CONFIGURE REDIS
+COPY ./config/redis.conf /etc/redis/
+RUN chmod 755 /etc/redis/redis.conf
+
+# CONFIGURE PHP7.2-FPM
+COPY ./config/php.ini /etc/php/7.2/fpm/
+
+# SET UP CRONJOB
+COPY ./config/default_crontab /home/
+RUN crontab /home/default_crontab
+
+# COPY ENTRYPOINT
+COPY entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# RUN GULP
+RUN cd /var/www/pathfinder && npm install && npm run gulp production
+
+ENTRYPOINT ["entrypoint.sh"]
@@ -82,7 +82,9 @@ public function put(\Base $f3){
 
                 if(
                     !is_null($source) &&
-                    !is_null($target)
+                    !is_null($target) &&
+                    $target->systemId != 30000142 &&
+                    $source->systemId != 30000142
                 ){
                     /**
                      * @var $connection Pathfinder\ConnectionModel
 
@@ -504,26 +504,35 @@ public function getCharacterData(int $characterId) : \stdClass{
 
                 $characterData->corporation = null;
                 $characterData->alliance = null;
-
-                if($corporationId = (int)$characterDataBasic['corporation']['id']){
-                    /**
-                     * @var $corporation Pathfinder\CorporationModel
-                     */
-                    $corporation = Pathfinder\AbstractPathfinderModel::getNew('CorporationModel');
-                    $corporation->getById($corporationId, 0);
-                    if($corporation->valid()){
-                        $characterData->corporation = $corporation;
+                /**
+                 * TODO: Move to -> @var $corporation Pathfinder\CorporationModel
+                 * REF: https://github.com/goryn-clade/pathfinder/pull/157/files
+                 */
+                $characterAffiliation = $this->getF3()->ccpClient()->send('getCharacterAffiliation', [$characterId]);
+                if(count($characterAffiliation) === 1) {
+                    $characterCorporationId = $characterAffiliation[0]['corporation']['id'];
+                    $characterAllianceId = $characterAffiliation[0]['alliance']['id'];
+
+                    if($corporationId = (int)$characterCorporationId){
+                        /**
+                         * @var $corporation Pathfinder\CorporationModel
+                         */
+                        $corporation = Pathfinder\AbstractPathfinderModel::getNew('CorporationModel');
+                        $corporation->getById($corporationId, 0);
+                        if($corporation->valid()){
+                            $characterData->corporation = $corporation;
+                        }
                     }
-                }
 
-                if($allianceId = (int)$characterDataBasic['alliance']['id']){
-                    /**
-                     * @var $alliance Pathfinder\AllianceModel
-                     */
-                    $alliance = Pathfinder\AbstractPathfinderModel::getNew('AllianceModel');
-                    $alliance->getById($allianceId, 0);
-                    if($alliance->valid()){
-                        $characterData->alliance = $alliance;
+                    if($allianceId = (int)$characterAllianceId){
+                        /**
+                         * @var $alliance Pathfinder\AllianceModel
+                         */
+                        $alliance = Pathfinder\AbstractPathfinderModel::getNew('AllianceModel');
+                        $alliance->getById($allianceId, 0);
+                        if($alliance->valid()){
+                            $characterData->alliance = $alliance;
+                        }
                     }
                 }
             }
@@ -614,4 +623,4 @@ static function getSsoJwkClaim() : string {
     static function getSSOLogger() : \Log {
         return parent::getLogger('SSO');
     }
-}
+}
@@ -195,6 +195,7 @@ protected function initResource(\Base $f3){
         $resource->register('url', self::getEnvironmentData('CCP_SSO_URL'), 'prerender');
         $resource->register('url', Config::getPathfinderData('api.ccp_image_server'), 'dns-prefetch');
         $resource->register('url', '//i.ytimg.com', 'dns-prefetch'); // YouTube tiny embed domain
+        header("Cache-Control: max-age=0");
 
         return $resource;
     }
 
@@ -36,7 +36,7 @@ CCP_SSO_DOWNTIME            =   11:00
 ; CCP ESI API
 CCP_ESI_URL                 =   https://esi.evetech.net
 CCP_ESI_DATASOURCE          =   singularity
-CCP_ESI_SCOPES              =   esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1
+CCP_ESI_SCOPES              =   esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1,esi-search.search_structures.v1
 CCP_ESI_SCOPES_ADMIN        =
 
 ; SMTP settings (optional)
@@ -90,7 +90,7 @@ CCP_SSO_DOWNTIME            =   11:00
 ; CCP ESI API
 CCP_ESI_URL                 =   https://esi.evetech.net
 CCP_ESI_DATASOURCE          =   tranquility
-CCP_ESI_SCOPES              =   esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1
+CCP_ESI_SCOPES              =   esi-location.read_online.v1,esi-location.read_location.v1,esi-location.read_ship_type.v1,esi-ui.write_waypoint.v1,esi-ui.open_window.v1,esi-universe.read_structures.v1,esi-corporations.read_corporation_membership.v1,esi-clones.read_clones.v1,esi-characters.read_corporation_roles.v1,esi-search.search_structures.v1
 CCP_ESI_SCOPES_ADMIN        =
 
 ; SMTP settings (optional)
 
@@ -13,8 +13,8 @@ NAME                        =   Pathfinder
 ;           Version is used for CSS/JS cache busting and is part of the URL for static resources:
 ;           e.g. public/js/vX.X.X/app.js
 ; Syntax:   String (current version)
-; Default:  v2.2.1
-VERSION                     =   v2.2.1
+; Default:  v2.2.2
+VERSION                     =   v2.2.2
 
 ; Contact information [optional]
 ;           Shown on 'licence', 'contact' page.
@@ -401,4 +401,4 @@ GIT_HUB                     =   https://api.github.com
 ; Hint:     Set 'wait_timeout' to a high value in your my.conf to keep them open
 ; Syntax:   0 | 1
 ; Default:  0
-PERSISTENT_DB_CONNECTIONS   =   1
+PERSISTENT_DB_CONNECTIONS   =   1
@@ -227,6 +227,38 @@
         2: 'Unsecured Core Emergence' //*
     };
 
+    // Ghost sites ======================================================================================================
+
+    let hsGh = {
+        1: 'Lesser Serpentis Covert Research Facility',
+        2: 'Lesser Sansha Covert Research Facility',
+        3: 'Lesser Guristas Covert Research Facility',
+        4: 'Lesser Blood Raiders Covert Research Facility'
+    };
+
+    let lsGh = {
+        1: 'Standard Serpentis Covert Research Facility',
+        2: 'Standard Sansha Covert Research Facility',
+        3: 'Standard Guristas Covert Research Facility',
+        4: 'Standard Blood Raiders Covert Research Facility'
+    };
+
+    let nsGh = {
+        1: 'Improved Serpentis Covert Research Facility',
+        2: 'Improved Sansha Covert Research Facility',
+        3: 'Improved Guristas Covert Research Facility',
+        4: 'Improved Blood Raiders Covert Research Facility'
+    };
+
+    let whGh = {
+        1: 'Superior Serpentis Covert Research Facility',
+        2: 'Superior Sansha Covert Research Facility',
+        3: 'Superior Guristas Covert Research Facility',
+        4: 'Superior Blood Raiders Covert Research Facility'
+    };
+
+
+
     // Gas sites ======================================================================================================
 
     let c1Gas = {
@@ -517,8 +549,7 @@
         8: 'N944 - L',
         9: 'S199 - 0.0',
         10: 'L031 - C12 Thera',
-        11: 'C729 - T Pochven',
-        12: 'U372 - T Pochven'
+        11: 'U372 - POCHVEN'
     };
 
     let pochWH = {
@@ -540,7 +571,7 @@
                 4: c1Gas,
                 5: c1WH,
                 6: c1Ore,
-                7: {}    // Ghost
+                7: whGh
             },
             2: {    // C2
                 1: c2Combat,
@@ -549,7 +580,7 @@
                 4: c2Gas,
                 5: c2WH,
                 6: c2Ore,
-                7: {}    // Ghost
+                7: whGh
             },
             3: {    // C3
                 1: c3Combat,
@@ -558,7 +589,7 @@
                 4: c3Gas,
                 5: c3WH,
                 6: c3Ore,
-                7: {}    // Ghost
+                7: whGh
             },
             4: {    // C4
                 1: c4Combat,
@@ -567,7 +598,7 @@
                 4: c4Gas,
                 5: c4WH,
                 6: c4Ore,
-                7: {}    // Ghost
+                7: whGh
             },
             5: {    // C5
                 1: c5Combat,
@@ -576,7 +607,7 @@
                 4: c5Gas,
                 5: c5WH,
                 6: c5Ore,
-                7: {}    // Ghost
+                7: whGh
             },
             6: {    // C6
                 1: c6Combat,
@@ -585,16 +616,15 @@
                 4: c6Gas,
                 5: c6WH,
                 6: c6Ore,
-                7: {    // Ghost
-                    1: 'Superior Blood Raider Covert Research Facility' //*
-                }
+                7: whGh
             },
             12: {   // Thera WH
                 1: c12Combat
             },
             13: {   // Shattered WH
                 5: c13WH,
-                6: c13Ore
+                6: c13Ore,
+                7: whGh
             },
             14: {   // Drifter Sentinel WH
                 1: c14Combat
@@ -613,14 +643,20 @@
             }
         }, // system type (k-space)
         2: {
+            29:{ //POCHVEN
+              5: pochWH
+            },
             30: {   // High Sec
-                5: hsWH
+                5: hsWH,
+                7: hsGh
             },
             31: {   // Low Sec
-                5: lsWH
+                5: lsWH,
+                7: lsGh
             },
             32: {   // 0.0
-                5: nullWH
+                5: nullWH,
+                7: nsGh
             },
             33: {   // Pochven
                 5: pochWH
 
@@ -242,6 +242,9 @@ define([], () => {
                 '0.0': {
                     class: 'pf-system-sec-nullSec'
                 },
+                'P': {
+                    class: 'pf-system-sec-pochven'
+                },
                 'C1': {
                     class: 'pf-system-sec-low'
                 },
@@ -567,7 +570,8 @@ define([], () => {
             4: 'K162 - H',
             5: 'K162 - L',
             6: 'K162 - 0.0',
-            7: 'K162 - C12 Thera'
+            7: 'K162 - C12 Thera',
+            8: 'k162 - POCHVEN'
         }
     };
 });
@@ -18,7 +18,7 @@ define(() => {
                 spacingX: 20,                           // spacing x between elements
                 spacingY: 10,                           // spacing y between elements
                 loops: 2,                               // max loops around "center" for search
-                grid: false,                            // set to [20, 20] to force grid snapping
+                grid: [20, 20],                            // set to [20, 20] to force grid snapping
                 newElementWidth: 100,                   // width for new element
                 newElementHeight: 22,                   // height for new element
                 mirrorSearch: false,                    // if true coordinates are "mirrored" for an "alternating" search
 
@@ -482,7 +482,7 @@ define([
                         data: 'log.ship',
                         render: {
                             _: (data, type, row, meta) => {
-                                let value = data.name;
+                                let value = Util.decodeUnicode(data.name.replace(/u'(?=[^:]+')/g, "'"));
                                 if(type === 'display'){
                                     value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis80Class + '">' + Util.unicodeToString(data.name) + '</div>';
                                 }
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ protected function initResource(\Base $f3){`
`195`	`195`	`$resource->register('url', self::getEnvironmentData('CCP_SSO_URL'), 'prerender');`
`196`	`196`	`$resource->register('url', Config::getPathfinderData('api.ccp_image_server'), 'dns-prefetch');`
`197`	`197`	`$resource->register('url', '//i.ytimg.com', 'dns-prefetch'); // YouTube tiny embed domain`
	`198`	`+ header("Cache-Control: max-age=0");`
`198`	`199`
`199`	`200`	`return $resource;`
`200`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ define([`
`482`	`482`	`data: 'log.ship',`
`483`	`483`	`render: {`
`484`	`484`	`_: (data, type, row, meta) => {`
`485`		`- let value = data.name;`
	`485`	`+ let value = Util.decodeUnicode(data.name.replace(/u'(?=[^:]+')/g, "'"));`
`486`	`486`	`if(type === 'display'){`
`487`	`487`	`value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis80Class + '">' + Util.unicodeToString(data.name) + '</div>';`
`488`	`488`	`}`