Edit deleteUser/getChannels & the messages functions (#2)

* Modifying the messages functions

- Edited the deleteMessage function.
- Replace $data[2] by $data[5] cf: users.csv
- Removed the "admins" rights for "acs-dds" user.
- Changed the resetMessages function since apache send me errors about
it.
- Added a new "notification": "Soon"

* Changed the getChannels function

Upgrated the old-school function for the getChannels function to a new
one in POO.

* Edit deleteUser/getChannels

+ Initialize new object "Controller"
+ Trim the username sent by post.

* Replace the old getChannels function by the new one, in POO

Author: Kasai

.classes/channelmapper.php

@@ -7,11 +7,8 @@ public function __construct(){}
 	public function createChannel($name){
 		$n = trim($name);
 		if($n != "null") : 
-			var_dump($n);
 			if($n != "") : 
-				var_dump($n);
 				if(!file_exists($this->fichier = __DIR__ . "/../.data/db/channels/" . $n . ".csv")) : 
-					var_dump($n);
 					touch($this->fichier);
 				endif;
 			endif;
@@ -25,4 +22,16 @@ public function deleteChannel($name){
 			endif;
 		endif;
 	}
+
+	public function getChannels(){
+		$channel = str_replace(array(".csv"),"",array_diff(scandir(".data/db/channels"),array(".","..")));
+
+		ob_start();
+		require(".data/tpl/channels.tpl");
+		return ob_get_clean();
+	}
+
+	public function __toString(){
+		return $this->getChannels();
+	}
 }

.classes/controller.php

@@ -54,13 +54,21 @@ public function changeChannel(){
 		return $this->message_mapper->getMessages();
 	}
 
+	public function getChannels(){
+		if(!$this->isRegistered()) return;
+
+		return $this->channel_mapper->getChannels();
+	}
+
 	public function createChannel($name){
 		if(!$this->isRegistered()) return;
 
 		return $this->channel_mapper->createChannel($name);
 	}
 
 	public function deleteChannel($name){
+		if(!$this->isRegistered()) return;
+
 		return $this->channel_mapper->deleteChannel($name);
 	}
 

.classes/messagemapper.php

@@ -59,7 +59,7 @@ public function deleteMessage($name,$time){
 
 	public function resetMessages(){
 		$file = fopen($this->fichier,"w");
-		fputcsv($file,"");
+		ftruncate($file,0);
 		fclose($file);
 	}
 }

.classes/usermapper.php

@@ -65,7 +65,7 @@ public function deleteUser($name){
 		$temp_table = fopen($this->file_temp,"w");
 
 		while(($data = fgetcsv($table,1000)) !== FALSE){
-			if($data[2] == $name){
+			if($data[5] == $name){
 				continue;
 			}
 

.data/db/users.csv

@@ -1,2 +1,2 @@
-acs,dds,8e0d92e98814d1cba96d8848fe709d36f94499ce,acs@ofp.com,azeaze.jpg,acs-dds,logged-out
-PERROT,Corentin,8e0d92e98814d1cba96d8848fe709d36f94499ce,kasaidot@gmail.com,img.png,Kasai.,logged
+PERROT,Corentin,8e0d92e98814d1cba96d8848fe709d36f94499ce,kasaidot@gmail.com,img.png,Kasai.,logged-out
+latti,lol,63982e54a7aeb0d89910475ba6dbd3ca6dd4e5a1,unknow@gmail.com,1234,CrackJ,logged-out

.data/tpl/channels.tpl

@@ -0,0 +1,8 @@
+<?php foreach($channel as $id => $b) : ?>
+<li>
+	<a id="ch-<?=$id;?>" name="<?=$b;?>" href="#" onclick="channel=this.name;changeChannel(this.name)"><?=$b;?></a>
+<?php if($_SESSION["username"] == "PERROT Corentin") : ?>
+	<input type="button" id="suppr" name="<?=$b;?>" onclick="deleteChannel(this.name)" value="✖">
+<?php endif;?>
+</li>
+<?php endforeach;?>

.data/tpl/users.tpl

@@ -1,6 +1,6 @@
 <li class="<?=$this->status;?>">
-	<a id="pm-<?=$this->pseudo;?>" href="#"><?=$this->pseudo;?></a>
-<?php if($_SESSION["username"] == "PERROT Corentin" || $_SESSION["username"] == "acs dds") : ?>
+	<a id="pm-<?=$this->pseudo;?>" href="#" onclick="soon();"><?=$this->pseudo;?></a>
+<?php if($_SESSION["username"] == "PERROT Corentin") : ?>
 	<input type="button" id="suppr" name="<?=$this->pseudo;?>" onclick="deleteUser(this.name);" value="✖">
 <?php endif;?>
 </li>

act.php

@@ -84,24 +84,22 @@
 
 	// USERS DELETE
 	if(isset($_POST["usersdelete"])) : 
-		$_SESSION["TChat"]->deleteUser($_POST["usersdelete"]);
+		$_SESSION["TChat"] = new Controller();
+		$_SESSION["TChat"]->deleteUser(trim($_POST["usersdelete"]));
 	endif;
 
 	// CHANNELS
 	if(isset($_POST["channels"])) : 
-		$dir   = ".data/db/channels";
-		$files = array_diff(scandir($dir),array(".",".."));
-		$ext   = array(".csv");
-
-		$out = str_replace($ext,"",$files);
-	foreach($out as $id => $channel) : ?>
-	<li>
-		<a id="ch-<?=$id;?>" name="<?=$channel;?>" href="#" onclick="channel=this.name;changeChannel(this.name)"><?=$channel;?></a>
-<?php if($_SESSION["username"] == "PERROT Corentin" || $_SESSION["username"] == "acs dds") : ?>
-		<input type="button" id="suppr" name="<?=$channel;?>" onclick="deleteChannel(this.name)" value="✖">
-<?php endif;?>
-	</li>
-	<?php endforeach;endif;
+		$_SESSION["TChat"] = new Controller();
+
+		// CHANNELS GET
+		if(isset($_POST["get"])) : 
+			$a = $_SESSION["TChat"]->getChannels();
+			if(!empty($a)) : 
+				echo $a;
+			endif;
+		endif;
+	endif;
 
 	// CHANGE
 	if(isset($_POST["change"])) : 

index.php

@@ -19,6 +19,11 @@
 				<p id="bienvenue">Bonjour et bienvenue sur TChat, <b><?=$_SESSION["username"];?> !</b></p>
 			</div>
 		</div>
+		<div class="notif" id="soon">
+			<div class="success">
+				<p id="bienvenue">Fonctionalitée en cours de développement !</b></p>
+			</div>
+		</div>
 		<div id="header">
 			<h1 id="ch-name"></h1>
 <?php if($_SESSION["username"] == "PERROT Corentin" || $_SESSION["username"] == "acs dds") : ?>
@@ -75,6 +80,7 @@
 				login();
 			});
 			var d=new Date();
+			var soon=function(){window.location="#soon";setTimeout(function(){window.location="#";},3000);};
 			var login=function(){$.ajax({url:"act.php",method:"POST",data:"login=<?=$_SESSION['username'];?>"})};
 			var logout=function(){$.ajax({url:"act.php",method:"POST",data:"logout=<?=$_SESSION['username'];?>",success:function(){window.location="./login";}})};
 			var send=function(e){a=encodeURIComponent($("#author").val());c=encodeURIComponent($("#content").val());if(a!=""&&c!=""){$.ajax({url:"act.php",method:"POST",data:"channel="+channel+"&author="+a+"&content="+c,success:function(){$("#content").val("")}})}e.preventDefault();};