From 457c1e7e20937d8f32f024be5f26e00fd55502d0 Mon Sep 17 00:00:00 2001
From: usmannasir <01-134132-158@student.bahria.edu.pk>
Date: Sat, 16 Dec 2017 11:59:47 +0500
Subject: [PATCH] Bug fix to SSL

---
 CyberCP/__init__.pyc                         | Bin 125 -> 137 bytes
 CyberCP/settings.pyc                         | Bin 3655 -> 3667 bytes
 api/__init__.pyc                             | Bin 121 -> 133 bytes
 api/admin.pyc                                | Bin 242 -> 254 bytes
 api/models.pyc                               | Bin 239 -> 251 bytes
 backup/__init__.pyc                          | Bin 124 -> 136 bytes
 backup/admin.pyc                             | Bin 341 -> 353 bytes
 backup/models.pyc                            | Bin 3129 -> 3165 bytes
 baseTemplate/__init__.pyc                    | Bin 130 -> 142 bytes
 baseTemplate/admin.pyc                       | Bin 251 -> 263 bytes
 baseTemplate/models.pyc                      | Bin 564 -> 588 bytes
 databases/__init__.pyc                       | Bin 127 -> 139 bytes
 databases/admin.pyc                          | Bin 330 -> 342 bytes
 databases/models.pyc                         | Bin 692 -> 716 bytes
 dns/__init__.pyc                             | Bin 121 -> 133 bytes
 dns/admin.pyc                                | Bin 433 -> 445 bytes
 dns/models.pyc                               | Bin 4719 -> 4899 bytes
 filemanager/__init__.pyc                     | Bin 129 -> 141 bytes
 filemanager/admin.pyc                        | Bin 250 -> 262 bytes
 filemanager/models.pyc                       | Bin 247 -> 259 bytes
 firewall/__init__.pyc                        | Bin 126 -> 138 bytes
 firewall/admin.pyc                           | Bin 183 -> 195 bytes
 firewall/models.pyc                          | Bin 613 -> 637 bytes
 ftp/__init__.pyc                             | Bin 121 -> 133 bytes
 ftp/admin.pyc                                | Bin 320 -> 332 bytes
 ftp/models.pyc                               | Bin 1397 -> 1433 bytes
 install/install.py                           |  29 ++++++
 locale/bs/LC_MESSAGES/django.po              |  22 ++---
 loginSystem/__init__.pyc                     | Bin 129 -> 141 bytes
 loginSystem/admin.pyc                        | Bin 336 -> 348 bytes
 loginSystem/models.pyc                       | Bin 888 -> 912 bytes
 loginSystem/templates/loginSystem/login.html |   2 +-
 mailServer/__init__.pyc                      | Bin 128 -> 140 bytes
 mailServer/admin.pyc                         | Bin 249 -> 261 bytes
 mailServer/models.pyc                        | Bin 2342 -> 2450 bytes
 managePHP/__init__.pyc                       | Bin 127 -> 139 bytes
 managePHP/admin.pyc                          | Bin 367 -> 379 bytes
 managePHP/models.pyc                         | Bin 926 -> 962 bytes
 manageSSL/__init__.pyc                       | Bin 127 -> 139 bytes
 manageSSL/admin.pyc                          | Bin 248 -> 260 bytes
 manageSSL/models.pyc                         | Bin 245 -> 257 bytes
 packages/__init__.pyc                        | Bin 126 -> 138 bytes
 packages/admin.pyc                           | Bin 345 -> 357 bytes
 packages/models.pyc                          | Bin 935 -> 959 bytes
 plogical/sslUtilities.py                     |   7 ++
 plogical/virtualHostUtilities.py             |   3 +
 serverLogs/__init__.pyc                      | Bin 128 -> 140 bytes
 serverLogs/admin.pyc                         | Bin 249 -> 261 bytes
 serverLogs/models.pyc                        | Bin 246 -> 258 bytes
 serverLogs/views.py                          |   7 +-
 serverStatus/__init__.pyc                    | Bin 130 -> 142 bytes
 serverStatus/admin.pyc                       | Bin 251 -> 263 bytes
 serverStatus/models.pyc                      | Bin 248 -> 260 bytes
 static/websiteFunctions/websiteFunctions.js  |  99 ++++++++++++++++++-
 tuning/__init__.pyc                          | Bin 124 -> 136 bytes
 tuning/admin.pyc                             | Bin 245 -> 257 bytes
 tuning/models.pyc                            | Bin 242 -> 254 bytes
 userManagment/__init__.pyc                   | Bin 131 -> 143 bytes
 userManagment/admin.pyc                      | Bin 252 -> 264 bytes
 userManagment/models.pyc                     | Bin 249 -> 261 bytes
 websiteFunctions/__init__.pyc                | Bin 134 -> 146 bytes
 websiteFunctions/admin.pyc                   | Bin 336 -> 348 bytes
 websiteFunctions/models.pyc                  | Bin 2286 -> 2358 bytes
 63 files changed, 153 insertions(+), 16 deletions(-)

