add query checks

doxikus · Jun 30, 2015 · 6bc7ce9 · 6bc7ce9
1 parent 469847a
commit 6bc7ce9
Show file tree

Hide file tree

Showing 28 changed files with 92 additions and 11 deletions.
diff --git a/...bootstrap-toggle/bootstrap-toggle.min.css → ...bootstrap-toggle/bootstrap-toggle.min.css b/...bootstrap-toggle/bootstrap-toggle.min.css → ...bootstrap-toggle/bootstrap-toggle.min.css
diff --git a/.../bootstrap-toggle/bootstrap-toggle.min.js → .../bootstrap-toggle/bootstrap-toggle.min.js b/.../bootstrap-toggle/bootstrap-toggle.min.js → .../bootstrap-toggle/bootstrap-toggle.min.js
diff --git a/jscss/bootstrap/css/bootstrap-theme.css → html/bootstrap/css/bootstrap-theme.css b/jscss/bootstrap/css/bootstrap-theme.css → html/bootstrap/css/bootstrap-theme.css
diff --git a/jscss/bootstrap/css/bootstrap-theme.css.map → html/bootstrap/css/bootstrap-theme.css.map b/jscss/bootstrap/css/bootstrap-theme.css.map → html/bootstrap/css/bootstrap-theme.css.map
diff --git a/jscss/bootstrap/css/bootstrap-theme.min.css → html/bootstrap/css/bootstrap-theme.min.css b/jscss/bootstrap/css/bootstrap-theme.min.css → html/bootstrap/css/bootstrap-theme.min.css
diff --git a/jscss/bootstrap/css/bootstrap.css → html/bootstrap/css/bootstrap.css b/jscss/bootstrap/css/bootstrap.css → html/bootstrap/css/bootstrap.css
diff --git a/jscss/bootstrap/css/bootstrap.css.map → html/bootstrap/css/bootstrap.css.map b/jscss/bootstrap/css/bootstrap.css.map → html/bootstrap/css/bootstrap.css.map
diff --git a/jscss/bootstrap/css/bootstrap.min.css → html/bootstrap/css/bootstrap.min.css b/jscss/bootstrap/css/bootstrap.min.css → html/bootstrap/css/bootstrap.min.css
diff --git a/...ap/fonts/glyphicons-halflings-regular.eot → ...ap/fonts/glyphicons-halflings-regular.eot b/...ap/fonts/glyphicons-halflings-regular.eot → ...ap/fonts/glyphicons-halflings-regular.eot
diff --git a/...ap/fonts/glyphicons-halflings-regular.svg → ...ap/fonts/glyphicons-halflings-regular.svg b/...ap/fonts/glyphicons-halflings-regular.svg → ...ap/fonts/glyphicons-halflings-regular.svg
diff --git a/...ap/fonts/glyphicons-halflings-regular.ttf → ...ap/fonts/glyphicons-halflings-regular.ttf b/...ap/fonts/glyphicons-halflings-regular.ttf → ...ap/fonts/glyphicons-halflings-regular.ttf
diff --git a/...p/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff b/...p/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/jscss/bootstrap/js/bootstrap.js → html/bootstrap/js/bootstrap.js b/jscss/bootstrap/js/bootstrap.js → html/bootstrap/js/bootstrap.js
diff --git a/jscss/bootstrap/js/bootstrap.min.js → html/bootstrap/js/bootstrap.min.js b/jscss/bootstrap/js/bootstrap.min.js → html/bootstrap/js/bootstrap.min.js
diff --git a/jscss/bootstrap/js/npm.js → html/bootstrap/js/npm.js b/jscss/bootstrap/js/npm.js → html/bootstrap/js/npm.js
diff --git a/jscss/custom.css → html/custom.css b/jscss/custom.css → html/custom.css
diff --git a/html/errors/db_error.php b/html/errors/db_error.php
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <title>nettemp</title>
+
+    <!-- Bootstrap -->
+    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="../custom.css" rel="stylesheet">
+
+    <!-- jQuery -->
+    <script type="text/javascript" src="../jquery/jquery-1.11.3.min.js"></script>
+
+    <!-- bootstrap-toogle -->
+    <link href="../bootstrap-toggle/bootstrap-toggle.min.css" rel="stylesheet">
+    <script type="text/javascript" src="../bootstrap-toggle/bootstrap-toggle.min.js"></script>
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <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>
+
+ <!-- Static navbar -->
+      <nav class="navbar navbar-default">
+        <div class="container-fluid">
+          <div class="navbar-header">
+		<a href="http://nettemp.pl" target="_blank"><img src="../../media/png/nettemp.pl.png" height="50"></a>
+
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+	              </div>
+          <div id="navbar" class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+
+		<li><a href="sqlite_error.php">Update DB</a></li>
+            </ul>
+
+    	</div><!--/.nav-collapse -->
+	</div><!--/.container-fluid -->
+        </nav>
+
+
+<div class="container">
+<?php include('../../modules/tools/html/tools_update.php'); ?>
+</div>
+
+
+<footer class="footer">
+      <div class="container text-center">
+        <p class="text-muted"><table><tr>Donate for developing <?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");?></tr></table></p>
+      </div>
+</footer>
+
+
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <!--  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> -->
+    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+
+
+  </body>
+</html>
diff --git a/jscss/highcharts/dark-unica.js → html/highcharts/dark-unica.js b/jscss/highcharts/dark-unica.js → html/highcharts/dark-unica.js
diff --git a/jscss/highcharts/exporting.js → html/highcharts/exporting.js b/jscss/highcharts/exporting.js → html/highcharts/exporting.js
diff --git a/jscss/highcharts/highcharts.js → html/highcharts/highcharts.js b/jscss/highcharts/highcharts.js → html/highcharts/highcharts.js
diff --git a/jscss/highcharts/highstock.js → html/highcharts/highstock.js b/jscss/highcharts/highstock.js → html/highcharts/highstock.js
diff --git a/jscss/jquery/jquery-1.11.3.min.js → html/jquery/jquery-1.11.3.min.js b/jscss/jquery/jquery-1.11.3.min.js → html/jquery/jquery-1.11.3.min.js
diff --git a/jscss/jquery/jquery.js → html/jquery/jquery.js b/jscss/jquery/jquery.js → html/jquery/jquery.js
diff --git a/jscss/masonry/masonry.pkgd.min.js → html/masonry/masonry.pkgd.min.js b/jscss/masonry/masonry.pkgd.min.js → html/masonry/masonry.pkgd.min.js
diff --git a/index.php b/index.php
@@ -25,17 +25,17 @@
     <title>nettemp</title>
 
     <!-- Bootstrap -->
