Merge branch 'feature/package-management' into feature/user-roles

Author: Kristan Kenney

bin/v-delete-user-package

@@ -5,8 +5,10 @@
 #
 # example: v-delete-user-package admin palegreen
 #
-# The function for deleting user package. It does not allow to delete package
-# if it is in use.
+# The function for deleting user package.
+#
+# If the package is in use, users will be updated to
+# use the default package.
 
 
 #----------------------------------------------------------#
@@ -24,11 +26,11 @@ source $HESTIA/conf/hestia.conf
 
 # Functions
 is_package_in_use() {
-    check_package=$(grep "PACKAGE='$package'" $USER_DATA/*/user.conf)
+    check_package=$(grep "PACKAGE='$package" $HESTIA/data/users/*/user.conf | cut -d'/' -f7)
     if [ ! -z "$check_package" ]; then
-        echo "Error: package $package is in use"
-        log_event "$E_INUSE" "$ARGUMENTS"
-        exit $E_INUSE
+        for user in $check_package; do
+            $BIN/v-change-user-package "$user" 'default'
+        done
     fi
 }
 

install/upgrade/versions/1.4.0.sh

@@ -123,3 +123,14 @@ if [ "$api" = "yes" ]; then
 else
     $HESTIA/bin/v-change-sys-api disable
 fi
+
+
+##### COMMANDS FOR V1.5.X
+
+# Back up default package and install latest version
+if [ -d $HESTIA/data/packages/ ]; then
+    echo "[ * ] Migrating legacy default package for all users..."
+    $HESTIA/bin/v-rename-user-package default custom >/dev/null 2>&1
+    echo "[ * ] Replacing default package..."
+    cp -f $HESTIA_INSTALL_DIR/packages/default.pkg $HESTIA/data/packages/
+fi

web/delete/package/index.php

@@ -11,6 +11,12 @@
     exit();
 }
 
+// Prevent editing of default package
+if ($_GET['package'] === 'default') {
+    header("Location: /list/package/");
+    exit;
+}
+
 if ($_SESSION['userContext'] === 'admin') {
     if (!empty($_GET['package'])) {
         $v_package = escapeshellarg($_GET['package']);

web/edit/package/index.php

@@ -19,6 +19,11 @@
     exit;
 }
 
+// Prevent editing of default package
+if ($_GET['package'] === 'default') {
+    header("Location: /list/package/");
+    exit;
+}
 
 // List package
 $v_package = escapeshellarg($_GET['package']);

web/templates/admin/list_packages.html

@@ -68,25 +68,23 @@
         <div class="clearfix l-unit__stat-col--left super-compact">
           <input id="check<?=$i?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="user[]" value="<?=$key?>">
         </div>
-            <div class="clearfix l-unit__stat-col--left wide-2 truncate">
-              <b>
-                <? if (($_SESSION['userContext'] === "admin") && ($_SESSION['user'] === 'admin')) {?>
-                  <a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Package')?>: <?=$key?>"><?=$key?></a>
-                <? } else { ?>
-                  <?=$key?>
-                <? } ?>
-              </b>
-            </div>
+            <? if ($key == 'default') { ?>
+              <div class="clearfix l-unit__stat-col--left wide-2 truncate"><b><?=$key?></b></div>
+            <? } else {?>
+              <div class="clearfix l-unit__stat-col--left wide-2 truncate"><b><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Package')?>: <?=$key?>"><?=$key?></b></a></div>
+            <? } ?>
             <!-- START QUICK ACTION TOOLBAR AREA -->
             <div class="clearfix l-unit__stat-col--left text-right compact-3">
                   <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                       <div class="actions-panel clearfix">
-                        <? if (($_SESSION['userContext'] === "admin") && ($_SESSION['user'] === 'admin')) {?>
-                          <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Package')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>
+                        <? if ($key == 'default') { ?>
+                          <!-- Restrict editing default package -->
+                        <? } else {?>
+                          <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Package')?>"><i class="fas fa-pencil-alt status-icon orange status-icon dim"></i></a></div>            
                         <? } ?>
                         <div class="actions-panel__col actions-panel__edit" key-action="href"><a href="/copy/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Copy')?>"><i class="fas fa-clone status-icon teal status-icon dim"></i></a></div>
-                        <? if ($key == 'default') {?>
-                          <!-- Hide option to delete the default package -->
+                        <? if ($key == 'default') { ?>
+                          <!-- Restrict deleting default package -->
                         <? } else {?>
                           <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                             <a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?=_('Delete')?>">