diff --git a/CyberCP/__init__.pyc b/CyberCP/__init__.pyc
index 2571db08e5a613b36f4f449a83d723a8e3c0bdef..b4c1a3d744ca390318c4a5a3a769d6794a993eee 100644
GIT binary patch
delta 44
zcmb>JWaMD}%**v*acSg44pT`Z1_lQGjQreG{nFyx#5{fH%B0kyfW*AiiC)G4Isp!N

delta 32
ncmeBVtmR<-%**vR#3*VahbgZb0|SG8X>pN$PJVLY#4uw3m&pli

diff --git a/CyberCP/settings.pyc b/CyberCP/settings.pyc
index 8462dbac16d33d1d6c58c552ead6073839659d59..a99037583a282d4ecf37bfafca3d6873fce2b547 100644
GIT binary patch
delta 46
zcmX>ub6JL+`7<w<?j_@m>><38MhpxL`WgATsrseGxrurD&Xq~2MFEL<sgpB!?*jl$
CFb_8X

delta 34
pcmcaCb6kd<`7<vUUy{*A_7GlPH3kL-{nFwh{ha*d#K|SR_W`CL3LgLf

diff --git a/api/__init__.pyc b/api/__init__.pyc
index d295767b8370b398a389b2f63ae0bd2fad3687f9..b65fd3706856c9f87f39b87f7c06f6037d1cce75 100644
GIT binary patch
delta 44
zcmb<yW#nM~%*z$I|6$}r4pT`z1_lQGjQreG{nFyx#5{fH%B0kyfW*AiiC+2uH6adJ

delta 32
ncmZo=tmI(+%**vR#3*VahbgZT0|SG8X>pN$PJVLY#4vpTmW>Hq

diff --git a/api/admin.pyc b/api/admin.pyc
index c6eaab6f43bdee1e9b1056da40ffc894d69b135e..82f1d16fa3d1855471a37344130cb627ea9251e1 100644
GIT binary patch
delta 45
zcmeyw_>Yl;`7<w9<o<_|6FJsPYBMk}=x5~Trs|g#=O*UqJ69&976l~crA|De2LNtL
B5Ig_?

delta 33
pcmeyz_=%B&`7<xq-w>myi5%;B<rx?l^h=A2^mFo)6DMBK0|3853qJq=

diff --git a/api/models.pyc b/api/models.pyc
index 95e618eab4a168d875dbd243498396a111ab8df5..3561deb50469f828ce1015a28cc161d0d32aeb74 100644
GIT binary patch
delta 45
zcmaFQ_?wY~`7<w9<o<_|6FF8(>M$@c=x5~Trs|g#=O*UqJ69&976l~crA|Dc4*+c6
B5HJ7$

delta 33
pcmey(_@0r2`7<xq-w>myi5#nW6&M&8^h=A2^mFo)6DOY02LQf93o`%!

diff --git a/backup/__init__.pyc b/backup/__init__.pyc
index f7ebdeb107b675a3b05afe4df772b353142dbee3..a070efdd65457e149d6f6deb7f84f63a740dee69 100644
GIT binary patch
delta 44
zcmb>FVB}!_%*z!nwl8ubhpD6?0|SG8Mt*Lpera)TVxGQpWm0NUKw@6%L@y%%8gvbp

delta 32
ncmeBRtl?n(%**vR#3*VahbgZr0|SG8X>pN$PJVLY#4sZOmwE|k

diff --git a/backup/admin.pyc b/backup/admin.pyc
index 75b5e34f159ca77e87aaa3a6d55ea47a490fbadb..18caa545dedf1f0f83faba3c8efa035a1583eb8a 100644
GIT binary patch
delta 47
zcmcc0^pJ^z`7<xq!Hj*88#%ZcCG{8>81yspb5r$8i*pn6^qnh{Qi}o-^HL`(Fq#4Y
DXEYAj

delta 35
qcmaFJbd`yN`7<xq-w>myjU3#Jyh;oV4Em+TMfy4U$%&J77)=4aX$kEB

diff --git a/backup/models.pyc b/backup/models.pyc
index e8810132260e8cb9fad4c9f93df1bdea62dd8264..4b928877f95349ca7ac30964ce27f573c10cca98 100644
GIT binary patch
delta 116
zcmdlfaaV$a`7<w<sMguYjU02>CG{B?81yspb5r$8i*pn6^qnh{Qi}o-^HMi&WG`UG
WEj@W7yYysF?)7+8NKKaKkpci-yd?zy

delta 80
zcmcaBu~UMB`7<xq-w>myjU02>d6gL$81zevi}Z8ylM^@ZWiMbx6`H)4U3zjN_j(Lb
JsmabfQUKt27$E=v

diff --git a/baseTemplate/__init__.pyc b/baseTemplate/__init__.pyc
index 552ff2862b1a6ba99bd20392d01b03086b78574f..25e5b7d666b81f123ff1ff53d09982a71620df18 100644
GIT binary patch
delta 45
zcmZo->|^9${>;mzv7|I|B8RD@IRgWOenx(7s(xv4ZepIkb7fL$Q9xo|>O?OK03i1b
A#sB~S

delta 33
ocmeBUY+~eK{>;nuH^eAvB8MrjHUk5Lera)$eolUJ;>0iu0GfmefdBvi

diff --git a/baseTemplate/admin.pyc b/baseTemplate/admin.pyc
index 096f35428310e2192a142f2cce8c6f7ae66dbf33..cb9c918b20afd7e02543ea25c06e71b2182e4ea4 100644
GIT binary patch
delta 45
zcmey(*v`bk{F#?aV@YY`M2_{6CJYP=`WgATsrseGxrurD&Xq~2MFEL<sS}Tw0{}!M
B4=Dfu

delta 33
pcmZo?`pw9}{F#^QZ-`OUM2_{m8Vn2!`lZE1`Z@W@i4!lF0|2qR3giF)

diff --git a/baseTemplate/models.pyc b/baseTemplate/models.pyc
index 7fc838c180a1d2aebe9a43acb6042bc345870898..0b1265b820627a02207dc31d74768d8e0207058b 100644
GIT binary patch
delta 81
zcmdnOa)yP2`7<w<%HhM28#$sFB~2L^81yspb5r$8i*pn6^qnh{Qi}o-^HL}0GuGji
KRhTTrBn1ExZ5d<$

delta 57
ycmX@ZvW10%`7<xq-w>myjT}*oyqXLQ4Em+TMfy4U$%&Jz8S5}a6eb%nNdW-lI1okv

diff --git a/databases/__init__.pyc b/databases/__init__.pyc
index 4c163040c5e135e424ca3c2242faa6fdf5d965bc..f8e7593fcef0244e89d978996df937d771a400c6 100644
GIT binary patch
delta 44
zcmb>LX5?W0%*!Qrr7dzIhpD6q0|SG8Mt*Lpera)TVxGQpWm0NUKw@6%L@!eSCRPpb

delta 32
ncmeBXtmk0<%**vJ#3*VahbgZH0|SG8X>pN$PJVLY#4u9;n12a%

diff --git a/databases/admin.pyc b/databases/admin.pyc
index 55bee3bfcf5a34431346bed6a80898b217a5d6c7..b3edea730692d3c2cc946d203019e41c91225792 100644
GIT binary patch
delta 46
zcmX@bbd8CF`7<w9z~uJGi5!0=4H+01^fU5vQ}s)Wa})FQohy@4ivkk!QYQ;BS^xlK
C^A8RH

delta 34
qcmcb{bc%_C`7<xqzYwFSi5!1<RT&r<^h=A2^mFo)6DP|tS^xmViVC3s

diff --git a/databases/models.pyc b/databases/models.pyc
index 9dbdb578c03e12531efd538ed79e6860c540f98a..479ad2eeee334ff6ab38ed7ff19c30e7b8d45f25 100644
GIT binary patch
delta 81
zcmdnOdWMyQ`7<w9`R%sIjU2lfC5;#u81yspb5r$8i*pn6^qnh{Qi}o-^HL{YV4R0n
KR(A3XCK&)uxEoFY

delta 57
ycmX@Zx`ma4`7<xqzYwFSjU2lfdDR#g81zevi}Z8ylM^T3VVs8{B0G5llMDa^h!O(;

diff --git a/dns/__init__.pyc b/dns/__init__.pyc
index a107e8132afe07522bb6f4cbad9a03b177d050d2..e13d9790cb2040d117c3b13225d2967604356331 100644
GIT binary patch
delta 44
zcmb<yW#nM~%*%D4s3CG9hpD6<0|SG8Mt*Lpera)TVxGQpWm0NUKw@6%L@#{+EHn-h

delta 32
ncmZo=tmI(+%**vJ#3*VahbgZT0|SG8X>pN$PJVLY#4vpTmZb?@

diff --git a/dns/admin.pyc b/dns/admin.pyc
index ea4ed62eb6e793ea13b8343388281c9b76687f02..59087644994782e19c815ec265087ae1c06d7529 100644
GIT binary patch
delta 47
zcmdnUyqB4S`7<xqo19sZ8#z)KCAAqC81yspb5r$8i*pn6^qnh{Qi}o-^HL{QGFkut
DXj>0Y

delta 35
qcmdnXypfrM`7<xqzYwFSjT|YAyz&eT4Em+TMfy4U$%&I&87%<31PWRJ

diff --git a/dns/models.pyc b/dns/models.pyc
index 2cd0d1084a00b827fe8d49f34c6a9573b5e629d7..0c689a527683e80ca7505c10cbaa52521b7d3d72 100644
GIT binary patch
delta 516
zcmaE_vRI9S`7<w9?xI<d8#(?nN$M~#Fz9FG=cekH7Uw4B={r{@r4|Jw=A}+<;E|bZ
zz<eE#3I}e9%{nYfgbXQXdqKdE7Ir5_JW4<=dCyUdM+L|w?VQ4d3^~kIfZLGG4&280
s4XDAbc{0caioEss4Un09k}rXPA%6Uw1PqxZn2g7a0>RCAWDSJu0l5#N`Tzg`

delta 345
zcmZ3i_Fjd9`7<xqzYwFSjU4}(coi5J81zevi}Z8ylM^Q!^2<!NVZM$g+Q=)h*@Z<3
zo8sAQFR&=y!tTU~CJZuJo3j{A6lC&wPGM|{#kmWxDBi&>jZHBJZvv{~&5gX%F%{OJ
hDw+(k{vLlPrb3y?a|Dwy6;C!0nvEeUKKZwh1^{pOV8{Rf

diff --git a/filemanager/__init__.pyc b/filemanager/__init__.pyc
index d6db003cacf0e3d80eabef679aec9cd16a397af2..6951e53e3ddb9ce33675a8b435219d0070605826 100644
GIT binary patch
delta 44
zcmZo<>}6zU{>;mD#8PD<yP2dJ0|SG8Mt*Lpera)TVxGQpWm0NUKw@6%L@#py4kisq

delta 32
ncmeBWY-D6-{>;nuFT`jfyBV(*0|SG8X>pN$PJVLY#4vLJk0J>p

diff --git a/filemanager/admin.pyc b/filemanager/admin.pyc
index d3021d3796ef92fcd6d35c778779745b69f3bc1a..df5374762e7cff1e64b439a84d150704ccaade8b 100644
GIT binary patch
delta 44
zcmeyx*v7=p{F#^Qh^5Lz_6?H83=9nV8Tq-X`lZFWiFx|Yl}V{Z0f~936OWhy05ISV
As{jB1

delta 32
ocmZo;`o+l3{F#^QUx?8}_6@x13=9nVrNu@1Ir+(n6EBzn0Hx*%h5!Hn

diff --git a/filemanager/models.pyc b/filemanager/models.pyc
index 0f50e16977e1f8dbb637b153088c9061eb7dbdf7..2f5b0f19809b20b8a650f0fd916941c50f5c6452 100644
GIT binary patch
delta 44
zcmey)*v!Pv{F#^Qh^5Lz_BE0w3=9nV8Tq-X`lZFWiFx|Yl}V{Z0f~936AzdJ055wE
Ap8x;=

delta 32
ocmZo>`p(GC{F#^QUx?8}_BFg33=9nVrNu@1Ir+(n6VI3f0Ho~-dH?_b

diff --git a/firewall/__init__.pyc b/firewall/__init__.pyc
index 378e2672ebd27f857b063ac817b4ba96f26f4bc4..b3cebf7032b969c3984b9bd952694fc9df50a4dc 100644
GIT binary patch
delta 44
zcmb>HV&q`{%**w-X<g(*4pT{E1_lQGjQreG{nFyx#5{fH%B0kyfW*AiiC!iEJFpIi

delta 32
ncmeBTtm9z*%**vJ#3*VahbgZ*0|SG8X>pN$PJVLY#4r;8m@o-(

diff --git a/firewall/admin.pyc b/firewall/admin.pyc
index 1f049a0bd8e8cba49fc64469c58ac50e33eec889..4a7e86e1f27232781fae2234e6c1a1e9f52c7325 100644
GIT binary patch
delta 45
zcmdnac$krc`7<xq<EC|y6FCYc4Hy_0^fU5vQ}s)Wa})FQohy@4ivkk!QYW?<0svPW
B4{QJc

delta 33
pcmX@ixSf%M`7<xqzYwFSi5!KzDhvz^`lZE1`Z@W@i4!Lo0syQP3RVCB

diff --git a/firewall/models.pyc b/firewall/models.pyc
index 04ea4b02ea37c36f789d602cd0043b96881fc007..31f9975ea6e299c74a99d9f2a211d12436132035 100644
GIT binary patch
delta 81
zcmaFL@|T5!`7<xqGR0q!8#$ITN*XdSFz9FG=cekH7Uw4B={r{@r4|Jw=A}+HWRjVD
KjnNOU3KIZBsTxNB

delta 57
ycmey%@|1;x`7<xqzYwFSjT}oEc~u!081zevi}Z8ylM^R<GRaJS#OQ}1Y61WTR}mio

diff --git a/ftp/__init__.pyc b/ftp/__init__.pyc
index c809dd32037704bbbcaf28cef54fa9954d20d067..d4609ae24a709c6f1ce286b3a3d68dd41f62a40f 100644
GIT binary patch
delta 44
zcmb<yW#nM~%*$nTsX1~YhpD6<0|SG8Mt*Lpera)TVxGQpWm0NUKw@6%L@#{+CBhBo

delta 32
ncmZo=tmI(+%**vJ#3*VahbgZT0|SG8X>pN$PJVLY#4vpTmZb?@

diff --git a/ftp/admin.pyc b/ftp/admin.pyc
index 6e7d7cc7261e218c59e9429607ee1b5972890cf5..c33a0295de6a5ec06851409e82832a66fe643b82 100644
GIT binary patch
delta 46
zcmX@WbcTt8`7<xqZs(TBi5x#AwHX)~^fU5vQ}s)Wa})FQohy@4ivkk!QYZ5<8UX-g
C0S^8E

delta 34
qcmX@ZbbyJ2`7<xqzYwFSi5x$9<rx?l^h=A2^mFo)6DLbC8UX;oG75PB

diff --git a/ftp/models.pyc b/ftp/models.pyc
index b6810b81d0db520a81164f7e51c6df98089dc8c8..64b88c626ff63b8f35ae264405022cc96517de66 100644
GIT binary patch
delta 116
zcmey$HItiz`7<xq5AT-9jT}bIk~$0w4Eh=QxvBc4#kq-j`p%U}sYL;ad8w1<vPf)>
SXEtQSt7H~lS@FrytWp3?Y$V74

delta 72
zcmbQq{gsP@`7<xqzYwFSjT}bIyb25q4Em+TMfy4U$%&hTnLQa%g(h!hnS~~j!D<Kq
D=<XDI

diff --git a/install/install.py b/install/install.py
index e720d0176..f85aad22e 100644
--- a/install/install.py
+++ b/install/install.py
@@ -1883,6 +1883,34 @@ class preFlightsChecks:
 
         return 1
 
+    def test_Requests(self):
+        try:
+            import requests
+            getVersion = requests.get('https://cyberpanel.net/version.txt')
+            latest = getVersion.json()
+        except BaseException,msg:
+
+            command = "pip uninstall --yes requests"
+            subprocess.call(shlex.split(command))
+
+            command = "pip install requests==2.2.1"
+            res = subprocess.call(shlex.split(command))
+
+            if res == 1:
+                print("###############################################")
+                print("          Requests Test Ran                ")
+                print("###############################################")
+            else:
+                print("###############################################")
+                print("          Request Test Fail                ")
+                print("###############################################")
+
+
+
+            logging.InstallLog.writeToFile(str(msg) + " [test_Requests]")
+            return 0
+
+
 
 
 def main():
@@ -1938,6 +1966,7 @@ def main():
     checks.install_python_requests()
     checks.install_default_keys()
 
+    checks.test_Requests()
     checks.download_install_CyberPanel(installCyberPanel.InstallCyberPanel.mysqlPassword)
     checks.setup_cron()
 
diff --git a/locale/bs/LC_MESSAGES/django.po b/locale/bs/LC_MESSAGES/django.po
index a7b5f21cb..247baf621 100644
--- a/locale/bs/LC_MESSAGES/django.po
+++ b/locale/bs/LC_MESSAGES/django.po
@@ -489,16 +489,16 @@ msgstr "Upotreba"
 #: baseTemplate/templates/baseTemplate/homePage.html:34
 #: baseTemplate/templates/baseTemplate/index.html:221
 msgid "CPU Usage"
-msgstr "CPU"
+msgstr "CPU Upotreba"
 
 #: baseTemplate/templates/baseTemplate/homePage.html:55
 #: baseTemplate/templates/baseTemplate/index.html:232
 msgid "Ram Usage"
-msgstr "RAM"
+msgstr "RAM Upotreba"
 
 #: baseTemplate/templates/baseTemplate/homePage.html:74
 msgid "Disk Usage '/'"
-msgstr "Disk '/'"
+msgstr "Upotreba diska '/'"
 
 #: baseTemplate/templates/baseTemplate/homePage.html:98
 msgid "HTTP Statistics"
@@ -510,7 +510,7 @@ msgstr "Dostupno/Max konekcija"
 
 #: baseTemplate/templates/baseTemplate/homePage.html:118
 msgid "Available/Max SSL Connections"
-msgstr "Dostupno/Max SSL konekcija"
+msgstr "Dostupno/Max ssl konekcija"
 
 #: baseTemplate/templates/baseTemplate/homePage.html:127
 msgid "Requests Processing"
@@ -994,7 +994,7 @@ msgstr "Server"
 
 #: baseTemplate/templates/baseTemplate/index.html:594
 msgid "NEW"
-msgstr "NOVO"
+msgstr "Novi"
 
 #: baseTemplate/templates/baseTemplate/index.html:599
 #: tuning/templates/tuning/index.html:24 tuning/templates/tuning/index.html:26
@@ -1452,7 +1452,7 @@ msgid ""
 "On this page you can add/delete firewall rules. (By default all ports are "
 "blocked, except mentioned below)"
 msgstr ""
-"Na ovoj stranici možete dodati / izbrisati pravila firewalla. (Podrazumijevano "
+"Na ovoj stranici možete dodati / izbrisati pravila firewalla. (Podrazumevano "
 "su svi portovi blokirani, osim što je navedeno ispod)"
 
 #: firewall/templates/firewall/firewall.html:19
@@ -1498,7 +1498,7 @@ msgstr "Bezbijednost - CyberPanel"
 
 #: firewall/templates/firewall/index.html:12
 msgid "Security Functions"
-msgstr "Bezbjednosne funkcije"
+msgstr "Sigurnosne funkcije"
 
 #: firewall/templates/firewall/index.html:13
 msgid "Manage the security of the server on this page."
@@ -2788,7 +2788,7 @@ msgstr "Izmijeni PHP konfiguracije"
 
 #: websiteFunctions/templates/websiteFunctions/website.html:486
 msgid "Edit vHost Main Configurations"
-msgstr "Promjena vHost glavnih podešavanja"
+msgstr ""
 
 #: websiteFunctions/templates/websiteFunctions/website.html:496
 #: websiteFunctions/templates/websiteFunctions/website.html:498
@@ -2811,7 +2811,7 @@ msgstr "SLL spremljen"
 
 #: websiteFunctions/templates/websiteFunctions/website.html:530
 msgid "Could not save SSL. Error message:"
-msgstr "Nisam mogao sačuvati SSL. Poruka o grešci:"
+msgstr ""
 
 #: websiteFunctions/templates/websiteFunctions/website.html:580
 msgid "Current configuration in the file fetched."
@@ -2820,12 +2820,12 @@ msgstr ""
 #: websiteFunctions/templates/websiteFunctions/website.html:585
 #: websiteFunctions/templates/websiteFunctions/website.html:598
 msgid "Could not fetch current configuration. Error message:"
-msgstr "Nisam mogao dohvatiti trenutnu konfiguraciju. Greška poruke:"
+msgstr ""
 
 #: websiteFunctions/templates/websiteFunctions/website.html:594
 #: websiteFunctions/templates/websiteFunctions/website.html:649
 msgid "Configuration saved. Restart LiteSpeed put them in effect."
-msgstr "Postavke su sačuavane. Morate da restartujete LiteSpeed."
+msgstr ""
 
 #: websiteFunctions/templates/websiteFunctions/website.html:635
 msgid "Current rewrite rules in the file fetched."
diff --git a/loginSystem/__init__.pyc b/loginSystem/__init__.pyc
index ab90442a88f80b5904a796d8254080462dbaa494..f65734b5913e78a255201c8c2cf23843a9842169 100644
GIT binary patch
delta 45
zcmZo<>}BL&{>;l2`l>W?B8RD@83O}@enx(7s(xv4ZepIkb7fL$Q9xo|>O?Pd05E6{
AH2?qr

delta 33
ocmeBWY-HqM{>;nuFT^NnB8Mrj76Su=era)$eolUJ;>0j>0Gdk)egFUf

diff --git a/loginSystem/admin.pyc b/loginSystem/admin.pyc
index 638cef3c9f9a262e56bbe6a50e4032f03ac63a8b..f852b0ed2d35a2b71234f7e5c389a029c0f9f527 100644
GIT binary patch
delta 47
zcmcb>bccz9`7<w<pjlPqMh-?sNn-{E2K|iu+*JM2;@reMedo%g)S`gIywu5Jj8*_S
Cwhf*D

delta 35
qcmcb^bb*P3`7<xqzYwFSjU0@Oyy^@L4Em+TMfy4U$%&Jd7_9)iqY2so

diff --git a/loginSystem/models.pyc b/loginSystem/models.pyc
index b99970fb1ea7447f15ab6861cae3e11f05201ce5..a0669655b7bfae4e94a22d7097491d409b681aef 100644
GIT binary patch
delta 81
zcmeytHi4ak`7<w<L(rGVjU1DhBuy9?81yspb5r$8i*pn6^qnh{Qi}o-^HL|<Gs{mt
K#*~9sg(UzPyBXjB

delta 57
ycmbQh{)3H!`7<xqzYwFSjU1Dhcr_Rp81zevi}Z8ylM^S0Gs{oD#FT>}Y6$@I$q@4Z

diff --git a/loginSystem/templates/loginSystem/login.html b/loginSystem/templates/loginSystem/login.html
index 0fcfe9c82..c8dcc8a4b 100755
--- a/loginSystem/templates/loginSystem/login.html
+++ b/loginSystem/templates/loginSystem/login.html
@@ -199,7 +199,7 @@
         <div class="col-md-8 col-lg-6 clearfix center-margin">
             <div class="row">
                 <div class="col-md-5">
-                    <h3 class="text-transform-upr font-size-17">CyberPanel <span class="opacity-80">v 1.5</span></h3>
+                    <h3 class="text-transform-upr font-size-17">CyberPanel <span class="opacity-80">v 1.6</span></h3>
                     <p class="font-gray">Web Hosting Control Panel</p>
                     <div class="divider"></div>
                     <ul class="reset-ul">
diff --git a/mailServer/__init__.pyc b/mailServer/__init__.pyc
index b26d87e1670b538893ec81479f27b8dab3ea54a4..49c4c226aa61f43b8189508eeb5409137b717bfc 100644
GIT binary patch
delta 45
zcmZo*>|x|!{>;nOadcwjL=IC)Qw9bG{fzwFRQ=N8+{8S6=gOqiqJYG_)QMhZ05!-C
ATL1t6

delta 33
ocmeBSY+&SI{>;nuFT^NnB8MrjCIbV5era)$eolUJ;>0jB0Gav;dH?_b

diff --git a/mailServer/admin.pyc b/mailServer/admin.pyc
index 942a2ddaccd2b11b9e0e16d3c11f68dfd67dd645..467828123607ab5b32aa1cb84e038ecc109ab457 100644
GIT binary patch
delta 45
zcmey#*viDg{F#@l<LJc5i5%-CjTjgh^fU5vQ}s)Wa})FQohy@4ivkk!QYRiU1prv}
B5552Z

delta 33
pcmZo=`pL+_{F#^QUx-oEM2_{mY77hv`lZE1`Z@W@i4!lF0syfw3f%wz

diff --git a/mailServer/models.pyc b/mailServer/models.pyc
index 99c6bc6fd3c9c616da51c891289cf667f1af80c2..3d8d40b5d0fda397f3ff00d707022f4c073ecbcd 100644
GIT binary patch
delta 321
zcmZ1`G)b6)`7<xq%-mU#8#%<7B#jvu81yspb5r$8i*pn6^qnh{Qi}o-^HL`_vdK^O
zV(Q1QVlyi<FC%^>lkHe)2&j0*@`->77PbQ1DmFK=i4$_f5%wtD20;AEf#0uklUX>G
E0FBgSUjP6A

delta 212
zcmbOvyiACL`7<xqzYwFSjT~Z3yy^@L4Em+TMfy4U$%&H{*_0<oF?C~z%5Ros=4HeX
wR-T;3Qh^~VKUs|R6NYF%hKT&+7i>Q;M3pDYaD-uq%1>U!foX!=<N{750Cf8~82|tP

diff --git a/managePHP/__init__.pyc b/managePHP/__init__.pyc
index bccbfb96747d5c730f0985a34ace70400b0f351e..6142ce7e26d89cbc6a050dfa7d1bf63fc9c5be1e 100644
GIT binary patch
delta 44
zcmb>LX5?W0%*&<y^I+se4pT`J1_lQGjQreG{nFyx#5{fH%B0kyfW*AiiC(4vH4hG5

delta 32
ncmeBXtmk0<%**vJ#3*VahbgZH0|SG8X>pN$PJVLY#4u9;n12a%

diff --git a/managePHP/admin.pyc b/managePHP/admin.pyc
index 9c8d4a1abad7e1b0f223f9a919db93bf36582901..272a18a6d5f403bc2479a17cdeb1cad2663676e1 100644
GIT binary patch
delta 47
zcmaFQ^qYx;`7<xqHTgr48#xphB@G!E81yspb5r$8i*pn6^qnh{Qi}o-^HL|9GFkxu
DZ0HXT

delta 35
qcmey(^qz@>`7<xqzYwFSjT{P$ys8Wg4Em+TMfy4U$%&I48La@uh6+>w

diff --git a/managePHP/models.pyc b/managePHP/models.pyc
index 530faf72a82833475332962598f46a80d2cbc9ee..ea173e7115e537c225147471c014507e3005c1d8 100644
GIT binary patch
delta 116
zcmbQoeu$le`7<xq29-mR8#$sGC5;#u81yspb5r$8i*pn6^qnh{Qi}o-^HMh#Foxri
Xo?O5vH~AA&8g2uCDr6@&G0Ok|J*p(a

delta 76
zcmX@aK98M)`7<xqzYwFSjU3U8ylM;#4Em+TMfy4U$%&h57{k$oCcj~7K~*%lhEaC%
HGG-Y7NT3!c

diff --git a/manageSSL/__init__.pyc b/manageSSL/__init__.pyc
index 21eaca29f701dc090dd5107f6dbf6e087c7b822b..9919c9f70652e72e74e3d921c8221ca00c56cb7a 100644
GIT binary patch
delta 44
zcmb>LX5?W0%**vc?^NVO4pT`J1_lQGjQreG{nFyx#5{fH%B0kyfW*AiiC(4vH53k5

delta 32
ncmeBXtmk0<%**vJ#3*VahbgZH0|SG8X>pN$PJVLY#4u9;n12a%

diff --git a/manageSSL/admin.pyc b/manageSSL/admin.pyc
index 202b3fc1c3804636a4de9fd6c118abaf4595bc1c..3fe69d414f44aacbe964793d8a9f73aed950c890 100644
GIT binary patch
delta 45
zcmeyt*uuoY{F#^Qh2E*ii5%-C4H+01^fU5vQ}s)Wa})FQohy@4ivkk!QYRiU0RUL-
B54->X

delta 33
pcmZo+`oYM-{F#^QUx-oEM2_{mstgPa`lZE1`Z@W@i4!lF006My3fTYv

diff --git a/manageSSL/models.pyc b/manageSSL/models.pyc
index d208484febfb1a575995d29fc8ef03ac43c87bb4..771436811dafe149c18d5df6f76d24a4705e448f 100644
GIT binary patch
delta 45
zcmey$*vQ1e{F#^Qh2E*ii5#mXjTjgh^fU5vQ}s)Wa})FQohy@4ivkk!QYRiT1prrq
B53m3L

delta 33
pcmZo<`pU?`{F#^QUx-oEM2^+GY77hv`lZE1`Z@W@i4)J50syb!3e5lj

diff --git a/packages/__init__.pyc b/packages/__init__.pyc
index 1eb701180e800af4e5f1d12c7cd0efbd63cbdf16..608d3b0df5089363f47a530fe13c93df8b856465 100644
GIT binary patch
delta 44
zcmb>HV&q`{%**xNzbtYhhpD770|SG8Mt*Lpera)TVxGQpWm0NUKw@6%L@yHnFc%Im

delta 32
ncmeBTtm9z*%**vJ#3*VahbgZ*0|SG8X>pN$PJVLY#4r;8m@o-(

diff --git a/packages/admin.pyc b/packages/admin.pyc
index 1f940dc711e5fbe112903be9e50cfe2237d78f0c..5cc47c1e5fa66b99aeb393715c388870a467fcbb 100644
GIT binary patch
delta 47
zcmcb~^puH%`7<w9CRbDBMh<R9NdpE32K|iu+*JM2;@reMedo%g)S`gIywu4GjFtdJ
C%nkGa

delta 35
qcmaFLbd!mL`7<xqzYwFSjU3#JyebR~4Em+TMfy4U$%&J77%c(5xe5FL

diff --git a/packages/models.pyc b/packages/models.pyc
index b0a5b0e4601eef66ec63185cccaa3590327d0101..1bf311c4e060f172350350f248c9cbc7aef450a2 100644
GIT binary patch
delta 81
zcmZ3^zMq|g`7<xqVUI778#z`pNg6URFz9FG=cekH7Uw4B={r{@r4|Jw=A}+Pz_bXj
Ktjy$YW*GoX5E~}|

delta 57
ycmdnbzMP$d`7<xqzYwFSjU20)cvTq~81zevi}Z8ylM^SOVOoSCA~Sh0vkU<HLJ_q9

diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py
index b5cdc1796..e5df76684 100644
--- a/plogical/sslUtilities.py
+++ b/plogical/sslUtilities.py
@@ -158,6 +158,8 @@ class sslUtilities:
             expectation.append("that you are serving files from the webroot path") #4
             expectation.append("Enter email address") #5
             expectation.append("There were too many requests") # 6
+            expectation.append("--expand flag") #7
+
 
             try:
 
@@ -248,6 +250,11 @@ class sslUtilities:
 
                 elif index==6:
                     return "Too many SSL requests for this domain, please try to get SSL at later time."
+                elif index==7:
+                    command = "certbot certonly -n --agree-tos --email " + adminEmail + " --expand --webroot -w " + sslpath + " -d " + virtualHostName + " -d www." + virtualHostName
+                    subprocess.call(shlex.split(command))
+                    logging.CyberCPLogFileWriter.writeToFile(virtualHostName + " SSL OK by expanding!")
+
 
 
             except pexpect.EOF,msg:
diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py
index f3430ad13..a6350de21 100644
--- a/plogical/virtualHostUtilities.py
+++ b/plogical/virtualHostUtilities.py
@@ -1393,6 +1393,9 @@ RewriteRule .* - [E=cache-control:max-age=120]
 
         installUtilities.installUtilities.reStartLiteSpeed()
 
+        print "1,None"
+        return
+
     except BaseException, msg:
         # remove the downloaded files
         try:
diff --git a/serverLogs/__init__.pyc b/serverLogs/__init__.pyc
index 72b63b0ae695778a7e7df18498b738fa33f4fea9..7010da2d8f11551a48e275a7a50c0313d19fd1e2 100644
GIT binary patch
delta 45
zcmZo*>|x|!{>;m@t94%FL=IC)Qw9bG{fzwFRQ=N8+{8S6=gOqiqJYG_)QMhZ05!@E
AS^xk5

delta 33
ocmeBSY+&SI{>;nuFT^NnB8MrjCIbV5era)$eolUJ;>0jB0Gav;dH?_b

diff --git a/serverLogs/admin.pyc b/serverLogs/admin.pyc
index e769b61e136833f109110dc8d89ed844f47dd8de..fb494858dd54cbc5661f9615b474b1e0446241df 100644
GIT binary patch
delta 45
zcmey#*viDg{F#?)SL?jUi5%-CjTjgh^fU5vQ}s)Wa})FQohy@4ivkk!QYRiU1prw0
B54`{Y

delta 33
pcmZo=`pL+_{F#^QUx-oEM2_{mY77hv`lZE1`Z@W@i4!lF0syfw3f%wz

diff --git a/serverLogs/models.pyc b/serverLogs/models.pyc
index bc8257b6c8b883ed2c3167a5bcbdca5db55339e5..8905b554ef09b11b635216a44c27e8ac63b5fe42 100644
GIT binary patch
delta 45
zcmeyy*u=!a{F#?)SL?jUi5#mXjTsmi^fU5vQ}s)Wa})FQohy@4ivkk!QYRiT0{~Zy
B53v9M

delta 33
pcmZo-`o_q?{F#^QUx-oEM2^+G>I@7F`lZE1`Z@W@i4)J50RXTv3ef-n

diff --git a/serverLogs/views.py b/serverLogs/views.py
index 2e270066c..941a1a722 100644
--- a/serverLogs/views.py
+++ b/serverLogs/views.py
@@ -8,6 +8,8 @@ import json
 import plogical.CyberCPLogFileWriter as logging
 from plogical.installUtilities import installUtilities
 from loginSystem.models import Administrator
+import subprocess
+import shlex
 # Create your views here.
 
 
@@ -104,10 +106,9 @@ def getLogsFromFile(request):
         elif type=="ftp":
             fileName="/var/log/messages"
 
-        fewLinesOfLogFile = logging.CyberCPLogFileWriter.readLastNFiles(50,fileName)
-
-        fewLinesOfLogFile = str(fewLinesOfLogFile)
+        command = "sudo tail -50 " + fileName
 
+        fewLinesOfLogFile = subprocess.check_output(shlex.split(command))
 
         status = {"logstatus":1,"logsdata":fewLinesOfLogFile}
 
diff --git a/serverStatus/__init__.pyc b/serverStatus/__init__.pyc
index 384f2927ae73b74df311303ffa13f04aaa1edef5..ab306a8b6008b078a612acd5c53560957c5460ae 100644
GIT binary patch
delta 45
zcmZo->|^9${>;mz{kbl3B8RD@IRgWOenx(7s(xv4ZepIkb7fL$Q9xo|>O?OK04-t;
AApigX

delta 33
ocmeBUY+~eK{>;nuFT^NnB8MrjHUk5Lera)$eolUJ;>0iu0GgZ$f&c&j

diff --git a/serverStatus/admin.pyc b/serverStatus/admin.pyc
index f001a5096e591cc93879984655f65bcf6bec03c0..d3b09cb22f368d087452c8e10ad36b136a953b65 100644
GIT binary patch
delta 45
zcmey(*v`bk{F#?a`*U67M2_{6CJYP=`WgATsrseGxrurD&Xq~2MFEL<sS}Tw0{~Eu
B4}<^!

delta 33
pcmZo?`pw9}{F#^QUx-oEM2_{m8Vn2!`lZE1`Z@W@i4!lF0|2qp3grL*

diff --git a/serverStatus/models.pyc b/serverStatus/models.pyc
index abd92c7533f4c60a81b23684660968cf4c1beef9..3e99fa5f0ac627867a1ed580b14fddebccd8a810 100644
GIT binary patch
delta 45
zcmeyt*uuoY{F#?a`*U67M2^*xrVI=W`WgATsrseGxrurD&Xq~2MFEL<sS^)a002)U
B4|o6o

delta 33
pcmZo+`oYM-{F#^QUx-oEM2^+GnhXpK`lZE1`Z@W@i4)IQ006Mm3fTYv

diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js
index e2c8474a7..1446b50c5 100644
--- a/static/websiteFunctions/websiteFunctions.js
+++ b/static/websiteFunctions/websiteFunctions.js
@@ -1129,6 +1129,7 @@ app.controller('websitePages', function($scope,$http) {
     //////// Application Installation part
 
     $scope.installationDetailsForm = true;
+    $scope.installationDetailsFormJoomla = true;
     $scope.applicationInstallerLoading = true;
     $scope.installationFailed = true;
     $scope.installationSuccessfull = true;
@@ -1138,8 +1139,15 @@ app.controller('websitePages', function($scope,$http) {
 
     $scope.installationDetails = function(){
 
-        $scope.installationDetailsForm = false;
+        $scope.installationDetailsForm = !$scope.installationDetailsForm;
+        $scope.installationDetailsFormJoomla = true;
 
+    }
+
+    $scope.installationDetailsJoomla = function(){
+
+        $scope.installationDetailsFormJoomla = !$scope.installationDetailsFormJoomla;
+        $scope.installationDetailsForm = true;
 
     }
 
@@ -1224,6 +1232,95 @@ app.controller('websitePages', function($scope,$http) {
 
     };
 
+    $scope.installJoomla = function(){
+
+
+                $scope.installationDetailsFormJoomla = false;
+                $scope.applicationInstallerLoading = false;
+                $scope.installationFailed = true;
+                $scope.installationSuccessfull = true;
+                $scope.couldNotConnect = true;
+
+                var domain = $("#domainNamePage").text();
+                var path = $scope.installPath;
+                var sitename = $scope.sitename
+                var username = $scope.username
+                var password = $scope.password
+                var prefix = $scope.prefix
+
+
+                url = "/websites/installJoomla";
+
+                var home = "1";
+
+                if (typeof path != 'undefined'){
+                    home = "0";
+                }
+
+
+                var data = {
+                    domain: domain,
+                    home:home,
+                    path:path,
+                    sitename:sitename,
+                    username:username,
+                    password:password,
+                    prefix:prefix,
+                };
+
+                var config = {
+                    headers : {
+                        'X-CSRFToken': getCookie('csrftoken')
+                    }
+                };
+
+                $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+                function ListInitialDatas(response) {
+
+                    if (response.data.installStatus == 1)
+                    {
+                        if (typeof path != 'undefined'){
+                            $scope.installationURL = "http://"+domain+"/"+path;
+                        }
+                        else{
+                            $scope.installationURL = domain;
+                        }
+
+                        $scope.installationDetailsFormJoomla = false;
+                        $scope.applicationInstallerLoading = true;
+                        $scope.installationFailed = true;
+                        $scope.installationSuccessfull = false;
+                        $scope.couldNotConnect = true;
+
+                    }
+                    else{
+
+                        $scope.installationDetailsFormJoomla = false;
+                        $scope.applicationInstallerLoading = true;
+                        $scope.installationFailed = false;
+                        $scope.installationSuccessfull = true;
+                        $scope.couldNotConnect = true;
+
+                        $scope.errorMessage = response.data.error_message;
+
+                    }
+
+
+                }
+                function cantLoadInitialDatas(response) {
+
+                    $scope.installationDetailsFormJoomla = false;
+                    $scope.applicationInstallerLoading = true;
+                    $scope.installationFailed = true;
+                    $scope.installationSuccessfull = true;
+                    $scope.couldNotConnect = false;
+
+                }
+
+    };
+
 
 
 
diff --git a/tuning/__init__.pyc b/tuning/__init__.pyc
index 9b0897c06ba415e9a4b0cf77f43c765e17c825ef..4d8b43840146df738d0e0304b3901807e8fdc278 100644
GIT binary patch
delta 44
zcmb>FVB}!_%*&OYQ4=|l!&K6cfq_9kBR@A)zqB|vF;CyQGAXqvATcj>qL&c>A0`dA

delta 32
ncmeBRtl?n(%**vZ#3*VahbgZr0|SG8X>pN$PJVLY#4sZOm#PVB

diff --git a/tuning/admin.pyc b/tuning/admin.pyc
index 3b7c90a12a3f2691a0fac5b7d732a5cfeea2b0e4..6f8b7d940dad90d9e6c0b0faf77d9d675fae910b 100644
GIT binary patch
delta 45
zcmey$*vQ1e{F#?4J)<UaBFB13Jq88_{fzwFRQ=N8+{8S6=gOqiqJYG_)QLw70Ydx_
A8vp<R

delta 33
pcmZo<`pU?`{F#^Qe~3}kM2_{mN(>AP`lZE1`Z@W@i4!jv0sycD3eErk

diff --git a/tuning/models.pyc b/tuning/models.pyc
index 2cc2267027a50729b71857be856bb3132058afec..ac677029400cd0c37ee68872bf89af46b86f5025 100644
GIT binary patch
delta 45
zcmeyw_>Yl;`7<w9dPYs;M2^*x`V0&V`WgATsrseGxrurD&Xq~2MFEL<sS^(v0RUF#
B4~_r;

delta 33
pcmeyz_=%B&`7<xq{}7|7i5#nWl^GZq^h=A2^mFo)6DOWA0sy~e3qb$?

diff --git a/userManagment/__init__.pyc b/userManagment/__init__.pyc
index 44fb1ac61745f63a36e8c04d50ab323479b71774..932555a1f4694124307a1c37a2c9e2b35e5e311d 100644
GIT binary patch
delta 45
zcmZo>>}TX){>;mDbW2O*L=IC)3kC)T{fzwFRQ=N8+{8S6=gOqiqJYG_)QMh}06VS@
Ah5!Hn

delta 33
ocmeBYY-Z$O{>;nuKg1|%B8Mrj4g&*&era)$eolUJ;>0jZ0GkB~hX4Qo

diff --git a/userManagment/admin.pyc b/userManagment/admin.pyc
index 26155ab20f31fa4ba72a7bdf40a943d8c642b535..0f08cf20cde77126424fc01e968060038cb648d4 100644
GIT binary patch
delta 45
zcmeyv*uliX{F#^Q=$4kqi5%-CO&J&%^fU5vQ}s)Wa})FQohy@4ivkk!QYRj<003Uw
B59t5^

delta 33
pcmeBR`oqY<{F#^Qe~3}kM2_{mnhXpK`lZE1`Z@W@i4!ka006Q)3hDp=

diff --git a/userManagment/models.pyc b/userManagment/models.pyc
index a097fe4d543529706142cd56389bfff23de4f120..b8e02570959e852af66b50547f96068e60e081b9 100644
GIT binary patch
delta 45
zcmey#*viDg{F#^Q=$4kqi5#mX%@`OM^fU5vQ}s)Wa})FQohy@4ivkk!QYRj;1OQ!d
B58VI&

delta 33
pcmZo=`pL+_{F#^Qe~3}kM2^+GS_}*f`lZE1`Z@W@i4)IQ0syf+3f=$!

diff --git a/websiteFunctions/__init__.pyc b/websiteFunctions/__init__.pyc
index 10023f6af75df37c846209d66ba17de549be170b..6cdcdddf3da17eba9bae42e2aa55b479ef1bd0dc 100644
GIT binary patch
delta 45
zcmZo;oW#h%{F#@lx3@fUB8RD@H3I{Kenx(7s(xv4ZepIkb7fL$Q9xo|>O?Oa04^R5
ACIA2c

delta 33
ocmbQl*v81g{F#^Qe~3}kL=ID4eFg>w{nFwh{ha*d#ED@x0Gs#;lK=n!

diff --git a/websiteFunctions/admin.pyc b/websiteFunctions/admin.pyc
index 842c0f3785f5206238afaf59d8cd268be4ac77c5..a7f1d7fa013b324cbd6e389d12497fbc6d4120c9 100644
GIT binary patch
delta 46
zcmcb>bccz9`7<xq<&=uZi5!0<Ef^RW^fU5vQ}s)Wa})FQohy@4ivkk!QYQ;C+5-S`
C1rKWg

delta 34
qcmcb^bb*P3`7<xq{}7|7i5!1;br={J^h=A2^mFo)6DP|u+5-T_mkPQ7

diff --git a/websiteFunctions/models.pyc b/websiteFunctions/models.pyc
index ab96a5e0ab32e1135ea97391508afeab4aa65cc5..adb24a2bb8957724542e5440b914aa6232253c63 100644
GIT binary patch
delta 218
zcmaDSxJ`(i`7<xq#fMxQ*?E~IEg2XX^fU5vQ}s)Wa})FQohy@4ivkk!Qa39yH!$Ls
no~+2My7@AT5dkHW&DoaVH)Jv|`z8V^KC&;vt3qY+2@W*?#WqAG

delta 146
zcmdlc^iGhS`7<xq{}7{%?7Ympx(o~q`lZE1`Z@W@iJNtq8yHcAChIb*Zhp;TghhCA
aG}{tP#glE>H(?Rg<yeLxsxn!CQw;!-4=1ny