-    <link href="jscss/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="html/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
-    <link href="jscss/custom.css" rel="stylesheet">
+    <link href="html/custom.css" rel="stylesheet">
 
     <!-- jQuery -->
-    <script type="text/javascript" src="jscss/jquery/jquery-1.11.3.min.js"></script>
+    <script type="text/javascript" src="html/jquery/jquery-1.11.3.min.js"></script>
 
     <!-- bootstrap-toogle -->
-    <link href="jscss/bootstrap-toggle/bootstrap-toggle.min.css" rel="stylesheet">
-    <script type="text/javascript" src="jscss/bootstrap-toggle/bootstrap-toggle.min.js"></script>
+    <link href="html/bootstrap-toggle/bootstrap-toggle.min.css" rel="stylesheet">
+    <script type="text/javascript" src="html/bootstrap-toggle/bootstrap-toggle.min.js"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -70,7 +70,7 @@
 <?php
 $db1 = new PDO('sqlite:dbf/nettemp.db');
 $rows1 = $db1->query("SELECT * FROM gpio WHERE mode='simple' OR mode='moment' OR mode='trigger'");
-$rows2 = $db1->query("SELECT * FROM relays WHERE type='relay'");
+$rows2 = $db1->query("SELECT * FROM relays WHERE type='relay'") or header("Location: html/errors/db_error.php");
 $row1 = $rows1->fetchAll();
 $row2 = $rows2->fetchAll();
 
@@ -152,7 +152,7 @@
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <!--  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> -->
-    <script src="jscss/bootstrap/js/bootstrap.min.js"></script>
+    <script src="html/bootstrap/js/bootstrap.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
 
 

diff --git a/modules/status/html/status.php b/modules/status/html/status.php
@@ -1,4 +1,4 @@
-<script src="/jscss/mansonry/masonry.pkgd.min.js"></script>
+<script src="html/mansonry/masonry.pkgd.min.js"></script>
 <script type="text/JavaScript">
 var container = document.querySelector('#container');
 var msnry = new Masonry( container, {

diff --git a/modules/view/html/view.php b/modules/view/html/view.php
@@ -1,6 +1,6 @@
-<script type="text/javascript" src="jscss/highcharts/highstock.js"></script>
-<script type="text/javascript" src="jscss/highcharts/exporting.js"></script>
-<script type="text/javascript" src="jscss/highcharts/dark-unica.js"></script>
+<script type="text/javascript" src="html/highcharts/highstock.js"></script>
+<script type="text/javascript" src="html/highcharts/exporting.js"></script>
+<script type="text/javascript" src="html/highcharts/dark-unica.js"></script>
 
 <script type="text/JavaScript">
 function timedRefresh(timeoutPeriod) {