enforce disk limits

packages/packagesManager.py

@@ -27,7 +27,7 @@ class PackagesManager:
         userID = self.request.session['userID']
         admin = Administrator.objects.get(pk=userID)
         proc = httpProc(self.request, 'packages/createPackage.html',
-                        {"admin": admin.userName}, 'createPackage')
+                        {"adminNamePackage": admin.userName}, 'createPackage')
         return proc.render()
 
     def deletePacakge(self):
@@ -66,6 +66,11 @@ class PackagesManager:
             except:
                 allowFullDomain = 1
 
+            try:
+                enforceDiskLimits = int(data['enforceDiskLimits'])
+            except:
+                enforceDiskLimits = 0
+
 
             if packageSpace < 0 or packageBandwidth < 0 or packageDatabases < 0 or ftpAccounts < 0 or emails < 0 or allowedDomains < 0:
                 data_ret = {'saveStatus': 0, 'error_message': "All values should be positive or 0."}
@@ -79,7 +84,7 @@ class PackagesManager:
 
             package = Package(admin=admin, packageName=packageName, diskSpace=packageSpace,
                               bandwidth=packageBandwidth, ftpAccounts=ftpAccounts, dataBases=packageDatabases,
-                              emailAccounts=emails, allowedDomains=allowedDomains, allowFullDomain=allowFullDomain)
+                              emailAccounts=emails, allowedDomains=allowedDomains, allowFullDomain=allowFullDomain, enforceDiskLimits=enforceDiskLimits)
 
             package.save()
 

packages/static/packages/packages.js

@@ -64,7 +64,7 @@ app.controller('createPackage', function ($scope, $http) {
             dataBases: dataBases,
             emails: emails,
             allowedDomains: $scope.allowedDomains,
-            allowFullDomain: $scope.allowFullDomain
+            enforceDiskLimits: $scope.enforceDiskLimits
         };
 
         var config = {

packages/templates/packages/createPackage.html

@@ -29,7 +29,7 @@
                                 <input name="pname" type="text" class="form-control" ng-model="packageName" required>
                             </div>
 
-                            <div class="current-pack">{{ admin }}_{$ packageName $}</div>
+                            <div class="current-pack">{{ adminNamePackage }}_{$ packageName $}</div>
                         </div>
 
                         <div class="form-group">
@@ -90,6 +90,12 @@
                                         Allow Creation of Fully Qualified Domain as Child-Domains
                                     </label>
                                 </div>
+                                <div class="checkbox">
+                                    <label>
+                                        <input ng-model="enforceDiskLimits" type="checkbox" value="">
+                                        Enforce Disk Limits
+                                    </label>
+                                </div>
                             </div>
                         </div>
 

plogical/CyberPanelUpgrade.py

@@ -37,7 +37,6 @@ class UpgradeCyberPanel:
         Upgrade.executioner(command, command)
         Upgrade.fixPermissions()
 
-
     def UpgardeNow(self):
 
         from plogical.upgrade import Upgrade
@@ -108,7 +107,6 @@ class UpgradeCyberPanel:
         self.PostStatus('CyberPanel Upgraded/Downgraded to %s. [200]' % (self.branch))
 
 
-
 def main():
     parser = argparse.ArgumentParser(description='CyberPanel Installer')
     parser.add_argument('--branch', help='Branch to install.')