From 8d9321225140a3db0b72796d4d0236d6cacfeb8a Mon Sep 17 00:00:00 2001 From: Nicolas BERNSTEIN Date: Sat, 17 Sep 2011 19:36:41 +0200 Subject: Started working on a study program. --- design/style.css | 30 ++++++++++++++++++++++- lib/conf/apps.php | 36 ++++++++++++++++++++++++---- lib/deck/add.php | 5 ++++ lib/deck/addent.php | 46 +++++++++++++++++++++++++++++++++++ lib/deck/edent.php | 44 ++++++++++++++++++++++++++++++++++ lib/deck/edit.php | 42 ++++++++++++++++++++++++++++++++ lib/deck/index.php | 25 +++++++++++++++++++ lib/deck/mvent.php | 32 +++++++++++++++++++++++++ lib/deck/new.php | 32 +++++++++++++++++++++++++ lib/deck/rment.php | 18 ++++++++++++++ lib/deck/view.php | 34 ++++++++++++++++++++++++++ lib/functions.php | 61 +++++++++++++++++++++++++++++++++++++++++++++++ lib/notes/index.php | 14 ++++++++++- lib/study/deck.php | 5 ++++ lib/study/deckadd.php | 5 ++++ lib/study/index.php | 3 +++ schema.sql | 40 ++++++++++++++++++++++++++++--- tpl/deck/ef.php | 16 +++++++++++++ tpl/deck/index.php | 20 ++++++++++++++++ tpl/deck/new.php | 8 +++++++ tpl/deck/view.php | 33 +++++++++++++++++++++++++ tpl/general/top.php | 9 ++++--- tpl/notes/index.php | 2 ++ tpl/study/index.php | 16 +++++++++++++ tpl/study/lib_sidebar.php | 18 ++++++++++++++ 25 files changed, 582 insertions(+), 12 deletions(-) create mode 100644 lib/deck/add.php create mode 100644 lib/deck/addent.php create mode 100644 lib/deck/edent.php create mode 100644 lib/deck/edit.php create mode 100644 lib/deck/index.php create mode 100644 lib/deck/mvent.php create mode 100644 lib/deck/new.php create mode 100644 lib/deck/rment.php create mode 100644 lib/deck/view.php create mode 100644 lib/study/deck.php create mode 100644 lib/study/deckadd.php create mode 100644 lib/study/index.php create mode 100644 tpl/deck/ef.php create mode 100644 tpl/deck/index.php create mode 100644 tpl/deck/new.php create mode 100644 tpl/deck/view.php create mode 100644 tpl/study/index.php create mode 100644 tpl/study/lib_sidebar.php diff --git a/design/style.css b/design/style.css index d186eda..64571fa 100644 --- a/design/style.css +++ b/design/style.css @@ -54,6 +54,8 @@ h1 { .menu a { min-width: 100px; padding: 4px; + padding-left: 20px; + padding-right: 20px; } } @@ -125,7 +127,7 @@ iframe, textarea { iframe, textarea { border: 1px solid gray; width: 98%; - height: 400px; + height: 300px; } textarea { @@ -177,6 +179,13 @@ iframe, textarea { font-style: italic; } +.ordering_links { + font-size: 0.8em; + margin-top: 10px; + margin-left: 50px; + color: #444; +} + table { margin: 8px; width: 99%; @@ -199,6 +208,25 @@ th { text-align: center; } +code { + font-size: 1.2em; +} + abbr { border-bottom: 1px dashed #999; } + + +/* CARDS */ + +.study_card { + margin: 16px; + border-left: 1px solid #ccc; + border-bottom: 1px solid #ccc; + padding: 8px; +} + +.study_card code { + margin-left: 16px; + margin-bottom: 8px; +} diff --git a/lib/conf/apps.php b/lib/conf/apps.php index fc714ca..734bfca 100644 --- a/lib/conf/apps.php +++ b/lib/conf/apps.php @@ -3,12 +3,20 @@ $homepage = "notes"; $apps = array( + + // Image upload application "image" => array( "index" => 1, "delete" => 1, - "upload" => 0), + "upload" => 0, + ), + + // Account application "account" => array( - "new" => 0), + "new" => 0, + ), + + // Notebook application "notes" => array( "index" => 0, "user" => 0, @@ -17,5 +25,25 @@ $apps = array( "edit" => 1, "delete" => 1, "move" => 1, - "source" => 0), - ); + "source" => 0, + ), + + // Studies application + "deck" => array( + "index" => 0, + "new" => 1, + "view" => 0, + // function called for editing + "edit" => 1, // change title, comment + "addent" => 1, // add card + "rment" => 1, // remove card + "edent" => 1, // edit card + "mvent" => 1, // move card + ), + "study" => array ( + "index" => 1, + "deckadd" => 1, + "deck" => 1, + ), + +); diff --git a/lib/deck/add.php b/lib/deck/add.php new file mode 100644 index 0000000..d7f8e9f --- /dev/null +++ b/lib/deck/add.php @@ -0,0 +1,5 @@ +study decks.'; +require("tpl/general/empty.php"); diff --git a/lib/deck/addent.php b/lib/deck/addent.php new file mode 100644 index 0000000..a860df1 --- /dev/null +++ b/lib/deck/addent.php @@ -0,0 +1,46 @@ + "Name : ", "name" => "name", "value" => $card_name), + array("label" => "Text : ", "name" => "text", "type" => "textarea", "value" => $card_text), +); +$validate = "Add card"; + +require("tpl/deck/ef.php"); diff --git a/lib/deck/edent.php b/lib/deck/edent.php new file mode 100644 index 0000000..8bdfac3 --- /dev/null +++ b/lib/deck/edent.php @@ -0,0 +1,44 @@ + $card['deckid'], 'name' => $card['deckname']); + +$card_name = $card['name']; +$card_text = $card['text']; +if (isset($_POST['name']) && isset($_POST['text'])) { + $card_name = esca($_POST['name']); + $card_text = esca($_POST['text']); + $card_text_html = Markdown($card_text); + if ($card_name == "") { + $error = "You must give your card a name."; + } else if ($card_text == "") { + $error = "You must put some text in your card."; + } else if (mysql_fetch_assoc(sql("SELECT id FROM cards WHERE deck = " . $deck['id'] . " AND name = '" . escs($card_name)."' AND id != $cardid"))) { + $error = "You already have a card using that name."; + } else { + sql("UPDATE cards SET name = '" . escs($card_name) . "', text_md = '" . escs($card_text) . "', text_html = '" . escs($card_text_html) . "'" . + " WHERE id = $cardid"); + header("Location: view-deck-" . $deck['id']); + die(); + } +} + +$title = "Edit card in " . $deck['name']; +$fields = array( + array("label" => "Name : ", "name" => "name", "value" => $card_name), + array("label" => "Text : ", "name" => "text", "type" => "textarea", "value" => $card_text), +); +$validate = "Edit card"; + +require("tpl/deck/ef.php"); + diff --git a/lib/deck/edit.php b/lib/deck/edit.php new file mode 100644 index 0000000..3d893a2 --- /dev/null +++ b/lib/deck/edit.php @@ -0,0 +1,42 @@ + "Name : ", "name" => "name", "value" => $deck_name), + array("label" => "Comment : ", "name" => "comment", "type" => "textarea", "value" => $deck_comment), +); +$validate = "Edit deck"; + +require("tpl/deck/ef.php"); diff --git a/lib/deck/index.php b/lib/deck/index.php new file mode 100644 index 0000000..7a125e2 --- /dev/null +++ b/lib/deck/index.php @@ -0,0 +1,25 @@ + array ( + "nbUsers" => "popularity", + "name" => "name", + "owner" => "author", + ), + "way" => $ord_ways, +); +$fdefaults = array ( + "order" => "nbUsers", + "way" => "DESC", +); + +$decks = array(); +$n = sql( + "SELECT decks.id AS id, decks.name AS name, account.login AS owner, 0 AS nbUsers ". + "FROM decks LEFT JOIN account ON decks.owner = account.id ". + "ORDER BY " . get_filter("order") . " " . get_filter("way") + ); +while ($nn = mysql_fetch_assoc($n)) $decks[] = $nn; + +require("tpl/deck/index.php"); + diff --git a/lib/deck/mvent.php b/lib/deck/mvent.php new file mode 100644 index 0000000..d4571e9 --- /dev/null +++ b/lib/deck/mvent.php @@ -0,0 +1,32 @@ + $card['deckid'], 'name' => $card['deckname']); +$deckid = $card['deckid']; + +$mn = mysql_fetch_assoc(sql("SELECT COUNT(*) AS c FROM cards WHERE deck = $deckid")); +$mn = $mn['c']; +if ($pos > $mn) { + $error = "That number is too big. You don't even have that much cards in your deck."; +} else if ($pos < 1) { + $error = "A position is at least one..."; +} else { + sql("UPDATE cards SET number = 0 WHERE id = $cardid"); + sql("UPDATE cards SET number = number - 1 WHERE number > " . $card['number']); + sql("UPDATE cards SET number = number + 1 WHERE number >= $pos"); + sql("UPDATE cards SET number = $pos WHERE id = $cardid"); + header("Location: view-deck-$deckid"); +} + +require("tpl/deck/ef.php"); diff --git a/lib/deck/new.php b/lib/deck/new.php new file mode 100644 index 0000000..2ff1b50 --- /dev/null +++ b/lib/deck/new.php @@ -0,0 +1,32 @@ + "Name : ", "name" => "name", "value" => $deck_name), + array("label" => "Comment : ", "name" => "comment", "type" => "textarea", "value" => $deck_comment), + ); +$validate = "Create deck"; + +require("tpl/deck/new.php"); diff --git a/lib/deck/rment.php b/lib/deck/rment.php new file mode 100644 index 0000000..d3a87e0 --- /dev/null +++ b/lib/deck/rment.php @@ -0,0 +1,18 @@ += 3, 'deck'); +$cardid = intval($args[2]); + +$card = mysql_fetch_assoc(sql( + "SELECT decks.id AS deckid, decks.owner AS deckowner, decks.name AS deckname, cards.name AS name, cards.text_md AS text, cards.number AS number ". + "FROM cards LEFT JOIN decks ON decks.id = cards.deck ". + "WHERE cards.id = $cardid")); +assert_error($card && $card["deckowner"] == $user['id'], + "This card does not exist, or you are not allowed to edit it."); + +token_validate("Do you really want to delete this card ?", "view-deck-". $card['deckid']); +sql("DELETE FROM cards WHERE id = $cardid"); +sql("UPDATE cards SET number = number - 1 WHERE number > " . $card['number'] . " AND deck = " . $card['deckid']); +header("Location: view-deck-" . $card['deckid']); diff --git a/lib/deck/view.php b/lib/deck/view.php new file mode 100644 index 0000000..eda2ca0 --- /dev/null +++ b/lib/deck/view.php @@ -0,0 +1,34 @@ + array ( + "name" => "card name", + "number" => "card number", + ), + "way" => $ord_ways, +); +$fdefaults = array ( + "order" => "number", + "way" => "ASC", +); + +$cards = array(); +$n = sql( + "SELECT id, number, name, text_html AS text FROM cards WHERE deck = $deckid ". + "ORDER BY " . get_filter("order") . " " . get_filter("way") + ); +while ($nn = mysql_fetch_assoc($n)) $cards[] = $nn; + +$can_edit = false; +if ($deck["owner_id"] == $user['id']) $can_edit = true; + +require("tpl/deck/view.php"); diff --git a/lib/functions.php b/lib/functions.php index 549ed3b..6190818 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -50,3 +50,64 @@ function assert_error($a, $e, $t = "") { die(); } } + + +// **** DISPLAY FILTERS ******* + +function get_filter($name) { + global $filters, $fdefaults; + if (!isset($filters[$name])) return ""; + $v = (isset($_GET[$name]) ? $_GET[$name] : ""); + if (!isset($filters[$name][$v])) return $fdefaults[$name]; + return $v; +} + +function filter_html_entry($name, $entry) { + global $filters, $filters_defaults, $url; + if (!isset($filters[$name])) return ""; + if (!isset($filters[$name][$entry])) return ""; + $rurl = array("p=".$url, $name . "=" . $entry); + foreach ($filters as $filter => $n) { + if ($filter != $name) { + $rurl[] = ($filter . "=" . get_filter($filter)); + } + } + return '' . $filters[$name][$entry] . ''; +} + +function filter_html($name) { + global $filters, $filters_defaults; + if (!isset($filters[$name])) return ""; + $r = array(); + foreach ($filters[$name] as $v => $t) { + if (get_filter($name) == $v) { + $r[] = "" . $t . ""; + } else { + $r[] = filter_html_entry($name, $v); + } + } + return implode(", ", $r); +} + +function filters_html() { + global $filters; + $r = array(); + foreach ($filters as $k => $filter) { + $r[$k] = filter_html($k); + } + return $r; +} + +function filters_html_full() { + global $filters_names; + $r = array(); + foreach (filters_html() as $f => $h) { + $r[] = $f . " (" . $h . ")"; + } + return implode(", ", $r); +} + +$ord_ways = array ( + "ASC" => "ascending", + "DESC" => "descending" +); diff --git a/lib/notes/index.php b/lib/notes/index.php index 3c81f46..3089605 100644 --- a/lib/notes/index.php +++ b/lib/notes/index.php @@ -1,9 +1,21 @@ array ( + "nbNotes" => "number of notes", + "name" => "username", + ), + "way" => $ord_ways, +); +$fdefaults = array ( + "order" => "nbNotes", + "way" => "DESC", +); + $users = array(); $n = sql("SELECT account.id AS id, login AS name, COUNT(notes.id) AS nbNotes FROM account ". "LEFT JOIN notes ON notes.owner = account.id ". "WHERE notes.public != 0 AND notes.id != 0 ". - "GROUP BY account.id ORDER BY nbNotes DESC"); + "GROUP BY account.id ORDER BY " . get_filter("order") . " " . get_filter("way")); while ($nn = mysql_fetch_assoc($n)) $users[] = $nn; require("tpl/notes/index.php"); diff --git a/lib/study/deck.php b/lib/study/deck.php new file mode 100644 index 0000000..d7f8e9f --- /dev/null +++ b/lib/study/deck.php @@ -0,0 +1,5 @@ +study decks.'; +require("tpl/general/empty.php"); diff --git a/lib/study/deckadd.php b/lib/study/deckadd.php new file mode 100644 index 0000000..d7f8e9f --- /dev/null +++ b/lib/study/deckadd.php @@ -0,0 +1,5 @@ +study decks.'; +require("tpl/general/empty.php"); diff --git a/lib/study/index.php b/lib/study/index.php new file mode 100644 index 0000000..e6cec20 --- /dev/null +++ b/lib/study/index.php @@ -0,0 +1,3 @@ +
'; + +echo '

' . $deck['name'] . '

'; +echo ''; + +require("tpl/general/bottom.php"); diff --git a/tpl/deck/index.php b/tpl/deck/index.php new file mode 100644 index 0000000..b8e9a76 --- /dev/null +++ b/tpl/deck/index.php @@ -0,0 +1,20 @@ +' . filters_html_full() . '
'; + +echo ""; +foreach ($decks as $deck) { + echo ''; + echo ''; +} +echo "
NameUsers
' . $deck["owner"] . ':' . $deck["name"] . '' . $deck["nbUsers"] . '
"; + +require("tpl/study/lib_sidebar.php"); + +require("tpl/general/bottom.php"); diff --git a/tpl/deck/new.php b/tpl/deck/new.php new file mode 100644 index 0000000..1f7e81e --- /dev/null +++ b/tpl/deck/new.php @@ -0,0 +1,8 @@ +edit | '; + echo 'add card'; +} + +echo '

Description

'; +echo $deck["comment"]; + +echo '

Cards

'; +echo '
' . filters_html_full() . '
'; +foreach ($cards as $card) { + echo '
'; + if ($can_edit) { + echo '
edit | remove | '; + echo 'move'; + echo '
'; + } + echo '#' . $card["number"] . ": " . $card["name"] . ''; + echo '
' . $card['text']; + echo '
'; +} +if ($can_edit) + echo '[+] add card'; + +require("tpl/study/lib_sidebar.php"); + +require("tpl/general/bottom.php"); diff --git a/tpl/general/top.php b/tpl/general/top.php index e87e466..28a9658 100644 --- a/tpl/general/top.php +++ b/tpl/general/top.php @@ -24,9 +24,12 @@ if ($user['id'] == 0) { Notebooks Uploaded images'; -} elseif ($user['priv'] >= $apps['image']['upload']) { - echo 'Upload image'; + echo 'Uploaded imagesMy studies'; +} else { + if ($user['priv'] >= $apps['image']['upload']) { + echo 'Upload image'; + } + echo 'Study decks'; } ?> diff --git a/tpl/notes/index.php b/tpl/notes/index.php index 1be4cd5..6c0eb99 100644 --- a/tpl/notes/index.php +++ b/tpl/notes/index.php @@ -2,6 +2,8 @@ $title = "User's notebooks"; require("tpl/general/top.php"); +echo '
' . filters_html_full() . '
'; + echo "