diff options
Diffstat (limited to 'includes/pages/user_news.php')
| -rw-r--r-- | includes/pages/user_news.php | 205 |
1 files changed, 88 insertions, 117 deletions
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index c85a6243..b8879e62 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -13,182 +13,153 @@ function meetings_title() { function user_meetings() { global $DISPLAY_NEWS, $privileges, $user; - - $html = ""; - - if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) + + $html = '<div class="col-md-10"><h1>' . meetings_title() . '</h1>'; + + if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) $page = $_REQUEST['page']; else $page = 0; - + $news = sql_select("SELECT * FROM `News` WHERE `Treffen`=1 ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS)); foreach ($news as $entry) $html .= display_news($entry); - - $html .= "<div class=\"pagination\">\n\n"; - $dis_rows = ceil(sql_num_query("SELECT * FROM `News` WHERE `Treffen`=1") / $DISPLAY_NEWS); - - $html .= _("Page:"); - - for ($i = 0; $i < $dis_rows; $i++) { + + $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS); + $html .= '<div class="text-center">' . '<ul class="pagination">'; + for ($i = 0; $i < $dis_rows; $i ++) { if (isset($_REQUEST['page']) && $i == $_REQUEST['page']) - $html .= ($i +1) . " "; + $html .= '<li class="active">'; + elseif (! isset($_REQUEST['page']) && $i == 0) + $html .= '<li class="active">'; else - $html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a> '; + $html .= '<li>'; + $html .= '<a href="' . page_link_to("user_meetings") . '&page=' . $i . '">' . ($i + 1) . '</a></li>'; } - $html .= '</div>'; + $html .= '</ul></div></div>'; + return $html; } function display_news($news) { global $privileges, $p; - - $html = ""; - $html .= '<article class="news' . ($news['Treffen'] == 1 ? ' meeting' : '') . '">'; - $html .= '<details>'; - $html .= date("Y-m-d H:i", $news['Datum']) . ', '; - + + $html = ''; + $html .= '<div class="panel' . ($news['Treffen'] == 1 ? ' panel-info' : ' panel-default') . '">'; + $html .= '<div class="panel-heading">'; + $html .= '<h3 class="panel-title">' . ($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '</h3>'; + $html .= '</div>'; + $html .= '<div class="panel-body">' . ReplaceSmilies(nl2br($news['Text'])) . '</div>'; + + $html .= '<div class="panel-footer text-muted">'; + if (in_array("admin_news", $privileges)) + $html .= '<div class="pull-right"><a class="btn btn-xs btn-default" href="' . page_link_to("admin_news") . '&action=edit&id=' . $news['ID'] . '">' . _("edit") . '</a></div>'; + + $html .= '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $news['Datum']) . ' '; + $user_source = User($news['UID']); - if($user_source === false) + if ($user_source === false) engelsystem_error(_("Unable to load user.")); - + $html .= User_Nick_render($user_source); if ($p != "news_comments") - $html .= ', <a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '">' . _("Comments") . ' (' . sql_num_query("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . ') »</a>'; - $html .= '</details>'; - $html .= '<h3>' . ($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '</h3>'; - $html .= '<p>' . ReplaceSmilies(nl2br($news['Text'])) . '</p>'; - if (in_array("admin_news", $privileges)) - $html .= '<details><a href="' . page_link_to("admin_news") . '&action=edit&id=' . $news['ID'] . '">' . _("edit") . '</a></details>'; - - $html .= '</article>'; + $html .= ' <a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '"><span class="glyphicon glyphicon-comment"></span> ' . _("Comments") . ' »</a> <span class="badge">' . sql_num_query("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . '</span>'; + $html .= '</div>'; + $html .= '</div>'; return $html; } function user_news_comments() { global $user; - - $html = ""; - if (isset ($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) { + + $html = '<div class="col-md-10"><h1>' . user_news_comments_title() . '</h1>'; + if (isset($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) { $nid = $_REQUEST["nid"]; - list ($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($nid) . " LIMIT 1"); - if (isset ($_REQUEST["text"])) { + list($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($nid) . " LIMIT 1"); + if (isset($_REQUEST["text"])) { $text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text'])); sql_query("INSERT INTO `NewsComments` (`Refid`, `Datum`, `Text`, `UID`) VALUES ('" . sql_escape($nid) . "', '" . date("Y-m-d H:i:s") . "', '" . sql_escape($text) . "', '" . sql_escape($user["UID"]) . "')"); engelsystem_log("Created news_comment: " . $text); $html .= success(_("Entry saved."), true); } - - $html .= '<a href="' . page_link_to("news") . '">« ' . _("back") . '</a>'; + $html .= display_news($news); - - $html .= '<h2>' . _("Comments") . '</h2>'; - + $comments = sql_select("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($nid) . "' ORDER BY 'ID'"); foreach ($comments as $comment) { $user_source = User($comment['UID']); - if($user_source === false) + if ($user_source === false) engelsystem_error(_("Unable to load user.")); - - $html .= '<article class="news_comment">'; - $html .= User_Avatar_render($user_source); - $html .= '<details>'; - $html .= $comment['Datum'] . ', '; + + $html .= '<div class="panel panel-default">'; + $html .= '<div class="panel-body">' . nl2br($comment['Text']) . '</div>'; + $html .= '<div class="panel-footer text-muted">'; + $html .= '<span class="glyphicon glyphicon-time"></span> ' . $comment['Datum'] . ' '; $html .= User_Nick_render($user_source); - $html .= '</details>'; - $html .= '<p>' . nl2br($comment['Text']) . '</p>'; - $html .= '</article>'; + $html .= '</div>'; + $html .= '</div>'; } - - $html .= "</table>"; - $html .= ' - <br /> - <hr> - <h2>' . _("New Comment:") . '</h2> - <a name="Neu"> </a> - - <form action="' . page_link_to("news_comments") . '" method="post"> - <input type="hidden" name="nid" value="' . $_REQUEST["nid"] . '"> - <table> - <tr> - <td align="right" valign="top">' . _("Message:") . '</td> - <td><textarea name="text" cols="50" rows="10"></textarea></td> - </tr> - </table> - <br /> - <input type="submit" value="' . _("Save") . '"> - </form>'; + + $html .= '<hr /><h2>' . _("New Comment:") . '</h2>'; + $html .= form(array( + form_textarea('text', _("Message"), ''), + form_submit('submit', _("Save")) + ), page_link_to('news_comments') . '&nid=' . $news['ID']); + } else { $html .= _("Invalid request."); } - - return $html; + + return $html . '</div>'; } function user_news() { global $DISPLAY_NEWS, $privileges, $user; - - $html = msg(); - - if (isset ($_POST["text"]) && isset ($_POST["betreff"]) && in_array("admin_news", $privileges)) { - if (!isset ($_POST["treffen"]) || !in_array("admin_news", $privileges)) + + $html = '<div class="col-md-10"><h1>' . news_title() . '</h1>' . msg(); + + if (isset($_POST["text"]) && isset($_POST["betreff"]) && in_array("admin_news", $privileges)) { + if (! isset($_POST["treffen"]) || ! in_array("admin_news", $privileges)) $_POST["treffen"] = 0; - sql_query("INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " . - "VALUES ('" . sql_escape(time()) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($user['UID']) . - "', '" . sql_escape($_POST["treffen"]) . "');"); + sql_query("INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " . "VALUES ('" . sql_escape(time()) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($user['UID']) . "', '" . sql_escape($_POST["treffen"]) . "');"); engelsystem_log("Created news: " . $_POST["betreff"] . ", treffen: " . $_POST["treffen"]); success(_("Entry saved.")); redirect(page_link_to('news')); } - - if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) + + if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) $page = $_REQUEST['page']; else $page = 0; - + $news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS)); foreach ($news as $entry) $html .= display_news($entry); - - $html .= "<div class=\"pagination\">\n\n"; + $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS); - - $html .= _("Page:"); - - for ($i = 0; $i < $dis_rows; $i++) { + $html .= '<div class="text-center">' . '<ul class="pagination">'; + for ($i = 0; $i < $dis_rows; $i ++) { if (isset($_REQUEST['page']) && $i == $_REQUEST['page']) - $html .= ($i +1) . " "; + $html .= '<li class="active">'; + elseif (! isset($_REQUEST['page']) && $i == 0) + $html .= '<li class="active">'; else - $html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a> '; + $html .= '<li>'; + $html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i + 1) . '</a></li>'; } - $html .= '</div>'; + $html .= '</ul></div>'; + if (in_array("admin_news", $privileges)) { - $html .= '<br /><hr /> - <h2>' . _("Create news:") . '</h2> - <a name="Neu"> </a> - - <form action="" method="post"> - <table> - <tr> - <td align="right">' . _("Subject") . ':</td> - <td><input type="text" name="betreff" size="60"></td> - </tr> - <tr> - <td align="right">' . _("Message") . ':</td> - <td><textarea name="text" cols="50" rows="10"></textarea></td> - </tr>'; - if (in_array('admin_news', $privileges)) { - $html .= ' <tr> - <td align="right">' . _("Meeting") . ':</td> - <td><input type="checkbox" name="treffen" size="1" value="1"></td> - </tr>'; - - } - $html .= '</table> - <br /> - <input type="submit" value="' . _("Save") . '"> - </form>'; + $html .= '<hr />'; + $html .= '<h2>' . _("Create news:") . '</h2>'; + + $html .= form(array( + form_text('betreff', _("Subject"), ''), + form_textarea('text', _("Message"), ''), + form_checkbox('treffen', _("Meeting"), false, 1), + form_submit('submit', _("Save")) + )); } - return $html; + return $html . '</div>'; } ?>
\ No newline at end of file |