aepnat / simhelpdesk

ticketnew.php

Indentation +65 added lines, -65 removed lines

@@ -6,62 +6,62 @@ 
 $documentedby = $_SESSION['loginid'];

 $user = $users->userdata($_SESSION['loginid']);

 if (isset($_POST['submit'])) {

-    $lastticket = $tickets->get_last_ticket();

-    $id = $lastticket['id'] + 1;

-    $ticketnumber = $id.'/SR/'.date('M').'/'.date('Y'); //format nomor tiket

-    $sla = $_POST['sla'];

-    //$idcustomer		= $_POST['idcustomer'];

-    $reporteddate = strtotime($_POST['reporteddate']);

-    $reportedby = $_POST['reportedby'];

-    $telp = $_POST['telp'];

-    $email = $_POST['email'];

-    $problemsummary = $_POST['problemsummary'];

-    $problemdetail = $_POST['problemdetail'];

-    $ticketstatus = 'Assigned'; //ketika pertama kali dibuat, status="Assigned" ke salah satu teknisi

-    $assignee = $_POST['idassignee'];

-    $pro = $_POST['pro'];

-    $user_assignee = $users->userdata($assignee);

-    $email_assignee = $user_assignee['email'];

-    $changes = 'Create New Ticket';

-    $emailcc = '';

-    $emailbcc = '';

-    $fullname_assignee = $user_assignee['fullname'];

-    if ($sla == '1') {

-        $managers = $users->get_user_by_level('Manager');

-        $i = 0;

-        foreach ($managers as $manager) {

-            $manageremail[$i] = $manager['email'];

-            $emailcc .= $manageremail[$i].', ';

-            $i++;

-        }

-    }

-    $emailstatus = 'New';

-    $senddate = time();

-    $datasla = $slas->sla_data($sla);

-    $resolutiontime = $datasla['resolutiontime'];

-    $slasenddate = strtotime("+$resolutiontime hours", $senddate);

-    $emailsubject = "Ticket No: $ticketnumber has assigned to you";

-    $message =

+	$lastticket = $tickets->get_last_ticket();

+	$id = $lastticket['id'] + 1;

+	$ticketnumber = $id.'/SR/'.date('M').'/'.date('Y'); //format nomor tiket

+	$sla = $_POST['sla'];

+	//$idcustomer		= $_POST['idcustomer'];

+	$reporteddate = strtotime($_POST['reporteddate']);

+	$reportedby = $_POST['reportedby'];

+	$telp = $_POST['telp'];

+	$email = $_POST['email'];

+	$problemsummary = $_POST['problemsummary'];

+	$problemdetail = $_POST['problemdetail'];

+	$ticketstatus = 'Assigned'; //ketika pertama kali dibuat, status="Assigned" ke salah satu teknisi

+	$assignee = $_POST['idassignee'];

+	$pro = $_POST['pro'];

+	$user_assignee = $users->userdata($assignee);

+	$email_assignee = $user_assignee['email'];

+	$changes = 'Create New Ticket';

+	$emailcc = '';

+	$emailbcc = '';

+	$fullname_assignee = $user_assignee['fullname'];

+	if ($sla == '1') {

+		$managers = $users->get_user_by_level('Manager');

+		$i = 0;

+		foreach ($managers as $manager) {

+			$manageremail[$i] = $manager['email'];

+			$emailcc .= $manageremail[$i].', ';

+			$i++;

+		}

+	}

+	$emailstatus = 'New';

+	$senddate = time();

+	$datasla = $slas->sla_data($sla);

+	$resolutiontime = $datasla['resolutiontime'];

+	$slasenddate = strtotime("+$resolutiontime hours", $senddate);

+	$emailsubject = "Ticket No: $ticketnumber has assigned to you";

+	$message =

 "Dear $fullname_assignee, \r\n

 You are currently assign for this ticket.\r\n

 Please follow this link to resolved the ticket --> http://localhost/helpdesk/ticketedit.php?id=$id"." \r\n

 Thank you. \r\n

 Regards, \r\n

 Helpdesk";

-    $tickets->add_ticket($ticketnumber, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $documentedby, $pro);

-    $assigneddate = '';

-    $pendingby = '';

-    $pendingdate = '';

-    $resolution = '';

-    $resolvedby = '';

-    $resolveddate = '';

-    $closedby = '';

-    $closeddate = '';

-    $tickets->log_tickets($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate, $changes, $changeby);

-    // $emails->add_email($id, $senddate, $email_assignee, $emailcc, $emailbcc, $emailsubject, $message, $emailstatus);

-    // $emails->add_sla_remainder($id, $ticketnumber, $slasenddate, $email_assignee, $emailcc, $emailbcc, $emailsubject, $message);

-    // $result = $emails->send_new_ticket();

-    header("Location: ticketread.php?id=$id");

+	$tickets->add_ticket($ticketnumber, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $documentedby, $pro);

+	$assigneddate = '';

+	$pendingby = '';

+	$pendingdate = '';

+	$resolution = '';

+	$resolvedby = '';

+	$resolveddate = '';

+	$closedby = '';

+	$closeddate = '';

+	$tickets->log_tickets($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate, $changes, $changeby);

+	// $emails->add_email($id, $senddate, $email_assignee, $emailcc, $emailbcc, $emailsubject, $message, $emailstatus);

+	// $emails->add_sla_remainder($id, $ticketnumber, $slasenddate, $email_assignee, $emailcc, $emailbcc, $emailsubject, $message);

+	// $result = $emails->send_new_ticket();

+	header("Location: ticketread.php?id=$id");

 }

 ?>

 <!DOCTYPE HTML>

