Explorar el Código

WebApp: Bump package version

Robert Zollner hace 6 años
padre
commit
6d3874a1dc
Se han modificado 3 ficheros con 10 adiciones y 7 borrados
  1. 1 0
      bin/v-run-cli-cmd
  2. 5 5
      web/add/webapp/index.php
  3. 4 2
      web/src/app/System/Util.php

+ 1 - 0
bin/v-run-cli-cmd

@@ -53,6 +53,7 @@ if [ "$realcmd" != '/bin/ps'            -a \
      "$realcmd" != '/usr/bin/php7.1'    -a \
      "$realcmd" != '/usr/bin/php7.2'    -a \
      "$realcmd" != '/usr/bin/php7.3'    -a \
+     "$realcmd" != '/usr/bin/php7.4'    -a \
      "$realcmd" != '/usr/bin/php'       -a \
      "$clicmd"  != 'composer' ]; then
     check_result $E_FORBIDEN "Error: Cli command not enabled"

+ 5 - 5
web/add/webapp/index.php

@@ -31,13 +31,13 @@ if(!in_array($v_domain, $user_domains)) {
 }
 
 $v_web_apps = [
-    [ 'name'=>'Wordpress', 'group'=>'cms', 'enabled'=>true, 'version'=>'5.2.2', 'thumbnail'=>'/images/webapps/wp-thumb.png' ],
-    [ 'name'=>'Drupal',    'group'=>'cms', 'enabled'=>false,'version'=>'1.2.3', 'thumbnail'=>'/images/webapps/drupal-thumb.png' ],
-    [ 'name'=>'Joomla',    'group'=>'cms', 'enabled'=>false,'version'=>'1.2.3', 'thumbnail'=>'/images/webapps/joomla-thumb.png' ],
+    [ 'name'=>'Wordpress', 'group'=>'cms', 'enabled'=>true, 'version'=>'5.2.4', 'thumbnail'=>'/images/webapps/wp-thumb.png' ],
+    [ 'name'=>'Drupal',    'group'=>'cms', 'enabled'=>false,'version'=>'latest', 'thumbnail'=>'/images/webapps/drupal-thumb.png' ],
+    [ 'name'=>'Joomla',    'group'=>'cms', 'enabled'=>false,'version'=>'latest', 'thumbnail'=>'/images/webapps/joomla-thumb.png' ],
 
     [ 'name'=>'Opencart',   'group'=>'ecommerce', 'enabled'=>true,  'version'=>'3.0.3.2', 'thumbnail'=>'/images/webapps/opencart-thumb.png' ],
-    [ 'name'=>'Prestashop', 'group'=>'ecommerce', 'enabled'=>true, 'version'=>'1.7.6.0', 'thumbnail'=>'/images/webapps/prestashop-thumb.png' ],
-    [ 'name'=>'Magento',    'group'=>'ecommerce', 'enabled'=>false, 'version'=>'1.2.3', 'thumbnail'=>'/images/webapps/magento-thumb.png' ],
+    [ 'name'=>'Prestashop', 'group'=>'ecommerce', 'enabled'=>true, 'version'=>'1.7.6.1', 'thumbnail'=>'/images/webapps/prestashop-thumb.png' ],
+    [ 'name'=>'Magento',    'group'=>'ecommerce', 'enabled'=>false, 'version'=>'latest', 'thumbnail'=>'/images/webapps/magento-thumb.png' ],
 
     [ 'name'=>'Laravel', 'group'=>'starter', 'enabled'=>true, 'version'=>'6.x', 'thumbnail'=>'/images/webapps/laravel-thumb.png' ],
     [ 'name'=>'Symfony', 'group'=>'starter', 'enabled'=>true, 'version'=>'4.3.x', 'thumbnail'=>'/images/webapps/symfony-thumb.png' ],

+ 4 - 2
web/src/app/System/Util.php

@@ -6,16 +6,18 @@ namespace Hestia\System;
 
 class Util
 {
+    /*
+     * Method from: https://stackoverflow.com/a/15575293
+     * https://stackoverflow.com/questions/1091107/how-to-join-filesystem-path-strings-in-php
+     */
     public static function join_paths()
     {
         $paths = array();
-
         foreach (func_get_args() as $arg) {
             if ($arg !== '') {
                 $paths[] = $arg;
             }
         }
-
         return preg_replace('#/+#', '/', join('/', $paths));
     }