diff --git a/admin.php b/admin.php index 9787a13..4410531 100644 --- a/admin.php +++ b/admin.php @@ -1,39 +1,37 @@ '; - echo '
'; - - //users - - include('user/users.php'); - - echo '
'; - //profile - include('user/profile.php'); - echo '
'; - - echo '
'; - echo '
'; - - //edit user - include('user/editUser.php'); - - - echo '
'; - //new user - include('user/newUser.php'); - echo '
'; - } - else - { - include('includes/profile.php'); - } - - - require('includes/footer.php'); -?> \ No newline at end of file +//11-24-16 + +require('includes/header.php'); + +if($admin) +{ + echo '
'; + echo '
'; + + //users + + include('user/users.php'); + + echo '
'; + //profile + include('user/profile.php'); + echo '
'; + + echo '
'; + echo '
'; + + //edit user + include('user/editUser.php'); + + + echo '
'; + //new user + include('user/newUser.php'); + echo '
'; +} +else +{ + include('includes/profile.php'); +} + +require('includes/footer.php'); \ No newline at end of file diff --git a/includes/header.php b/includes/header.php index d372d5c..86429fa 100644 --- a/includes/header.php +++ b/includes/header.php @@ -1,114 +1,114 @@ - - Panda Quotes - - - - - - - - - -
-
- -

Panda Quotes

- -
-
'; - } - elseif($loggedIn) - { - echo ' - - Panda Quotes - - - - - - - - - -
-
- -

Panda Quotes

- -
-
'; - } - else - { - echo ' - - Panda Quotes - - - - - - - - - -
-
- -

Panda Quotes

- -
-
'; - } +} + + +if($admin) +{ + echo ' + + Panda Quotes + + + + + + + + + +
+
+ +

Panda Quotes

+ +
+
'; +} +elseif($loggedIn) +{ + echo ' + + Panda Quotes + + + + + + + + + +
+
+ +

Panda Quotes

+ +
+
'; +} +else +{ + echo ' + + Panda Quotes + + + + + + + + + +
+
-?> +

Panda Quotes

+ +
+
'; +} diff --git a/index.php b/index.php index 87395fe..5983c01 100644 --- a/index.php +++ b/index.php @@ -1,40 +1,32 @@ '; - echo '
'; - echo ''; - echo '
'; - - echo '
'; - echo ' - '; - echo '
'; - - - echo ''; - - - - - - include('includes/footer.php'); - -?> +include('includes/header.php'); + +//first row + + +include 'quotes/panda.php'; + + +include('quotes/public.php'); + +include('quotes/private.php'); + + +//4-row +echo '
'; +echo '
'; +echo ''; +echo '
'; + +echo '
'; +echo ' +'; +echo '
'; + + +echo '
'; + +include('includes/footer.php'); diff --git a/quotes.php b/quotes.php index bdb33ec..d733580 100644 --- a/quotes.php +++ b/quotes.php @@ -1,50 +1,41 @@ '; - echo '
'; - - //add quote - - include('quotes/newQuote.php'); - - echo '
'; - //profile - include('user/profile.php'); - echo '
'; - - echo '
'; - echo '
'; - - //people - include('quotes/people.php'); - - - echo '
'; - //add person - include('quotes/newPerson.php'); - echo '
'; - - echo '
'; - echo '
'; - - //people - include('quotes/allQuotes.php'); - - - echo '
'; - - echo '
'; - } - else - { - include('includes/profile.php'); - } - - include('includes/footer.php'); - -?> \ No newline at end of file +if($loggedIn) +{ + echo '
'; + echo '
'; + + include('quotes/newQuote.php'); + + echo '
'; + + include('user/profile.php'); + echo '
'; + + echo '
'; + echo '
'; + + include('quotes/people.php'); + + + echo '
'; + + include('quotes/newPerson.php'); + echo '
'; + + echo '
'; + echo '
'; + + include('quotes/allQuotes.php'); + + + echo '
'; +} +else +{ + include('includes/profile.php'); +} + +include('includes/footer.php'); diff --git a/quotes/allQuotes.php b/quotes/allQuotes.php index 3506a51..c90e195 100644 --- a/quotes/allQuotes.php +++ b/quotes/allQuotes.php @@ -1,87 +1,81 @@ Quotes'; + + $q = "select * from quote"; + + $r = mysqli_query($dbc, $q); + + echo '
+ + + + + + + + + + + '; + + while($row = mysqli_fetch_array($r)) + { + echo ''; + + //quote + echo ""; + + //person + $q2 = "select name from people where person_id='" + . $row['person_id'] . "'"; + $r2 = mysqli_query($dbc, $q2); + while($row2 = mysqli_fetch_array($r2)) { - $del_id = mysqli_real_escape_string($dbc, trim($_POST['del_quote_id'])); - - $q = "delete from quote where quote_id='$del_id' limit 1"; - - $r = mysqli_query($dbc, $q); - - header("Location: quotes.php"); + echo ""; } - - - echo '