@@ -144,12 +144,12 @@ 
 			<td> Urgency (SLA)*</td><td> : </td>

 			<td><select name="sla">

 				<?php 

-                    $sla = $slas->get_sla();

-                    echo '<option value="'.$slaval['slaid'].'" selected="selected">'.$slaval['namasla'].'</option>';

-                    foreach ($sla as $slaval) {

-                        echo '<option value="'.$slaval['slaid'].'">'.$slaval['namasla'].'</option>';

-                    }

-                ?>

+					$sla = $slas->get_sla();

+					echo '<option value="'.$slaval['slaid'].'" selected="selected">'.$slaval['namasla'].'</option>';

+					foreach ($sla as $slaval) {

+						echo '<option value="'.$slaval['slaid'].'">'.$slaval['namasla'].'</option>';

+					}

+				?>

 				</select>

 			</td>

 		</tr>

@@ -157,11 +157,11 @@ 
 			<td> Type</td><td> : </td>

 			<td><select name="pro">

 				<?php 

-                    //$pro = $slas->get_sla();

-                    echo '<option value=""></option>';

-                    echo '<option value="Hardware">Hardware</option>';

-                    echo '<option value="Software">Software</option>';

-                ?>

+					//$pro = $slas->get_sla();

+					echo '<option value=""></option>';

+					echo '<option value="Hardware">Hardware</option>';

+					echo '<option value="Software">Software</option>';

+				?>

 				</select>

 			</td>

 		</tr>

@@ -188,9 +188,9 @@ 
 	</form>

 

 	<?php 

-    if (empty($errors) === false) {

-        echo '<p class=errormsg>'.implode('</p><p class=errormsg>', $errors).'</p>';

-    }

-    ?>

+	if (empty($errors) === false) {

+		echo '<p class=errormsg>'.implode('</p><p class=errormsg>', $errors).'</p>';

+	}

+	?>

 </body>

 </html>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
 		</tr>

 		<tr>

 			<td> Reported By* </td><td> : </td>

-			<td> <?php echo $user['fullname'];?> <input type='hidden' size='50' name='reportedby' value="<?php echo $user['fullname'];?>" maxlength="50"> </td>

+			<td> <?php echo $user['fullname']; ?> <input type='hidden' size='50' name='reportedby' value="<?php echo $user['fullname']; ?>" maxlength="50"> </td>

 		</tr>

 		<tr>

 			<td> Urgency (SLA)*</td><td> : </td>

