General Fixes

Jason2605 · Sep 3, 2016 · bd4ac62 · bd4ac62
1 parent 70e0fee
commit bd4ac62
Show file tree

Hide file tree

Showing 116 changed files with 75 additions and 34 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ArmaRConClass/rcon.php b/ArmaRConClass/rcon.php
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/Steam/steam.php b/Steam/steam.php
diff --git a/addStaff.php b/addStaff.php
diff --git a/changeLicense.php b/changeLicense.php
diff --git a/chatRoom/assets/css/styles.css b/chatRoom/assets/css/styles.css
diff --git a/chatRoom/assets/img/refresh.png b/chatRoom/assets/img/refresh.png
diff --git a/chatRoom/assets/js/script.js b/chatRoom/assets/js/script.js
diff --git a/chatRoom/chatRoom.php b/chatRoom/chatRoom.php
diff --git a/chatRoom/composer.json b/chatRoom/composer.json
diff --git a/chatRoom/composer.lock b/chatRoom/composer.lock
diff --git a/chatRoom/data/shouts/tag7Nw7Vw_0e29e82001efe99c45433d853600787cfac5f355.json b/chatRoom/data/shouts/tag7Nw7Vw_0e29e82001efe99c45433d853600787cfac5f355.json
diff --git a/chatRoom/data/shouts/zjSrRlhVN_d6b00a083f066963dbb80279c989fd5ae261e180.json b/chatRoom/data/shouts/zjSrRlhVN_d6b00a083f066963dbb80279c989fd5ae261e180.json
diff --git a/chatRoom/error_log b/chatRoom/error_log
diff --git a/chatRoom/load.php b/chatRoom/load.php
diff --git a/chatRoom/publish.php b/chatRoom/publish.php
diff --git a/chatRoom/vendor/autoload.php b/chatRoom/vendor/autoload.php
diff --git a/chatRoom/vendor/composer/ClassLoader.php b/chatRoom/vendor/composer/ClassLoader.php
diff --git a/chatRoom/vendor/composer/autoload_classmap.php b/chatRoom/vendor/composer/autoload_classmap.php
diff --git a/chatRoom/vendor/composer/autoload_namespaces.php b/chatRoom/vendor/composer/autoload_namespaces.php
diff --git a/chatRoom/vendor/composer/autoload_psr4.php b/chatRoom/vendor/composer/autoload_psr4.php
diff --git a/chatRoom/vendor/composer/autoload_real.php b/chatRoom/vendor/composer/autoload_real.php
diff --git a/chatRoom/vendor/composer/installed.json b/chatRoom/vendor/composer/installed.json
diff --git a/chatRoom/vendor/jamesmoss/flywheel/LICENSE b/chatRoom/vendor/jamesmoss/flywheel/LICENSE
diff --git a/chatRoom/vendor/jamesmoss/flywheel/composer.json b/chatRoom/vendor/jamesmoss/flywheel/composer.json
diff --git a/chatRoom/vendor/jamesmoss/flywheel/composer.lock b/chatRoom/vendor/jamesmoss/flywheel/composer.lock
diff --git a/chatRoom/vendor/jamesmoss/flywheel/phpunit.xml b/chatRoom/vendor/jamesmoss/flywheel/phpunit.xml
diff --git a/chatRoom/vendor/jamesmoss/flywheel/readme.md b/chatRoom/vendor/jamesmoss/flywheel/readme.md
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/CachedQuery.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/CachedQuery.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Config.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Config.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Document.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Document.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/Format.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/Format.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/JSON.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/JSON.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/Markdown.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/Markdown.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/YAML.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/YAML.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/error_log b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Formatter/error_log
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Query.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Query.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Repository.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Repository.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Result.php b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/Result.php
diff --git a/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/error_log b/chatRoom/vendor/jamesmoss/flywheel/src/JamesMoss/Flywheel/error_log
diff --git a/chatRoom/vendor/mpratt/relativetime/LICENSE b/chatRoom/vendor/mpratt/relativetime/LICENSE
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Adapters/Language.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Adapters/Language.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Autoload.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Autoload.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/English.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/English.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/German.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/German.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/Spanish.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/Spanish.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/error_log b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Languages/error_log
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/RelativeTime.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/RelativeTime.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Translation.php b/chatRoom/vendor/mpratt/relativetime/Lib/RelativeTime/Translation.php
diff --git a/chatRoom/vendor/mpratt/relativetime/README.md b/chatRoom/vendor/mpratt/relativetime/README.md
diff --git a/chatRoom/vendor/mpratt/relativetime/Tests/Autoload.php b/chatRoom/vendor/mpratt/relativetime/Tests/Autoload.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Tests/TestLanguageAdapter.php b/chatRoom/vendor/mpratt/relativetime/Tests/TestLanguageAdapter.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Tests/TestRelativeTime.php b/chatRoom/vendor/mpratt/relativetime/Tests/TestRelativeTime.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Tests/TestTranslation.php b/chatRoom/vendor/mpratt/relativetime/Tests/TestTranslation.php
diff --git a/chatRoom/vendor/mpratt/relativetime/Tests/error_log b/chatRoom/vendor/mpratt/relativetime/Tests/error_log
diff --git a/chatRoom/vendor/mpratt/relativetime/composer.json b/chatRoom/vendor/mpratt/relativetime/composer.json
diff --git a/chatRoom/vendor/mpratt/relativetime/phpunit.xml b/chatRoom/vendor/mpratt/relativetime/phpunit.xml
diff --git a/create.php b/create.php
diff --git a/delete.php b/delete.php
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/css/bootstrap.min.css.map b/dist/css/bootstrap.min.css.map
diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
diff --git a/editPlayer.php b/editPlayer.php
diff --git a/error_log b/error_log
@@ -0,0 +1,3 @@
+[03-Sep-2016 13:04:24 UTC] PHP Warning:  mysqli_connect(): (28000/1045): Access denied for user 'jason_000'@'ns343442.ip-94-23-251.eu' (using password: YES) in /home/adminpa1/testPanel.adminpanel.vilayer.me/verifyCheck.php on line 119
+[03-Sep-2016 13:04:45 UTC] PHP Warning:  mysqli_connect(): (28000/1045): Access denied for user 'jason_000'@'ns343442.ip-94-23-251.eu' (using password: YES) in /home/adminpa1/testPanel.adminpanel.vilayer.me/verifyPanel.php on line 12
+[03-Sep-2016 13:04:54 UTC] PHP Warning:  mysqli_connect(): (28000/1045): Access denied for user 'jason_000'@'ns343442.ip-94-23-251.eu' (using password: YES) in /home/adminpa1/testPanel.adminpanel.vilayer.me/verifyPanel.php on line 12
diff --git a/gangs.php b/gangs.php
diff --git a/header/header.php b/header/header.php
diff --git a/help.php b/help.php
diff --git a/home.php b/home.php
@@ -103,7 +103,7 @@
 $money = "$".number_format($money, 2);
 
     echo	"<div id='rcorners3'>";
