suExec, Filemanager and bug Fixes.

websiteFunctions/models.py

@@ -16,6 +16,7 @@ class Websites(models.Model):
     phpSelection = models.CharField(max_length=10)
     ssl = models.IntegerField()
     state = models.IntegerField(default=1)
+    externalApp = models.CharField(max_length=10, default=None)
 
 class ChildDomains(models.Model):
     master = models.ForeignKey(Websites,on_delete=models.CASCADE)

websiteFunctions/static/websiteFunctions/websiteFunctions.js

@@ -439,7 +439,8 @@ app.controller('websitePages', function($scope,$http) {
         $scope.hideLogs = true;
     };
 
-    $scope.fileManagerURL = "filemanager/"+$("#domainNamePage").text();
+    $scope.fileManagerURL = "/filemanager/"+$("#domainNamePage").text();
+    $scope.previewUrl = "/preview/"+$("#domainNamePage").text()+"/";
 
     var logType = 0;
     $scope.pageNumber = 1;

websiteFunctions/templates/websiteFunctions/createWebsite.html

@@ -51,7 +51,7 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
                     <div class="col-sm-6">
-                        <input ng-pattern="/([\da-z\.-]+\.[a-z\.]{2,6}|[\d\.]+)([\/:?=&#]{1}[\da-z\.-]+)*[\/\?]?$/i"  name="dom"  type="text" class="form-control" ng-model="domainNameCreate" required>
+                        <input ng-pattern="/([\da-z\.-]+\.[a-z\.]{2,6}|[\d\.]+)([\/:?=&#]{1}[\da-z\.-]+)*[\/\?]?$/i"  name="dom"  type="text" class="form-control" ng-model="domainNameCreate" placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>
                     </div>
                         <div ng-show="websiteCreationForm.dom.$error.pattern" class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
                 </div>

websiteFunctions/templates/websiteFunctions/website.html

@@ -9,9 +9,8 @@
 
 <div ng-controller="websitePages" class="container">
 
-
     <div id="page-title">
-       <h2 id="domainNamePage">{{ domain }}</h2>
+        <h2 ><span id="domainNamePage">{{ domain }}</span> -  <a target="_blank" href="{$ previewUrl $}" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Preview" %}</span></a></h2>
        <p>{% trans "All functions related to a particular site." %}</p>
     </div>
 
@@ -591,7 +590,7 @@
                                 </div>
 
                                 <div ng-hide="configSaved" class="alert alert-success">
-                                    <p>{% trans "Configuration saved. Restart LiteSpeed put them in effect." %}</p>
+                                    <p>{% trans "Configurations saved." %}</p>
                                 </div>
 
                                  <div ng-hide="couldNotSaveConfigurations" class="alert alert-danger">
@@ -646,7 +645,7 @@
                                 </div>
 
                                 <div ng-hide="rewriteRulesSaved" class="alert alert-success">
-                                    <p>{% trans "Configuration saved. Restart LiteSpeed put them in effect." %}</p>
+                                    <p>{% trans "Configurations saved." %}</p>
                                 </div>
 
                                  <div ng-hide="couldNotSaveRewriteRules" class="alert alert-danger">

websiteFunctions/urls.py

@@ -1,6 +1,5 @@
 from django.conf.urls import url
 import views
-from filemanager_app import views as fm
 
 
 urlpatterns = [
@@ -47,29 +46,6 @@ urlpatterns = [
 
     url(r'^CreateWebsiteFromBackup', views.CreateWebsiteFromBackup, name='CreateWebsiteFromBackup'),
 
-
-
-
-    url(r'^filemanager/(?P<domain>([\da-z\.-]+\.[a-z\.]{2,6}|[\d\.]+)([\/:?=&#]{1}[\da-z\.-]+)*[\/\?]?)$', views.filemanager,name='filemanager'),
-
-    ## File manager urls
-
-    url(r'^filemanager/list', fm.list_),
-    url(r'^filemanager/rename', fm.rename),
-    url(r'^filemanager/move', fm.move),
-    url(r'^filemanager/copy', fm.copy),
-    url(r'^filemanager/remove', fm.remove),
-    url(r'^filemanager/edit', fm.edit),
-    url(r'^filemanager/getContent', fm.getContent),
-    url(r'^filemanager/createFolder', fm.createFolder),
-    url(r'^filemanager/changePermissions', fm.changePermissions),
-    url(r'^filemanager/compress', fm.compress),
-    url(r'^filemanager/extract', fm.extract),
-    url(r'^filemanager/downloadMultiple', fm.downloadMultiple),
-    url(r'^filemanager/download', fm.download),
-    url(r'^filemanager/upload', fm.upload),
-
-
     ## sub/add/park domains
 
     url(r'^submitDomainCreation', views.submitDomainCreation, name='submitDomainCreation'),