@@ -177,8 +177,8 @@ 
 			<td> </td>

 			<td> </td>

 			<td> <br/>

-			<?php $assignee = $users->get_user_random_by_level('Admin');?>

-			<input type="hidden" name="idassignee" value="<?php echo $assignee['id'];?>"/>

+			<?php $assignee = $users->get_user_random_by_level('Admin'); ?>

+			<input type="hidden" name="idassignee" value="<?php echo $assignee['id']; ?>"/>

 			<input type='submit' name='submit' value=' Submit '>  &nbsp;&nbsp;&nbsp;

 			<input type='reset' name='reset' value=' Reset '> 

 			</td>

ticketedituser.php

Indentation +51 added lines, -51 removed lines

@@ -6,50 +6,50 @@ 
 $id = $_GET['id'];

 $ticket = $tickets->ticket_data($id);

 if ($ticket['ticketstatus'] == 'Closed') {

-    header("Location: ticketread.php?id=$id");

-    exit();

+	header("Location: ticketread.php?id=$id");

+	exit();

 }

 if (isset($_POST['submit'])) {

-    $sla = $_POST['sla'];

-    $reporteddate = $_POST['reporteddate'];

-    $reportedmonth = $_POST['reportedmonth'];

-    $reportedyear = $_POST['reportedyear'];

-    $datetimeStr = $reportedyear.'-'.$reportedmonth.'-'.$reporteddate;

-    $reporteddate = strtotime($datetimeStr);

+	$sla = $_POST['sla'];

+	$reporteddate = $_POST['reporteddate'];

+	$reportedmonth = $_POST['reportedmonth'];

+	$reportedyear = $_POST['reportedyear'];

+	$datetimeStr = $reportedyear.'-'.$reportedmonth.'-'.$reporteddate;

+	$reporteddate = strtotime($datetimeStr);

 

-    $reportedby = $_POST['reportedby'];

-    $telp = $_POST['telp'];

-    $email = $_POST['email'];

-    $problemsummary = $_POST['problemsummary'];

-    $problemdetail = $_POST['problemdetail'];

-    $assignee = $_POST['idassignee'];

-    $ticketstatus = $_POST['ticketstatus'];

-    $resolution = $_POST['resolution'];

-    $pendingby = $_POST['pendingby'];

-    $pendingdate = $_POST['pendingdate'];

-    $resolvedby = $_POST['resolvedby'];

-    $resolveddate = $_POST['resolveddate'];

-    $closedby = $_POST['closedby'];

-    $closeddate = $_POST['closeddate'];

-    $changes = 'Re-assigned the ticket.';

-    if ($ticketstatus == 'Pending') {

-        $pendingby = $user['username'];

-        $pendingdate = strtotime(now);

-        $changes = 'Change Status to Pending.';

-    }

-    if ($ticketstatus == 'Resolved') {

-        $resolvedby = $user['username'];

-        $resolveddate = strtotime(now);

-        $changes = 'Change Status to Resolved.';

-    }

-    if ($ticketstatus == 'Closed') {

-        $closedby = $user['username'];

-        $closeddate = strtotime(now);

-        $changes = 'Change Status to Closed.';

-    }

-    $tickets->update_ticket($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate);

-    $tickets->log_tickets($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate, $changes, $changeby);

-    header('Location: ticketlistuser.php');

+	$reportedby = $_POST['reportedby'];

+	$telp = $_POST['telp'];

+	$email = $_POST['email'];

+	$problemsummary = $_POST['problemsummary'];

+	$problemdetail = $_POST['problemdetail'];

+	$assignee = $_POST['idassignee'];

+	$ticketstatus = $_POST['ticketstatus'];

+	$resolution = $_POST['resolution'];

+	$pendingby = $_POST['pendingby'];

+	$pendingdate = $_POST['pendingdate'];

+	$resolvedby = $_POST['resolvedby'];

+	$resolveddate = $_POST['resolveddate'];

+	$closedby = $_POST['closedby'];

+	$closeddate = $_POST['closeddate'];

+	$changes = 'Re-assigned the ticket.';

+	if ($ticketstatus == 'Pending') {

+		$pendingby = $user['username'];

+		$pendingdate = strtotime(now);

+		$changes = 'Change Status to Pending.';

+	}

+	if ($ticketstatus == 'Resolved') {

+		$resolvedby = $user['username'];

+		$resolveddate = strtotime(now);

+		$changes = 'Change Status to Resolved.';

+	}

+	if ($ticketstatus == 'Closed') {

+		$closedby = $user['username'];

+		$closeddate = strtotime(now);

+		$changes = 'Change Status to Closed.';

+	}

+	$tickets->update_ticket($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate);

+	$tickets->log_tickets($id, $sla, $reporteddate, $reportedby, $telp, $email, $problemsummary, $problemdetail, $ticketstatus, $assignee, $assigneddate, $pendingby, $pendingdate, $resolution, $resolvedby, $resolveddate, $closedby, $closeddate, $changes, $changeby);

+	header('Location: ticketlistuser.php');

 }

 ?>

 <!DOCTYPE HTML>

