goddamn

still working on preliminary shit
paleomedia · Apr 5, 2015 · 4b9b2e2 · 4b9b2e2
1 parent 2cd20ce
commit 4b9b2e2
Show file tree

Hide file tree

Showing 14 changed files with 152 additions and 25 deletions.
diff --git a/about.php b/about.php
@@ -2,9 +2,6 @@
 $thisPage="About"; 
 include 'top.php'; ?>
 
-
-<!--  <title>About - IDLEG - Idaho Legislative Information Portal, Bills, Lawmakers & Data</title> -->
-
 <div class="maincontainer">
 
 <?php include 'dash.php'; ?>

diff --git a/bills.php b/bills.php
@@ -1,12 +1,11 @@
 <?php
 $thisPage="Bills"; 
 include 'top.php'; ?>
-
-
-<!--  <title>Bills - IDLEG - Idaho Legislative Information Portal, Bills, Lawmakers & Data</title> -->
 
 <div class="maincontainer">
 
 <?php include 'dash.php'; ?>
+
+
 
 <?php include 'footer.php'; ?>
diff --git a/dash.php b/dash.php
@@ -9,13 +9,19 @@
             <input type="search" name="search" placeholder="Search bills, legislators, etc...." autocomplete="on">
           </div>
         </form>
-      </div>
+      </div>   
 
       <div class="dashhead" id="login">Login</div>
       <div class="loginbox">
-        <form action="login.php" method="post">
+<!--       	<?php
+   		if (isset($_SESSION["status"])) {
+      	echo "<div id=\"status\">" .  $_SESSION["status"] . "</div>";
+      	unset($_SESSION["status"]);
+   		}
+   		?>   -->
+        <form action="login.php" method="POST">
           <div class="loginbox">
-            <input type="text" name="name" id="username" placeholder="User name" />
+            <input type="text" name="username" id="username" placeholder="User name" />
           </div>
           <input type="submit" value="Go">
           <div>

diff --git a/granted.php b/granted.php
@@ -0,0 +1,14 @@
+<?php
+
+session_start();
+
+if (isset($_SESSION["access_granted"]) && !$_SESSION["access_granted"] ||
+   !isset($_SESSION["access_granted"])) {
+  $_SESSION["status"] = "You need to log in first";
+  header("Location:index.php");
+}
+else {
+echo "ACCESS GRANTED"; }
+?>
+
+<a href="logout.php">Logout</a>
diff --git a/index.php b/index.php
@@ -1,5 +1,7 @@
-<?php $thisPage="Home"; ?>
-<?php include 'top.php'; ?>
+<?php
+include 'session_start.php';
+$thisPage="Home"; 
+include 'top.php'; ?>
 
   <body>
 

diff --git a/lawmakers.php b/lawmakers.php
@@ -1,12 +1,21 @@
 <?php
 $thisPage="Lawmakers"; 
 include 'top.php'; ?>
-
-
-<!--  <title>Lawmakers - IDLEG - Idaho Legislative Information Portal, Bills, Lawmakers & Data</title> -->
 
 <div class="maincontainer">
 
 <?php include 'dash.php'; ?>
+
+  <div class="billmain">
+
+  <?php
+
+    $host = "localhost";
+    $user = "root";
+    $dbpassword = "root";
+    $database = "idleg_test";
+    $dbport = 8889;
+
+    $db = new PDO("mysql:host=$host;dbname=$database;port=$dbport", $user, $dbpassword);
 
 <?php include 'footer.php'; ?>
