From 1ef19439c96e826cc9f2bd61303be02cdff4e729 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Wed, 22 Jun 2016 19:43:43 +0200
Subject: [PATCH] - added "document_root", "port", "protocol" and "PHP
 framework version" to /setup page - added new "shattered" wormhole types to
 "signature table", closed #182, #179

---
 app/main/controller/setup.php    | 12 ++++++++++++
 js/app/init.js                   | 21 ++++++++++++++-------
 public/js/v1.1.1/app/init.js     | 21 ++++++++++++++-------
 public/templates/view/setup.html | 13 ++++++++++---
 4 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/app/main/controller/setup.php b/app/main/controller/setup.php
index 9893309f..c213b383 100644
--- a/app/main/controller/setup.php
+++ b/app/main/controller/setup.php
@@ -250,6 +250,18 @@ class Setup extends Controller {
             'machine' => [
                 'label' => 'Machine type',
                 'value' => php_uname('m')
+            ],
+            'root' => [
+                'label' => 'Document root',
+                'value' => $f3->get('ROOT')
+            ],
+            'port' => [
+                'label' => 'Port',
+                'value' => $f3->get('PORT')
+            ],
+            'protocol' => [
+                'label' => 'Protocol',
+                'value' => $f3->get('SCHEME')
             ]
         ];
 
diff --git a/js/app/init.js b/js/app/init.js
index 46004891..de015f3d 100644
--- a/js/app/init.js
+++ b/js/app/init.js
@@ -336,7 +336,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             2: {    // C2
                 1: 'E004 - C1',
@@ -345,7 +346,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             3: {    // C3
                 1: 'E004 - C1',
@@ -354,7 +356,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             4: {    // C4
                 1: 'E004 - C1',
@@ -363,7 +366,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
 	    },
             5: {    // C5
                 1: 'E004 - C1',
@@ -372,7 +376,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             6: {    // C6
                 1: 'E004 - C1',
@@ -381,7 +386,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             13: {   // Shattered Wormholes (some of them are static)
                 1: 'E004 - C1',
@@ -390,7 +396,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             }
         },
         // incoming wormholes
diff --git a/public/js/v1.1.1/app/init.js b/public/js/v1.1.1/app/init.js
index 46004891..de015f3d 100644
--- a/public/js/v1.1.1/app/init.js
+++ b/public/js/v1.1.1/app/init.js
@@ -336,7 +336,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             2: {    // C2
                 1: 'E004 - C1',
@@ -345,7 +346,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             3: {    // C3
                 1: 'E004 - C1',
@@ -354,7 +356,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             4: {    // C4
                 1: 'E004 - C1',
@@ -363,7 +366,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
 	    },
             5: {    // C5
                 1: 'E004 - C1',
@@ -372,7 +376,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             6: {    // C6
                 1: 'E004 - C1',
@@ -381,7 +386,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             },
             13: {   // Shattered Wormholes (some of them are static)
                 1: 'E004 - C1',
@@ -390,7 +396,8 @@ define(['jquery'], function($) {
                 4: 'M001 - C4',
                 5: 'C008 - C5',
                 6: 'G008 - C6',
-                7: 'Q003 - 0.0'
+                7: 'Q003 - 0.0',
+                8: 'A009 - (shattered)'
             }
         },
         // incoming wormholes
diff --git a/public/templates/view/setup.html b/public/templates/view/setup.html
index 40d32330..85cc2198 100644
--- a/public/templates/view/setup.html
+++ b/public/templates/view/setup.html
@@ -61,6 +61,12 @@
                                     <kbd>{{ @PATHFINDER.VERSION }}</kbd>
                                 </td>
                             </tr>
+                            <tr>
+                                <td>Package</td>
+                                <td class="text-right">
+                                    <kbd>{{ @PACKAGE }} {{ @VERSION }}</kbd>
+                                </td>
+                            </tr>
                             <tr>
                                 <td>Contact</td>
                                 <td class="text-right"><a href="{{ @PATHFINDER.CONTACT }}" target="_blank">{{ @PATHFINDER.CONTACT }}</a></td>
@@ -150,7 +156,7 @@
 
             <div class="col-xs-12 col-md-6 pf-landing-pricing-panel">
 
-                {* OS *}
+                {* Server *}
                 <div class="panel panel-default pricing-big">
 
                     <div class="panel-heading text-left">
@@ -754,10 +760,11 @@
                             <span class="pull-right">
                                 <check if="{{ @cacheSize }}">
                                     <true>
-                                        {{ @cacheSize }}
+                                        {{ @cacheSize }}&nbsp;
                                         <i class="fa fa-fw fa-battery-half txt-color txt-color-success"></i>
                                     </true>
                                     <false>
+                                        0 KB&nbsp;
                                         <i class="fa fa-fw fa-battery-empty txt-color txt-color-warning" title="" data-original-title="empty cache"></i>
                                     </false>
                                 </check>
@@ -766,7 +773,7 @@
                     </div>
 
                     <div class="panel-footer btn-group btn-group-justified">
-                        <a href="?clearCache=1" class="btn btn-warning">
+                        <a href="?clearCache=1" class="btn btn-warning {{ (@cacheSize) ?'':'disabled' }}">
                             <i class="fa fa-fw fa-times"></i> Clear cache
                         </a>