@@ -136,8 +136,8 @@ 
 			<td> <input type="hidden" name="oldticketstatus" value="<?php echo $ticket['ticketstatus']; ?>"> 

 			<select name="ticketstatus">

 				<?php

-                    echo '<option value='.$ticket['ticketstatus'].' selected="selected">'.$ticket['ticketstatus'].'</option>';

-                ?>

+					echo '<option value='.$ticket['ticketstatus'].' selected="selected">'.$ticket['ticketstatus'].'</option>';

+				?>

 				<option value="Assigned"> Assigned </option>

 				<option value="Resolved"> Resolved </option>

 				<option value="Pending"> Pending </option>

@@ -175,14 +175,14 @@ 
 	<table class="formtable">

 	<tr bgcolor="#e0e0e0" ><td width="150">Updated On</td><td width="150">Updated By</td><td>Description</td></tr>

 	<?php

-        $list_log_tickets = $tickets->get_audit_trail($id);

-        foreach ($list_log_tickets as $log_ticket) {

-            $changed_by = $users->userdata($log_ticket['changeby']);

-            echo '<tr><td>'.date('d-M-Y H:i:s', $log_ticket['changedate']).'</td>'.

-                 '<td>'.$changed_by['fullname'].'</td>'.

-                 '<td>'.$log_ticket['changes'].'</td></tr>';

-        }

-    ?>

+		$list_log_tickets = $tickets->get_audit_trail($id);

+		foreach ($list_log_tickets as $log_ticket) {

+			$changed_by = $users->userdata($log_ticket['changeby']);

+			echo '<tr><td>'.date('d-M-Y H:i:s', $log_ticket['changedate']).'</td>'.

+				 '<td>'.$changed_by['fullname'].'</td>'.

+				 '<td>'.$log_ticket['changes'].'</td></tr>';

+		}

+	?>

 	</table>

 	</fieldset>

 	<br/><br/>

ticketread.php

Indentation +14 added lines, -14 removed lines

@@ -43,9 +43,9 @@ 
 			<td> Urgency (SLA)</td><td> : </td>

 			<td> 

 			<?php 

-                $sladata = $slas->sla_data($ticket['sla']);

-                echo $sladata['namasla'];

-            ?>

+				$sladata = $slas->sla_data($ticket['sla']);

+				echo $sladata['namasla'];

+			?>

 			</td>

 		</tr>

 		<tr>

@@ -63,9 +63,9 @@ 
 			<td width="120"> Assign to </td><td> : </td>

 			<td> 

 			<?php

-                $userassignee = $users->userdata($ticket['assignee']);

-                echo $userassignee['fullname'];

-            ?>

+				$userassignee = $users->userdata($ticket['assignee']);

+				echo $userassignee['fullname'];

+			?>

 			</td>

 		</tr>

 		<tr>

@@ -85,14 +85,14 @@ 
 	<table class="formtable">

 	<tr bgcolor="#e0e0e0" ><td width="150">Updated On</td><td width="150">Updated By</td><td>Description</td></tr>

 	<?php

-        $list_log_tickets = $tickets->get_audit_trail($id);

