Poweradmin version moved to special class.

wociscz · Mar 13, 2016 · 23f1df4 · 23f1df4
1 parent 88accc2
commit 23f1df4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 37 deletions.
diff --git a/inc/footer.inc.php b/inc/footer.inc.php
@@ -28,7 +28,9 @@
  * @copyright   2010-2014 Poweradmin Development Team
  * @license     http://opensource.org/licenses/GPL-3.0 GPL
  */
-include_once('version.inc.php');
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+$VERSION = Poweradmin\Version::VERSION;
 
 global $db;
 if (is_object($db)) {
@@ -39,7 +41,7 @@
 <div class="footer">
     <a href="http://www.poweradmin.org/">a complete(r) <strong>poweradmin</strong><?php
         if (isset($_SESSION["userid"])) {
-            echo " v $VERSION";
+            echo " v$VERSION";
         }
         ?></a> - <a href="http://www.poweradmin.org/credits.html">credits</a>
 </div>

diff --git a/inc/version.inc.php b/inc/version.inc.php
diff --git a/install/index.php b/install/index.php
@@ -30,7 +30,7 @@
     $language = 'en_EN';
 }
 
-$step = isset($_POST['step']) || is_numeric($_POST['step']) ? $_POST['step'] : 1;
+$step = isset($_POST['step']) && is_numeric($_POST['step']) ? $_POST['step'] : 1;
 
 $loader = new Twig_Loader_Filesystem('templates');
 $twig = new Twig_Environment($loader);
@@ -326,7 +326,6 @@
         break;
 }
 
-require_once '../inc/version.inc.php';
-echo $twig->render('footer.html', array('version' => $VERSION));
+echo $twig->render('footer.html', array('version' => Poweradmin\Version::VERSION));
 
 
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -7,6 +7,7 @@
 
 return array(
     'Poweradmin\\Password' => $vendorDir . '/poweradmin/Password.php',
+    'Poweradmin\\Version' => $vendorDir . '/poweradmin/Version.php',
     'Twig_Autoloader' => $vendorDir . '/twig/twig/lib/Twig/Autoloader.php',
     'Twig_BaseNodeVisitor' => $vendorDir . '/twig/twig/lib/Twig/BaseNodeVisitor.php',
     'Twig_CacheInterface' => $vendorDir . '/twig/twig/lib/Twig/CacheInterface.php',

diff --git a/vendor/poweradmin/Version.php b/vendor/poweradmin/Version.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Poweradmin;
+
+class Version
+{
+    const VERSION = '2.1.8';
+}