diff --git a/htdocs/frontend/javascripts/options.js b/htdocs/frontend/javascripts/options.js
index 8f24726..de66ab5 100644
--- a/htdocs/frontend/javascripts/options.js
+++ b/htdocs/frontend/javascripts/options.js
@@ -27,7 +27,7 @@
// default time interval to show
vz.options = {
language: 'de',
- backendUrl: '../backend/index.php',
+ backendUrl: '../backend.php',
tuples: 300,
render: 'lines',
refresh: false,
diff --git a/lib/vendor/README b/lib/vendor/README
index 154a905..e09147b 100644
--- a/lib/vendor/README
+++ b/lib/vendor/README
@@ -2,4 +2,4 @@ This directory contains PHP libraries by external developers or projects.
Please consult the wiki for detailed instructions:
-http://wiki.volkszaehler.org/getstarted
+http://wiki.volkszaehler.org/howto/getstarted
diff --git a/misc/controller/bash/log_onewire b/misc/controller/bash/log_onewire.sh
similarity index 98%
rename from misc/controller/bash/log_onewire
rename to misc/controller/bash/log_onewire.sh
index de497c6..aeab12c 100755
--- a/misc/controller/bash/log_onewire
+++ b/misc/controller/bash/log_onewire.sh
@@ -5,7 +5,7 @@
#
# call it with a cronjob similiar to this one:
#
-# */5 * * * * ~/bin/log1wire.sh
+# */5 * * * * ~/bin/log_onewire.sh
#
# @copyright Copyright (c) 2010, The volkszaehler.org project
# @package controller
diff --git a/misc/controller/bash/log_onewire_ecmd.sh b/misc/controller/bash/log_onewire_ecmd.sh
new file mode 100755
index 0000000..712ba79
--- /dev/null
+++ b/misc/controller/bash/log_onewire_ecmd.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# This is a simple bash script to read Dallas 1-Wire sensors
+# connected to a controller board running ethersex and log their
+# values to the volkszaehler project.
+#
+# call it with a cronjob similiar to this one:
+#
+# */5 * * * * ~/bin/log_onewire_ecmd.sh
+#
+# @copyright Copyright (c) 2010, The volkszaehler.org project
+# @package controller
+# @license http://www.opensource.org/licenses/gpl-license.php GNU Public License
+# @author Justin Otherguy
';
-
- flush();
- $pulses = array();
- }
- }
- };
-
- fclose($fd);
-}
-
-?>
\ No newline at end of file
diff --git a/misc/tools/import_justin.php b/misc/tools/import_justin.php
deleted file mode 100644
index 02fc889..0000000
--- a/misc/tools/import_justin.php
+++ /dev/null
@@ -1,59 +0,0 @@
-.
- */
-
-$sql = '';
-
-$fd = fopen('../docs/developer/pulses.dummy.copy', 'r');
-if ($fd) {
- while (!feof($fd)) {
- $buffer = explode("\t", fgets($fd));
-
- $ts = parsePgSqlTimestamp($buffer[0]);
-
- if ($ts > 0)
- $pulses[] = '(' . (int) ($buffer[2] + 1) . ', ' . $ts . ', 1)';
- };
-
- fclose($fd);
-
- $sql = 'INSERT INTO data (channel_id, timestamp, value) VALUES ' . implode(', ', $pulses);
- $dbh->execute($sql);
-
- echo 'Imported rows: ' . $dbh->affectedRows();
-}
-else {
- throw new Exception('cant open dump');
-}
-
-function parsePgSqlTimestamp($timestamp) {
- $unix = strtotime($timestamp);
- $ms = substr($timestamp, strrpos($timestamp, '.') + 1);
-
- return $unix + $ms/pow(10, strlen($ms));
-}
-
-?>
\ No newline at end of file
diff --git a/misc/tools/install.php b/misc/tools/install.php
deleted file mode 100644
index dda5d40..0000000
--- a/misc/tools/install.php
+++ /dev/null
@@ -1,78 +0,0 @@
-.
- */
-?>
-
-= '
-
-
-
- volkszaehler.org - setup
-
-Invalid step during installation: ' . $_GET['step'] . '
- ';
- }
-}
-else {
- echo <<
-This installer will:
-
-
-Only fundamental administration knowledge is required :)
-
-So, ready? Take a cup of coffee and lets take a look on your system:
- -EOT; -} - -?> - - - \ No newline at end of file diff --git a/misc/tools/install b/misc/tools/install.sh similarity index 95% rename from misc/tools/install rename to misc/tools/install.sh index a9ab600..1ae7ca1 100755 --- a/misc/tools/install +++ b/misc/tools/install.sh @@ -64,7 +64,7 @@ get_db_name() { echo echo doctrine setup... -ask "doctrine path?" /usr/local/lib/volkszaehler.org/doctrine +ask "doctrine path?" /usr/local/lib/doctrine dtdir=$REPLY REPLY=y @@ -87,8 +87,7 @@ fi echo echo volkszaehler setup... -#/var/www/volkszaehler.org -ask "volkszaehler path?" /var/www/vz +ask "volkszaehler path?" /var/www/volkszaehler.org vzdir=$REPLY REPLY=y @@ -150,7 +149,7 @@ ask "insert demo data in to database?" n if [ "$REPLY" == "y" ]; then get_admin get_db_name - cat $vzdir/misc/sql/demo/entities.sql $vzdir/misc/sql/demo/properties.sql $vzdir/share/sql/demo/data-demoset1.sql | + cat $vzdir/misc/sql/demo/entities.sql $vzdir/misc/sql/demo/properties.sql $vzdir/misc/sql/demo/data-demoset1.sql | mysql -h$db_host -u$db_admin_user -p$db_admin_pass $db_name fi