aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/adjutant/functions.php154
-rw-r--r--admin/adjutant/index.php58
-rw-r--r--admin/adjutant/style.css13
-rw-r--r--admin/admin_functions.php4
-rw-r--r--admin/blocks/functions.php2
-rw-r--r--admin/calendar/functions.php4
-rw-r--r--admin/calendar/index.php2
-rw-r--r--admin/images/adjutant.pngbin0 -> 6496 bytes
-rw-r--r--admin/index.php3
-rw-r--r--admin/settings/index.php2
-rw-r--r--admin/style.css167
-rw-r--r--blocks/donations/index.php2
-rw-r--r--blocks/mini_calendar/functions.php30
-rw-r--r--blocks/mini_calendar/style.css72
-rw-r--r--blocks/rss_agw/index.php2
-rw-r--r--blocks/rss_agw/style.css4
-rw-r--r--includes/classes.php131
-rw-r--r--includes/debug.php17
-rw-r--r--includes/functions.php13
-rw-r--r--includes/sql.class.php14
-rw-r--r--index.php15
-rw-r--r--style.css40
22 files changed, 502 insertions, 247 deletions
diff --git a/admin/adjutant/functions.php b/admin/adjutant/functions.php
new file mode 100644
index 0000000..261c122
--- /dev/null
+++ b/admin/adjutant/functions.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008 Joseph Hunkeler & Evan O'Connell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ function EditPoints(){
+
+ global $db;
+
+ $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id != 4 AND rudi_unit_members.status_id != 5 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
+ $row = $db->Fetch($result);
+
+ if(isset($_POST['processed'])){
+ echo "Updating data... Please wait.";
+ foreach($row as $soldier){
+ $mID = $soldier['member_id'];
+ $missed = $_POST[$mID.'missed'];
+ $points = $_POST[$mID.'points'];
+
+ if($missed !="" && $points != ""){
+ $db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed WHERE `member_id` = $mID LIMIT 1");
+ }else{
+ ReportError("Error updating points for soldier id# '$mID'. Please contact administrator.");
+ }
+ }
+ PageRedirect(1,"?op=adjutant&edit=points");
+ return;
+ }
+?>
+ <form method="POST" action="<?php $_SERVER['PHP_SELF']?>">
+ <table style="text-align:center;" width="100%">
+ <?php //OpenTable(); ?>
+ <tr><th>Rank</th><th>Soldier</th><th>Status</th><th>Points</th><th>Drills Missed</th></tr>
+<?php
+ foreach($row as $soldier){
+ $memberID = $soldier['member_id'];
+ if($soldier['status_id'] != 1)
+ echo "<tr class=\"inactive\">";
+ else
+ echo "<tr>";
+ echo "<td>{$soldier['shortname']}</td>
+ <td>{$soldier['first_name']} {$soldier['last_name']}</td>
+ <td>".getStatus($soldier['status_id'])."</td>
+ <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['points']}\" name=\"{$memberID}points\" size=\"1\" maxlength=\"3\" />/100</td>
+ <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['drillcount']}\" name=\"{$memberID}missed\" size=\"1\" maxlength=\"1\" />/3</td>";
+
+
+ echo "<input type=\"hidden\" value=\"{$memberID}\" name=\"{$memberID}id\" />\n";
+ }
+ CloseTable();
+ echo "<input type=\"submit\" name=\"processed\" value=\"Update Points\" /></form>";
+
+ }
+
+ function editLOAs($status_id = 1){
+
+ global $db;
+
+ $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id = '$status_id' ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
+ $row = $db->Fetch($result);
+?>
+ <script type="text/javascript">
+
+ function switchOption(id)
+ {
+ var op = document.getElementById(id).value;
+ location.href="?op=adjutant&edit=loas&id="+op+"";
+ }
+ </script>
+<?php
+
+ $opArr = Array();
+ $opArr[1] = "Active Soldiers";
+ $opArr[2] = "Soldiers on Leave";
+ $opArr[3] = "Soldiers on Extended Leave";
+
+ echo 'Viewing: <select id="option" name="option" onchange="switchOption(this.id)">';
+ for($x=1; $x<4; $x++){
+ if($status_id == $x)
+ echo '<option value="'.$x.'" selected>'.$opArr[$x].'</option>';
+ else
+ echo '<option value="'.$x.'">'.$opArr[$x].'</option>';
+ }
+ echo '</select>';
+
+?>
+ <table style="text-align:center;" width="100%">
+ <tr><th>Rank</th><th>Soldier</th><th>Status</th></tr>
+<?php
+$num = 1;
+ foreach($row as $member){
+ if($num %2 == 0)
+ echo "<tr style=\"background-color:#c6c6c6;\">";
+ else
+ echo "<tr>";
+ echo "<td>{$member['shortname']}</td><td>{$member['first_name']} {$member['last_name']}</td><td><a href=\"?op=adjutant&edit=loas&member={$member['member_id']}\">Edit</a></td></tr>";
+ $num++;
+ }
+ CloseTable();
+ }
+
+ function EditStatus($member_id){
+ global $db;
+
+ $form = new BayonetForm($_SERVER['PHP_SELF'], "POST");
+ if($form->VerifySubmit('processed')){
+
+ return;
+ }
+
+ $result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE `member_id` = '$member_id' LIMIT 1");
+ $row = $db->FetchRow($result);
+?>
+ <table width="100%" style="text-align:center;">
+ <tr><th>Rank</th><th>Soldier</th><th>Status</th></tr>
+ <tr>
+ <td><?php echo $row['shortname']; ?></td>
+ <td><?php echo $row['first_name']." ".$row['last_name']; ?></td>
+ <td style="text-align:left;">
+ <?php $form->radioButton('status', 1, true); ?>Active<br />
+ <?php $form->radioButton('status', 2); ?>On Leave<br />
+ <?php $form->radioButton('status', 3); ?>On Extended Leave
+ </td>
+ </tr>
+ </table>
+<?php
+ $form->__destruct();
+
+ }
+
+ function getStatus($sID){
+ global $db;
+ $gStatusName = "N/A";
+
+ $result = $db->Query("SELECT `name` FROM `rudi_statuses` WHERE `status_id` = $sID LIMIT 1");
+ $row = $db->FetchRow($result);
+
+ return $row['name'];
+ }
+ ?> \ No newline at end of file
diff --git a/admin/adjutant/index.php b/admin/adjutant/index.php
new file mode 100644
index 0000000..5149c28
--- /dev/null
+++ b/admin/adjutant/index.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008 Joseph Hunkeler & Evan O'Connell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ ?>
+ <link rel="stylesheet" type="text/css" href="adjutant/style.css" media="screen"/>
+ <div style="text-align:left;"><h2>- Adjutant Control Panel</h2></div>
+ <a href="?op=adjutant&edit=points">Edit Points</a>&nbsp;&nbsp;
+ <a href="?op=adjutant&edit=loas">Edit LOAs</a>
+ <table class="panel" width="100%">
+ <tr><td style="text-align:center; vertical-align:top;">
+ <?php
+ if(!defined("ADMIN_FILE"))
+ {
+ die("Access denied.");
+ }
+
+ include $basedir.'adjutant/functions.php';
+
+ //chek to see if the person is indeed an adjutant
+
+ if(isset($_GET['edit'])){
+ if($_GET['edit'] == "points"){
+ echo "<h3>Edit Points</h3>";
+ EditPoints();
+ }
+ if($_GET['edit'] == "loas"){
+ echo "<h3>Edit LOAs</h3>";
+ if(isset($_GET['member'])){
+ $member_id = $_GET['member'];
+ EditStatus($member_id);
+ }else{
+ if(isset($_GET['id']))
+ $status_id = $_GET['id'];
+ else
+ $status_id = 1;
+ EditLOAs($status_id);
+ }
+ }
+ }
+ ?>
+ </td></tr>
+ </table> \ No newline at end of file
diff --git a/admin/adjutant/style.css b/admin/adjutant/style.css
new file mode 100644
index 0000000..24a3eb8
--- /dev/null
+++ b/admin/adjutant/style.css
@@ -0,0 +1,13 @@
+ input.lrg {
+ font-size:14px;
+ font-weight:bold;
+ text-align:center;
+ font-family: Arial, Sans-Serif;
+ }
+
+ tr.inactive {
+ background-color:#dfdfdf;
+ }
+ tr.inactive td {
+ color:#a2a2a2;
+ } \ No newline at end of file
diff --git a/admin/admin_functions.php b/admin/admin_functions.php
index 1f5f866..46572e5 100644
--- a/admin/admin_functions.php
+++ b/admin/admin_functions.php
@@ -127,8 +127,8 @@ $num = 1;
if($num==1){
echo "<tr style=\"text-align:center; height:90px;\">";
}
- echo "<td class=\"center\" style=\"width:16%;\">$td</td>\n";
- if($num%6 == 0){
+ echo "<td class=\"center\" style=\"width:12%;\">$td</td>\n";
+ if($num%8 == 0){
echo "</tr>";
$num=0;
}
diff --git a/admin/blocks/functions.php b/admin/blocks/functions.php
index fadf610..84c20b5 100644
--- a/admin/blocks/functions.php
+++ b/admin/blocks/functions.php
@@ -117,7 +117,7 @@ function EditBlock($block_id)
}
//Update the database with the new data.
- $db->Query("UPDATE bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'");
+ $db->Query("UPDATE bayonet_blocks SET title = '$title', weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'");
//$isActive = $active ? "IS" : "IS NOT";
echo "Block, '$dir_name', at position '$weight'(order) has been edited.\n";
PageRedirect(3, "?op=blocks");
diff --git a/admin/calendar/functions.php b/admin/calendar/functions.php
index cffaab1..76922cc 100644
--- a/admin/calendar/functions.php
+++ b/admin/calendar/functions.php
@@ -380,8 +380,8 @@ $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$da
echo '<td class="cal_weekday">'; //weekdays
}
- $sqlDate = $year.'-'.$monthNum.'-'.$day_num; //old way NOT unix
-
+ $sqlDate = date("Y-m-d", mktime(0, 0, 0, $monthNum, $day_num, $year));
+
//checks to see if the current day has events
$isEvent=false;
foreach($events as $event){
diff --git a/admin/calendar/index.php b/admin/calendar/index.php
index 1197990..2b631d8 100644
--- a/admin/calendar/index.php
+++ b/admin/calendar/index.php
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
?>
-
+ <link rel="stylesheet" type="text/css" href="calendar/style.css" media="screen"/>
<div style="text-align:left;"><h2>- Manage Calendar & Events</h2></div>
<?php
diff --git a/admin/images/adjutant.png b/admin/images/adjutant.png
new file mode 100644
index 0000000..e0dc701
--- /dev/null
+++ b/admin/images/adjutant.png
Binary files differ
diff --git a/admin/index.php b/admin/index.php
index e888b6d..511418f 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -98,7 +98,8 @@ include 'header.php';
LinkInternal('<img src="images/news.png" /><br />News','?op=news'),
LinkInternal('<img src="images/calendar.png" /><br />Calendar','?op=calendar'),
LinkInternal('<img src="images/box_download.png" /><br />Downloads', '?op=downloads'),
- LinkInternal('<img src="images/rudi.png" /><br />RUDI','?op=rudi')
+ LinkInternal('<img src="images/rudi.png" /><br />RUDI','?op=rudi'),
+ LinkInternal('<img src="images/adjutant.png" /><br />Adjutant','?op=adjutant')
);
//render administration table
diff --git a/admin/settings/index.php b/admin/settings/index.php
index 875abc8..e3c8946 100644
--- a/admin/settings/index.php
+++ b/admin/settings/index.php
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
?>
-
+ <link rel="stylesheet" type="text/css" href="settings/style.css" media="screen"/>
<div style="text-align:left;"><h2>- Account Settings</h2>
-<a href="?op=settings&change=password" >Change password</a>, email, name<br />
</div>
diff --git a/admin/style.css b/admin/style.css
index 63055ab..281e0b2 100644
--- a/admin/style.css
+++ b/admin/style.css
@@ -24,7 +24,6 @@ a:hover {
}
h1, h2, h3, h4, h5, h6 {
- /* font-family: 'Century Gothic'; */
font-weight: normal;
}
h2 {
@@ -51,12 +50,12 @@ table.panel {
border:1px solid #848484;
}
-.panel-none {
+td.panel-none {
width:201px;
vertical-align:top;
}
-.panel-shadow {
+td.panel-shadow {
background-image:url("../images/rightshadow.png");
background-position: left;
background-repeat: repeat-y;
@@ -133,164 +132,4 @@ fieldset {
padding:10px;
color:#333333;
}
-/* START>> CALENDAR STYLES*/
- .monthTitle{
- color:black;
- text-align:center;
- font-size:12px;
- font-weight:bold;
- font-family:arial;
- }
- td.weekday {
- width:40px;
- height:20px;
- background-color:#cb2121;
- color:green;
- text-align:center;
- font-size:10px;
- font-weight:bold;
- }
- th.weekday {
- width:40px;
- height:29px;
- background-color:white;
- color:black;
- text-align:center;
- font-size:11px;
- font-weight:bold;
- }
- .monthday {
- width:40px;
- height:20px;
- background-color:#aea2a2;
- color:white;
- text-align:left;
- font-size:10pt;
- font-weight:bold;
-
- }
- .monthtoday {
- width:38px;
- height:38px;
- /* background-color:#3666ba; */
- color:#225eac;
- text-align:center;
- font-size:14px;
- font-weight:bold;
- border:1px solid #333333;
- }
- .event {
- width:38px;
- height:38px;
- background-color:#225eac;
- text-align:center;
- border:1px solid #333333;
- }
- table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {
- color:white;
- }
- .eventtoday{
- width:38px;
- height:38px;
- background-color:#225eac;
- color:#ef8e25;
- text-align:center;
- font-size:14px;
- font-weight:bold;
- border:1px solid #333333;
- }
- td.cal_weekday {
- width:40px;
- height:40px;
- background-color:#a1a1a1;
- vertical-align:top;
- color:#eeeeee;
- font-family:arial;
- text-align:center;
- font-size:14px;
- }
- td.cal_weekend {
- width:40px;
- height:40px;
- background-color:#8f8f8f;
- vertical-align:top;
- color:#eeeeee;
- font-family:arial;
- text-align:center;
- font-size:14px;
- }
- td.cal_notmonth {
- width:40px;
- height:40px;
- background-color:#6e6e6e;
- vertical-align:top;
- color:#d4d4d4;
- text-align:left;
- font-size:11px;
- }
-/* END>> CALENDAR STYLES */
-
-/* START>> PASSWORD STYLES */
-
-input{
- font-family: "Lucida Grande", "Verdana", sans-serif;
-}
-
-#pwordCont{
- font-family: "Lucida Grande", "Verdana", sans-serif;
- width: 820px;
- font-size:12px;
- margin-left: auto;
- margin-right: auto;
- padding: 50px 0 0 0;
-}
-
-#complexity{
- color: #000;
- font-size: 10px;
- text-align: center;
-}
-
-.outer {
- width:180px;
- height:5px;
- background-color: #CCC;
-}
-
-.default {
- height:5px;
- background-color: #CCC;
- width:0px;
-}
-.short {
- height:5px;
- background-color: #aa0033;
- width:15px;
-}
-.weak {
- height:5px;
- background-color: #aa0033;
- width:45px;
-}
-.good {
- height:5px;
- background-color: #6699cc;
- width:90px;
-}
-.strong {
- height:5px;
- background-color: #008000;
- width:135px;
-}
-.secure {
- height:5px;
- background-color: #008000;
- width:180px;
-}
-
-span.value{
- font-weight:bold;
- float: right;
-}
-
-/* END>> PASSWORD STYLES */ \ No newline at end of file
+ \ No newline at end of file
diff --git a/blocks/donations/index.php b/blocks/donations/index.php
index ff77657..1329f20 100644
--- a/blocks/donations/index.php
+++ b/blocks/donations/index.php
@@ -5,7 +5,7 @@
<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" 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" />
+<!-- <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/functions.php b/blocks/mini_calendar/functions.php
index 1133daa..ffc98a6 100644
--- a/blocks/mini_calendar/functions.php
+++ b/blocks/mini_calendar/functions.php
@@ -25,6 +25,15 @@
/**
* PrintCalendar() - prints the calendar with events
*/
+ ?>
+<script type="text/javascript">
+function openEvent(date)
+{
+ myWindow = window.open('http://testbed.3rd-infantry-division.org/cms/blocks/mini_calendar/event.php?date='+date+'','','width=300,height=300')
+ myWindow.focus();
+}
+</script>
+ <?php
function PrintCalendar(){
$date = time();
@@ -35,7 +44,6 @@
$month = date('m', $date);
$monthNum = date('n', $date);
$year = date('Y', $date);
-
/* Accounts for the last couple days from the previous months */
$first_day = mktime(0,0,0,$monthNum, 1, $year);
@@ -76,7 +84,7 @@
?>
<center>
<table class="calendar" style="background-color:white;" cellspacing="1" cellpadding="0">
- <tr style="background-color:#999999; height:27px;">
+ <tr style="background-color:#999999; height:20px;">
<td colspan="50" style="vertical-align:middle; text-align:center;">
<!-- <a href="?op=calendar&month=<?php echo $previous_month.'&year='.$previous_year; ?>"><<</a> -->
<!-- Month Name and Year -->
@@ -105,7 +113,7 @@
$day_count++;
}
-$sqlToday = $year.'-'.$monthNum.'-'.$today;
+$sqlToday = date("Y-m-d", mktime(0, 0, 0, $monthNum, $today, $year));
$events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$days_in_month}");
//loop printing each day of the CURRENT month ONLY
@@ -117,7 +125,7 @@ $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$da
echo '<td class="cal_weekday">'; //weekdays
}
- $sqlDate = $year.'-'.$monthNum.'-'.$day_num; //old way NOT unix
+ $sqlDate = date("Y-m-d", mktime(0, 0, 0, $monthNum, $day_num, $year));
//checks to see if the current day has events
$isEvent=false;
@@ -129,23 +137,13 @@ $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$da
}
}
- }
-
- /* global $db;
- $result = $db->Query("SELECT title,color,date,time FROM `bayonet_events` WHERE `date` = '$sqlDate' ORDER BY `date` DESC");
- while(($row = $db->Fetch($result))!=false)
- {
- $isEvent = true;
- if($day_num == $today){
- $todaysEvents[] = $row;
- }
- } */
+ }
if($day_num == $today && $isEvent==true){
echo '<div class="eventtoday">'.$day_num.'</div>';
}else if($day_num == $today && $isEvent==false){
echo '<div class="monthtoday">'.$day_num.'</div>';
}else if($day_num != $today && $isEvent==true){
- echo '<div class="event" id="event'.$day_num.'" onmouseover="highlightEvent(this.id)" onmouseout="normEvent(this.id)">';
+ echo "<div class=\"event\" onclick=\"openEvent('{$sqlDate}')\">";
echo $day_num;
echo '</div>';
}else{
diff --git a/blocks/mini_calendar/style.css b/blocks/mini_calendar/style.css
index 72898ee..792ab69 100644
--- a/blocks/mini_calendar/style.css
+++ b/blocks/mini_calendar/style.css
@@ -7,90 +7,108 @@
font-family:arial;
}
td.weekday {
- width:40px;
- height:20px;
+ width:34px;
+ height:34px;
background-color:#cb2121;
color:green;
text-align:center;
font-size:10px;
- font-weight:bold;
+ /* font-weight:bold; */
}
th.weekday {
- width:40px;
- height:29px;
+ width:34px;
+ height:20px;
background-color:white;
color:black;
text-align:center;
font-size:11px;
- font-weight:bold;
+ font-weight:normal;
}
.monthday {
- width:40px;
- height:20px;
+ /* width:29px; */
+ height:36px;
background-color:#aea2a2;
color:white;
text-align:left;
font-size:10pt;
- font-weight:bold;
+ /* font-weight:bold; */
}
.monthtoday {
- width:38px;
- height:38px;
+ /* width:25px; */
+ height:32px;
/* background-color:#3666ba; */
color:#225eac;
text-align:center;
font-size:14px;
- font-weight:bold;
+ font-weight:bold;
+ font-family: arial;
border:1px solid #333333;
}
.event {
- width:38px;
- height:38px;
+ /* width:25px; */
+ height:32px;
background-color:#225eac;
text-align:center;
- border:1px solid #333333;
+ border:1px solid #333333;
+ cursor: pointer;
}
table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {
color:white;
}
- .eventtoday{
- width:38px;
- height:38px;
+ .eventtoday {
+ /* width:25px; */
+ height:32px;
background-color:#225eac;
- color:#ef8e25;
+ color: white;
text-align:center;
font-size:14px;
font-weight:bold;
+ font-family: arial;
border:1px solid #333333;
}
td.cal_weekday {
- width:40px;
- height:40px;
+ width:34px;
+ height:34px;
background-color:#a1a1a1;
vertical-align:top;
color:#eeeeee;
font-family:arial;
text-align:center;
- font-size:14px;
+ font-size:12px;
}
td.cal_weekend {
- width:40px;
- height:40px;
+ width:34px;
+ height:34px;
background-color:#8f8f8f;
vertical-align:top;
color:#eeeeee;
font-family:arial;
text-align:center;
- font-size:14px;
+ font-size:12px;
}
td.cal_notmonth {
- width:40px;
- height:40px;
+ width:34px;
+ height:34px;
background-color:#6e6e6e;
vertical-align:top;
color:#d4d4d4;
text-align:left;
font-size:11px;
}
+ div.event_title {
+ font-family: Geneva, Verdana, Arial;
+ font-size: 14px;
+ }
+ div.event_text {
+ font-family: Geneva, Verdana, Arial;
+ font-size: 12px;
+ padding-top: 3px;
+ padding-left: 10px;
+ padding-right: 5px;
+ }
+ div.event_time {
+ font-family: Geneva, Verdana, Arial;
+ font-size: 12px;
+ }
/* END>> CALENDAR STYLES */ \ No newline at end of file
diff --git a/blocks/rss_agw/index.php b/blocks/rss_agw/index.php
index 8649582..3a492ca 100644
--- a/blocks/rss_agw/index.php
+++ b/blocks/rss_agw/index.php
@@ -20,7 +20,7 @@ if (!extension_loaded('curl')) {
/**
* Armed Global Warfare Feed
*/
-define('AGW_FEED', 'http://www.armedglobalwarfare.com/index.php?type=rss;action=.xml;limit=150');
+define('AGW_FEED', 'http://www.armedglobalwarfare.com/index.php?type=rss;action=.xml;limit=300');
/**
* Cache File
diff --git a/blocks/rss_agw/style.css b/blocks/rss_agw/style.css
index 0bc6e81..e9d0824 100644
--- a/blocks/rss_agw/style.css
+++ b/blocks/rss_agw/style.css
@@ -2,11 +2,11 @@
display: none;
}
.rss span.title{
- font-size: 16px;
+ font-size: 10px;
font-weight: bold;
/* text-decoration:underline; */
}
-
+
.rss span.date{
font-family: 'Trebuchet MS', Trebuchet, Verdana, sans-serif;
font-size: 11px;
diff --git a/includes/classes.php b/includes/classes.php
new file mode 100644
index 0000000..33794c2
--- /dev/null
+++ b/includes/classes.php
@@ -0,0 +1,131 @@
+<?php
+
+define('PASSWORD', true);
+define('NO_PASSWORD', false);
+define('CHECKED', true);
+
+class BayonetForm
+{
+ static public $request;
+
+ public function __construct($action, $method)
+ {
+ $this->request = $_POST;
+ echo "<form action=\"$action\" method=\"$method\">\n";
+ }
+
+ public function __destruct()
+ {
+ echo "</form>\n";
+ }
+
+ function getKeyStates($keys)
+ {
+ $good = array();
+ $bad = array();
+
+ if(!is_array($keys))
+ return array();
+
+ foreach($keys as $key => $value)
+ {
+ if(!empty($value))
+ $good[$key] = $value;
+ else
+ $bad[$key] = $value;
+ }
+
+ $data = array(
+ 'set' => $good,
+ 'unset' => $bad
+ );
+
+ return $data;
+ }
+
+ function verify($submit_key)
+ {
+ return $this->verifySubmit($submit_key);
+ }
+
+ function verifySubmit($submit_key)
+ {
+ return isset($this->request[$submit_key]) ? true : false;
+ }
+
+ function button($extern_name, $value, $text = "Button")
+ {
+ echo "<button name=\"{$extern_name}\" value=\"{$value}\">{$text}</button>\n";
+ }
+
+ function submitButton($extern_name, $value = "Submit")
+ {
+ echo "<input type=\"submit\" name=\"{$extern_name}\" value=\"{$value}\" />\n";
+ }
+
+ function reset($value = "Reset")
+ {
+ echo "<input type=\"reset\" value=\"{$value}\" />\n";
+ }
+
+ function textField($extern_name, $value = NULL, $isPassword = false)
+ {
+ $type = 'text';
+ if($isPassword) $type = 'password';
+
+ $value = filter_var($value, FILTER_SANITIZE_STRING);
+ echo "<input type=\"{$type}\" name=\"{$extern_name}\" value=\"$value\" />\n";
+ }
+
+ function radioButton($extern_name, $value, $isChecked = false)
+ {
+ if($isChecked)
+ {
+ echo "<input type=\"radio\" name=\"{$extern_name}\" value=\"$value\" checked=\"checked\"/>\n";
+ }
+ else
+ {
+ echo "<input type=\"radio\" name=\"{$extern_name}\" value=\"$value\" />\n";
+ }
+ }
+
+ function checkBox($extern_name, $value, $isChecked = false)
+ {
+ if($isChecked)
+ {
+ echo "<input type=\"checkbox\" name=\"{$extern_name}\" value=\"$value\" checked=\"checked\"/>\n";
+ }
+ else
+ {
+ echo "<input type=\"checkbox\" name=\"{$extern_name}\" value=\"$value\" />\n";
+ }
+ }
+
+ function dropDown($extern_name, $values = array('None'), $select = NULL)
+ {
+ $selectIterator = 1;
+
+ echo "<select name=\"{$extern_name}\">\n";
+ foreach($values as $option => $text)
+ {
+ if(!is_null($select) && $selectIterator !== (int)$select)
+ {
+ echo "<option value=\"{$option}\">{$text}</option>\n";
+ }
+ else
+ {
+ echo "<option value=\"{$option}\" selected=\"selected\">{$text}</option>\n";
+ }
+ $selectIterator++;
+ }
+ echo "</select>\n";
+ }
+
+ function textArea($extern_name, $rows = 10, $cols = 30, $value = NULL)
+ {
+ $value = filter_var($value, FILTER_SANITIZE_STRING);
+ echo "<textarea name=\"{$extern_name}\" rows=\"$rows\" cols=\"$cols\">{$value}</textarea>\n";
+ }
+}
+
+?> \ No newline at end of file
diff --git a/includes/debug.php b/includes/debug.php
index 87ebe70..29f4195 100644
--- a/includes/debug.php
+++ b/includes/debug.php
@@ -50,8 +50,8 @@ function decho($message, $force = false)
$message = $message;
}
- if(count($log_message_queue) >= 100)
- array_pop($log_message_queue);
+ //if(count($log_message_queue) >= 100)
+ // array_pop($log_message_queue);
array_push($log_message_queue, $message);
@@ -67,10 +67,15 @@ function queuePrint($obj, $force = false)
if($config['debug']['enabled'] == false ||
$config['debug']['show_messages'] == false) return;
}
-
+
if(is_array($obj))
{
$array_dump = print_r($obj,true);
+ if(empty($obj))
+ {
+ echo "Array was empty<br />\n";
+ return;
+ }
echo "<pre>" . $array_dump . "</pre><br/>\n";
//WriteLog($array_dump,BAYONET_LOG_INFO);
}
@@ -90,6 +95,10 @@ function queuePrint($obj, $force = false)
echo $obj . "<br/>\n";
//WriteLog($message,BAYONET_LOG_INFO);
}
+ else
+ {
+ echo "queuePrint: Invalid type of " . gettype($obj) . "<br/>\n";
+ }
}
function logQueueFlush($force = false)
@@ -117,6 +126,7 @@ function logQueueFlush($force = false)
return false;
}
+ echo "<b>" . count($log_message_queue) . " messages received.</b><br/><br/>\n";
foreach($log_message_queue as $message)
{
if($message != $log_message_queue[$messageCount - 1])
@@ -156,6 +166,7 @@ function logQueueFlush($force = false)
++$messageCount;
}
+
echo "</div>";
CloseContent();
error_reporting(1);
diff --git a/includes/functions.php b/includes/functions.php
index 46b92f3..30997c6 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -25,6 +25,9 @@
* @param mixed $str
* @return
*/
+
+include_once 'classes.php';
+
function bbcode_format ($str)
{
$str = htmlentities($str);
@@ -363,6 +366,10 @@ static $error_stack_messages = array(); //global stack of errors accumulated thr
function push_error_stack($message)
{
global $error_stack_messages;
+
+ if(count($error_stack_messages) >= 100)
+ array_pop($error_stack_messages);
+
array_push($error_stack_messages, $message);
}
@@ -586,15 +593,15 @@ function UnderConstruction($message = NULL, $flag = BAYONET_SITE)
* @return
*/
-define('BLOCK_LEFT',false);
-define('BLOCK_RIGHT',true);
+define('BLOCK_LEFT', 0);
+define('BLOCK_RIGHT', 1);
function GetBlocks($position = BLOCK_LEFT)
{
global $config;
global $db;
- $result = $db->Query("SELECT * FROM `bayonet_blocks` WHERE `position` = '$position' AND `active` = 1 ORDER BY weight");
+ $result = $db->Query("SELECT block_id, active, weight, position, dir_name, title FROM `bayonet_blocks` WHERE `position` = $position AND `active` = 1 ORDER BY weight");
$blocks = $db->Fetch($result);
foreach($blocks as $block)
diff --git a/includes/sql.class.php b/includes/sql.class.php
index 2bdb996..bbc0bbb 100644
--- a/includes/sql.class.php
+++ b/includes/sql.class.php
@@ -88,20 +88,26 @@ class Bayonet_SQL
return is_array($result) ? $result : array();
}
- public function FetchObject($p_result, $class)
+ public function FetchObject($p_result, $class, $no_array = false)
{
global $db_fetches;
++$db_fetches;
decho("Fetching object result");
- while ($row = mysqli_fetch_object($p_result, $class)) {
- (object)$result[] = $row;
+ while ($row = mysqli_fetch_object($p_result, $class))
+ {
+ if($no_array == true)
+ (object)$result = $row;
+ else
+ (object)$result[] = $row;
}
$this->Free($p_result);
- return is_object($result) ? $result : (object)array();
+ // TODO: Test for objects inside of $result array
+ if($no_array == true) { return is_object($result) ? $result : (object)$nothing; }
+ return is_array($result) ? $result : (object)array();
}
public function FetchAssoc($result)
diff --git a/index.php b/index.php
index 855fcee..dd5dd40 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,8 @@ include 'header.php';
<div class="container">
<!-- banner -->
-<div class="banner"><a href="index.php"><img src="images/logo.jpg" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
+<!-- <div class="banner"><a href="index.php"><img src="images/logo.jpg" alt="3rd Infantry Division - ArmAII Unit" /></a></div> -->
+<div class="banner"><a href="index.php"><img src="images/3rdidtext.png" alt="3rd Infantry Division - ArmAII Unit" /></a></div>
<!-- navigation -->
<div class="nav"><?php require_once 'navigation.php'; ?></div>
@@ -43,7 +44,15 @@ include 'header.php';
<!-- content -->
<table border="0" cellspacing="10px" cellpadding="0" class="main" width="100%">
<tr>
- <td class="leftcol">
+
+ <!-- block area LEFT -->
+ <?php //if(!defined('BLOCK_LEFT_DISABLE')): ?>
+ <td class="leftcol">
+ <?php GetBlocks(BLOCK_LEFT); ?>
+ </td>
+ <?php //endif; ?>
+
+ <td class="midcol">
<?php require_once 'modules.php'; ?>
</td>
@@ -53,7 +62,7 @@ include 'header.php';
<?php GetBlocks(BLOCK_RIGHT); ?>
</td>
<?php endif; ?>
-
+
</tr>
</table>
diff --git a/style.css b/style.css
index b075dbe..a24d9ff 100644
--- a/style.css
+++ b/style.css
@@ -2,43 +2,53 @@
** Layout Styles **
*********************************/
div.container {
- width: 990px;
+ /* width: 990px; */
+ /* width: 1000px; */
color: #000000;
- margin: auto auto;
+ /* margin: auto auto; */
text-align: left; /* IE 5 fix */
}
div.banner {
- width: 990px;
- background: #fff;
- color: #000000;
- margin: auto auto;
+ /* width: 990px; */
+ text-align:center;
+ background-image:url('images/3rdbanner.png')
+ /* margin: auto auto; */
}
div.nav {
- width: 990px;
+ /*width: 990px; */
height: 28px;
background: #284c75;
background-image:url('images/navbackground.jpg');
color: #000000;
- margin: auto auto;
+ text-align:center;
+ /* margin: auto auto; */
font-size:14px;
}
table.main {
- background-image:url('images/sandbackground.jpg');
+ /* background-image:url('images/sandbackground.jpg'); */
padding: 0px;
color:#ffffff;
- width:990px;
- background-color:#a3a2a0;
+ /* width:990px; */
+ /*width: 1134px; */
+ /* width: 1234px; */
+ /* margin: auto auto; */
+ /* background-color:#a3a2a0; */
}
table.main td {
- /* color:white; */
+ /* color:white; */
}
- td.leftcol {
- width:644px;
+ td.midcol {
+ /* width: 644px; */
background-color:transparent;
vertical-align:top;
}
td.rightcol {
+ width: 275px;
+ vertical-align:top;
+ }
+ td.leftcol {
+ width: 275px;
vertical-align:top;
}
div.footer {
@@ -76,7 +86,7 @@
color:#333333;
}
div.content img {
- padding:5px;
+ padding:10px;
}
div.contentFooter {
border-top:1px solid #333333;
generated by cgit (git 2.34.1) at 2025-04-28 18:17:08 -0400