Release prep for v4.8

inex · Jul 3, 2018 · 7b6f84e · 7b6f84e
1 parent 4b54975
commit 7b6f84e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -83,10 +83,11 @@ private function dashboardStats( Request $request )
 
             $vis = D2EM::getRepository( VirtualInterfaceEntity::class )->getByLocation();
 
-            $speeds     = [];
-            $byLocation = [];
-            $byLan      = [];
-            $byIxp      = [];
+            $speeds          = [];
+            $byLocation      = [];
+            $byLan           = [];
+            $byIxp           = [];
+            $custsByLocation = [];
 
             foreach( $vis as $vi ) {
 

diff --git a/config/app.php b/config/app.php
@@ -170,8 +170,6 @@
         IXP\Providers\EventServiceProvider::class,
         IXP\Providers\RouteServiceProvider::class,
 
-        Barryvdh\Debugbar\ServiceProvider::class,
-
         IXP\Providers\HelpdeskServiceProvider::class,
         IXP\Providers\ZendFrameworkServiceProvider::class,
         IXP\Providers\GrapherServiceProvider::class,
@@ -253,8 +251,6 @@
         'PDF'       => Barryvdh\DomPDF\Facade::class,
 
         'Countries' => Webpatser\Countries\CountriesFacade::class,
-
-        'Debugbar' => Barryvdh\Debugbar\Facade::class,
     ],
 
 ];
diff --git a/resources/views/admin/dashboard.foil.php b/resources/views/admin/dashboard.foil.php
@@ -280,7 +280,7 @@
                                 <b><?= $total ?></b>
                             </td>
                             <td align="right">
-                                <b><?= round( (100.0 * $rsclients ) / $total ) ?>%</b>
+                                <b><?= $total ? round( (100.0 * $rsclients ) / $total ) : 0 ?>%</b>
                             </td>
                         </tr>
                     </tfoot>
@@ -352,7 +352,7 @@
                             <b><?= $total ?></b>
                         </td>
                         <td align="right">
-                            <b><?= round( (100.0 * $ipv6 ) / $total ) ?>%</b>
+                            <b><?= $total ? round( (100.0 * $ipv6 ) / $total ) : 0 ?>%</b>
                         </td>
                     </tr>
                     </tfoot>

diff --git a/tools/installers/ubuntu-lts-1604-ixp-manager-v4.sh b/tools/installers/ubuntu-lts-1604-ixp-manager-v4.sh
@@ -388,18 +388,11 @@ echo '[done]'
 echo -n "Installing / updating composer - PHP's package manager..."
 log_break && echo -n "Installing composer - PHP's package manager... " &>> /tmp/ixp-manager-install.log
 cd $IXPROOT
-EXPECTED_SIGNATURE=$(wget https://composer.github.io/installer.sig -O - -q)
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');")
 
-if [ "$EXPECTED_SIGNATURE" = "$ACTUAL_SIGNATURE" ]; then
-    sudo -u www-data bash -c "HOME=$IXPROOT && cd $IXPROOT && php composer-setup.php --quiet"
-    rm $IXPROOT/composer-setup.php
-else
-    echo -e "\n\nERROR: Invalid installer signature for composer installation"
-    rm $IXPROOT/composer-setup.php
-    exit 1
-fi
+curl -so $IXPROOT/composer.phar https://getcomposer.org/download/1.6.5/composer.phar && \
+    chmod a+x $IXPROOT/composer.phar && \
+    $IXPROOT/composer.phar selfupdate
+
 echo '[done]'
 echo '[done]' &>> /tmp/ixp-manager-install.log
 
@@ -530,7 +523,7 @@ echo '[done]'
 echo -n "Running composer to install PHP dependencies (please be patient)... "
 cd $IXPROOT
 log_break
-sudo -u www-data bash -c "HOME=$IXPROOT && cd $IXPROOT && ./composer.phar --no-ansi --no-interaction install &>> /tmp/ixp-manager-install.log"
+sudo -u www-data bash -c "HOME=$IXPROOT && cd $IXPROOT && ./composer.phar --no-ansi --no-interaction --no-dev --prefer-dist install &>> /tmp/ixp-manager-install.log"
 echo '[done]'
 
 ##################################################################