Quotes

'; - - $q = "select * from quote"; - - $r = mysqli_query($dbc, $q); - - echo '
-
QuotePersonCreated ByDateDelete
" . $row['quote'] . "" . $row2['name'] . "
- - - - - - - - - - - '; - - while($row = mysqli_fetch_array($r)) + + //created by + $q2 = "select user_name from users where user_id='" + . $row['user_id'] . "'"; + $r2 = mysqli_query($dbc, $q2); + while($row2 = mysqli_fetch_array($r2)) { - echo ''; - - //quote - echo ""; - - //person - $q2 = "select name from people where person_id='" . $row['person_id'] . "'"; - $r2 = mysqli_query($dbc, $q2); - while($row2 = mysqli_fetch_array($r2)) - { - echo ""; - } - - //created by - $q2 = "select user_name from users where user_id='" . $row['user_id'] . "'"; - $r2 = mysqli_query($dbc, $q2); - while($row2 = mysqli_fetch_array($r2)) - { - echo ""; - } - - //date - $c = Carbon::createFromTimestampUTC(strtotime($row['creation_date'] . ' UTC')); - echo ''; - - - - //del - echo ''; - - echo ''; + echo ""; } - - echo ' -
QuotePersonCreated ByDateDelete
" . $row['quote'] . "" . $row2['name'] . "" . $row2['user_name'] . "' . $c->format('l jS \of F Y') . ''; - echo '
- - - -
'; - echo '
" . $row2['user_name'] . "
-
'; - } + //date + $c = Carbon::createFromTimestampUTC(strtotime( + $row['creation_date'] . ' UTC')); + echo '' . $c->format('l jS \of F Y') . ''; -?> \ No newline at end of file + //del + echo ''; + echo '
+ + + +
'; + echo ''; + + echo ''; + } + echo ''; +} \ No newline at end of file diff --git a/quotes/newPerson.php b/quotes/newPerson.php index 3bd3f68..6dd081f 100644 --- a/quotes/newPerson.php +++ b/quotes/newPerson.php @@ -1,44 +1,46 @@
New Person
'; - - echo '
- -
- - -
-
- - -
-

- - - -
'; - - foreach($errors as $msg) - { - echo " - $msg
"; - } + $i_first = mysqli_real_escape_string($dbc, + trim($_POST['person_first'])); + $i_last = mysqli_real_escape_string($dbc, + trim($_POST['person_last'])); + + $q = "insert into people (name, creation_date) values ('" + . $i_first . " " . $i_last . "' , now())"; + + $r = mysqli_query($dbc, $q); + + header("Location: quotes.php"); } -?> \ No newline at end of file + echo '

New Person

'; + + echo '
+ +
+ + +
+
+ + +
+

+ + + +
'; + + foreach($errors as $msg) + echo " - $msg
"; + +} diff --git a/quotes/newQuote.php b/quotes/newQuote.php index ddf75ea..d5e8262 100644 --- a/quotes/newQuote.php +++ b/quotes/newQuote.php @@ -1,80 +1,84 @@
New Quote
'; - - echo '
'; - - $q = "select name from people order by name asc"; - $r = mysqli_query($dbc, $q); - echo ''; - echo '
- - -
- -