-    echo		"<div class='box-top'><center><h1>Total money</h1></div>";
+    echo		"<div class='box-top'><center><h1>Total Money</h1></div>";
     echo		"<div class='box-panel'><p></p>";
     echo		"<p><br><center>There is a total of ".$money." on the server.</p>";
     echo		"</div>";

diff --git a/houses.php b/houses.php
diff --git a/images/img1.jpg b/images/img1.jpg
diff --git a/images/img10.jpg b/images/img10.jpg
diff --git a/images/img2.jpg b/images/img2.jpg
diff --git a/images/img3.jpg b/images/img3.jpg
diff --git a/images/img4.jpg b/images/img4.jpg
diff --git a/images/img5.jpg b/images/img5.jpg
diff --git a/images/img6.jpg b/images/img6.jpg
diff --git a/images/img7.jpg b/images/img7.jpg
diff --git a/images/img8.jpg b/images/img8.jpg
diff --git a/images/img9.jpg b/images/img9.jpg
diff --git a/images/man.png b/images/man.png
diff --git a/index.php b/index.php
diff --git a/login.php b/login.php
diff --git a/logout.php b/logout.php
diff --git a/logs.php b/logs.php
diff --git a/lvlError.php b/lvlError.php
diff --git a/notes.php b/notes.php
diff --git a/players.php b/players.php
diff --git a/profile.php b/profile.php
diff --git a/rCon/Kmenu.php b/rCon/Kmenu.php
diff --git a/rCon/Kplayer.php b/rCon/Kplayer.php
diff --git a/rCon/SKPlayerv1.php b/rCon/SKPlayerv1.php
diff --git a/rCon/error_log b/rCon/error_log
diff --git a/rCon/player.php b/rCon/player.php
diff --git a/rCon/rcon-Skick.php b/rCon/rcon-Skick.php
diff --git a/rCon/rcon-ban.php b/rCon/rcon-ban.php
diff --git a/rCon/rcon-check.php b/rCon/rcon-check.php
diff --git a/rCon/rcon-kick.php b/rCon/rcon-kick.php
diff --git a/rCon/rcon-mess.php b/rCon/rcon-mess.php
diff --git a/rCon/rcon-restart.php b/rCon/rcon-restart.php
diff --git a/rCon/rcon-stop.php b/rCon/rcon-stop.php
diff --git a/rCon/rcon-unBan.php b/rCon/rcon-unBan.php
diff --git a/rCon/unBan.php b/rCon/unBan.php
diff --git a/reimbursement.php b/reimbursement.php
diff --git a/scripts/jquery-1.12.3.min.js b/scripts/jquery-1.12.3.min.js
diff --git a/scripts/jquery.backstretch.js b/scripts/jquery.backstretch.js
diff --git a/settings.php b/settings.php
diff --git a/staff.php b/staff.php
@@ -72,35 +72,35 @@
 			</FORM>
 		  </div>
 		  <div class="btn-group" role="group" aria-label="...">
