bug fix: git manager

baseTemplate/views.py

@@ -4,10 +4,8 @@
 from django.shortcuts import render,redirect
 from django.http import HttpResponse
 from plogical.getSystemInformation import SystemInformation
-from loginSystem.models import Administrator, ACL
 import json
 from loginSystem.views import loadLoginPage
-import re
 from .models import version
 import requests
 import subprocess
@@ -20,6 +18,8 @@ from django.views.decorators.csrf import ensure_csrf_cookie
 from plogical.processUtilities import ProcessUtilities
 # Create your views here.
 
+VERSION = '2.0'
+BUILD = 0
 
 @ensure_csrf_cookie
 def renderBase(request):
@@ -121,16 +121,8 @@ def versionManagment(request):
 
         ## Get local version
 
-
+        currentVersion = VERSION
-        versionFile = '/usr/local/CyberCP/version.txt'
+        currentBuild = str(BUILD)
-
-        try:
-            data = open(versionFile, 'r').read().split('\n')
-            currentVersion = data[0]
-            currentBuild = data[1]
-        except:
-            currentVersion = latestVersion
-            currentBuild = str(5) + 'E'
 
         return render(request, 'baseTemplate/versionManagment.html', {'build': currentBuild,
                                                                       'currentVersion': currentVersion,

install/install.py

@@ -14,6 +14,9 @@ from os.path import *
 from stat import *
 import stat
 
+VERSION = '2.0'
+BUILD = 0
+
 char_set = {'small': 'abcdefghijklmnopqrstuvwxyz',
             'nums': '0123456789',
             'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
@@ -518,13 +521,9 @@ class preFlightsChecks:
         preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
 
         try:
-            import requests
-            getVersion = requests.get('https://cyberpanel.net/version.txt')
-            latest = getVersion.json()
-            path = "/usr/local/CyberCP/version.txt"
             writeToFile = open(path, 'w')
-            writeToFile.writelines('%s\n' % (str(latest['version'])))
+            writeToFile.writelines('%s\n' % (VERSION))
-            writeToFile.writelines(str(latest['build']))
+            writeToFile.writelines(str(BUILD))
             writeToFile.close()
         except:
             pass

loginSystem/views.py

@@ -18,6 +18,9 @@ from django.http import HttpResponse
 from django.utils import translation
 # Create your views here.
 
+VERSION = '2.0'
+BUILD = 0
+
 def verifyLogin(request):
     try:
         userID = request.session['userID']
@@ -193,7 +196,7 @@ def loadLoginPage(request):
                                   firstName="Cyber",lastName="Panel", acl=acl, token=token)
             admin.save()
 
-            vers = version(currentVersion="1.9", build=5)
+            vers = version(currentVersion=VERSION, build=BUILD)
             vers.save()
 
             package = Package(admin=admin, packageName="Default", diskSpace=1000,

plogical/adminPass.py

@@ -12,6 +12,9 @@ from plogical.acl import ACLManager
 from packages.models import Package
 from baseTemplate.models import version
 
+VERSION = '2.0'
+BUILD = 0
+
 if not os.geteuid() == 0:
     sys.exit("\nOnly root can run this script\n")
 
@@ -34,7 +37,7 @@ def main():
                               firstName="Cyber", lastName="Panel", acl=acl, token=token)
         admin.save()
 
-        vers = version(currentVersion="1.9", build=5)
+        vers = version(currentVersion=VERSION, build=BUILD)
         vers.save()
 
         package = Package(admin=admin, packageName="Default", diskSpace=1000,

plogical/upgrade.py

@@ -7,14 +7,14 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
 import shlex
 import subprocess
 import shutil
-import requests
-import json
 import time
 import MySQLdb as mysql
 from CyberCP import settings
 import random
 import string
 
+VERSION = '2.0'
+BUILD = 0
 
 class Upgrade:
     logPath = "/usr/local/lscp/logs/upgradeLog"
@@ -391,11 +391,8 @@ class Upgrade:
     @staticmethod
     def downloadLink():
         try:
-            url = "https://cyberpanel.net/version.txt"
+            version_number = VERSION
-            r = requests.get(url, verify=True)
+            version_build = str(BUILD)
-            data = json.loads(r.text)
-            version_number = str(data['version'])
-            version_build = str(data['build'])
 
             try:
                 path = "/usr/local/CyberCP/version.txt"
@@ -467,10 +464,8 @@ class Upgrade:
             from baseTemplate.models import version
 
             vers = version.objects.get(pk=1)
-            getVersion = requests.get('https://cyberpanel.net/version.txt')
+            vers.currentVersion = VERSION
-            latest = getVersion.json()
+            vers.build = str(BUILD)
-            vers.currentVersion = latest['version']
-            vers.build = latest['build']
             vers.save()
         except:
             pass

websiteFunctions/templates/websiteFunctions/launchChild.html

@@ -26,6 +26,7 @@
 
                     <h3 class="content-box-header">
                         {% trans "Resource Usage" %}
+                        <a style="float: right; margin-left: 2%" class="btn btn-border btn-alt border-orange btn-link font-orange" href="/websites/{{ childDomain }}/manageGIT" title="Manage Git"><span>{% trans "Manage Git" %}</span></a>
                         <a style="float: right; margin-left: 2%"
                            class="btn btn-border btn-alt border-azure btn-link font-azure"
                            href="/websites/{{ domain }}/{{ childDomain }}/syncToMaster"

websiteFunctions/website.py

@@ -3864,7 +3864,11 @@ StrictHostKeyChecking no
                 else:
                     initialNumber = initialNumber + 1
 
+            try:
                 lineNumber = int(fileChangedContent[initialNumber].split('+')[1].split(',')[0])
+            except:
+                lineNumber = int(fileChangedContent[initialNumber].split('+')[1].split(' ')[0])
+
             fileLen = len(fileChangedContent)
             finalConent = '<tr><td style="border-top: none;color:blue">%s</td><td style="border-top: none;"><p style="color:blue">%s</p></td></tr>' % ('#', fileChangedContent[initialNumber])