-        foreach ($list_log_tickets as $log_ticket) {

-            $changed_by = $users->userdata($log_ticket['changeby']);

-            echo '<tr><td>'.date('d-M-Y H:i:s', $log_ticket['changedate']).'</td>'.

-                 '<td>'.$changed_by['fullname'].'</td>'.

-                 '<td>'.$log_ticket['changes'].'</td></tr>';

-        }

-    ?>

+		$list_log_tickets = $tickets->get_audit_trail($id);

+		foreach ($list_log_tickets as $log_ticket) {

+			$changed_by = $users->userdata($log_ticket['changeby']);

+			echo '<tr><td>'.date('d-M-Y H:i:s', $log_ticket['changedate']).'</td>'.

+				 '<td>'.$changed_by['fullname'].'</td>'.

+				 '<td>'.$log_ticket['changes'].'</td></tr>';

+		}

+	?>

 	</table>

 	</fieldset>

 	<br/><br/>

navigator.php

Indentation +3 added lines, -3 removed lines

@@ -26,15 +26,15 @@
 </ul>

 </div>

 <?php

-    if ($user['level'] == 'Manager' || $user['level'] == 'Admin') {

-        echo '<div id="leftmenu">

+	if ($user['level'] == 'Manager' || $user['level'] == 'Admin') {

+		echo '<div id="leftmenu">

 				<div id="headleftmenu">Helpdesk Statistic</div>

 					<ul>

 					<li><a href="pivot/hdpivot.php" target="contentFrame">Pivot Table</a></li>

 					<li><a href="statistic/chart.php" target="contentFrame">SLA Chart</a></li>

 					</ul>

 			 </div>';

-    }

+	}

 ?>

 </body>

 </html>

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		<li><a href="myticketbyresolver.php" target="contentFrame">My Resolution</a></li>

 		<li><a href="myticketwaitforclosed.php" target="contentFrame">Waiting for Close</a></li>

 		<li><a href="ticketlistuser.php" target="contentFrame">View All Opened Tickets</a></li>

-	<?php endif;?>

+	<?php endif; ?>

 </ul>

 </div>

 <?php

core/classes/Users.php

Indentation +284 added lines, -284 removed lines

