summaryrefslogtreecommitdiffstats
path: root/notFinishedCode/web
diff options
context:
space:
mode:
Diffstat (limited to 'notFinishedCode/web')
-rwxr-xr-xnotFinishedCode/web/css/chk_off.pngbin0 -> 655 bytes
-rwxr-xr-xnotFinishedCode/web/css/chk_on.pngbin0 -> 537 bytes
-rw-r--r--notFinishedCode/web/css/formCSS.css41
-rw-r--r--notFinishedCode/web/insertData.php12
-rw-r--r--notFinishedCode/web/mutex1.php39
-rw-r--r--notFinishedCode/web/mutexFunctions.php36
-rw-r--r--notFinishedCode/web/post.php93
-rw-r--r--notFinishedCode/web/startTest.php53
8 files changed, 194 insertions, 80 deletions
diff --git a/notFinishedCode/web/css/chk_off.png b/notFinishedCode/web/css/chk_off.png
new file mode 100755
index 0000000..1514d51
--- /dev/null
+++ b/notFinishedCode/web/css/chk_off.png
Binary files differ
diff --git a/notFinishedCode/web/css/chk_on.png b/notFinishedCode/web/css/chk_on.png
new file mode 100755
index 0000000..a9925a0
--- /dev/null
+++ b/notFinishedCode/web/css/chk_on.png
Binary files differ
diff --git a/notFinishedCode/web/css/formCSS.css b/notFinishedCode/web/css/formCSS.css
new file mode 100644
index 0000000..70bbdaf
--- /dev/null
+++ b/notFinishedCode/web/css/formCSS.css
@@ -0,0 +1,41 @@
+/* fancyform styles */
+.form label
+{
+display:block;
+padding:0.0em;
+padding-left:22px;
+/*background-position:9px center;*/
+background-repeat:no-repeat;
+/*border:1px solid #252525;*/
+clear:both;cursor:pointer;
+
+font-family:Arial,Helvetica,sans-serif;
+font-style:normal;
+}
+
+.checked
+{
+background-color:#fff;
+background-image:url(chk_on.png);
+}
+
+.unchecked
+{
+background-color:#fff;
+background-image:url(chk_off.png);
+}
+
+.leftcol
+{
+float:left;
+clear:left;
+width:30%;
+}
+
+.rightcol
+{
+float:left;
+clear:right;
+width:50%;
+}
+
diff --git a/notFinishedCode/web/insertData.php b/notFinishedCode/web/insertData.php
index 5969683..fe77587 100644
--- a/notFinishedCode/web/insertData.php
+++ b/notFinishedCode/web/insertData.php
@@ -1,5 +1,5 @@
<?
-
+/*
//Connection stuff
//DB
$dbhost = 'localhost';
@@ -12,7 +12,7 @@ $conn = mysql_connect($dbhost, $dbuser, $dbpass) or die('Error connecting to mys
$dbname = 'gsmselftesting';
mysql_select_db($dbname);
//End of connection stuff
-
+*/
function getNewTaskNo()
{
$sql = "SELECT MAX(taskNo) FROM TaskTable"; //the SQL command to find the max value in taskNo
@@ -77,11 +77,5 @@ function insertTask($taskNo, $from, $to)
return 0; //nothing was added to the table, some error occured
}
}
- $taskNo = getNewTaskNo();
-/* echo insertTask($taskNo,'meho','lafi pik');
- echo insertTask($taskNo,'meho','lafi pik');
- echo insertTask($taskNo,'meho','lafi pik');
- echo insertTask($taskNo,'meho','lafi pik');
- echo getNewTaskNo();
- */
+ //include 'post.php';
?>
diff --git a/notFinishedCode/web/mutex1.php b/notFinishedCode/web/mutex1.php
index 133a6b5..ff5e3d9 100644
--- a/notFinishedCode/web/mutex1.php
+++ b/notFinishedCode/web/mutex1.php
@@ -16,41 +16,8 @@ $conn = mysql_connect($dbhost, $dbuser, $dbpass) or die('Error connecting to mys
$dbname = 'gsmselftesting';
mysql_select_db($dbname);
//End of connection stuff
-
-//Mutex functions
-function Lock($lockName,$seconds)
-{
- $sql = "SELECT GET_LOCK('$lockName', $seconds);";
- $res = mysql_query($sql);
- if (!$res)
- {
- die('Could not query:' . mysql_error());
- }
- return mysql_result($res,0);
-}
-
-function IsLocked($lockName)
-{
- $sql = "SELECT IS_FREE_LOCK('$lockName');";
- $res = mysql_query($sql);
- if (!$res)
- {
- die('Could not query:' . mysql_error());
- }
- return mysql_result($res,0);
-}
-
-function ReleaseLock($lockName)
-{
- $sql = "SELECT RELEASE_LOCK('$lockName');";
- $res = mysql_query($sql);
- if (!$res)
- {
- die('Could not query:' . mysql_error());
- }
- return mysql_result($res,0);
-}
-//End of mutex functions
+include 'mutexFunctions.php'; //mutex functions, isfree, lock and release
+include 'insertData.php'; //insert task functions
$nameOfLock = 'Webpage';
$timeToKeepTheMutex = 360;
@@ -62,6 +29,8 @@ if ($locking == '1') //1 means nobody is on the website
$lockMe = Lock($nameOfLock,$timeToKeepTheMutex); //Set a mutex for the webpage
if ($lockMe == '1') //1 means a successful lock
{
+ include 'post.php'; // read posted data and add them to the database
+ echo 'WE had errors: '. $errorAdding;
//stuff to do here
//check if the software is running!
$softwareLock = 'SoftwareStarted';
diff --git a/notFinishedCode/web/mutexFunctions.php b/notFinishedCode/web/mutexFunctions.php
new file mode 100644
index 0000000..af45610
--- /dev/null
+++ b/notFinishedCode/web/mutexFunctions.php
@@ -0,0 +1,36 @@
+<?
+//Mutex functions
+function Lock($lockName,$seconds)
+{
+ $sql = "SELECT GET_LOCK('$lockName', $seconds);";
+ $res = mysql_query($sql);
+ if (!$res)
+ {
+ die('Could not query:' . mysql_error());
+ }
+ return mysql_result($res,0);
+}
+
+function IsLocked($lockName)
+{
+ $sql = "SELECT IS_FREE_LOCK('$lockName');";
+ $res = mysql_query($sql);
+ if (!$res)
+ {
+ die('Could not query:' . mysql_error());
+ }
+ return mysql_result($res,0);
+}
+
+function ReleaseLock($lockName)
+{
+ $sql = "SELECT RELEASE_LOCK('$lockName');";
+ $res = mysql_query($sql);
+ if (!$res)
+ {
+ die('Could not query:' . mysql_error());
+ }
+ return mysql_result($res,0);
+}
+//End of mutex functions
+?>
diff --git a/notFinishedCode/web/post.php b/notFinishedCode/web/post.php
index 01ee63d..1b28db5 100644
--- a/notFinishedCode/web/post.php
+++ b/notFinishedCode/web/post.php
@@ -1,5 +1,4 @@
<?
-
$sipgsmrz1 = $_REQUEST["sip_gsmrz1"]; //SIP to GSMRZ1
$sipgsmrz2 = $_REQUEST["sip_gsmrz2"]; //SIP to GSMRZ2
$sipgsmrz3 = $_REQUEST["sip_gsmrz3"]; //SIP to GSMRZ3
@@ -24,80 +23,142 @@ $landgsmrz3 = $_REQUEST["landline_gsmrz3"]; //Landline to GSMRZ1
//Add allso for external GSM
+$taskNo = getNewTaskNo();
+$errorAdding = 0;
if($sipgsmrz1 == 'on')
{
- echo 'test';
+ $taskAdded = insertTask($taskNo,'sip','GSMRZ1');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($sipgsmrz2 == 'on')
{
- echo 'meho';
+ $taskAdded = insertTask($taskNo,'sip','GSMRZ2');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($sipgsmrz3 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'sip','GSMRZ3');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($gsmrzsip1 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'GSMRZ1','sip');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($gsmrzsip2 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'GSMRZ2','sip');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($gsmrzsip3 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'GSMRZ3','sip');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($sipland == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'sip','landline');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($sipuniv == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'sip','unisip');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($gsm2gsm12 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'GSMRZ1','GSMRZ2');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($gsm2gsm13 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'GSMRZ1','GSMRZ3');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($gsm2gsm23 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'GSMRZ2','GSMRZ3');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($landsip == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'landline','sip');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($landgsmrz1 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'landline','GSMRZ1');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($landgsmrz2 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'landline','GSMRZ2');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
if($landgsmrz3 == 'on')
{
-
+ $taskAdded = insertTask($taskNo,'landline','GSMRZ3');
+ if($taskAdded != 1)
+ {
+ $errorAdding = 1;
+ }
}
?>
diff --git a/notFinishedCode/web/startTest.php b/notFinishedCode/web/startTest.php
index 98b95ce..309e3fe 100644
--- a/notFinishedCode/web/startTest.php
+++ b/notFinishedCode/web/startTest.php
@@ -1,21 +1,34 @@
-<FORM NAME="form1" form action="post.php" method="POST">
- <INPUT TYPE=CHECKBOX NAME="sip_gsmrz1"> SIP to RZ-GSM 1<BR>
- <INPUT TYPE=CHECKBOX NAME="sip_gsmrz2"> SIP to RZ-GSM 2<BR>
- <INPUT TYPE=CHECKBOX NAME="sip_gsmrz3"> SIP to RZ-GSM 3<BR>
- <INPUT TYPE=CHECKBOX NAME="sip_landln"> SIP to Landline<BR>
- <INPUT TYPE=CHECKBOX NAME="sip_sipuniv"> SIP to SIP University Phone line<BR>
- <INPUT TYPE=CHECKBOX NAME="gsmrz1_sip"> RZ-GSM 1 to SIP<BR>
- <INPUT TYPE=CHECKBOX NAME="gsmrz2_sip"> RZ-GSM 2 to SIP<BR>
- <INPUT TYPE=CHECKBOX NAME="gsmrz3_sip"> RZ-GSM 3 to SIP<BR>
- <INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz2"> RZ-GSM 1 to RZ-GSM 2<BR>
- <INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz3"> RZ-GSM 1 to RZ-GSM 3<BR>
- <INPUT TYPE=CHECKBOX NAME="gsmrz2_gsmrz3"> RZ-GSM 2 to RZ-GSM 3<BR>
- <INPUT TYPE=CHECKBOX NAME="landline_sip"> Landline to SIP <BR>
- <INPUT TYPE=CHECKBOX NAME="landline_gsmrz1"> Landline to RZ-GSM 1<BR>
- <INPUT TYPE=CHECKBOX NAME="landline_gsmrz2"> Landline to RZ-GSM 2<BR>
- <INPUT TYPE=CHECKBOX NAME="landline_gsmrz3"> Landline to RZ-GSM 3<BR>
- <BR> <INPUT TYPE=SUBMIT VALUE="Submit"> </FORM>
-<?
+<html>
+<head>
+<!--ADD HERE ALL THE NEEDED META DATA -->
+<title>Network test stuff!</title>
+<link rel="stylesheet" href="css/formCSS.css" type="text/css" media="screen">
+</head>
+<body>
+<div class='section form'>
-
-?>
+<FORM NAME="form1" form action="mutex1.php" method="POST">
+ <div class='leftcol'>
+ <label><input type="checkbox" NAME="sip_gsmrz1"> SIP to RZ-GSM 1</label>
+ <label><input type="checkbox" NAME="sip_gsmrz2"> SIP to RZ-GSM 2</label>
+ <label><input type="checkbox" NAME="sip_gsmrz3"> SIP to RZ-GSM 3</label>
+ <label><input type="checkbox" NAME="sip_landln"> SIP to Landline</label>
+ <label><input type="checkbox" NAME="sip_sipuniv"> SIP to SIP University Phone line</label>
+ <label><input type="checkbox" NAME="gsmrz1_sip"> RZ-GSM 1 to SIP</label>
+ <label><input type="checkbox" NAME="gsmrz2_sip"> RZ-GSM 2 to SIP</label>
+ <label><input type="checkbox" NAME="gsmrz3_sip"> RZ-GSM 3 to SIP</label>
+ <label><input type="checkbox" NAME="gsmrz1_gsmrz2"> RZ-GSM 1 to RZ-GSM 2</label>
+ <label><input type="checkbox" NAME="gsmrz1_gsmrz3"> RZ-GSM 1 to RZ-GSM 3</label>
+ <label><input type="checkbox" NAME="gsmrz2_gsmrz3"> RZ-GSM 2 to RZ-GSM 3</label>
+ <label><input type="checkbox" NAME="landline_sip"> Landline to SIP </label>
+ <label><input type="checkbox" NAME="landline_gsmrz1"> Landline to RZ-GSM 1</label>
+ <label><input type="checkbox" NAME="landline_gsmrz2"> Landline to RZ-GSM 2</label>
+ <label><input type="checkbox" NAME="landline_gsmrz3"> Landline to RZ-GSM 3</label>
+ <BR> <INPUT TYPE=SUBMIT VALUE="Submit">
+ </div>
+</FORM>
+</div>
+<script type="text/javascript" src="mootools.js"></script>
+<script type="text/javascript" src="moocheck.js"></script>
+</body>
+</html>