A lot of small bugfixes and improvments

alarmen/overzicht.php

@@ -75,4 +75,4 @@
             </table>
         </div>
     </div>
-</div>
+</div>

alarmen/toevoegen.php

@@ -6,7 +6,7 @@
 	    $streamurl = $_POST["StreamUrl"];
 	    $streamport = safeString($_POST["StreamPort"]);
 	    $snoozetijd = safeString($_POST["snoozetijd"]);
-
+		$onlyOnce = safeString($_POST["onlyOnce"]);
 		if (filter_var($streamurl, FILTER_VALIDATE_URL) === FALSE) {
 			 print('
 		    <div class="alert alert-danger alert-dismissable">
@@ -19,8 +19,8 @@
 			$streamip = gethostbyname($streamsplit["host"]);
 			$streamurl = $streamsplit["path"];
 			
-		    if($stmt = $mysqli -> prepare("INSERT INTO alarm(message,name,streamip, streamurl, streamport, tijd, snoozetijd, streamdomain, uid) VALUES(?,?,?,?,?,?,?,?,?)")){
-		    	$stmt ->bind_param("ssssisisi", $message, $alarmname, $streamip,  $streamurl, $streamport, $tijd, $snoozetijd, $streamdomain, $userid);
+		    if($stmt = $mysqli -> prepare("INSERT INTO alarm(message,name,streamip, streamurl, streamport, tijd, snoozetijd, streamdomain, onlyOnce, uid) VALUES(?,?,?,?,?,?,?,?,?,?)")){
+		    	$stmt ->bind_param("ssssisisii", $message, $alarmname, $streamip,  $streamurl, $streamport, $tijd, $snoozetijd, $streamdomain,$onlyOnce, $userid);
 		    	$stmt ->execute();
 		    	$stmt ->close();
 		    }
@@ -87,12 +87,27 @@
 						<input type="number" min"0" max="9999" value="80" required name = "StreamPort" class="form-control">
 					</div>
 				</div>
+				<div class="form-group">
+				<label class="col-sm-2 control-label">Eenmalige-Alarm</label>
+				<div class="switch">
+					<div class="col-sm-4">
+	                    <div class="onoffswitch">
+	                           <input type="checkbox" value="1" checked="" class="onoffswitch-checkbox" name = "onlyOnce" id="example1">
+	                        <label class="onoffswitch-label" for="example1">
+	                       	    <span class="onoffswitch-inner"></span>
+	                        	<span class="onoffswitch-switch"></span>
+	                        </label>
+	                    </div>
+                    </div>
+                </div>
+                </div>
 				<div class="form-group">
 					<div class="col-sm-4 col-sm-offset-2">
 						<button class="btn btn-primary" type="submit">Alarm opslaan</button>
 						<button class="btn btn-primary" type="reset">Reset</button>
 					</div>
 				</div>
+				
 			</form>
 		</div>
 	</div>

alarmen/wijzigen.php

@@ -28,7 +28,13 @@
 	    	$stmt ->close();
 	    }
 	    $id = $maxid;
-	    
+	    $maxid++;
+	    if($stmt = $mysqli -> prepare("ALTER TABLE alarm AUTO_INCREMENT = ?")){
+	    	$stmt ->bind_param("i", $maxid);
+	    	$stmt ->execute();
+	    	$stmt ->close();
+	    }
+
 	    print('
 	    <div class="alert alert-success alert-dismissable">
             <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>Alarm succesvol gewijzigd

getAlarmen.php

@@ -16,10 +16,10 @@
         }
         
         $array = array();
-       	if($stmt = $mysqli -> prepare("SELECT id, message, message, streamip, streamurl, streamport, tijd, snoozetijd FROM alarm LEFT JOIN users ON alarm.uid = users.uid WHERE users.radiotoken = ? LIMIT 5")){
+       	if($stmt = $mysqli -> prepare("SELECT id, message, message, streamip, streamurl, streamport, tijd, snoozetijd, onlyOnce FROM alarm LEFT JOIN users ON alarm.uid = users.uid WHERE users.radiotoken = ? LIMIT 5")){
         	$stmt -> bind_param("s", $radioid);
         	$stmt -> execute();
-        	$stmt -> bind_result($id, $message, $message, $streamip, $streamurl, $streamport, $tijdstr, $snoozetijd);
+        	$stmt -> bind_result($id, $message, $message, $streamip, $streamurl, $streamport, $tijdstr, $snoozetijd, $onlyOnce);
         	while($result = $stmt -> fetch()){
         	    $tijd = strtotime($tijdstr);
         	    
@@ -41,6 +41,7 @@
         	                                id => $id,
                                             port => $streamport,
                                             url => $streamurl,
+                                            oo => $onlyOnce,
                                             st => $snoozetijd
         	                               ) 
         	               );

getTwitch.php

@@ -1,6 +1,6 @@
 <?php
-	include_once('includes/db_connect.php');
-	include_once('includes/global_functions.php');
+    include_once('includes/db_connect.php');
+    include_once('includes/global_functions.php');
     $radioid = $_GET['radioid'];
     $radiomac = $_GET['radiomac'];
         
@@ -12,19 +12,38 @@
             $radiomac = str_replace(':', '', $radiomac);
             $radioid = substr($radiomac, 6 , 11);
         }
-        
-        $array = array();
-       	if($stmt = $mysqli -> prepare("SELECT username FROM Twitch LEFT JOIN users ON Twitch.uid = users.uid WHERE users.radiotoken = ?")){
-        	$stmt -> bind_param("s", $radioid);
-        	$stmt -> execute();
-        	$stmt -> bind_result($TwitchUsername);
-        	while($result = $stmt -> fetch()){
-        	    array_push($array, array(   username =>$TwitchUsername) 
-        	               );
-        	 };
-        	$stmt -> close();
+        $currentStream = null;
+        if($stmt = $mysqli -> prepare("SELECT username FROM Twitch LEFT JOIN users ON Twitch.uid = users.uid WHERE users.radiotoken = ?")){
+            $stmt -> bind_param("s", $radioid);
+         	$stmt -> execute();
+         	$stmt -> bind_result($TwitchUsername);
+        	$stmt -> fetch();
+         	$stmt -> close();
+         	
+         	$ch = curl_init(); 
+            curl_setopt($ch, CURLOPT_URL, "https://api.twitch.tv/kraken/users/".$TwitchUsername."/follows/channels"); 
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
+            $jsonreturn = json_decode(curl_exec($ch), true);
+            for($x = 0; $x < count($jsonreturn["follows"]); $x++)
+            {
+                $channel = $jsonreturn["follows"][$x]["channel"]["display_name"];
+                curl_setopt($ch, CURLOPT_URL, "https://api.twitch.tv/kraken/streams/".$channel); 
+                $stream = json_decode(curl_exec($ch), true);
+                if($stream["stream"] != null)
+                {
+                    $currentStream = array();
+                    $status = $stream["stream"]["channel"]["status"];
+                    $game = $stream["stream"]["game"];
+                    $datetime = $stream["stream"]["created_at"];
+                    $date = strtotime($datetime);
+                    array_push($currentStream, array(   Name => $channel,
+                                                        Title => $status,
+                                                        Game => $game,
+                                                        Date => $date));
+                }
+            }
        	}
-        print(json_encode($array, JSON_UNESCAPED_SLASHES));
+        print(json_encode($currentStream, JSON_UNESCAPED_SLASHES));
     }
     
     

getTwitter.php

@@ -0,0 +1,102 @@
+<?php
+    include_once('includes/db_connect.php');
+    include_once('includes/global_functions.php');
+    $radioid = $_GET['radioid'];
+    $radiomac = $_GET['radiomac'];
+    
+ if($radioid == "" && $radiomac == ""){
+        print(json_encode([error => "Not a valid radioid"]));
+        die();
+    }else{
+        if($radiomac != ""){
+            $radiomac = str_replace(':', '', $radiomac);
+            $radioid = substr($radiomac, 6 , 11);
+        }
+        $currentStream = null;
+        if($stmt = $mysqli -> prepare("SELECT FollowerID FROM Twitter LEFT JOIN users ON Twitter.uid = users.uid WHERE users.radiotoken = ?")){
+            $stmt -> bind_param("s", $radioid);
+         	$stmt -> execute();
+         	$stmt -> bind_result($FollowerID);
+        	$stmt -> fetch();
+         	$stmt -> close();
+         	
+              //specificeer token, key variable
+            $oauth_access_token = "254139292-uhnFJBvMdO2ymdTWnzRGuct5aME4dT3Ll9Ag03J6";
+            $oauth_access_token_secret = "L1D96ulaUSb8ArC7NV0UwoGResYLcpPvnoPRsZwvJTVpz";
+            $consumer_key = "OKcwZL7ZeCElUU3GevJW2flcb";
+            $consumer_secret = "6M8Gwco5PP15baRYrSxI3HKCXW3mIKO1nzlr7dQJioZAdr3lTV";
+            
+            $twitter_timeline = "user_timeline";
+            
+             $request = array('count' => '2',
+                            'screen_name' => $FollowerID
+                            );
+            
+            // authentticatie protocol   
+            $oauth = array(
+                'oauth_consumer_key' => $consumer_key,
+                'oauth_nonce' => time(),
+                'oauth_signature_method' => 'HMAC-SHA1',
+                'oauth_token' => $oauth_access_token,
+                'oauth_timestamp' => time(),
+                'oauth_version' => '1.0'
+            );
+                           
+            $oauth = array_merge($oauth,$request);
+            
+            $baseURI="https://api.twitter.com/1.1/statuses/$twitter_timeline.json";
+            $method="GET";
+            $params=$oauth;
+            
+            $r = array();
+            ksort($params);
+            foreach($params as $key=>$value){
+                $r[] = "$key=" . rawurlencode($value);
+            }
+            $base_info = $method."&" . rawurlencode($baseURI) . '&' . rawurlencode(implode('&', $r));
+            $composite_key = rawurlencode($consumer_secret) . '&' . rawurlencode($oauth_access_token_secret);
+             
+            // get oauth signature
+            $oauth_signature = base64_encode(hash_hmac('sha1', $base_info, $composite_key, true));
+            $oauth['oauth_signature'] = $oauth_signature;
+            
+            
+            
+            // authentication request
+            
+            $r = 'Authorization: OAuth ';
+            
+            $values = array();
+            foreach($oauth as $key=>$value){
+                $values[] = "$key=\"" . rawurlencode($value) . "\"";
+            }
+            $r .= implode(', ', $values);
+            
+            $header = array($r, 'Expect:');
+            
+            $options = array(
+                CURLOPT_HTTPHEADER => $header,
+                CURLOPT_HEADER => false,
+                CURLOPT_URL => "https://api.twitter.com/1.1/statuses/$twitter_timeline.json?". http_build_query($request),
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_SSL_VERIFYPEER => true
+            );
+            // ontvangen van twitter feeds met user informaties
+            $feed = curl_init();
+            curl_setopt_array($feed, $options);
+            $json = curl_exec($feed);
+            curl_close($feed);
+            $tweets=json_decode($json, true);
+            if($tweets[0]["text"] != null)
+            {
+            //array('@(https?://([-\w\.]+[-\w])+(:\d+)?(/([\w/_\.#-]*(\?\S+)?[^\.\s])?)?)@','/[^A-Za-z0-9 ]/')
+              $regex = "@(https?://([-\w\.]+[-\w])+(:\d+)?(/([\w/_\.#-]*(\?\S+)?[^\.\s])?)?)@";
+              $regex2 = "/[^a-zA-Z0-9 ]+/";
+              
+              $message = preg_replace($regex, "", $tweets[0]['text']);
+              echo preg_replace($regex2, "", $message);
+            }
+        }
+    }
+?> 
+ 

includes/nav.php

@@ -43,9 +43,6 @@
 				<li id="twitter.php">
 					<a href="twitter.php?i=overzicht"><i class="fa fa-twitter"></i> <span class="nav-label">Twitter</span></a>
 				</li>
-					<li id="getTwitter.php">
-					<a href="getTwitter.php?i=overzicht"><i class="fa fa-twitter"></i> <span class="nav-label">Twitter</span></a>
-				</li>
 			</ul>
 		</div>
 	</nav>

twitch/configuration.php

@@ -1,12 +1,29 @@
 <?php
 	if($_SERVER['REQUEST_METHOD'] == "POST"){
 		$twitchUsername = safeString($_POST["twitchUsername"]);
-
-	   if($stmt = $mysqli -> prepare("INSERT INTO Twitch(uid,username) VALUES(?,?) ON DUPLICATE KEY UPDATE username=VALUES(username)")){
+		
+	    $ch = curl_init(); 
+        curl_setopt($ch, CURLOPT_URL, "https://api.twitch.tv/kraken/users/".$twitchUsername); 
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
+        $jsonreturn = json_decode(curl_exec($ch), true);
+        if(isset($jsonreturn["error"]))
+        {
+            print('
+    	        <div class="alert alert-danger alert-dismissable">
+                    <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>Gebruiker bestaat niet.
+                </div>
+    	    ');
+        }
+        else
+        {
+            if($stmt = $mysqli -> prepare("INSERT INTO Twitch(uid,username) VALUES(?,?) ON DUPLICATE KEY UPDATE username=VALUES(username)"))
+            {
         	$stmt -> bind_param("is",$userid,$twitchUsername);
         	$stmt -> execute();
         	$stmt -> close();
-        } 
+        	reDirect("twitch.php?i=overzicht");	
+            }
+        }
 	}
 ?>
 
@@ -34,5 +51,4 @@
             </form>
         </div>
     </div>
-</div>
-
+</div>

twitch/overzicht.php

@@ -9,13 +9,24 @@ if($stmt = $mysqli -> prepare("SELECT username FROM Twitch WHERE uid = ?")){
 	$stmt -> fetch();
 	$stmt -> close();
 }
-
-$ch = curl_init(); 
-curl_setopt($ch, CURLOPT_URL, "https://api.twitch.tv/kraken/users/".$TwitchUsername."/follows/channels"); 
-curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
-$jsonreturn = json_decode(curl_exec($ch), true);
-//$jsonreturn = curl_exec($ch);
+if(isset($TwitchUsername))
+{
+    $ch = curl_init(); 
+    curl_setopt($ch, CURLOPT_URL, "https://api.twitch.tv/kraken/users/".$TwitchUsername."/follows/channels"); 
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
+    $jsonreturn = json_decode(curl_exec($ch), true);
+    curl_setopt($ch, CURLOPT_URL, "https://api.twitch.tv/kraken/users/".$TwitchUsername); 
+    $userdata = json_decode(curl_exec($ch), true);
+}
 ?>
+<head>
+    <style type="text/css">
+        title {
+            font-size: 200%;
+        }
+    </style>
+</head>
+
 <div class="col-lg-12">
     <div class="ibox float-e-margins">
         <div class="ibox-title">
@@ -36,14 +47,33 @@ $jsonreturn = json_decode(curl_exec($ch), true);
             </div>
         </div>
         <div class="ibox-content">
-            <label>Ingelogd als: <?php print($TwitchUsername); ?> </label>
+            <label><?php 
+            if(isset($TwitchUsername))
+            {
+                print("Ingelogd als: <br/> <br/> <br/> <img src=".$userdata["logo"]." width=\"100\" height=\"100\">".$userdata["display_name"]);
+            }
+            else
+            {
+                print("Nog geen twitchaccount toegevoegd");
+            }
+            ?> </label>
             <br />
-            <label>Aan het volgen:</label>
             <br />
-            <label><?php
-            for($x = 0; $x < count($jsonreturn["follows"]); $x++ )
+            <?php
+            if(isset($TwitchUsername))
+            {
+                print("<label>Aan het volgen:</label>
+                <br />
+                <label>");
+                for($x = 0; $x < count($jsonreturn["follows"]); $x++ )
+                {
+                    echo "<img src=\"".$jsonreturn["follows"][$x]["channel"]["logo"]."\" width=\"50\" heigth=\"50\">";
+                    echo $jsonreturn["follows"][$x]["channel"]["display_name"]."<br />";
+                }
+            }
+            else
             {
-                echo $jsonreturn["follows"][$x]["channel"]["display_name"]."<br />";
+                print("<html> Voeg een account toe door op het <i class=\"fa fa-wrench\"></i> icoon rechtsboven te klikken. </html>");
             }
             ?></label>
         </div>

twitter.php

@@ -0,0 +1,25 @@
+<?php
+include_once("includes/header.php");
+include_once("includes/nav.php");
+    $a = array (
+		'overzicht'	=> 1,
+		'configuration' => 1,
+		'verwijderen' => 1,
+		'wijzigen' => 1,
+	); 
+	if(isset($_GET["i"])){
+		if($_GET["i"] == ""){
+			@include('twitter/overzicht.php');
+		}
+		else{
+			if(isset($a[$_GET["i"]])){	
+				@include('twitter/'.$_GET["i"].'.php');
+			}else{
+				echo '<h1>Deze pagina bestaat helaas niet.</h1>';
+			}
+		}
+	}else{
+		@include('twitter/overzicht.php');
+	}
+	include_once("includes/footer.php");
+?>

twitter/configuration.php

@@ -0,0 +1,40 @@
+<?php
+error_reporting(-1); ini_set('display_errors', 'On'); 
+error_reporting(E_ALL);
+ini_set("display_errors", 1);	
+	if($_SERVER['REQUEST_METHOD'] == "POST"){
+		 $FollowerID = safeString($_POST["FollowerID"]);
+	    
+	   if($stmt = $mysqli -> prepare("INSERT INTO Twitter(uid,FollowerID) VALUES(?,?)")){
+        	$stmt -> bind_param("is", $userid,$FollowerID);
+        	$stmt -> execute();
+        	$stmt -> close();
+        }
+	}
+?>
+
+<div class="col-lg-12">
+    <div class="ibox float-e-margins">
+        <div class="ibox-title">
+            <h5>Change Follower</h5>
+            <div class="ibox-tools">
+                <a class="collapse-link">
+                    <i class="fa fa-chevron-up"></i>
+                </a>
+            </div>
+        </div>
+        <div class="ibox-content">
+            <form method="POST" class="form-horizontal">
+                <div class="form-group"><label class="col-sm-2 control-label">Naam Follower</label>
+                    <div class="col-sm-10"><input type="text" required name="FollowerID"  class="form-control"></div>
+                </div>
+		        <div class="form-group">
+                        <div class="col-sm-4 col-sm-offset-2">
+                        <button class="btn btn-primary" type="submit">opslaan follower</button>
+                        <a href="twitter.php?i=overzicht" class="btn btn-primary" role="button">Annuleren</a>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

twitter/overzicht.php

@@ -0,0 +1,62 @@
+<?php
+    	if($stmt = $mysqli -> prepare("SELECT FolloweID FROM Twitter WHERE uid = ?")){
+        	$stmt -> bind_param("i", $userid);
+        	$stmt -> execute();
+        	$stmt -> bind_result($FollowerID);
+        	$stmt -> fetch();
+        	$stmt -> close();
+        }
+?>
+
+<div class="col-lg-12">
+    <div class="ibox float-e-margins">
+        <div class="ibox-title">
+            <h5>Twitter Integratie</h5>
+            <div class="ibox-tools">
+                <a class="collapse-link">
+                    <i class="fa fa-chevron-up"></i>
+                </a>
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                    <i class="fa fa-wrench"></i>
+                </a>
+                <ul class="dropdown-menu dropdown-user">
+                    <li><a href="twitter.php?i=configuration">New follower</a></li>
+                </ul>
+                <a class="close-link">
+                    <i class="fa fa-times"></i>
+                </a>
+            </div>
+        </div>
+        <div class="ibox-content">
+           <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th>Follower</th>
+                    </tr>
+                </thead>
+				 <tbody>
+                    <?php 
+                    	if($stmt = $mysqli -> prepare("SELECT FollowerID FROM Twitter WHERE uid=?")){
+                        	$stmt -> bind_param('i', $userid);
+                        	$stmt -> execute();
+                        	$stmt -> bind_result($FollowerID);
+                        	while($result = $stmt -> fetch()){
+                        	    print '
+                        	        <tr>
+                        	            <td>'.$FollowerID.'</td>
+                        	            <td style="width: 100px !important" class="text-center valign-middle" >
+							                <a href="twitter.php?i=wijzigen&FollowerID='.$FollowerID.'"><button class="btn btn-xs btn-primary"><i class="fa fa-pencil"></i></button></a>
+							                 &nbsp;
+							                <a href="twitter.php?i=verwijderen&FollowerID='.$FollowerID.'"><button class="btn btn-xs btn-danger"><i class="fa fa-times"></i></button></a>
+						                </td>
+                        	        </tr>
+                        	    ';
+                        	};
+                        	$stmt -> close();
+                        }
+                    ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>

twitter/verwijderen.php

@@ -0,0 +1,16 @@
+<?php
+	if(isset($_GET['FollowerID'])){
+		$FollowerID= $_GET['FollowerID'];
+		if($stmt = $mysqli -> prepare("DELETE FROM Twitter WHERE FollowerID =?")){
+	    	$stmt -> bind_param("s", $FollowerID);
+	    	$stmt -> execute();
+	    	$stmt -> close();
+	    }
+	}else{
+		print "Er is geen id meegegeven.";
+	}
+?>
+
+<div class="alert alert-success alert-dismissable">
+    <button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>Het is succesvol verwijderd.
+</div>

twitter/wijzigen.php

@@ -0,0 +1,44 @@
+<?php
+	if($_SERVER['REQUEST_METHOD'] == "POST"){
+    	$FollowerID = safeString($_POST["FollowerID"]);
+    	$OldFollowerID = safeString($_POST["OldFollowerID"]);
+    
+    	if($stmt = $mysqli -> prepare("UPDATE Twitter SET FollowerID = ? WHERE FollowerID = ?")){
+        	$stmt ->bind_param("ss", $FollowerID, $OldFollowerID);
+        	$stmt ->execute();
+        	$stmt ->close();
+        }
+	}else{
+	    $FollowerID = $_GET['FollowerID'];
+	}
+?>
+
+<div class="col-lg-12">
+    <div class="ibox float-e-margins">
+        <div class="ibox-title">
+            <h5>Alarm wijzigen</h5>
+            <div class="ibox-tools">
+                <a class="collapse-link">
+                    <i class="fa fa-chevron-up"></i>
+                </a>
+            </div>
+        </div>
+        <div class="ibox-content">
+            <form method="POST" class="form-horizontal">
+				<div class="form-group">
+					<label class="col-sm-2 control-label">Follower</label>
+					<div class="col-sm-10">
+						<input type="hidden" value="<?php echo $FollowerID ?>" required class="form-control" name = "OldFollowerID" maxlength="16">
+						<input type="text" value="<?php echo $FollowerID ?>" required class="form-control" name = "FollowerID" maxlength="16">
+					</div>
+				</div>
+		        <div class="form-group">
+                        <div class="col-sm-4 col-sm-offset-2">
+                        <button class="btn btn-primary" type="submit">Follower opslaan</button>
+                        <button class="btn btn-primary" type="reset">Reset</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>