@@ -2,288 +2,288 @@
 
 class Users
 {
-    private $db;
-
-    public function __construct($database)
-    {
-        $this->db = $database;
-    }
-
-    public function user_exists($username)
-    {
-        $query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `username`= ?');
-        $query->bindValue(1, $username);
-
-        try {
-            $query->execute();
-            $rows = $query->fetchColumn();
-            if ($rows == 1) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function email_exists($email)
-    {
-        $query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `email`= ?');
-        $query->bindValue(1, $email);
-
-        try {
-            $query->execute();
-            $rows = $query->fetchColumn();
-            if ($rows == 1) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function register($username, $password, $email, $fullname, $Telp, $level, $locked)
-    {
-        $time = time();
-        $ip = $_SERVER['REMOTE_ADDR'];
-        $email_code = sha1($username + microtime());
-        $password = sha1($password);
-        $query = $this->db->prepare('INSERT INTO `users` (`username`,`level`, `password`, `fullname`, `email`, `Telp`,`ip`, `time`, `email_code`, `confirmed`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?)');
-        $query->bindValue(1, $username);
-        $query->bindValue(2, $level);
-        $query->bindValue(3, $password);
-        $query->bindValue(4, $fullname);
-        $query->bindValue(5, $email);
-        $query->bindValue(6, $Telp);
-        $query->bindValue(7, $ip);
-        $query->bindValue(8, $time);
-        $query->bindValue(9, $email_code);
-        $query->bindValue(10, 1);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function update($id, $username, $password, $email, $fullname, $Telp, $level, $locked)
-    {
-        $time = time();
-        $ip = $_SERVER['REMOTE_ADDR'];
-        $email_code = sha1($username + microtime());
-        $password = sha1($password);
-        $query = $this->db->prepare('UPDATE `users` SET `level` = ? , `password` = ? , `fullname` = ? , `email` = ? , `Telp` = ? ,`ip` = ? , `time` = ? , `email_code` = ? ,`confirmed` = ? WHERE `id` = ?');
-        $query->bindValue(1, $level);
-        $query->bindValue(2, $password);
-        $query->bindValue(3, $fullname);
-        $query->bindValue(4, $email);
-        $query->bindValue(5, $Telp);
-        $query->bindValue(6, $ip);
-        $query->bindValue(7, $time);
-        $query->bindValue(8, $email_code);
-        $query->bindValue(9, $locked);
-        $query->bindValue(10, $id);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function changepwd($id, $password)
-    {
-        $password = sha1($password);
-        $query = $this->db->prepare('UPDATE `users` SET `password` = ? WHERE `id` = ?');
-        $query->bindValue(1, $password);
-        $query->bindValue(2, $id);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function delete($id)
-    {
-        $sql = 'DELETE FROM `users` WHERE `id` = ?';
-        $query = $this->db->prepare($sql);
-        $query->bindValue(1, $id);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function activate($email, $email_code)
-    {
-        $query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `email` = ? AND `email_code` = ? AND `confirmed` = ?');
-        $query->bindValue(1, $email);
-        $query->bindValue(2, $email_code);
-        $query->bindValue(3, 0);
-
-        try {
-            $query->execute();
-            $rows = $query->fetchColumn();
-            if ($rows == 1) {
-                $query_2 = $this->db->prepare('UPDATE `users` SET `confirmed` = ? WHERE `email` = ?');
-                $query_2->bindValue(1, 1);
-                $query_2->bindValue(2, $email);
-                $query_2->execute();
-
-                return true;
-            } else {
-                return false;
-            }
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function email_confirmed($username)
-    {
-        $query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `username`= ? AND `confirmed` = ?');
-        $query->bindValue(1, $username);
-        $query->bindValue(2, 1);
-
-        try {
-            $query->execute();
-            $rows = $query->fetchColumn();
-            if ($rows == 1) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function login($username, $password)
-    {
-        $query = $this->db->prepare('SELECT `password`, `id` FROM `users` WHERE `username` = ?');
-        $query->bindValue(1, $username);
-
-        try {
-            $query->execute();
-            $data = $query->fetch();
-            $stored_password = $data['password'];
-            $id = $data['id'];
-            if ($stored_password === sha1($password)) {
-                return $id;
-            } else {
-                return false;
-            }
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function userdata($id)
-    {
-        $query = $this->db->prepare('SELECT * FROM `users` WHERE `id`= ?');
-        $query->bindValue(1, $id);
-
-        try {
-            $query->execute();
-
-            return $query->fetch();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function get_user_by_id($id)
-    {
-        $query = $this->db->prepare('SELECT * FROM `users` WHERE `id`= ?');
-        $query->bindValue(1, $id);
-
-        try {
-            $query->execute();
-
-            return $query->fetch();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function get_user_by_level($level)
-    {
-        $query = $this->db->prepare('SELECT * FROM `users` WHERE `level`= ?');
-        $query->bindValue(1, $level);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-
-        return $query->fetchAll();
-    }
-
-    public function get_user_random_by_level($level)
-    {
-        $query = $this->db->prepare('SELECT * FROM `users` WHERE `level`= ? ORDER BY RAND() LIMIT 1');
-        $query->bindValue(1, $level);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-
-        return $query->fetch();
-    }
-
-    public function get_users()
-    {
-        $query = $this->db->prepare('SELECT * FROM `users` ORDER BY `time` DESC');
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-
-        return $query->fetchAll();
-    }
-
-    public function log_users($iduser, $log)
-    {
-        $time = time();
-        $ip = $_SERVER['REMOTE_ADDR'];
-        $browser = $_SERVER['HTTP_USER_AGENT'];
-        $query = $this->db->prepare('INSERT INTO `log_users` (`iduser`,`time`,`ip`,`browser`,`log`) VALUES (?, ?, ?, ?, ?)');
-        $query->bindValue(1, $iduser);
-        $query->bindValue(2, $time);
-        $query->bindValue(3, $ip);
-        $query->bindValue(4, $browser);
-        $query->bindValue(5, $log);
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-    }
-
-    public function get_users_log()
-    {
-        $query = $this->db->prepare('SELECT * FROM `log_users` ORDER BY `time` DESC');
-
-        try {
-            $query->execute();
-        } catch (PDOException $e) {
-            die($e->getMessage());
-        }
-
-        return $query->fetchAll();
-    }
+	private $db;
+
+	public function __construct($database)
+	{
+		$this->db = $database;
+	}
+
+	public function user_exists($username)
+	{
+		$query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `username`= ?');
+		$query->bindValue(1, $username);
+
+		try {
+			$query->execute();
+			$rows = $query->fetchColumn();
+			if ($rows == 1) {
+				return true;
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function email_exists($email)
+	{
+		$query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `email`= ?');
+		$query->bindValue(1, $email);
+
+		try {
+			$query->execute();
+			$rows = $query->fetchColumn();
+			if ($rows == 1) {
+				return true;
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function register($username, $password, $email, $fullname, $Telp, $level, $locked)
+	{
+		$time = time();
+		$ip = $_SERVER['REMOTE_ADDR'];
+		$email_code = sha1($username + microtime());
+		$password = sha1($password);
+		$query = $this->db->prepare('INSERT INTO `users` (`username`,`level`, `password`, `fullname`, `email`, `Telp`,`ip`, `time`, `email_code`, `confirmed`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?)');
+		$query->bindValue(1, $username);
+		$query->bindValue(2, $level);
+		$query->bindValue(3, $password);
+		$query->bindValue(4, $fullname);
+		$query->bindValue(5, $email);
+		$query->bindValue(6, $Telp);
+		$query->bindValue(7, $ip);
+		$query->bindValue(8, $time);
+		$query->bindValue(9, $email_code);
+		$query->bindValue(10, 1);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function update($id, $username, $password, $email, $fullname, $Telp, $level, $locked)
+	{
+		$time = time();
+		$ip = $_SERVER['REMOTE_ADDR'];
+		$email_code = sha1($username + microtime());
+		$password = sha1($password);
+		$query = $this->db->prepare('UPDATE `users` SET `level` = ? , `password` = ? , `fullname` = ? , `email` = ? , `Telp` = ? ,`ip` = ? , `time` = ? , `email_code` = ? ,`confirmed` = ? WHERE `id` = ?');
+		$query->bindValue(1, $level);
+		$query->bindValue(2, $password);
+		$query->bindValue(3, $fullname);
+		$query->bindValue(4, $email);
+		$query->bindValue(5, $Telp);
+		$query->bindValue(6, $ip);
+		$query->bindValue(7, $time);
+		$query->bindValue(8, $email_code);
+		$query->bindValue(9, $locked);
+		$query->bindValue(10, $id);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function changepwd($id, $password)
+	{
+		$password = sha1($password);
+		$query = $this->db->prepare('UPDATE `users` SET `password` = ? WHERE `id` = ?');
+		$query->bindValue(1, $password);
+		$query->bindValue(2, $id);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function delete($id)
+	{
+		$sql = 'DELETE FROM `users` WHERE `id` = ?';
+		$query = $this->db->prepare($sql);
+		$query->bindValue(1, $id);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function activate($email, $email_code)
+	{
+		$query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `email` = ? AND `email_code` = ? AND `confirmed` = ?');
+		$query->bindValue(1, $email);
+		$query->bindValue(2, $email_code);
+		$query->bindValue(3, 0);
+
+		try {
+			$query->execute();
+			$rows = $query->fetchColumn();
+			if ($rows == 1) {
+				$query_2 = $this->db->prepare('UPDATE `users` SET `confirmed` = ? WHERE `email` = ?');
+				$query_2->bindValue(1, 1);
+				$query_2->bindValue(2, $email);
+				$query_2->execute();
+
+				return true;
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function email_confirmed($username)
+	{
+		$query = $this->db->prepare('SELECT COUNT(`id`) FROM `users` WHERE `username`= ? AND `confirmed` = ?');
+		$query->bindValue(1, $username);
+		$query->bindValue(2, 1);
+
+		try {
+			$query->execute();
+			$rows = $query->fetchColumn();
+			if ($rows == 1) {
+				return true;
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function login($username, $password)
+	{
+		$query = $this->db->prepare('SELECT `password`, `id` FROM `users` WHERE `username` = ?');
+		$query->bindValue(1, $username);
+
+		try {
+			$query->execute();
+			$data = $query->fetch();
+			$stored_password = $data['password'];
+			$id = $data['id'];
+			if ($stored_password === sha1($password)) {
+				return $id;
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function userdata($id)
+	{
+		$query = $this->db->prepare('SELECT * FROM `users` WHERE `id`= ?');
+		$query->bindValue(1, $id);
+
+		try {
+			$query->execute();
+
+			return $query->fetch();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function get_user_by_id($id)
+	{
+		$query = $this->db->prepare('SELECT * FROM `users` WHERE `id`= ?');
+		$query->bindValue(1, $id);
+
+		try {
+			$query->execute();
+
+			return $query->fetch();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function get_user_by_level($level)
+	{
+		$query = $this->db->prepare('SELECT * FROM `users` WHERE `level`= ?');
+		$query->bindValue(1, $level);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+
+		return $query->fetchAll();
+	}
+
+	public function get_user_random_by_level($level)
+	{
+		$query = $this->db->prepare('SELECT * FROM `users` WHERE `level`= ? ORDER BY RAND() LIMIT 1');
+		$query->bindValue(1, $level);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+
+		return $query->fetch();
+	}
+
+	public function get_users()
+	{
+		$query = $this->db->prepare('SELECT * FROM `users` ORDER BY `time` DESC');
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+
+		return $query->fetchAll();
+	}
+
+	public function log_users($iduser, $log)
+	{
+		$time = time();
+		$ip = $_SERVER['REMOTE_ADDR'];
+		$browser = $_SERVER['HTTP_USER_AGENT'];
+		$query = $this->db->prepare('INSERT INTO `log_users` (`iduser`,`time`,`ip`,`browser`,`log`) VALUES (?, ?, ?, ?, ?)');
+		$query->bindValue(1, $iduser);
+		$query->bindValue(2, $time);
+		$query->bindValue(3, $ip);
+		$query->bindValue(4, $browser);
+		$query->bindValue(5, $log);
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+	}
+
+	public function get_users_log()
+	{
+		$query = $this->db->prepare('SELECT * FROM `log_users` ORDER BY `time` DESC');
+
+		try {
+			$query->execute();
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+
+		return $query->fetchAll();
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -19,10 +19,10 @@ 
             $rows = $query->fetchColumn();
             if ($rows == 1) {
                 return true;
-            } else {
+            }else {
                 return false;
             }
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -37,10 +37,10 @@ 
             $rows = $query->fetchColumn();
             if ($rows == 1) {
                 return true;
-            } else {
+            }else {
                 return false;
             }
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -65,7 +65,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -90,7 +90,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -104,7 +104,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -117,7 +117,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -139,10 +139,10 @@ 
                 $query_2->execute();
 
                 return true;
-            } else {
+            }else {
                 return false;
             }
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -158,10 +158,10 @@ 
             $rows = $query->fetchColumn();
             if ($rows == 1) {
                 return true;
-            } else {
+            }else {
                 return false;
             }
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -178,10 +178,10 @@ 
             $id = $data['id'];
             if ($stored_password === sha1($password)) {
                 return $id;
-            } else {
+            }else {
                 return false;
             }
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -195,7 +195,7 @@ 
             $query->execute();
 
             return $query->fetch();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -209,7 +209,7 @@ 
             $query->execute();
 
             return $query->fetch();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -221,7 +221,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
 
@@ -235,7 +235,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
 
@@ -248,7 +248,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
 
@@ -269,7 +269,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }
     }
@@ -280,7 +280,7 @@ 
 
         try {
             $query->execute();
-        } catch (PDOException $e) {
+        }catch (PDOException $e) {
             die($e->getMessage());
         }