From 6cb6dabc23f0114f577ecb0f143f3f0af180c070 Mon Sep 17 00:00:00 2001
From: root <root@raspberrypi.(none)>
Date: Tue, 7 Jul 2015 07:57:37 +0200
Subject: [PATCH] fiex

---
 {modules => html}/info/80x15.png         | Bin
 {modules => html}/info/btn_donate_SM.gif | Bin
 {modules => html}/info/info.php          |   0
 {modules => html}/info/paypal.php        |   4 ++--
 {modules => html}/info/pixel.gif         | Bin
 index.php                                |  10 ++--------
 install/lighttpd_ssl_on                  |   2 +-
 modules/status/html/status.php           |   4 ++--
 8 files changed, 7 insertions(+), 13 deletions(-)
 rename {modules => html}/info/80x15.png (100%)
 rename {modules => html}/info/btn_donate_SM.gif (100%)
 rename {modules => html}/info/info.php (100%)
 rename {modules => html}/info/paypal.php (92%)
 rename {modules => html}/info/pixel.gif (100%)

diff --git a/modules/info/80x15.png b/html/info/80x15.png
similarity index 100%
rename from modules/info/80x15.png
rename to html/info/80x15.png
diff --git a/modules/info/btn_donate_SM.gif b/html/info/btn_donate_SM.gif
similarity index 100%
rename from modules/info/btn_donate_SM.gif
rename to html/info/btn_donate_SM.gif
diff --git a/modules/info/info.php b/html/info/info.php
similarity index 100%
rename from modules/info/info.php
rename to html/info/info.php
diff --git a/modules/info/paypal.php b/html/info/paypal.php
similarity index 92%
rename from modules/info/paypal.php
rename to html/info/paypal.php
index 27f2b9320..5702436fb 100755
--- a/modules/info/paypal.php
+++ b/html/info/paypal.php
@@ -1,6 +1,6 @@
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----">
-<input type="image" src="/modules/info/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0" src="pixel.gif" width="1" height="1">
+<input type="image" src="html/info/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<img alt="" border="0" src="html/info/pixel.gif" width="1" height="1">
 </form>
diff --git a/modules/info/pixel.gif b/html/info/pixel.gif
similarity index 100%
rename from modules/info/pixel.gif
rename to html/info/pixel.gif
diff --git a/index.php b/index.php
index 0657378f0..3d7c73498 100755
--- a/index.php
+++ b/index.php
@@ -37,12 +37,6 @@
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
-    
-
- 
-
-
-
  </head>
 <body>
 
@@ -122,7 +116,7 @@
 case 'security': include('modules/security/html/security.php'); break;
 case 'settings': include('modules/settings/settings.php'); break;
 case 'tools': include('modules/tools/html/tools.php'); break;
-case 'info': include('modules/info/info.php'); break;
+case 'info': include('html/info/info.php'); break;
 case 'denied': include('modules/login/denied.php'); break;
 case 'logout': include('modules/login/logout.php'); break;
 case 'upload': include('modules/tools/backup/html/upload.php'); break;
@@ -136,7 +130,7 @@
 
 <footer class="footer">
       <div class="container text-center">
-        <p class="text-muted"><?php include('modules/info/paypal.php');?><?php passthru("/usr/bin/git branch |grep [*]|awk '{print $2}' && awk '/Changelog/{y=1;next}y' readme.md |head -2 |grep -v '^$'"); ?>| System time <?php passthru("date +%H:%M:%S");?></p>
+        <p class="text-muted"><?php include('html/info/paypal.php');?><?php passthru("/usr/bin/git branch |grep [*]|awk '{print $2}' && awk '/Changelog/{y=1;next}y' readme.md |head -2 |grep -v '^$'"); ?>| System time <?php passthru("date +%H:%M:%S");?></p>
       </div>
 </footer>
 
diff --git a/install/lighttpd_ssl_on b/install/lighttpd_ssl_on
index 4af553a81..ba9f146bf 100755
--- a/install/lighttpd_ssl_on
+++ b/install/lighttpd_ssl_on
@@ -2,7 +2,7 @@
 
 mkdir /etc/lighttpd/certs
 cd /etc/lighttpd/certs
-openssl req -new -x509 -keyout lighttpd.pem -out lighttpd.pem -days 365 -nodes -subj "/C=PL/ST=Pomorskie/L=PL/O=techfreak.pl/CN=nettemp.local" 
+openssl req -new -x509 -sha256 -keyout lighttpd.pem -out lighttpd.pem -days 365 -nodes -subj "/C=PL/ST=Pomorskie/L=PL/O=techfreak.pl/CN=nettemp.local" 
 chmod 400 lighttpd.pem
 
 if cat /etc/lighttpd/lighttpd.conf |grep -q 'ssl.engine' ; then
diff --git a/modules/status/html/status.php b/modules/status/html/status.php
index e1c0cf330..7a4919aac 100755
--- a/modules/status/html/status.php
+++ b/modules/status/html/status.php
@@ -1,4 +1,4 @@
-<script src="html/mansonry/masonry.pkgd.min.js"></script>
+<script src="html/masonry/masonry.pkgd.min.js"></script>
 <script type="text/JavaScript">
 var container = document.querySelector('#container');
 var msnry = new Masonry( container, {
@@ -38,7 +38,7 @@
   <div class="item"><?php include('modules/tools/html/tools_file_check.php'); ?></div>
 </div>
 
-<script src="media/jquery.js"></script>
+<script src="html/jquery/jquery.js"></script>
 <script>
 var auto_refresh = setInterval(
 (function () {