-			<FORM METHOD="LINK" ACTION="delete.php">
-			<INPUT class='btn btn-primary btn-outline' TYPE="submit" name=delete VALUE="Reset entire panel">
-			</FORM>
+			<INPUT class='btn btn-primary btn-outline'data-toggle="modal" data-target="#myModal" id="deletePan" name=delete VALUE="Reset Entire Panel">
+
 		  </div>
+
+<!-- Modal -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <h4 class="modal-title" id="myModalLabel">Reset Entire Panel</h4>
+      </div>
+      <div class="modal-body">
+        Are you sure you want to reset the entire panel?
+      </div>
+      <div class="modal-footer">
+        <FORM METHOD="LINK" ACTION="delete.php">
+        <button type="submit" class="btn btn-danger">Reset</button>
+
+        <button type="button" class="btn btn-primary btn-outline" data-dismiss="modal">Close</button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div> 
+
 			<br><br>
-<!--
-          <div class="row placeholders">
-            <div class="col-xs-6 col-sm-3 placeholder">
-              <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-responsive" alt="Generic placeholder thumbnail">
-              <h4>Label</h4>
-              <span class="text-muted">Something else</span>
-            </div>
-            <div class="col-xs-6 col-sm-3 placeholder">
-              <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-responsive" alt="Generic placeholder thumbnail">
-              <h4>Label</h4>
-              <span class="text-muted">Something else</span>
-            </div>
-            <div class="col-xs-6 col-sm-3 placeholder">
-              <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-responsive" alt="Generic placeholder thumbnail">
-              <h4>Label</h4>
-              <span class="text-muted">Something else</span>
-            </div>
-            <div class="col-xs-6 col-sm-3 placeholder">
-              <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-responsive" alt="Generic placeholder thumbnail">
-              <h4>Label</h4>
-              <span class="text-muted">Something else</span>
-            </div>
-          </div>
--->
 <?php
 if ($adminLev != 8) {
   echo "<script src='scripts/na.js'></script>";
@@ -182,4 +182,4 @@
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
-</html>
+</html>
diff --git a/styles/dashboard.css b/styles/dashboard.css
@@ -466,7 +466,6 @@ color: white;
 .btn-primary.btn-outline {
 	color: #428bca;
 }
-
 /*
  * Placeholder dashboard ideas
  */
@@ -497,4 +496,4 @@ color: white;
 	margin-top: 10px;
 	margin-left: calc(100% - 350px);
 }
-}
+}
diff --git a/styles/global.css b/styles/global.css
diff --git a/updateSettings.php b/updateSettings.php
diff --git a/vehicles.php b/vehicles.php
diff --git a/verifyCheck.php b/verifyCheck.php
@@ -200,7 +200,7 @@ function Rconconnect(){
 
 $sqldatadel = mysqli_query($dbconnect, $sqldeluser) or die ('Connection could not be established - USER!');
 
-$sqlinsert = "INSERT INTO `users` (`ID`, `username`, `password`, `level`) VALUES (1, 'AdminPanel', 'Admin1234', '8');";
+$sqlinsert = "INSERT INTO `users` (`ID`, `username`, `password`, `level`) VALUES (1, 'AdminPanel','2b12e1a2252d642c09f640b63ed35dcc5690464a', '8');";
 
 $sqldata2 = mysqli_query($dbconnect, $sqlinsert) or die ('Connection could not be established or user already exists!');
 
@@ -224,7 +224,7 @@ function Rconconnect(){
 
 $sqldata4 = mysqli_query($dbconnect, $sqledit1) or die ('Connection could not be established or column "warning" already exists!');
 
-header("Location: /index.php");
+header("Location: index.php");
 }else {
 
   //header("Location: create.php");
@@ -236,7 +236,7 @@ function Rconconnect(){
 
 }else
 {
-  header("Location: /index.php");
+  header("Location: index.php");
 }
 
 ?>
diff --git a/verifyPanel.php b/verifyPanel.php
@@ -0,0 +1,39 @@
+<?php
+
+function masterconnect(){
+
+	global $dbcon;
+	$dbcon = mysqli_connect('77.98.39.61', 'jason_000', 'knight11', 'arma3life') or die ('Database connection failed');
+}
+
+function loginconnect(){
+
+	global $dbconL;
+	$dbconL = mysqli_connect('77.98.39.61', 'jason_000', 'knight11', 'arma3life');
+}
+
+function Rconconnect(){
+
+	global $rcon;
+	$rcon = new \Nizarii\ArmaRConClass\ARC('77.98.39.61', 2416, 'test');
+}
+global $DBHost;
+$DBHost = '77.98.39.61';
+global $DBUser;
+$DBUser = 'jason_000';
+global $DBPass;
+$DBPass = 'knight11';
+global $DBName;
+$DBName = 'arma3life';
+global $DBLName;
+$DBLName = 'arma3life';
+
+global $RconHost;
+$RconHost = '77.98.39.61';
+global $RconPort;
+$RconPort = 2416;
+global $RconPass;
+$RconPass = 'test';
+
+
+?>