aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/admins/functions.php12
-rw-r--r--admin/pages/functions.php4
-rw-r--r--blocks/donations/index.php8
-rw-r--r--blocks/mini_calendar/index.php4
-rw-r--r--includes/debug.php6
-rw-r--r--includes/functions.php43
-rw-r--r--index.php4
-rw-r--r--modules/download/index.php6
-rw-r--r--modules/index/index.php4
-rw-r--r--modules/news/functions.php10
-rw-r--r--modules/newsreel/index.php6
-rw-r--r--modules/page/index.php10
12 files changed, 69 insertions, 48 deletions
diff --git a/admin/admins/functions.php b/admin/admins/functions.php
index 68b9bc7..8987322 100644
--- a/admin/admins/functions.php
+++ b/admin/admins/functions.php
@@ -43,7 +43,7 @@
function ListAdmins()
{
global $db;
- $result = $db->Query("SELECT `user_id`, `username`, `level` FROM `bayonet_users` ORDER BY `level` DESC");
+ $result = $db->Query("SELECT `user_id`, `username`, `level` FROM `bayonet_users` ORDER BY `level` DESC, `username` ASC");
while(($rows = $db->fetch($result))!=false)
{
$admins[] = $rows;
@@ -51,9 +51,13 @@
$num = 1;
OpenTable("300px");
- echo "<tr><th></th><th>Username</th><th>Level</th></tr>";
+ echo "<tr><th></th><th style=\"text-align:left;\">Username</th><th style=\"text-align:left;\">Level</th></tr>";
foreach($admins as $admin)
{
+ if($admin['level'] != $level){
+ $level = $admin['level'];
+ echo "<tr><td colspan=\"3\"><hr /></td></tr>";
+ }
echo "<tr><td>{$num}.</td><td><a href=\"?op=admins&edit={$admin['user_id']}\">{$admin['username']}</a></td><td>{$admin['level']}</td></tr>";
$num++;
}
@@ -127,10 +131,10 @@
<center>
<form method="POST" action="<?php $_SERVER['PHP_SELF']?>">
<table>
- <tr><th>Username:</th><td><input type="text" value="" name="username" /></td></tr>
+ <tr><th>Username:</th><td><input type="text" value="" name="username" />*</td></tr>
<tr><th>First Name:</th><td><input type="text" value="" name="first" /></td></tr>
<tr><th>Last Name:</th><td><input type="text" value="" name="last" /></td></tr>
- <tr><th>Email Address:</th><td><input type="text" value="" name="email" /></td></tr>
+ <tr><th>Email Address:</th><td><input type="text" value="" name="email" />*</td></tr>
<tr>
<th>Level:</th>
<td>
diff --git a/admin/pages/functions.php b/admin/pages/functions.php
index c4d4369..15b1f0c 100644
--- a/admin/pages/functions.php
+++ b/admin/pages/functions.php
@@ -377,9 +377,9 @@ function DeletePage($page_id)
?>
- <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post">
+ <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
<table>
- <th>Are you <u>SURE</u> you want to delete the page titled: '<?php echo $page['title']?>'?<br />All articles attached to this page will be deleted as well.</th>
+ <th>Are you <u>SURE</u> you want to delete the page titled: '<?php echo $page['title'];?>'?<br />All articles attached to this page will be deleted as well.</th>
<tr><th><button name="proceed">Yes</button>&nbsp;&nbsp;&nbsp;<button name="cancel">No</button></th></tr>
</table>
</form>
diff --git a/blocks/donations/index.php b/blocks/donations/index.php
index 8695f68..4deb5dc 100644
--- a/blocks/donations/index.php
+++ b/blocks/donations/index.php
@@ -2,11 +2,11 @@
<tr><td id="block">
<center>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
-<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
+<input type="hidden" name="cmd" value="_s-xclick" />
+<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
</form>
</center>
</td></tr>
diff --git a/blocks/mini_calendar/index.php b/blocks/mini_calendar/index.php
index 6516646..c67df9a 100644
--- a/blocks/mini_calendar/index.php
+++ b/blocks/mini_calendar/index.php
@@ -1,3 +1,5 @@
<link rel="stylesheet" type="text/css" href="blocks/mini_calendar/style.css" media="screen"/>
<?php include 'blocks/mini_calendar/functions.php'; ?>
-<?php PrintCalendar(); ?> \ No newline at end of file
+<?php PrintCalendar(); ?>
+
+<?php /*SELECT title, color, date, time FROM bayonet_events WHERE date BETWEEN [start] AND [end]*/ ?> \ No newline at end of file
diff --git a/includes/debug.php b/includes/debug.php
index 1a5dcb1..c67ee9c 100644
--- a/includes/debug.php
+++ b/includes/debug.php
@@ -101,7 +101,7 @@ function logQueueFlush($force = false)
static $log_message_last_count = 0;
static $next = false;
- OpenTable();
+ OpenContent();
echo "<div class=\"contentHeading\">Bayonet Debug Messages</div>";
echo "<div class=\"content\">";
foreach($log_message_queue as $message)
@@ -143,8 +143,8 @@ function logQueueFlush($force = false)
++$messageCount;
}
- echo "</div></div>";
- CloseTable();
+ echo "</div>";
+ CloseContent();
}
/*
diff --git a/includes/functions.php b/includes/functions.php
index 6238ec4..f0fe60e 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -29,7 +29,7 @@ function bbcode_format ($str)
{
$str = htmlentities($str);
$str = strip_tags($str);
- $str = wordwrap($str,100,"\n",true);
+ //$str = wordwrap($str,100,"\n",true);
$simple_search = array(
'/\[b\](.*?)\[\/b\]/is',
@@ -247,7 +247,8 @@ function LinkList($array)
*/
function LinkModule($module_name,$args = NULL,$link_name)
{
- return "<a href=\"?load={$module_name}{$args}\">{$link_name}</a>";
+
+ return "<a href=\"index.php?load={$module_name}{$args}\">{$link_name}</a>";
}
/**
@@ -297,29 +298,43 @@ if(!defined("CALLED_FROM_ADMIN"))
{
/**
* OpenTable()
- *
* Begins a Bayonet site table.
- *
* @return
*/
function OpenTable()
{
//width="100%" is important. Otherwise all of our tables will be text width.
- //echo "<table width=\"100%\" align=\"center\" class=\"cleartable\">\n";
- echo "<div class=\"contentBorder1\">";
- echo "<div class=\"contentBorder2\">";
+ echo "<table width=\"100%\" align=\"center\" class=\"cleartable\">\n";
}
/**
* CloseTable()
- *
* Closes a Bayonet site table.
- *
* @return
*/
function CloseTable()
{
//echo "</table>";
+ }
+
+ /**
+ * OpenContent()
+ * Begins a Bayonet site table.
+ * @return
+ */
+ function OpenContent()
+ {
+ echo "<div class=\"contentBorder1\">";
+ echo "<div class=\"contentBorder2\">";
+ }
+
+ /**
+ * CloseContent()
+ * Closes a Bayonet site table.
+ * @return
+ */
+ function CloseContent()
+ {
echo "</div>";
echo "</div>";
}
@@ -327,7 +342,7 @@ if(!defined("CALLED_FROM_ADMIN"))
function OpenBlock($title = 'New Block')
{
- OpenTable();
+ OpenContent();
echo "<div class=\"contentHeading\">{$title}</div>";
echo "<div class=\"content\">";
}
@@ -335,7 +350,7 @@ function OpenBlock($title = 'New Block')
function CloseBlock()
{
echo "</div>";
- CloseTable();
+ CloseContent();
}
static $error_stack_messages = array(); //global stack of errors accumulated throughout execution
@@ -375,9 +390,9 @@ function handle_error ($errno, $errstr, $errfile, $errline)
function ReportError($message)
{
//WriteLog($message,BAYONET_LOG_ERROR);
- OpenTable();
+ OpenContent();
echo "<div class=\"contentHeading\">Error Message</div><div class=\"content\">{$message}</div>";
- CloseTable();
+ CloseContent();
}
/**
@@ -587,7 +602,7 @@ function GetBlocks($position = BLOCK_LEFT)
if(file_exists($load))
{
OpenBlock($block['title']);
- include $load;
+ include_once $load;
CloseBlock();
decho("'{$block['dir_name']}' block loaded");
}
diff --git a/index.php b/index.php
index 4f6d84b..e2d34ed 100644
--- a/index.php
+++ b/index.php
@@ -38,13 +38,13 @@ include 'header.php';
<div class="banner"><a href="index.php"><img src="images/logo.jpg" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
<!-- navigation -->
- <div class="nav"><?php require 'navigation.php'; ?></div>
+ <div class="nav"><?php require_once 'navigation.php'; ?></div>
<!-- content -->
<table border="0" cellspacing="10px" cellpadding="0" class="main" width="100%">
<tr>
<td class="leftcol">
- <?php require 'modules.php'; ?>
+ <?php require_once 'modules.php'; ?>
</td>
<!-- block area RIGHT -->
diff --git a/modules/download/index.php b/modules/download/index.php
index 1fa99e5..300bd46 100644
--- a/modules/download/index.php
+++ b/modules/download/index.php
@@ -26,13 +26,13 @@ $download = NULL;
$download_relative_path = "modules/" . basename(dirname(__FILE__)) . "/files/";
$download_absolute_path = dirname(__FILE__) . "/files/";
-$result = $db->Query("SELECT uid, name, description, filename FROM bayonet_downloads");
+$result = $db->Query("SELECT `file_id`, `name`, `description`, `filename` FROM `bayonet_downloads`");
while(($row = $db->Fetch($result)) !== false)
{
$download[] = $row;
}
-OpenTable();
+OpenContent();
echo "<div class=\"contentHeading\">Downloads</div>";
echo "<div class=\"content\">";
foreach($download as $file)
@@ -59,7 +59,7 @@ decho($download);
echo "</div>";
-CloseTable();
+CloseContent();
?> \ No newline at end of file
diff --git a/modules/index/index.php b/modules/index/index.php
index b7554b7..7d23bc6 100644
--- a/modules/index/index.php
+++ b/modules/index/index.php
@@ -26,9 +26,9 @@
}
else
{
- OpenTable();
+ OpenContent();
ReportError("Cannot load module '{$module}' directory.<br>\n");
- CloseTable();
+ CloseContent();
}
echo "<br />";
}
diff --git a/modules/news/functions.php b/modules/news/functions.php
index ee4345d..b76a53e 100644
--- a/modules/news/functions.php
+++ b/modules/news/functions.php
@@ -49,7 +49,7 @@ function getNewsComments($id){
function displayComments($data){
date_default_timezone_set("America/New_York");
- OpenTable();
+ OpenContent();
?>
<div id="comments">
@@ -104,7 +104,7 @@ function displayComments($data){
commentForm();
- CloseTable();
+ CloseContent();
}
/**
@@ -164,7 +164,7 @@ function displayNews($data){
{
$numComments = getNumOfComments($news['news_id']);
- OpenTable(); ?>
+ OpenContent(); ?>
<div class="contentHeading">
<table width="100%">
@@ -190,7 +190,7 @@ function displayNews($data){
</div>
<?php
- CloseTable();
+ CloseContent();
echo "<br />";
}
}
@@ -245,7 +245,7 @@ function commentForm(){
?>
<br><span><?php echo date('F jS', time()); ?></span></p>
</div>
- <form action="<?php $_SERVER['PHP_SELF']?>" method="POST" id="comment_form">
+ <form action="<?php $_SERVER['PHP_SELF']; ?>" method="POST" id="comment_form">
<!-- <fieldset> -->
<textarea name="comment" id="comment" rows="8" cols="10" tabindex="1" class="input textarea required"></textarea>
<input type="hidden" value="<?php echo $cur_user_id; ?>" name="author" />
diff --git a/modules/newsreel/index.php b/modules/newsreel/index.php
index f0b9d73..0a986c2 100644
--- a/modules/newsreel/index.php
+++ b/modules/newsreel/index.php
@@ -1,5 +1,5 @@
<!-- START News Reel -->
-<?php OpenTable(); ?>
+<?php OpenContent(); ?>
<script type="text/javascript">
var current = "0";
@@ -102,12 +102,12 @@ $y=0;
$get_slidenav = mysql_query("SELECT * FROM `bayonet_newsreel` WHERE `visible`= 1 ORDER BY `weight` ASC LIMIT 0, 6");
while($echo_slidenav = mysql_fetch_array($get_slidenav)){
- echo '<td id="'.$y.'" width="'.$width.'%" class="slidenav" onClick="nextSlide(this.id,true)" onmouseover="mouseOverBG(this.id)" onmouseout="mouseOutBG(this.id)">'.$echo_slidenav['title'].'</td>';
+ echo '<td id="'.$y.'" width="'.$width.'%" class="slidenav" onclick="nextSlide(this.id,true)" onmouseover="mouseOverBG(this.id)" onmouseout="mouseOutBG(this.id)">'.$echo_slidenav['title'].'</td>';
$y++;
}
?>
</tr>
</table>
</div></div>
-<?php CloseTable(); ?>
+<?php CloseContent(); ?>
<!-- END News Reel --> \ No newline at end of file
diff --git a/modules/page/index.php b/modules/page/index.php
index 68dbb62..abf559f 100644
--- a/modules/page/index.php
+++ b/modules/page/index.php
@@ -42,7 +42,7 @@ if(isset($_GET['list']))
}
mysql_free_result($result);
- OpenTable();
+ OpenContent();
echo "<div class=\"contentHeading\">Page Map</div>";
echo "<div class=\"content\">";
echo "<ul>";
@@ -52,7 +52,7 @@ if(isset($_GET['list']))
}
echo "</ul>";
echo "</div>";
- CloseTable();
+ CloseContent();
/* Kill module execution to prevent odd page results */
return;
@@ -76,7 +76,7 @@ if($proceed > 0)
while(($row = $db->Fetch($result))!==false)
{
$page = $row;
- OpenTable();
+ OpenContent();
echo "<div class=\"content\">";
$aresult = $db->Query("SELECT * FROM `bayonet_articles` WHERE `page_id` = $id ORDER BY `weight` ASC");
while(($article = $db->Fetch($aresult))!==false)
@@ -84,10 +84,10 @@ if($proceed > 0)
$articleTitle = $article['title'];
echo '<h2>'.$articleTitle.'</h2>';
//echo "<h3>".$article['title']."</h3>";
- echo BBCode($article['text']);
+ echo bbcode_format($article['text']);
}
echo "</div>";
- CloseTable();
+ CloseContent();
}
?>
generated by cgit (git 2.34.1) at 2025-04-28 18:12:34 -0400