diff --git a/login.php b/login.php
@@ -0,0 +1,18 @@
+<?php
+
+session_start();
+include 'users.php';
+
+if (check_login($_POST["username"], $_POST["password"])) {
+  $_SESSION["access_granted"] = true;
+  header("Location:granted.php");
+
+} else {
+  $status = "Invalid username or password";
+  $_SESSION["status"] = $status;
+  $_SESSION["user_preset"] = $_POST["user"];
+  $_SESSION["access_granted"] = false;
+
+  header("Location:index.php");
+}
+?>
diff --git a/login_test.php b/login_test.php
@@ -0,0 +1,22 @@
+<?php
+include('top.php');
+include('users.php');
+
+$name = $_POST["name"];
+$password = $_POST["password"];
+
+if (check_login($name, $password) {
+	session_start();
+	$_SESSION["name"] = $name;
+	?>
+
+	<p>Login successful! Welcome back, <?= $name ?>.</p>
+	<?php 
+}
+	else {
+	?>
+	<p>Sorry, incorrect user name or password.</p>
+	<?php
+}
+include('bottom.php');
+?>
diff --git a/logout.php b/logout.php
@@ -0,0 +1,5 @@
+<?php
+session_start();
+session_destroy();
+header("Location:index.php");
+?>
diff --git a/session_start.php b/session_start.php
@@ -0,0 +1,24 @@
+<?php
+
+if (!isset($_SESSION)) {
+session_start();
+}
+
+if (isset($_SESSION["flash"])) {
+	?>
+	<div id="flash"> <?= $_SESSION["flash"] ?> </div>
+	<?php
+	unset($_SESSION["flash"]);
+	}
+
+
+
+/*  if (isset($_SESSION["access_granted"]) && $_SESSION["access_granted"]) {
+    header("Location:granted.php");
+  }
+
+  $user = "";
+  if (isset($_SESSION["user_preset"])) {
+    $user = $_SESSION["user_preset"];
+  }  */
+?>
diff --git a/styles.css b/styles.css
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-
-
-
-
 .tops {
 	width: 100%;
 	height: 145px;
@@ -88,7 +83,7 @@ div#logo {
 	padding: .5em;
 	margin: 10;
 	}
-=======
+	
 body {
 	font-family: 'Source Sans Pro', Helvetica, sans-serif;
 	font-size: 12px;

diff --git a/top.php b/top.php
@@ -6,14 +6,15 @@
 
   <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
 
-  <title>IDLEG - Idaho Legislative Information Portal, Bills, Lawmakers & Data</title>
+  <title><?php if ($thisPage!="")
+echo "$thisPage"; ?> - Idaho Legislative Information Portal, Bills, Lawmakers & Data</title>
   <meta charset="utf-8" />
   <meta name="description" content="idleg: Idaho legislative bill information portal" />
   <meta name="keywords" content="Idaho, legislature, bills, laws, legislation" />
   <meta name="author" content="Nathaniel Hoffman" />  <!-- Note: Make dynamic based on page author -->
 
   <?php include 'functions.php'; ?>
-  <meta name="revised" content="<?php filemtime(index.html); ?>" />  <!-- last mod of index.html -->
+  <meta name="revised" content="<?php filemtime('index.php'); ?>" />  <!-- last mod of index.html -->
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <link href="styles.css" type="text/scc" rel="stylesheet" />

diff --git a/topics.php b/topics.php
@@ -2,9 +2,6 @@
 $thisPage="Topics"; 
 include 'top.php'; ?>
 
-
-<!--  <title>Topics - IDLEG - Idaho Legislative Information Portal, Bills, Lawmakers & Data</title> -->
-
 <div class="maincontainer">
 
 <?php include 'dash.php'; ?>

diff --git a/users.php b/users.php
@@ -0,0 +1,38 @@
+<?php
+
+if (!isset($_SESSION)) { session_start(); }
+
+# Returns TRUE if PW correct
+
+ini_set('display_errors',1);
+error_reporting(E_ALL);
+
+/*    $host = "localhost";
+    $user = "root";
+    $dbpassword = "root";
+    $database = "idleg_test";
+    $dbport = 8889;   */
+
+function check_login($name, $password) {
+    $db = new PDO("mysql:host=127.0.0.1;port=8889;dbname=idleg_test", "root", "root");
+    var_dump($db);
+    $name = $db->quote($name);
+    $rows = $db->query("SELECT password FROM users WHERE username = $name");
+    if ($rows) {
+        foreach ($rows as $row) {             #only one row should match  
+            if ($password === $row["password"]) {
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+function ensure_logged_in() {
+if (!isset($_SESSION[$name])) {
+redirect("user.php", "You must login first");
+}
+}
+
+function redirect 
+?>