openfirst-cvscommit Mailing List for openFIRST (Page 61)
Brought to you by:
xtimg
Menu
▾
▴
openfirst-cvscommit — Notify subscribers of changes to files in CVS.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(41) |
Jun
(210) |
Jul
(39) |
Aug
(153) |
Sep
(147) |
Oct
(173) |
Nov
(81) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(33) |
Feb
(18) |
Mar
|
Apr
(62) |
May
|
Jun
(100) |
Jul
(38) |
Aug
(58) |
Sep
(1) |
Oct
|
Nov
(25) |
Dec
(172) |
| 2005 |
Jan
(31) |
Feb
(12) |
Mar
(67) |
Apr
(92) |
May
(247) |
Jun
(34) |
Jul
(36) |
Aug
(192) |
Sep
(15) |
Oct
(42) |
Nov
(92) |
Dec
(4) |
| 2006 |
Jan
|
Feb
(21) |
Mar
|
Apr
|
May
|
Jun
(53) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(4) |
Apr
(4) |
May
|
Jun
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <i-...@us...> - 2003-12-25 18:58:26
|
Update of /cvsroot/openfirst/news
In directory sc8-pr-cvs1:/tmp/cvs-serv15043/news
Modified Files:
rssfeed.php
Log Message:
RSS link fix (very minor bug)
Index: rssfeed.php
===================================================================
RCS file: /cvsroot/openfirst/news/rssfeed.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rssfeed.php 24 Dec 2003 03:24:09 -0000 1.6
--- rssfeed.php 25 Dec 2003 18:58:22 -0000 1.7
***************
*** 43,47 ****
}
! $link = $basepath."/news/rss/rss.php?headlines=".$numhead."&rss=".$_POST['version'];
?>
--- 43,47 ----
}
! $link = $home.$basepath."/news/rss/rss.php?headlines=".$numhead."&rss=".$_POST['version'];
?>
|
|
From: <i-...@us...> - 2003-12-25 18:52:56
|
Update of /cvsroot/openfirst/forum
In directory sc8-pr-cvs1:/tmp/cvs-serv14437/forum
Modified Files:
NOTES index.php
Added Files:
register.php
Log Message:
Audited forum module.
--- NEW FILE: register.php ---
<?php
/*
* openFIRST.members - register.php
*
* Copyright (C) 2003,
* openFIRST Project
* Original Author: Greg Inozemtsev <gr...@si...>
*
* 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 2 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.
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
include_once("../config/globals.php");
include_once($header);
//Change this variable to allow users to register on the website.
//Registration will provide users with "user" level of access.
//Use this feature with caution.
$regenabled=false;
if($regenabled){
if(isset($_POST["team"])) {
$team=$_POST["team"];
}
else{
$team=0;
}
if(isset($_POST["user"])) {
$user=$_POST["user"];
}
else{
$user="";
}
if(isset($_POST["firstname"])) {
$firstname=$_POST["firstname"];
}
else{
$firstname="";
}
if(isset($_POST["lastname"])) {
$lastname=$_POST["lastname"];
}
else{
$lastname="";
}
if(isset($_POST["password"])) {
$password=$_POST["password"];
}
else{
$password="";
}
if(isset($_POST["password2"])) {
$password2=$_POST["password2"];
}
else{
$password2="";
}
if(isset($_POST["signature"])) {
$signature=$_POST["signature"];
}
else{
$signature="";
}
$msg="";
if(isset($_SERVER["HTTP_REFERER"])&&strstr($_SERVER["HTTP_REFERER"],"register.php")){
if($user==""){
$msg="<br>You must enter a username.";
}
if($password!=$password2){
$msg.="<br>Passwords do not match. Check the password fields.";
}
if(strlen($password)<5){
$msg.="<br>Please pick a password that is at least 5 characters long.";
}
$q = ofirst_dbquery("SELECT user FROM ofirst_members WHERE user='".$user."'");
if(ofirst_dbnum_rows($q)>0){
$msg.="<br>A user is already registered with this username.";
}
if($msg==""){
$q = ofirst_dbquery("INSERT INTO ofirst_members (user, firstname,
lastname, password, membertype, signature, picturelocation, team, dateregistered)
VALUES ('". $user ."', '" . $firstname . "','" . $lastname . "', '" . cryptpassword($password,
$encryption)."', 'user', '".$signature."', '', '".$team."', '".date("Y-m-d") . "');");
echo("<h1>Registration</h1><p>Thank you for registering. You can now use you username and password to access members-only areas of the website</p>");
include_once($footer);
exit;
}
}
?>
<form method="post" action="register.php">
<table width="50%">
<tr><th colspan=2><h1>Registration</h1></th></tr>
<tr><td class=sub colspan=2><p>Please use this form to register. Once you are a registered user, you will be granted access to the Members area of the web site. You can update your profile there at any time.</p>
<p>You will also be able to post messages on the forums and use the Messenger and other modules with no restrictions.</p>
<p><?php echo($msg); ?></p></td></tr>
<tr><th colspan=2><h2>Required Information</h2></th></tr>
<tr>
<th>User Name</th>
<td><input type="text" name="user" value="<?php echo($user); ?>" /></td>
</tr>
<tr>
<th>Password</th>
<td><input type="password" name="password" /></td>
</tr>
<tr>
<th>Confirm Password</th>
<td><input type="password" name="password2" /></td>
</tr>
<tr>
<th>Team Number</th>
<td><input type="text" name="team" value="<?php echo($team); ?>" /><br>Please use 0 if you are not a member of a FIRST team</td>
</tr>
<tr><th colspan=2><h2>Optional Information</h2></th></tr>
<tr>
<th>First Name</th>
<td><input type="text" name="firstname" value="<?php echo($firstname); ?>" /></td>
</tr>
<tr>
<th>Last Name</th>
<td><input type="text" name="lastname" value="<?php echo($lastname); ?>" /></td>
</tr>
<tr>
<th>Signature</th>
<td><textarea name="signature"><?php echo($signature); ?></textarea></td>
</tr>
<tr>
<th colspan=2 align=center><input type="submit" value="Register" /> <input type="reset" /></th>
</tr>
</table>
</form>
<?php
}else{
echo("<h3>Automatic Registration Disabled</h3><p>The administrator of this website has disabled automatic
registrations. Please contact the administrator directly to register.</p>");
}
include_once($footer); ?>
Index: NOTES
===================================================================
RCS file: /cvsroot/openfirst/forum/NOTES,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NOTES 24 Dec 2003 21:12:40 -0000 1.2
--- NOTES 25 Dec 2003 18:52:52 -0000 1.3
***************
*** 9,11 ****
Tim Ginn - not yet audited
! Greg Inozemtsev - not yet audited
\ No newline at end of file
--- 9,11 ----
Tim Ginn - not yet audited
! Greg Inozemtsev - Module approved. Added missing script register.php (this feature is disabled by default).
\ No newline at end of file
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/forum/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.php 24 Dec 2003 21:11:33 -0000 1.10
--- index.php 25 Dec 2003 18:52:53 -0000 1.11
***************
*** 66,70 ****
}
! echo '<div align=left><a href="'.$basepath.'/forum">'.$title.' Forums</a> $res</div>';
if ($forum == "") {
--- 66,70 ----
}
! echo '<div align=left><a href="'.$basepath.'/forum">'.$title." Forums</a> $res</div>";
if ($forum == "") {
|
|
From: <xt...@us...> - 2003-12-25 02:47:19
|
Update of /cvsroot/openfirst/members
In directory sc8-pr-cvs1:/tmp/cvs-serv1117
Modified Files:
updateprofile.php
Log Message:
Remove warning message generated by not checking using isset() first
Index: updateprofile.php
===================================================================
RCS file: /cvsroot/openfirst/members/updateprofile.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** updateprofile.php 22 Dec 2003 17:23:50 -0000 1.12
--- updateprofile.php 25 Dec 2003 02:47:15 -0000 1.13
***************
*** 43,47 ****
}
! if($_POST["cellphonesms"] == "0") {
$_POST["cellphonesms"] = true;
$user->cellphonesms = "1";
--- 43,47 ----
}
! if(isset($_POST["cellphonesms"]) && $_POST["cellphonesms"] == "0") {
$_POST["cellphonesms"] = true;
$user->cellphonesms = "1";
|
|
From: <xt...@us...> - 2003-12-24 21:56:40
|
Update of /cvsroot/openfirst/meetings
In directory sc8-pr-cvs1:/tmp/cvs-serv28963
Modified Files:
NOTES index.php updatesetup.php
Log Message:
Make some audit changes (primarily coding style)
Index: NOTES
===================================================================
RCS file: /cvsroot/openfirst/meetings/NOTES,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NOTES 24 Dec 2003 18:51:06 -0000 1.1
--- NOTES 24 Dec 2003 21:56:36 -0000 1.2
***************
*** 7,11 ****
David Di Biase - Module approved.
! Tim Ginn - not yet audited
! Greg Inozemtsev - not yet audited
\ No newline at end of file
--- 7,11 ----
David Di Biase - Module approved.
! Tim Ginn - audit not yet complete.
! Greg Inozemtsev - not yet audited
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php 24 Dec 2003 18:51:06 -0000 1.4
--- index.php 24 Dec 2003 21:56:36 -0000 1.5
***************
*** 35,58 ****
} else {
! // Create button process
! if(isset($_POST['create'])){
! if(! isset($_POST['assign'])){
! echo "<br><br>You must assign an arranged for field to this meeting! Click back to continue.<br><br><br>";
! die(include_once($footer));
! }
! // Check if assign is a single value or array then give variable a value
! if(is_array($_POST['assign'])){
! $assign = implode(",",$_POST['assign']);
! } else {
! $assign = $_POST['assign'];
! }
! // Collect date and combine it
! $fordate = strtotime($_POST['month']." ".$_POST['day'].",".$_POST['year']." ".$_POST['hour'].":".$_POST['minute']." ".$_POST['ampm']);
! if(isset($_POST['sendreminder'])){ $sendreminder = "1"; }else{ $sendreminder = "0"; }
! // Put value into database
! ofirst_dbquery("INSERT INTO ofirst_meetings SET
ForDate = '".$fordate."',
Description = '".$_POST['description']."',
--- 35,58 ----
} else {
! // Create button process
! if(isset($_POST['create'])){
! if(! isset($_POST['assign'])){
! echo "<br><br>You must assign an arranged for field to this meeting! Click back to continue.<br><br><br>";
! die(include_once($footer));
! }
! // Check if assign is a single value or array then give variable a value
! if(is_array($_POST['assign'])){
! $assign = implode(",",$_POST['assign']);
! } else {
! $assign = $_POST['assign'];
! }
! // Collect date and combine it
! $fordate = strtotime($_POST['month']." ".$_POST['day'].",".$_POST['year']." ".$_POST['hour'].":".$_POST['minute']." ".$_POST['ampm']);
! if(isset($_POST['sendreminder'])){ $sendreminder = "1"; }else{ $sendreminder = "0"; }
! // Put value into database
! ofirst_dbquery("INSERT INTO ofirst_meetings SET
ForDate = '".$fordate."',
Description = '".$_POST['description']."',
***************
*** 60,106 ****
AbsentList = 'none',
Status = 'wait',
! SendReminder = '$sendreminder',
! CalledBy = '".$user->user."',
! EndHour = '".$_POST['endhour']."',
! EndMinute = '".$_POST['endminute']."',
Dates = '".time()."'") or die(ofirst_dberror());
! echo "<br><br>Meeting created! [ <a href='index.php'>Meetings</a> ]<br><br>";
! // ---------------- SEND E-MAIL NOTICE OUT ----------------
! // Prepare e-mail headers without using the multipartmail function
! $headers = "MIME-Version: 1.0\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! $headers .= "X-Priority: 1\r\n";
! $headers .= "X-MSMail-Priority: High\r\n";
! // Prepare message for email
! $message = "<b>$title</b> Meeting System<br>----------------------------------------------------<br>
! <i>".$user->user."</i> requested a meeting for: ".$fordate.". Here are the topics to be discussed:
! <br><blockquote>".$_POST['description'];
! // Query members and mail out notifications
! $assigned = explode(",",$assign);
! foreach($assigned as $assign){
! $member_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE Division = '".$assign."'");
! while($member = ofirst_dbfetch_object($member_query)){
! mail($member->email,"$title Meeting System: Meeting Call",$message,$headers);
! }
! }
! // --------------------------------------------------------
! die(include_once($footer));
! }
! // Remove button process
! if(isset($_POST['remove'])){
! if(! isset($_POST['confirm'])){
! echo "<br><br>Your request to remove the project was denied because you have not confirmed! [ <a href='projects.php?GroupID=".$_GET['GroupID']."'>Projects</a> ]<br><br>";
die(include_once($footer));
}
- ofirst_dbquery("DELETE FROM ofirst_meetings WHERE ID = '".$_POST['project']."'") or die(ofirst_dberror());
- echo "<br><br>Meetings removed! [ <a href='index.php'>Meetings</a> ]<br><br>";
- die(include_once($footer));
- }
?>
--- 60,106 ----
AbsentList = 'none',
Status = 'wait',
! SendReminder = '$sendreminder',
! CalledBy = '".$user->user."',
! EndHour = '".$_POST['endhour']."',
! EndMinute = '".$_POST['endminute']."',
Dates = '".time()."'") or die(ofirst_dberror());
! echo "<br><br>Meeting created! [ <a href='index.php'>Meetings</a> ]<br><br>";
! // ---------------- SEND E-MAIL NOTICE OUT ----------------
! // Prepare e-mail headers without using the multipartmail function
! $headers = "MIME-Version: 1.0\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! $headers .= "X-Priority: 1\r\n";
! $headers .= "X-MSMail-Priority: High\r\n";
! // Prepare message for email
! $message = "<b>$title</b> Meeting System<br>----------------------------------------------------<br>
! <i>".$user->user."</i> requested a meeting for: ".$fordate.". Here are the topics to be discussed:
! <br><blockquote>".$_POST['description'];
! // Query members and mail out notifications
! $assigned = explode(",",$assign);
! foreach($assigned as $assign){
! $member_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE Division = '".$assign."'");
! while($member = ofirst_dbfetch_object($member_query)){
! mail($member->email,"$title Meeting System: Meeting Call",$message,$headers);
! }
! }
! // --------------------------------------------------------
! die(include_once($footer));
! }
! // Remove button process
! if(isset($_POST['remove'])){
! if(! isset($_POST['confirm'])){
! echo "<br><br>Your request to remove the project was denied because you have not confirmed! [ <a href='projects.php?GroupID=".$_GET['GroupID']."'>Projects</a> ]<br><br>";
! die(include_once($footer));
! }
! ofirst_dbquery("DELETE FROM ofirst_meetings WHERE ID = '".$_POST['project']."'") or die(ofirst_dberror());
! echo "<br><br>Meetings removed! [ <a href='index.php'>Meetings</a> ]<br><br>";
die(include_once($footer));
}
?>
***************
*** 119,124 ****
</tr>
<?php
! $meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
! while($meeting = ofirst_dbfetch_object($meetquery)){
?>
<tr>
--- 119,124 ----
</tr>
<?php
! $meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
! while($meeting = ofirst_dbfetch_object($meetquery)) {
?>
<tr>
***************
*** 128,135 ****
</tr>
<?php
! }
! if(ofirst_dbnum_rows($meetquery) == 0){
! echo "<tr><td> </td><td> </td><td>There are no planned meetings!</td></tr>";
! }
?>
</table>
--- 128,135 ----
</tr>
<?php
! }
! if(ofirst_dbnum_rows($meetquery) == 0){
! echo "<tr><td> </td><td> </td><td>There are no planned meetings!</td></tr>";
! }
?>
</table>
***************
*** 146,168 ****
<td class="sub" width="65%"><div align="left">Arranged For Divisions</div></tr>
<?php
! // Check for passed meetings and preview them
! $query = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='done'");
! while($meeting = ofirst_dbfetch_object($query)){
?>
<tr>
! <td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>">
! <img src="../members/icons/apps/date.png" width="32" height="32" border="0"></a></div></td>
<td><?php echo date("F j, Y",$meeting->ForDate); ?></td>
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
<?php
! }
! if(ofirst_dbnum_rows($query) == 0){
! echo "<tr><td> </td><td> </td><td>There are no past meetings!</td></tr>";
! }
?>
</table>
<br>
! <?php if($user->membertype == "administrator"){ ?><form onsubmit="return dhtmlEditorPrepareSubmit();" action='index.php' method='POST'>
<table width="64%">
<tr>
--- 146,172 ----
<td class="sub" width="65%"><div align="left">Arranged For Divisions</div></tr>
<?php
! // Check for passed meetings and preview them
! $query = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='done'");
! while($meeting = ofirst_dbfetch_object($query)) {
?>
<tr>
! <td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>">
! <img src="../members/icons/apps/date.png" width="32" height="32" border="0"></a></div></td>
<td><?php echo date("F j, Y",$meeting->ForDate); ?></td>
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
<?php
! }
! if(ofirst_dbnum_rows($query) == 0){
! echo "<tr><td> </td><td> </td><td>There are no past meetings!</td></tr>";
! }
?>
</table>
<br>
! <?php
! if($user->membertype == "administrator") {
! ?>
!
! <form onsubmit="return dhtmlEditorPrepareSubmit();" action='index.php' method='POST'>
<table width="64%">
<tr>
***************
*** 174,183 ****
<td>
<?php
! // If the WYSIWYG function is set then use the WYSIWYG module
! if (function_exists("make_wysiwyg")) {
! make_wysiwyg("description",500,255,"");
! } else {
! echo "<textarea name='description'></textarea>";
! }
?>
</td>
--- 178,187 ----
<td>
<?php
! // If the WYSIWYG function is set then use the WYSIWYG module
! if (function_exists("make_wysiwyg")) {
! make_wysiwyg("description",500,255,"");
! } else {
! echo "<textarea name='description'></textarea>";
! }
?>
</td>
***************
*** 296,304 ****
<td><select name="project" id="project">
<?php
! // Output a list of meetings by date
! $query = ofirst_dbquery("SELECT * FROM ofirst_meetings ORDER BY ForDate");
! while($meeting = ofirst_dbfetch_object($query)){
! echo "<option value='".$meeting->ID."'>".date("F j, Y h:i a",$meeting->ForDate)."</option>";
! }
?>
</select></td>
--- 300,308 ----
<td><select name="project" id="project">
<?php
! // Output a list of meetings by date
! $query = ofirst_dbquery("SELECT * FROM ofirst_meetings ORDER BY ForDate");
! while($meeting = ofirst_dbfetch_object($query)){
! echo "<option value='".$meeting->ID."'>".date("F j, Y h:i a",$meeting->ForDate)." for " . $meeting->ArrangedFor . "</option>";
! }
?>
</select></td>
***************
*** 318,322 ****
<br>
<?php
! }
}
include_once($footer); ?>
--- 322,326 ----
<br>
<?php
! }
}
include_once($footer); ?>
Index: updatesetup.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/updatesetup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** updatesetup.php 24 Dec 2003 18:51:06 -0000 1.2
--- updatesetup.php 24 Dec 2003 21:56:36 -0000 1.3
***************
*** 34,38 ****
showlogin();
} else {
! if(isset($_POST['addtask'])){
$time = $_POST['when'];
$when = $_POST['perform'];
--- 34,38 ----
showlogin();
} else {
! if(isset($_POST['addtask'])) {
$time = $_POST['when'];
$when = $_POST['perform'];
***************
*** 119,123 ****
</table>
<?php
! }
}
include_once($footer); ?>
--- 119,123 ----
</table>
<?php
! }
}
include_once($footer); ?>
|
|
From: <xt...@us...> - 2003-12-24 21:15:58
|
Update of /cvsroot/openfirst/messenger
In directory sc8-pr-cvs1:/tmp/cvs-serv16965
Modified Files:
index.php
Log Message:
Fix incorrect image location.
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** index.php 24 Dec 2003 21:07:20 -0000 1.13
--- index.php 24 Dec 2003 21:15:55 -0000 1.14
***************
*** 48,52 ****
?>
<tr>
! <td><img src="<?php echo $home.$basepath; ?>/members/icons/actions/personal.png" alt="Visitor"></td>
<td>
<?php
--- 48,52 ----
?>
<tr>
! <td><img src="visitors.png" alt="Visitor"></td>
<td>
<?php
|
|
From: <dav...@us...> - 2003-12-24 21:12:43
|
Update of /cvsroot/openfirst/forum In directory sc8-pr-cvs1:/tmp/cvs-serv16551 Modified Files: NOTES Log Message: Changed comments. Index: NOTES =================================================================== RCS file: /cvsroot/openfirst/forum/NOTES,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NOTES 24 Dec 2003 17:05:59 -0000 1.1 --- NOTES 24 Dec 2003 21:12:40 -0000 1.2 *************** *** 5,9 **** ** December 25, 2003 Release ** ! David Di Biase - Module approved. There was MUCH syntax editing required for this module. I think its because this module was written when Greg first joined the team so he wasn't completely aware of our coding rules. I have arranged the code to match the rest of the modules. Very nice logic though. Tim Ginn - not yet audited --- 5,9 ---- ** December 25, 2003 Release ** ! David Di Biase - Module approved. Module has been re-audited as Tim's request because of the horrible job done prior to this msg. :-p Tim Ginn - not yet audited |
|
From: <dav...@us...> - 2003-12-24 21:12:28
|
Update of /cvsroot/openfirst/news In directory sc8-pr-cvs1:/tmp/cvs-serv16486 Modified Files: NOTES Log Message: Changed comments. Index: NOTES =================================================================== RCS file: /cvsroot/openfirst/news/NOTES,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NOTES 24 Dec 2003 03:24:09 -0000 1.3 --- NOTES 24 Dec 2003 21:12:25 -0000 1.4 *************** *** 5,11 **** ** December 25, 2003 Release ** ! David Di Biase - Module approved. Just a bit of syntax fixing. I suggest whoever is auditing this module next someone should implement an upload feature when they post a new news column. Tim Ginn - not yet audited ! Greg Inozemtsev - Module approved. Minor fixes in RSS scripts. I am not sure what Dave meant by "new news column" though. \ No newline at end of file --- 5,11 ---- ** December 25, 2003 Release ** ! David Di Biase - Module approved. Just a bit of syntax fixing. I suggest whoever is auditing this module next someone should implement an upload image feature whenever someone posts a new headline for mail. It would be nice to store these images (once uploaded by the user) in /news/images/ to keep things organized. Tim Ginn - not yet audited ! Greg Inozemtsev - Module approved. Minor fixes in RSS scripts. \ No newline at end of file |
|
From: <dav...@us...> - 2003-12-24 21:11:56
|
Update of /cvsroot/openfirst/forum/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv16372
Modified Files:
index.php
Log Message:
Fixed syntax...again :'(
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/forum/admin/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php 24 Dec 2003 17:06:18 -0000 1.2
--- index.php 24 Dec 2003 21:11:53 -0000 1.3
***************
*** 29,44 ****
include_once($header);
! echo("<h1>Forum Admin</h1>");
! if (isset($user->membertype) && $user->membertype == "administrator"){
! if(! isset($_POST["act"])) {
! $query = ofirst_dbquery("SELECT * FROM ofirst_forum ORDER BY ID";
echo "<table width=300><tr><th colspan=2><label for=cat>Forum</label></th></tr>";
! echo '<tr><td align=center colspan=2><form id=ForumAdmin name=ForumAdmin method="POST" action="index.php"><select style="width:250px" name=cat id=cat size=4>');
! if(ofirst_dbnum_rows($query) == 0){
echo '<option selected value="0">(none)</option></select>';
} else {
! while($cat = ofirst_dbfetch_object($query)){
! echo '<option value="'.$cat->ID.'">'.ucfirst($cat->name).'</option>';
}
?>
--- 29,44 ----
include_once($header);
! echo "<h1>Forum Admin</h1>";
! if (isset($user->membertype) && $user->membertype == "administrator") {
! if (! isset($_POST["act"])) {
! $query = ofirst_dbquery("SELECT * FROM ofirst_forum ORDER BY ID");
echo "<table width=300><tr><th colspan=2><label for=cat>Forum</label></th></tr>";
! echo '<tr><td align=center colspan=2><form id=ForumAdmin name=ForumAdmin method="POST" action="index.php"><select style="width:250px" name=cat id=cat size=4>';
! if (ofirst_dbnum_rows($query) == 0) {
echo '<option selected value="0">(none)</option></select>';
} else {
! while($cat = ofirst_dbfetch_object($query)) {
! echo '<option value="' . $cat->ID . '">' . ucfirst($cat->name) . '</option>';
}
?>
***************
*** 72,86 ****
} else {
// Action
! switch($_POST["act"]){
case "hide": {
! if(isset($_POST["cat"]) && $_POST["cat"] != 0){
! $q = ofirst_dbquery("SELECT name,hidden FROM ofirst_forum WHERE ID='".$_POST["cat"]."'");
$subforum = ofirst_dbfetch_object($q);
! if($subforum->hidden){
! ofirst_dbquery("UPDATE ofirst_forum SET hidden='0' WHERE ID='".$_POST["cat"]."'");
! echo "<div>Subforum ".$subforum->name." is now visible to all visitors</div>";
} else {
! ofirst_dbquery("UPDATE ofirst_forum SET hidden='1' WHERE ID='".$_POST["cat"]."'");
! echo "<div>Subforum ".$subforum->name." is only shown to administrators</div>";
}
} else {
--- 72,86 ----
} else {
// Action
! switch($_POST["act"]) {
case "hide": {
! if (isset($_POST["cat"]) && $_POST["cat"] != 0) {
! $q = ofirst_dbquery("SELECT name,hidden FROM ofirst_forum WHERE ID='" . $_POST["cat"] . "'");
$subforum = ofirst_dbfetch_object($q);
! if ($subforum->hidden) {
! ofirst_dbquery("UPDATE ofirst_forum SET hidden='0' WHERE ID='" . $_POST["cat"] . "'");
! echo "<div>Subforum " . $subforum->name . " is now visible to all visitors</div>";
} else {
! ofirst_dbquery("UPDATE ofirst_forum SET hidden='1' WHERE ID='" . $_POST["cat"] . "'");
! echo "<div>Subforum " . $subforum->name . " is only shown to administrators</div>";
}
} else {
***************
*** 90,103 ****
}
case "close": {
! if(isset($_POST["cat"]) && $_POST["cat"] != 0){
! $q = ofirst_dbquery("SELECT name,closed FROM ofirst_forum WHERE ID='".$_POST["cat"]."'");
$subforum = ofirst_dbfetch_object($q);
! if($subforum->closed){
! ofirst_dbquery("UPDATE ofirst_forum SET closed='0' WHERE ID='".$_POST["cat"]."'");
! echo "<div>Subforum ".$subforum->name." is now unlocked</div>";
}
else{
! ofirst_dbquery("UPDATE ofirst_forum SET closed='1' WHERE ID='".$_POST["cat"]."'");
! echo "<div>Subforum ".$subforum->name." is now locked</div>";
}
} else {
--- 90,103 ----
}
case "close": {
! if (isset($_POST["cat"]) && $_POST["cat"] != 0) {
! $q = ofirst_dbquery("SELECT name,closed FROM ofirst_forum WHERE ID='" . $_POST["cat"] . "'");
$subforum = ofirst_dbfetch_object($q);
! if ($subforum->closed) {
! ofirst_dbquery("UPDATE ofirst_forum SET closed='0' WHERE ID='" . $_POST["cat"] . "'");
! echo "<div>Subforum " . $subforum->name . " is now unlocked</div>";
}
else{
! ofirst_dbquery("UPDATE ofirst_forum SET closed='1' WHERE ID='" . $_POST["cat"] . "'");
! echo "<div>Subforum " . $subforum->name . " is now locked</div>";
}
} else {
***************
*** 107,118 ****
}
case "delete": {
! if(isset($_POST["cat"]) && $_POST["cat"] != 0){
! $q = ofirst_dbquery("SELECT name FROM ofirst_forum WHERE ID='".$_POST["cat"]."'");
$subforum = ofirst_dbfetch_object($q);
! ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE forum='".$subforum->name."'");
! ofirst_dbquery("DELETE FROM ofirst_forum WHERE ID='".$_POST["cat"]."'");
! echo "<div>Subforum ".$subforum->name." deleted</div>";
} else {
echo "<div>No action has been performed</div>";
--- 107,118 ----
}
case "delete": {
! if (isset($_POST["cat"]) && $_POST["cat"] != 0) {
! $q = ofirst_dbquery("SELECT name FROM ofirst_forum WHERE ID='" . $_POST["cat"] . "'");
$subforum = ofirst_dbfetch_object($q);
! ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE forum='" . $subforum->name . "'");
! ofirst_dbquery("DELETE FROM ofirst_forum WHERE ID='" . $_POST["cat"] . "'");
! echo "<div>Subforum " . $subforum->name . " deleted</div>";
} else {
echo "<div>No action has been performed</div>";
***************
*** 121,133 ****
}
default: {
! if($_POST["newcat"] != ""){
$subforum = 0;
$q = ofirst_dbquery("SELECT name FROM ofirst_forum WHERE subforum='0'");
! if(isset($_POST["cat"])){
$subforum = $_POST["cat"];
}
! if(ofirst_dbnum_rows($q) == 0 || $subforum != 0){
ofirst_dbquery("INSERT INTO ofirst_forum (name, message, subforum) VALUES ('" . $_POST["newcat"] . "', '" . $_POST["newdesc"] . "', '" .$subforum. "');");
! echo "<div>Subforum ".$_POST["newcat"]." created</div>";
} else {
echo "<div>Root category already exists. You must create a subforum.</div>";
--- 121,133 ----
}
default: {
! if ($_POST["newcat"] != "") {
$subforum = 0;
$q = ofirst_dbquery("SELECT name FROM ofirst_forum WHERE subforum='0'");
! if (isset($_POST["cat"])) {
$subforum = $_POST["cat"];
}
! if (ofirst_dbnum_rows($q) == 0 || $subforum != 0) {
ofirst_dbquery("INSERT INTO ofirst_forum (name, message, subforum) VALUES ('" . $_POST["newcat"] . "', '" . $_POST["newdesc"] . "', '" .$subforum. "');");
! echo "<div>Subforum " . $_POST["newcat"] . " created</div>";
} else {
echo "<div>Root category already exists. You must create a subforum.</div>";
|
|
From: <dav...@us...> - 2003-12-24 21:11:37
|
Update of /cvsroot/openfirst/forum
In directory sc8-pr-cvs1:/tmp/cvs-serv16331
Modified Files:
thread.php newpost.php login.php index.php editpost.php
Log Message:
Fixed syntax...again :'(
Index: thread.php
===================================================================
RCS file: /cvsroot/openfirst/forum/thread.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** thread.php 24 Dec 2003 17:05:59 -0000 1.4
--- thread.php 24 Dec 2003 21:11:33 -0000 1.5
***************
*** 31,40 ****
$admin=false;
! if (isset($user->membertype)){
! $admin=($user->membertype == "administrator");
}
$thread=0;
! if(isset($_GET["id"])){
$thread=$_GET["id"];
}
--- 31,40 ----
$admin=false;
! if (isset($user->membertype)) {
! $admin = ($user->membertype == "administrator");
}
$thread=0;
! if (isset($_GET["id"])) {
$thread=$_GET["id"];
}
***************
*** 43,49 ****
$forum="";
! if($thread != 0){
$query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ID=".$thread);
! if(ofirst_dbnum_rows($query) != 0){
$msg = ofirst_dbfetch_object($query);
$reply = $msg->ID;
--- 43,49 ----
$forum="";
! if ($thread != 0) {
$query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ID=".$thread);
! if (ofirst_dbnum_rows($query) != 0) {
$msg = ofirst_dbfetch_object($query);
$reply = $msg->ID;
***************
*** 52,67 ****
$sub = $forum;
$res = "";
! while($sub != ""){
!
! $res = " > ".'<a href="'.$basepath."/forum/index.php?forum=".urlencode($sub).'">'.ucfirst($sub)."</a>".$res;
$q = ofirst_dbquery("SELECT subforum FROM ofirst_forum WHERE name='".$sub."'");
! if(ofirst_dbnum_rows($q)!=0){
$sub = ofirst_dbfetch_object($q);
!
! $q = ofirst_dbquery("SELECT name,subforum FROM ofirst_forum WHERE ID=".$sub->subforum);
$sub = ofirst_dbfetch_object($q);
! if($sub->subforum != 0){
$sub = $sub->name;
} else {
--- 52,65 ----
$sub = $forum;
$res = "";
! while ($sub != "") {
! $res = " > ".'<a href="' . $basepath . "/forum/index.php?forum=" . urlencode($sub) . '">' . ucfirst($sub) . "</a>".$res;
$q = ofirst_dbquery("SELECT subforum FROM ofirst_forum WHERE name='".$sub."'");
! if (ofirst_dbnum_rows($q)!=0) {
$sub = ofirst_dbfetch_object($q);
! $q = ofirst_dbquery("SELECT name,subforum FROM ofirst_forum WHERE ID=" . $sub->subforum);
$sub = ofirst_dbfetch_object($q);
! if ($sub->subforum != 0) {
$sub = $sub->name;
} else {
***************
*** 72,84 ****
}
}
! echo '<div align=left><a href="'.$basepath.'/forum">'.$title." Forums</a> $res</div>";
echo "<h1>$msg->Title</h1>";
echo "<table width=600><tr><th colspan=2>$msg->Title</th></tr>";
! echo "<tr><td width=200 valign=top class=sub>".userdetails($msg->Author)."<div>Date: $msg->DatePosted</div></td><td valign=top>".$msg->Message."</td></tr>";
echo "<tr><td colspan=2 align=right class=sub>";
! if(is_readable("../members/profile.php")){
! echo "<a href=".$basepath."/members/profile.php?id=".urlencode($msg->Author).">Profile</a> | ";
}
! echo '<a href="'.$basepath.'/forum/editpost.php?id='.$msg->ID.'&threadid='.$thread.'">Edit</a></td></tr></table><br />';
$query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ReplyTo=$thread ORDER BY DatePosted");
--- 70,84 ----
}
}
!
! echo '<div align=left><a href="'.$basepath.'/forum">' . $title . " Forums</a> $res</div>";
echo "<h1>$msg->Title</h1>";
echo "<table width=600><tr><th colspan=2>$msg->Title</th></tr>";
! echo "<tr><td width=200 valign=top class=sub>" . userdetails($msg->Author) . "<div>Date: $msg->DatePosted</div></td><td valign=top>" . $msg->Message . "</td></tr>";
echo "<tr><td colspan=2 align=right class=sub>";
!
! if (is_readable("../members/profile.php")) {
! echo "<a href=" . $basepath . "/members/profile.php?id=" . urlencode($msg->Author) . ">Profile</a> | ";
}
! echo '<a href="' . $basepath . '/forum/editpost.php?id=' . $msg->ID . '&threadid=' . $thread . '">Edit</a></td></tr></table><br />';
$query = ofirst_dbquery("SELECT * FROM ofirst_forumposts WHERE ReplyTo=$thread ORDER BY DatePosted");
***************
*** 86,91 ****
$page = 0;
! if(isset($_GET["page"])){
! if($_GET["page"] == "last"){
$page = ceil($num/posts_page)-1;
} else {
--- 86,91 ----
$page = 0;
! if (isset($_GET["page"])) {
! if ($_GET["page"] == "last") {
$page = ceil($num/posts_page)-1;
} else {
***************
*** 93,175 ****
}
}
! if($page < 0){
$page = 0;
}
! if($num != 0){
echo("<table width=600><tr><th colspan=2>");
! if($num == 1){
echo "1 Reply";
! }else{
echo "$num Replies";
}
echo "</th></tr>";
// Skip records
! for($i=0; $i < $page * posts_page; $i++){
! if(!ofirst_dbfetch_object($query)){
break;
}
}
! for($i=0; $i < posts_page; $i++){
! if($msg=ofirst_dbfetch_object($query)){
! echo '<tr><td width=200 valign=top class=sub>'.userdetails($msg->Author)."<div>Date: $msg->DatePosted</div></td>";
echo "<td valign=top>";
! if($msg->Title!=""){
echo "<p><b>$msg->Title</b></p>";
}
echo "<div>$msg->Message</div></td></tr>";
echo "<tr><td colspan=2 align=right class=sub>";
! if(is_readable("../members/profile.php")){
! echo "<a href=".$basepath."/members/profile.php?id=".urlencode($msg->Author).">Profile</a> | ";
}
! echo '<a href="'.$basepath.'/forum/editpost.php?id='.$msg->ID.'&threadid='.$thread.'">Edit</a></td></tr>';
! }else{
break;
}
}
echo '<tr><th colspan=2><div style="font-size:12px" align=right> ';
! if($num>posts_page){
! if($page>1){
! echo '<a href="thread.php?id='.$thread.'&page=1">[First]</a> ... ';
}
! if($page > 0){
! echo '<a href="thread.php?id='.$thread.'&page='.($page).'"><<Prev</a> ';
}
! echo "Page ".($page+1)." of ".ceil($num/posts_page);
! if($page < ceil($num/posts_page) - 1){
! echo ' <a href="thread.php?id='.$thread.'&page='.($page+2).'">Next>></a>';
}
! if($page < ceil($num/posts_page) - 2){
! echo ' ... <a href="thread.php?id='.$thread.'&page='.ceil($num/posts_page).'">[Last]</a>';
}
}
echo "</div></th></tr>";
}
! echo '</table><br /><div><a href="'.$basepath.'/forum/newpost.php?forumid='.urlencode($forum).'&replyto='.$reply.'">New Reply</a></div>';
}
}
include($footer);
! function userdetails($username){
$q = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user='".$username."';");
! if(ofirst_dberrno()==0){
$user = ofirst_dbfetch_object($q);
$ret = "<h4>$username</h4><div>$user->description</div>";
! if($user->picturelocation != ""){
$ret .= '<div><img src="'.$GLOBALS["basepath"]."/members/".$user->picturelocation.'"></div>';
}
! if($user->membertype == "administrator"){
$ret .= "<div><i>Administrator</i></div><br>";
}
! if($user->lastname != "" || $user->firstname != ""){
$ret .= "<div>Real name: $user->firstname $user->lastname</div>";
}
! if($user->team != 0){
$ret .= "<div>Team $user->team</div>";
}
return $ret;
! }
! else{
return "<h4>$username</h4>";
}
--- 93,177 ----
}
}
!
! if ($page < 0) {
$page = 0;
}
! if ($num != 0) {
echo("<table width=600><tr><th colspan=2>");
!
! if ($num == 1) {
echo "1 Reply";
! } else {
echo "$num Replies";
}
+
echo "</th></tr>";
// Skip records
! for($i=0; $i < $page * posts_page; $i++) {
! if (!ofirst_dbfetch_object($query)) {
break;
}
}
! for ($i=0; $i < posts_page; $i++) {
! if ($msg=ofirst_dbfetch_object($query)) {
! echo '<tr><td width=200 valign=top class=sub>' . userdetails($msg->Author) . "<div>Date: $msg->DatePosted</div></td>";
echo "<td valign=top>";
! if ($msg->Title != "") {
echo "<p><b>$msg->Title</b></p>";
}
echo "<div>$msg->Message</div></td></tr>";
echo "<tr><td colspan=2 align=right class=sub>";
! if (is_readable("../members/profile.php")) {
! echo "<a href=" . $basepath . "/members/profile.php?id=" . urlencode($msg->Author) . ">Profile</a> | ";
}
! echo '<a href="' . $basepath . '/forum/editpost.php?id=' . $msg->ID . '&threadid=' . $thread . '">Edit</a></td></tr>';
! } else {
break;
}
}
echo '<tr><th colspan=2><div style="font-size:12px" align=right> ';
! if ($num > posts_page) {
! if ($page > 1) {
! echo '<a href="thread.php?id=' . $thread . '&page=1">[First]</a> ... ';
}
! if ($page > 0) {
! echo '<a href="thread.php?id=' . $thread . '&page=' . ($page) . '"><<Prev</a> ';
}
! echo "Page " . ($page+1) . " of " . ceil($num/posts_page);
! if ($page < ceil($num/posts_page) - 1) {
! echo ' <a href="thread.php?id=' . $thread . '&page=' . ($page+2) . '">Next>></a>';
}
! if ($page < ceil($num/posts_page) - 2) {
! echo ' ... <a href="thread.php?id=' . $thread . '&page=' . ceil($num/posts_page) . '">[Last]</a>';
}
}
echo "</div></th></tr>";
}
! echo '</table><br /><div><a href="' . $basepath . '/forum/newpost.php?forumid=' . urlencode($forum) . '&replyto=' . $reply . '">New Reply</a></div>';
}
}
include($footer);
! function userdetails($username) {
$q = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user='".$username."';");
! if (ofirst_dberrno()==0) {
$user = ofirst_dbfetch_object($q);
$ret = "<h4>$username</h4><div>$user->description</div>";
! if ($user->picturelocation != "") {
$ret .= '<div><img src="'.$GLOBALS["basepath"]."/members/".$user->picturelocation.'"></div>';
}
! if ($user->membertype == "administrator") {
$ret .= "<div><i>Administrator</i></div><br>";
}
! if ($user->lastname != "" || $user->firstname != "") {
$ret .= "<div>Real name: $user->firstname $user->lastname</div>";
}
! if ($user->team != 0) {
$ret .= "<div>Team $user->team</div>";
}
return $ret;
! } else {
return "<h4>$username</h4>";
}
Index: newpost.php
===================================================================
RCS file: /cvsroot/openfirst/forum/newpost.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** newpost.php 24 Dec 2003 17:05:59 -0000 1.4
--- newpost.php 24 Dec 2003 21:11:33 -0000 1.5
***************
*** 29,83 ****
include("../config/globals.php");
! $admin=false;
! if (isset($user->membertype)){
$admin = ($user->membertype == "administrator");
$author = $user->user;
$forumid = "";
! if(isset($_POST["forumid"])){
$forumid = strtolower($_POST["forumid"]);
! } else {
! if(isset($_GET["forumid"])){
! $forumid = strtolower($_GET["forumid"]);
}
- }
$errmsg = "";
$reply = 0;
! if(isset($_POST["replyto"])){
$reply = $_POST["replyto"];
} else {
! if(isset($_GET["replyto"])){
$reply = $_GET["replyto"];
}
}
! if($forumid != ""){
$query = "SELECT * FROM ofirst_forum WHERE name='$forumid'";
! if(!$admin){
$query .= " AND hidden=0";
}
$query = ofirst_dbquery($query);
! if(ofirst_dbnum_rows($query)!=0){
$cat = ofirst_dbfetch_object($query);
! if($forumid != "main"&&$cat->closed==0){
$message = "";
$title = "";
! if(isset($_POST["post"])){
! if($_POST["post"] == 1){
// Add to database
! if($reply==0){
! if($_POST["title"] == ""){
$errmsg = "New topic must have a title";
}
}
! if($errmsg == ""){
$query = ofirst_dbquery("INSERT INTO ofirst_forumposts (forum,ReplyTo,Title,Author,Message,DatePosted) values ('$forumid','".$reply."','".$_POST["title"]."','$author','".strip_tags($_POST["message"],allowed_tags)."','".date("Y-m-d H:i:s")."');");
// Redirect back to forum
! if($reply == 0){
header("Location: index.php?forum=".$_POST["forumid"]);
} else {
--- 29,88 ----
include("../config/globals.php");
! $admin = false;
!
! if (isset($user->membertype)) {
!
$admin = ($user->membertype == "administrator");
$author = $user->user;
$forumid = "";
!
! if (isset($_POST["forumid"])) {
$forumid = strtolower($_POST["forumid"]);
! } else {
! if (isset($_GET["forumid"])) {
! $forumid = strtolower($_GET["forumid"]);
! }
}
$errmsg = "";
$reply = 0;
!
! if (isset($_POST["replyto"])) {
$reply = $_POST["replyto"];
} else {
! if (isset($_GET["replyto"])) {
$reply = $_GET["replyto"];
}
}
! if ($forumid != "") {
$query = "SELECT * FROM ofirst_forum WHERE name='$forumid'";
! if (!$admin) {
$query .= " AND hidden=0";
}
$query = ofirst_dbquery($query);
! if (ofirst_dbnum_rows($query)!=0) {
$cat = ofirst_dbfetch_object($query);
! if ($forumid != "main"&&$cat->closed==0) {
$message = "";
$title = "";
! if (isset($_POST["post"])) {
! if ($_POST["post"] == 1) {
// Add to database
! if ($reply==0) {
! if ($_POST["title"] == "") {
$errmsg = "New topic must have a title";
}
}
!
! if ($errmsg == "") {
$query = ofirst_dbquery("INSERT INTO ofirst_forumposts (forum,ReplyTo,Title,Author,Message,DatePosted) values ('$forumid','".$reply."','".$_POST["title"]."','$author','".strip_tags($_POST["message"],allowed_tags)."','".date("Y-m-d H:i:s")."');");
// Redirect back to forum
! if ($reply == 0) {
header("Location: index.php?forum=".$_POST["forumid"]);
} else {
***************
*** 94,102 ****
include($header);
! if($errmsg != ""){
echo('<br /><div style="color:red">'.$errmsg."</div><br />");
}
! if($message != ""){
! echo("<br /><table><tr><th>Message Preview</th></tr><tr><td>$message</td></tr></table><br />");
}
echo '<form id=NewPost name=NewPost action="'.$_SERVER["PHP_SELF"].'" method=post>';
--- 99,107 ----
include($header);
! if ($errmsg != "") {
echo('<br /><div style="color:red">'.$errmsg."</div><br />");
}
! if ($message != "") {
! echo "<br /><table><tr><th>Message Preview</th></tr><tr><td>$message</td></tr></table><br />";
}
echo '<form id=NewPost name=NewPost action="'.$_SERVER["PHP_SELF"].'" method=post>';
***************
*** 111,115 ****
<?php
$dhtml=function_exists("make_wysiwyg");
! if($dhtml){
echo "<input type=hidden name=post value=1>";
make_wysiwyg("message", 500, 300, $message);
--- 116,120 ----
<?php
$dhtml=function_exists("make_wysiwyg");
! if ($dhtml) {
echo "<input type=hidden name=post value=1>";
make_wysiwyg("message", 500, 300, $message);
***************
*** 123,132 ****
<tr><td colspan=2 align=center>
<?php
! if($dhtml){
echo '<input type=button onclick="dhtmlEditorPrepareSubmit(); document.NewPost.submit();" value="Post">';
} else {
echo '<input type=submit value=" OK ">';
}
! ?> <input type=reset></td></tr>
</table></form><div>The following HTML tags are allowed:
<?php
--- 128,138 ----
<tr><td colspan=2 align=center>
<?php
! if ($dhtml) {
echo '<input type=button onclick="dhtmlEditorPrepareSubmit(); document.NewPost.submit();" value="Post">';
} else {
echo '<input type=submit value=" OK ">';
}
! ?>
! <input type=reset></td></tr>
</table></form><div>The following HTML tags are allowed:
<?php
***************
*** 140,145 ****
}
} else {
! //not logged in: redirect to login
! header("Location: login.php");
}
?>
--- 146,150 ----
}
} else {
! header("Location: login.php");
}
?>
Index: login.php
===================================================================
RCS file: /cvsroot/openfirst/forum/login.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** login.php 24 Dec 2003 17:05:59 -0000 1.2
--- login.php 24 Dec 2003 21:11:33 -0000 1.3
***************
*** 29,33 ****
include($header);
! if(isset($user->user) && ! isset($_GET["logout"])){
echo "<br /><table><tr><th>Forum Login</th></tr><tr><td>";
echo "<p>You are logged in as <b>$user->user</b>.</p>";
--- 29,33 ----
include($header);
! if (isset($user->user) && ! isset($_GET["logout"])) {
echo "<br /><table><tr><th>Forum Login</th></tr><tr><td>";
echo "<p>You are logged in as <b>$user->user</b>.</p>";
***************
*** 35,54 ****
echo "</td></tr></table><br />";
} else {
! if(isset($user->user)){
logout();
}
! echo('<h2>Forum Login</h2><div style="width:300px;border-width:1px;border-style:dotted;padding:5px;background:url(\''.$basepath.'/images/back-lighter.gif\');">You need to log in to use this feature of the forum.<br />
! If you are not registered yet? <b><a href=register.php>Register Now!</a></b></div>');
showlogin();
}
! if(isset($_POST['referer']) && (! ereg("login.php",$_POST['referer']))){
$back = $_POST['referer'];
}
! if(isset($_SERVER['HTTP_REFERER']) && (! ereg("login.php",$_SERVER['HTTP_REFERER']))){
$back = $_SERVER['HTTP_REFERER'];
}
! if(isset($back)){
echo '<div><a href="'.$back.'">Back to forum</a></div>';
}
! include($footer);
! ?>
\ No newline at end of file
--- 35,53 ----
echo "</td></tr></table><br />";
} else {
! if (isset($user->user)) {
logout();
}
! echo '<h2>Forum Login</h2><div style="width:300px;border-width:1px;border-style:dotted;padding:5px;background:url(\''.$basepath.'/images/back-lighter.gif\');">You need to log in to use this feature of the forum.<br />
! If you are not registered yet? <b><a href=register.php>Register Now!</a></b></div>';
showlogin();
}
! if (isset($_POST['referer']) && (! ereg("login.php",$_POST['referer']))) {
$back = $_POST['referer'];
}
! if (isset($_SERVER['HTTP_REFERER']) && (! ereg("login.php",$_SERVER['HTTP_REFERER']))) {
$back = $_SERVER['HTTP_REFERER'];
}
! if (isset($back)) {
echo '<div><a href="'.$back.'">Back to forum</a></div>';
}
! include($footer); ?>
\ No newline at end of file
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/forum/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php 24 Dec 2003 19:39:25 -0000 1.9
--- index.php 24 Dec 2003 21:11:33 -0000 1.10
***************
*** 199,234 ****
echo "<tr><td class=sub width=350><b>Forum</b></td><td class=sub align=right><b>Posts</b></td><td class=sub align=right><b>Threads</b></td><td class=sub align=center width=100><b>Last Post</b></td></tr>";
while ($sub=ofirst_dbfetch_object($query)) {
! echo("<tr><td>");
! $q = ofirst_dbquery("SELECT Author,DatePosted FROM ofirst_forumposts WHERE forum='$sub->name' ORDER BY DatePosted DESC");
! if (ofirst_dbnum_rows($q)!=0) {
! $lastposter = ofirst_dbfetch_object($q);
! $lastdate = $lastposter->DatePosted;
! $lastposter = $lastposter->Author;
! }
! if (!$sub->closed == 1) {
! if (ofirst_dbnum_rows($q) != 0 && isset($user)) {
! echo getimage($_SESSION["forumvisit".$uname],$lastdate).'<a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">'.ucfirst($sub->name)."</a></td>";
! } else {
! echo '<img src=old.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">' . ucfirst($sub->name) . "</a></td>";
}
! } else {
echo '<img src=locked.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=" . urlencode($sub->name) . '">' . ucfirst($sub->name) . "</a></td>";
- }
- echo "<td align=right>" . ofirst_dbnum_rows($q) . "</td>";
- $q = ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='$sub->name' AND ReplyTo='0'");
- echo "<td align=right>" . ofirst_dbnum_rows($q) . "</td>";
- echo "<td align=right> ";
- if (isset($lastposter)) {
- echo($lastdate . " by ");
- if (is_readable("../members/profile.php")) {
- echo '<a href="'.$GLOBALS['basepath']."/members/profile.php?id=" . $lastposter . '">';
}
! echo $lastposter."</a>";
! unset($lastposter);
! } else {
! echo "Never";
}
- echo "</td></tr>";
- }
echo "</table><br>";
}
--- 199,234 ----
echo "<tr><td class=sub width=350><b>Forum</b></td><td class=sub align=right><b>Posts</b></td><td class=sub align=right><b>Threads</b></td><td class=sub align=center width=100><b>Last Post</b></td></tr>";
while ($sub=ofirst_dbfetch_object($query)) {
! echo("<tr><td>");
! $q = ofirst_dbquery("SELECT Author,DatePosted FROM ofirst_forumposts WHERE forum='$sub->name' ORDER BY DatePosted DESC");
! if (ofirst_dbnum_rows($q)!=0) {
! $lastposter = ofirst_dbfetch_object($q);
! $lastdate = $lastposter->DatePosted;
! $lastposter = $lastposter->Author;
}
! if (!$sub->closed == 1) {
! if (ofirst_dbnum_rows($q) != 0 && isset($user)) {
! echo getimage($_SESSION["forumvisit".$uname],$lastdate).'<a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">'.ucfirst($sub->name)."</a></td>";
! } else {
! echo '<img src=old.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">' . ucfirst($sub->name) . "</a></td>";
! }
! } else {
echo '<img src=locked.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=" . urlencode($sub->name) . '">' . ucfirst($sub->name) . "</a></td>";
}
! echo "<td align=right>" . ofirst_dbnum_rows($q) . "</td>";
! $q = ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='$sub->name' AND ReplyTo='0'");
! echo "<td align=right>" . ofirst_dbnum_rows($q) . "</td>";
! echo "<td align=right> ";
! if (isset($lastposter)) {
! echo($lastdate . " by ");
! if (is_readable("../members/profile.php")) {
! echo '<a href="'.$GLOBALS['basepath']."/members/profile.php?id=" . $lastposter . '">';
! }
! echo $lastposter."</a>";
! unset($lastposter);
! } else {
! echo "Never";
! }
! echo "</td></tr>";
}
echo "</table><br>";
}
Index: editpost.php
===================================================================
RCS file: /cvsroot/openfirst/forum/editpost.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editpost.php 24 Dec 2003 19:39:25 -0000 1.5
--- editpost.php 24 Dec 2003 21:11:33 -0000 1.6
***************
*** 30,43 ****
$forumid = "";
! if(isset($_POST["forumid"])){
! $forumid=strtolower($_POST["forumid"]);
} else {
! if(isset($_GET["threadid"])){
! $forumid=strtolower($_GET["threadid"]);
}
}
$admin = false; // Set admin as false initially
! if (isset($user->membertype)){
$admin = ($user->membertype == "administrator");
$author = $user->user;
--- 30,43 ----
$forumid = "";
! if (isset($_POST["forumid"])) {
! $forumid = strtolower($_POST["forumid"]);
} else {
! if (isset($_GET["threadid"])) {
! $forumid = strtolower($_GET["threadid"]);
}
}
$admin = false; // Set admin as false initially
! if (isset($user->membertype)) {
$admin = ($user->membertype == "administrator");
$author = $user->user;
***************
*** 45,73 ****
$errmsg = "";
$msgid = 0;
! if (isset($_POST["msgid"])){
$msgid = $_POST["msgid"];
} else {
! if(isset($_GET["id"])){
$msgid=$_GET["id"];
}
}
! if ($msgid != 0){
! $query="SELECT * FROM ofirst_forumposts WHERE ID='$msgid'";
! if (!$admin){
$query .= " AND Author='$author'";
}
$query = ofirst_dbquery($query);
! if (ofirst_dbnum_rows($query) !=0 ){
$msg = ofirst_dbfetch_object($query);
$msgtext = $msg->Message;
! if (isset($_POST["message"])){
! if (isset($_POST["delete"])&&$_POST["delete"]==1){
! if ($msg->ReplyTo==0){
! if (!$admin){
! $errmsg="You can not delete this message because it is the first message in the thread";
} else {
$query = ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ReplyTo='".$msg->ID."'");
--- 45,73 ----
$errmsg = "";
$msgid = 0;
! if (isset($_POST["msgid"])) {
$msgid = $_POST["msgid"];
} else {
! if (isset($_GET["id"])) {
$msgid=$_GET["id"];
}
}
! if ($msgid != 0) {
! $query = "SELECT * FROM ofirst_forumposts WHERE ID='$msgid'";
! if (!$admin) {
$query .= " AND Author='$author'";
}
$query = ofirst_dbquery($query);
! if (ofirst_dbnum_rows($query) !=0 ) {
$msg = ofirst_dbfetch_object($query);
$msgtext = $msg->Message;
! if (isset($_POST["message"])) {
! if (isset($_POST["delete"]) && $_POST["delete"] == 1) {
! if ($msg->ReplyTo == 0) {
! if (!$admin) {
! $errmsg = "You can not delete this message because it is the first message in the thread";
} else {
$query = ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ReplyTo='".$msg->ID."'");
***************
*** 86,101 ****
// Update record in database
! if ($msg->ReplyTo==0){
! if ($_POST["title"] == ""){
$errmsg = "New topic must have a title";
}
}
! if ($errmsg==""){
! if ($author != $msg->Author){
if ($admin){
$msgtext .= "<br /><i>Edited by $author on " . date("H:i:s d-m-Y") . "</i>";
}
}
! $query=ofirst_dbquery("UPDATE ofirst_forumposts SET Title='" . $_POST["title"] . "', Message='" . strip_tags($msgtext,allowed_tags) . "' WHERE ID='" . $msg->ID . "'");
header("Location: thread.php?id=".$forumid);
exit;
--- 86,101 ----
// Update record in database
! if ($msg->ReplyTo == 0) {
! if ($_POST["title"] == "") {
$errmsg = "New topic must have a title";
}
}
! if ($errmsg == "") {
! if ($author != $msg->Author) {
if ($admin){
$msgtext .= "<br /><i>Edited by $author on " . date("H:i:s d-m-Y") . "</i>";
}
}
! $query = ofirst_dbquery("UPDATE ofirst_forumposts SET Title='" . $_POST["title"] . "', Message='" . strip_tags($msgtext,allowed_tags) . "' WHERE ID='" . $msg->ID . "'");
header("Location: thread.php?id=".$forumid);
exit;
***************
*** 105,109 ****
include($header);
! if ($errmsg != ""){
echo '<br /><div style="color:red">'.$errmsg."</div><br />";
}
--- 105,109 ----
include($header);
! if ($errmsg != "") {
echo '<br /><div style="color:red">'.$errmsg."</div><br />";
}
***************
*** 122,136 ****
// Show DHTML editing bar or else just a regular textarea
$dhtml = function_exists("make_wysiwyg");
! if ($dhtml){
! echo("<input type=hidden name=post value=1>");
make_wysiwyg("message", 500, 300, $msgtext);
} else {
! echo("<textarea name=message id=message cols=40 rows=10>$msgtext</textarea></td></tr>");
}
! echo("</td></tr><tr><td colspan=2 align=center>");
! if ($dhtml){
! echo('<input type=button onclick="dhtmlEditorPrepareSubmit(); document.EditPost.submit();" value="Save Changes">');
} else {
echo '<input type=submit value="Save Changes">';
--- 122,136 ----
// Show DHTML editing bar or else just a regular textarea
$dhtml = function_exists("make_wysiwyg");
! if ($dhtml) {
! echo "<input type=hidden name=post value=1>";
make_wysiwyg("message", 500, 300, $msgtext);
} else {
! echo "<textarea name=message id=message cols=40 rows=10>$msgtext</textarea></td></tr>";
}
! echo "</td></tr><tr><td colspan=2 align=center>";
! if ($dhtml) {
! echo '<input type=button onclick="dhtmlEditorPrepareSubmit(); document.EditPost.submit();" value="Save Changes">';
} else {
echo '<input type=submit value="Save Changes">';
***************
*** 140,144 ****
</table></form><div>The following HTML tags are allowed:
<?php
! echo(htmlentities(allowed_tags)."</div>");
} else {
include($header);
--- 140,144 ----
</table></form><div>The following HTML tags are allowed:
<?php
! echo htmlentities(allowed_tags)."</div>";
} else {
include($header);
|
|
From: <xt...@us...> - 2003-12-24 21:07:58
|
Update of /cvsroot/openfirst/messenger In directory sc8-pr-cvs1:/tmp/cvs-serv14419 Modified Files: NOTES Log Message: Modify NOTES Index: NOTES =================================================================== RCS file: /cvsroot/openfirst/messenger/NOTES,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NOTES 24 Dec 2003 00:15:36 -0000 1.1 --- NOTES 24 Dec 2003 21:07:55 -0000 1.2 *************** *** 7,11 **** David Di Biase - Module approved. Just a bit of syntax fixing. ! Tim Ginn - not yet audited ! Greg Inozemtsev - not yet audited \ No newline at end of file --- 7,11 ---- David Di Biase - Module approved. Just a bit of syntax fixing. ! Tim Ginn - Module approved. ! Greg Inozemtsev - not yet audited |
|
From: <xt...@us...> - 2003-12-24 21:07:23
|
Update of /cvsroot/openfirst/messenger
In directory sc8-pr-cvs1:/tmp/cvs-serv12951
Modified Files:
inbox.php index.php messenger.php newmsg.php viewmsg.php
Log Message:
Bring messenger into compliance with openFIRST coding standards. Fix bug on some systems where the location of an image is partially censored by slur_block, causing the image path to be improper, creating a 404 error.
Index: inbox.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/inbox.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** inbox.php 24 Dec 2003 00:15:36 -0000 1.13
--- inbox.php 24 Dec 2003 21:07:20 -0000 1.14
***************
*** 31,35 ****
if(! isset($user->user)){
showlogin();
! die(include_once($footer));
}
--- 31,35 ----
if(! isset($user->user)){
showlogin();
! die(include_once($footer));
}
***************
*** 37,41 ****
if (isset($_GET['DELETE'])) {
ofirst_dbquery("DELETE FROM ofirst_messenger_messages WHERE ID = '".$_GET['DELETE']."'") or die(ofirst_dberror());
! echo "<br><p>Message has been removed, thank you! [ <a href='inbox.php'>Inbox</a> ]</p><br>";
die(include_once($footer));
}
--- 37,41 ----
if (isset($_GET['DELETE'])) {
ofirst_dbquery("DELETE FROM ofirst_messenger_messages WHERE ID = '".$_GET['DELETE']."'") or die(ofirst_dberror());
! echo "<br><p>Message has been removed, thank you! [ <a href='inbox.php'>Inbox</a> ]</p><br>";
die(include_once($footer));
}
***************
*** 44,48 ****
if (isset($_POST['deleteall'])) {
ofirst_dbquery("DELETE FROM ofirst_messenger_messages WHERE Receiver = '".$user->user."'") or die(ofirst_dberror());
! echo "<br><p>All messages have been deleted, thank you! [ <a href='inbox.php'>Inbox</a> ]</p><br>";
die(include_once($footer));
}
--- 44,48 ----
if (isset($_POST['deleteall'])) {
ofirst_dbquery("DELETE FROM ofirst_messenger_messages WHERE Receiver = '".$user->user."'") or die(ofirst_dberror());
! echo "<br><p>All messages have been deleted, thank you! [ <a href='inbox.php'>Inbox</a> ]</p><br>";
die(include_once($footer));
}
***************
*** 61,77 ****
<th width="116">Option</th>
</tr>
! <?php while($messages = ofirst_dbfetch_object($query)){ ?>
<tr>
<td><img src="<?php echo $home.$basepath; ?>/members/icons/actions/mail_new.png" alt="Message"></td>
<td><a href='viewmsg.php?ID=<?php echo $messages->ID; ?>'>
<?php
! if (empty($messages->Subject)){
echo "< No Subject >";
} else {
! if(function_exists("slur_block")){
echo slur_block(emoticon_translate($messages->Subject));
! }else{
! echo $messages->Subject;
! }
}
?>
--- 61,78 ----
<th width="116">Option</th>
</tr>
! <?php
! while($messages = ofirst_dbfetch_object($query)) { ?>
<tr>
<td><img src="<?php echo $home.$basepath; ?>/members/icons/actions/mail_new.png" alt="Message"></td>
<td><a href='viewmsg.php?ID=<?php echo $messages->ID; ?>'>
<?php
! if (empty($messages->Subject)) {
echo "< No Subject >";
} else {
! if(function_exists("slur_block")) {
echo slur_block(emoticon_translate($messages->Subject));
! } else {
! echo $messages->Subject;
! }
}
?>
***************
*** 80,84 ****
<td><?php echo $messages->Sender; ?></td>
<td>[ <a href='inbox.php?DELETE=<?php echo $messages->ID; ?>'> Delete </a> ]
! <br>[ <a href="newmsg.php?RECIP=<?php echo($messages->Sender); ?>&SUBJECT=Re: <?php echo $messages->Subject; ?>">Reply</a> ]</td>
</tr>
<?php
--- 81,85 ----
<td><?php echo $messages->Sender; ?></td>
<td>[ <a href='inbox.php?DELETE=<?php echo $messages->ID; ?>'> Delete </a> ]
! <br>[ <a href="newmsg.php?RECIP=<?php echo($messages->Sender); ?>&SUBJECT=Re: <?php echo $messages->Subject; ?>">Reply</a> ]</td>
</tr>
<?php
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** index.php 24 Dec 2003 00:15:36 -0000 1.12
--- index.php 24 Dec 2003 21:07:20 -0000 1.13
***************
*** 45,49 ****
$querymember = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$userinf->Member."'");
! $members = ofirst_dbfetch_object($querymember);
?>
<tr>
--- 45,49 ----
$querymember = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$userinf->Member."'");
! $members = ofirst_dbfetch_object($querymember);
?>
<tr>
***************
*** 62,73 ****
<?php
if ($userinf->Member == "none") {
! echo "<center>--</center>";
! }else{
! echo "[ <a href='newmsg.php?RECIP=".$userinf->ID."'> Message User</a> ]";
! }
?>
! </td>
</tr>
! <?php } ?>
</table>
<?php
--- 62,74 ----
<?php
if ($userinf->Member == "none") {
! echo "<center>--</center>";
! } else {
! echo "[ <a href='newmsg.php?RECIP=".$userinf->ID."'> Message User</a> ]";
! }
?>
! </td>
</tr>
! <?php
! } ?>
</table>
<?php
Index: messenger.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/messenger.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** messenger.php 24 Dec 2003 00:15:36 -0000 1.12
--- messenger.php 24 Dec 2003 21:07:20 -0000 1.13
***************
*** 36,40 ****
$IP = "127.0.0.1";
}
!
// Declare information to be used in all messenger files
$SCRIPT = $_SERVER['PHP_SELF'];
--- 36,40 ----
$IP = "127.0.0.1";
}
!
// Declare information to be used in all messenger files
$SCRIPT = $_SERVER['PHP_SELF'];
***************
*** 44,54 ****
$query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline WHERE IPAddress = '".$IP."'");
! if(isset($user->user)){
! $memberinf = $user->user;
! }else{
! $memberinf = "none";
! }
! if (ofirst_dbnum_rows($query) == 0){
$timeout = $TIME+30;
--- 44,54 ----
$query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline WHERE IPAddress = '".$IP."'");
! if(isset($user->user)) {
! $memberinf = $user->user;
! } else {
! $memberinf = "none";
! }
! if (ofirst_dbnum_rows($query) == 0) {
$timeout = $TIME+30;
***************
*** 66,88 ****
ofirst_dbquery("DELETE FROM ofirst_messenger_usersonline WHERE Timestamp < '".$TIME."'") or die("DELETE: ".ofirst_dberror());
! // Check how many records of users are available and put in user usable variable
! $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline");
! $usersonline = "There are currently <b>".ofirst_dbnum_rows($query)."</b> persons on this website! [ <a href='$basepath/messenger/'>View List</a> ]";
! // Check how many people are previewing the same exact script location and put in user usable variable
! $page_query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline WHERE Location = '".$SCRIPT."'");
! $usersonpage = "There are currently <b>".ofirst_dbnum_rows($page_query)."</b> viewing this page!";
! if(isset($user->user)){
! // Check if the user has any new Messages
! $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_messages WHERE Status = 'New' AND Receiver = '".$user->user."'") or die(ofirst_dberror());
! $messages = ofirst_dbnum_rows($query);
! // Update Message status so they don't show after the person requests the next page
! ofirst_dbquery("UPDATE ofirst_messenger_messages SET Status = 'Read' WHERE Receiver = '".$user->user."'") or die(ofirst_dberror());
! // If there are one ore more then one Messages then preview the Message box
! if ($messages >= 1) {
?>
<table style="position: absolute; left: 32px; top: 163px; width: 384px; height: 19px" width="400">
--- 66,88 ----
ofirst_dbquery("DELETE FROM ofirst_messenger_usersonline WHERE Timestamp < '".$TIME."'") or die("DELETE: ".ofirst_dberror());
! // Check how many records of users are available and put in user usable variable
! $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline");
! $usersonline = "There are currently <b>".ofirst_dbnum_rows($query)."</b> persons on this website! [ <a href='$basepath/messenger/'>View List</a> ]";
! // Check how many people are previewing the same exact script location and put in user usable variable
! $page_query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline WHERE Location = '".$SCRIPT."'");
! $usersonpage = "There are currently <b>".ofirst_dbnum_rows($page_query)."</b> viewing this page!";
! if(isset($user->user)) {
! // Check if the user has any new Messages
! $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_messages WHERE Status = 'New' AND Receiver = '".$user->user."'") or die(ofirst_dberror());
! $messages = ofirst_dbnum_rows($query);
! // Update Message status so they don't show after the person requests the next page
! ofirst_dbquery("UPDATE ofirst_messenger_messages SET Status = 'Read' WHERE Receiver = '".$user->user."'") or die(ofirst_dberror());
! // If there are one ore more then one Messages then preview the Message box
! if ($messages >= 1) {
?>
<table style="position: absolute; left: 32px; top: 163px; width: 384px; height: 19px" width="400">
***************
*** 102,104 ****
}
}
! ?>
\ No newline at end of file
--- 102,104 ----
}
}
! ?>
Index: newmsg.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/newmsg.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** newmsg.php 24 Dec 2003 00:15:36 -0000 1.15
--- newmsg.php 24 Dec 2003 21:07:20 -0000 1.16
***************
*** 31,35 ****
if(! isset($user->user)){
showlogin();
! die(include_once($footer));
}
--- 31,35 ----
if(! isset($user->user)){
showlogin();
! die(include_once($footer));
}
***************
*** 37,68 ****
if (isset($_POST['send'])) {
ofirst_dbquery("INSERT INTO ofirst_messenger_messages (Sender,Receiver,Subject,Body, Status, Date) values(
! '".$user->user."'
! ,'".$_POST['recip']."'
! ,'".$_POST['subject']."'
! ,'".$_POST['body']."'
! ,'New'
! ,'".time()."')") or die("INSERT ERROR: ".ofirst_dberror());
!
! $recipient_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$_POST['recip']."'");
! $recipient = ofirst_dbfetch_object($recipient_query);
! if(function_exists("multipartmail")){
! multipartmail($recipient->email,
! "New message has arrived!" , $message = "Hello ".$recipient->firstname.", you have received a new message from ".$user->user.".
! You may pickup your message by visiting: $home/$basepath/messenger/inbox.php. Thank you and have a nice day!");
! }else{
! // Prepare e-mail headers without using the multipartmail function
! $headers = "MIME-Version: 1.0\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! $headers .= "X-Priority: 1\r\n";
! $headers .= "X-MSMail-Priority: High\r\n";
! // Prepare message for email
! $message = "Hello ".$recipient->firstname.",<br><br>You have received a new message from ".$user->user." on the <b>$title</b>
! Messenger System. You may pickup your message by visiting: $home/$basepath/messenger/inbox.php.<br><br>Thank you and have a nice day!";
! mail($recipient->email,"New message has arrived!",$message,$headers);
! }
echo("<br><br><br><center>Message has been sent! [ <a href='inbox.php'>Inbox</a> ]<br><br>");
--- 37,69 ----
if (isset($_POST['send'])) {
ofirst_dbquery("INSERT INTO ofirst_messenger_messages (Sender,Receiver,Subject,Body, Status, Date) values(
! '".$user->user."'
! ,'".$_POST['recip']."'
! ,'".$_POST['subject']."'
! ,'".$_POST['body']."'
! ,'New'
! ,'".time()."')") or die("INSERT ERROR: ".ofirst_dberror());
!
! $recipient_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE user = '".$_POST['recip']."'");
! $recipient = ofirst_dbfetch_object($recipient_query);
! if(function_exists("multipartmail")) {
! multipartmail($recipient->email,
! "New message has arrived!" , $message = "Hello ".$recipient->firstname.", you have received a new message from ".$user->user.
! ". You may pickup your message by visiting: $home/$basepath/messenger/inbox.php. Thank you and have a nice day!");
! } else {
! // Prepare e-mail headers without using the multipartmail function
! $headers = "MIME-Version: 1.0\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! $headers .= "X-Priority: 1\r\n";
! $headers .= "X-MSMail-Priority: High\r\n";
! // Prepare message for email
! $message = "Hello ".$recipient->firstname.",<br><br>You have received a new message from ".$user->user." on the <b>$title</b>
! Messenger System. You may pickup your message by visiting: $home/$basepath/messenger/inbox.php.<br><br>Thank you and have a nice day!";
!
! mail($recipient->email,"New message has arrived!",$message,$headers);
! }
echo("<br><br><br><center>Message has been sent! [ <a href='inbox.php'>Inbox</a> ]<br><br>");
***************
*** 85,109 ****
// Set the reply based on querystring or list members
! if (isset($_GET['RECIP'])){
! $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline WHERE ID = '".$_GET['RECIP']."'");
! if(ofirst_dbnum_rows($query) == "0") {
! $recipient->Member = $_GET["RECIP"];
! } else {
! $recipient = ofirst_dbfetch_object($query);
! }
! echo "<input type='hidden' name='recip' value='".$recipient->Member."'>";
! echo $recipient->Member;
! }else{
! echo "<select name='recip' id='recip'>";
! $query = ofirst_dbquery("SELECT user FROM ofirst_members ORDER BY user;");
! while($recipient = ofirst_dbfetch_object($query)){
! echo "<option>".$recipient->user."</option>";
! }
! echo "</select>";
}
?>
--- 86,110 ----
// Set the reply based on querystring or list members
! if (isset($_GET['RECIP'])) {
! $query = ofirst_dbquery("SELECT * FROM ofirst_messenger_usersonline WHERE ID = '".$_GET['RECIP']."'");
! if(ofirst_dbnum_rows($query) == "0") {
! $recipient->Member = $_GET["RECIP"];
! } else {
! $recipient = ofirst_dbfetch_object($query);
! }
! echo "<input type='hidden' name='recip' value='".$recipient->Member."'>";
! echo $recipient->Member;
! } else {
! echo "<select name='recip' id='recip'>";
! $query = ofirst_dbquery("SELECT user FROM ofirst_members ORDER BY user;");
! while($recipient = ofirst_dbfetch_object($query)){
! echo "<option>".$recipient->user."</option>";
! }
! echo "</select>";
}
?>
***************
*** 119,125 ****
<?php
if (function_exists("make_wysiwyg")) {
! make_wysiwyg("body",500,255,"");
! }else{
! echo "<textarea name='body'></textarea>";
}
?>
--- 120,126 ----
<?php
if (function_exists("make_wysiwyg")) {
! make_wysiwyg("body",500,255,"");
! } else {
! echo "<textarea name='body'></textarea>";
}
?>
Index: viewmsg.php
===================================================================
RCS file: /cvsroot/openfirst/messenger/viewmsg.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** viewmsg.php 24 Dec 2003 00:15:36 -0000 1.13
--- viewmsg.php 24 Dec 2003 21:07:20 -0000 1.14
***************
*** 31,35 ****
if(! isset($user->user)){
showlogin();
! die(include_once($footer));
}
--- 31,35 ----
if(! isset($user->user)){
showlogin();
! die(include_once($footer));
}
***************
*** 60,64 ****
<td><div align="right">Subject</div></td>
<td>
! <?php if(function_exists("slur_block")){ echo slur_block(emoticon_translate($msg->Subject)); }else{ echo $msg->Subject; } ?>
</td>
</tr>
--- 60,64 ----
<td><div align="right">Subject</div></td>
<td>
! <?php if(function_exists("slur_block") && function_exists("emoticon_translate")) { echo emoticon_translate(slur_block($msg->Subject)); } else { echo $msg->Subject; } ?>
</td>
</tr>
***************
*** 66,70 ****
<td><div align="right">Body</div></td>
<td>
! <?php if(function_exists("slur_block")){ echo slur_block(emoticon_translate($msg->Body)); }else{ echo $msg->Body; } ?>
</td>
</tr>
--- 66,70 ----
<td><div align="right">Body</div></td>
<td>
! <?php if(function_exists("slur_block") && function_exists("emoticon_translate")) { echo emoticon_translate(slur_block($msg->Body)); } else { echo $msg->Body; } ?>
</td>
</tr>
|
|
From: <xt...@us...> - 2003-12-24 20:30:46
|
Update of /cvsroot/openfirst/guestbook
In directory sc8-pr-cvs1:/tmp/cvs-serv1789
Modified Files:
sign.php
Log Message:
Fix glaring errors which should have been caught earlier, including parse errors.
Index: sign.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/sign.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sign.php 23 Dec 2003 22:50:33 -0000 1.11
--- sign.php 24 Dec 2003 20:30:43 -0000 1.12
***************
*** 48,87 ****
<tr>
<td width="25%"><img src="person.png" alt="Name: " /> Name </td>
! <td width="75%"><input type="text" name="guest" style="width: 300px;" value="<?php if(isset($user->user) { echo($user->firstname . ' ' . $user->lastname); } ?>" /></td>
</tr>
<tr>
<td><img src="email.png" alt="E-mail Address: " /> E-mail Address </td>
! <td><input type="text" name="email" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->email); } ?>" /></td>
</tr>
<tr>
<td><img src="icq.png" alt="ICQ UIN: " /> ICQ UIN </td>
! <td><input type="text" name="icq" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->icq); } ?>" /></td>
</tr>
<tr>
<td><img src="aim.png" alt="AIM Screen name: " /> AIM Screen Name </td>
! <td><input type="text" name="aim" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->aim); } ?>" /></td>
</tr>
<tr>
<td><img src="msmsgs.png" alt="MSN Messenger Address: " /> MSN Messenger
Address </td>
! <td><input type="text" name="msn" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->msn); } ?>" /></td>
</tr>
<tr>
<td><img src="yahoo.png" alt="Yahoo! Messenger Address: " /> Yahoo! Messenger
Address </td>
! <td><input type="text" name="yim" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->yim); } ?>" /></td>
</tr>
<tr>
<td><img src="irc.png" alt="IRC: " /> IRC Address </td>
! <td><input type="text" name="irc" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->irc); } ?>" /></td>
</tr>
<tr>
<td><img src="webpage.png" alt="Web Page" /> Web Page Address (include the
http://) </td>
! <td><input type="text" name="webpage" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->homepage); } ?>" /></td>
</tr>
<tr>
<td><img src="world.png" alt="Location: "/> Location </td>
! <td><input type="text" name="location" style="width: 300px;" value="<?php if(isset($user->user)) { echo($user->location); } ?>" /></td>
</tr>
<tr>
--- 48,87 ----
<tr>
<td width="25%"><img src="person.png" alt="Name: " /> Name </td>
! <td width="75%"><input type="text" name="guest" style="width: 300px;" value="<?php if(isset($user->firstname) && isset($user->lastname)) { echo($user->firstname . ' ' . $user->lastname); } ?>" /></td>
</tr>
<tr>
<td><img src="email.png" alt="E-mail Address: " /> E-mail Address </td>
! <td><input type="text" name="email" style="width: 300px;" value="<?php if(isset($user->email)) { echo($user->email); } ?>" /></td>
</tr>
<tr>
<td><img src="icq.png" alt="ICQ UIN: " /> ICQ UIN </td>
! <td><input type="text" name="icq" style="width: 300px;" value="<?php if(isset($user->icq)) { echo($user->icq); } ?>" /></td>
</tr>
<tr>
<td><img src="aim.png" alt="AIM Screen name: " /> AIM Screen Name </td>
! <td><input type="text" name="aim" style="width: 300px;" value="<?php if(isset($user->aim)) { echo($user->aim); } ?>" /></td>
</tr>
<tr>
<td><img src="msmsgs.png" alt="MSN Messenger Address: " /> MSN Messenger
Address </td>
! <td><input type="text" name="msn" style="width: 300px;" value="<?php if(isset($user->msn)) { echo($user->msn); } ?>" /></td>
</tr>
<tr>
<td><img src="yahoo.png" alt="Yahoo! Messenger Address: " /> Yahoo! Messenger
Address </td>
! <td><input type="text" name="yim" style="width: 300px;" value="<?php if(isset($user->yim)) { echo($user->yim); } ?>" /></td>
</tr>
<tr>
<td><img src="irc.png" alt="IRC: " /> IRC Address </td>
! <td><input type="text" name="irc" style="width: 300px;" value="<?php if(isset($user->irc)) { echo($user->irc); } ?>" /></td>
</tr>
<tr>
<td><img src="webpage.png" alt="Web Page" /> Web Page Address (include the
http://) </td>
! <td><input type="text" name="webpage" style="width: 300px;" value="<?php if(isset($user->homepage)) { echo($user->homepage); } ?>" /></td>
</tr>
<tr>
<td><img src="world.png" alt="Location: "/> Location </td>
! <td><input type="text" name="location" style="width: 300px;" value="<?php if(isset($user->location)) { echo($user->location); } ?>" /></td>
</tr>
<tr>
|
|
From: <dav...@us...> - 2003-12-24 19:39:29
|
Update of /cvsroot/openfirst/forum
In directory sc8-pr-cvs1:/tmp/cvs-serv26583
Modified Files:
index.php forumvisit.php editpost.php
Log Message:
More syntax changes, as per Tim's request.
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/forum/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php 24 Dec 2003 17:05:59 -0000 1.8
--- index.php 24 Dec 2003 19:39:25 -0000 1.9
***************
*** 31,56 ****
$admin = false;
! if(isset($user->membertype)){
$admin = ($user->membertype == "administrator");
}
$forum = "";
! if(isset($_GET["forum"])){
$forum = strtolower($_GET["forum"]);
}
$sub = $forum;
$res = "";
$uname = "";
! if(isset($user->user)){
$uname = $user->user;
}
! while($sub != ""){
! $res = " > ".'<a href="'.$basepath."/forum/index.php?forum=".urlencode($sub).'">'.ucfirst($sub)."</a>".$res;
! $q = ofirst_dbquery("SELECT subforum FROM ofirst_forum WHERE name='".$sub."'");
! if(ofirst_dbnum_rows($q) != 0){
$sub = ofirst_dbfetch_object($q);
! $q = ofirst_dbquery("SELECT name,subforum FROM ofirst_forum WHERE ID=".$sub->subforum);
$sub = ofirst_dbfetch_object($q);
! if($sub->subforum != 0){
$sub = $sub->name;
} else {
--- 31,60 ----
$admin = false;
! if (isset($user->membertype)) {
$admin = ($user->membertype == "administrator");
}
$forum = "";
! if (isset($_GET["forum"])) {
$forum = strtolower($_GET["forum"]);
}
+
$sub = $forum;
$res = "";
$uname = "";
!
! if (isset($user->user)) {
$uname = $user->user;
}
!
! while ($sub != "") {
! $res = " > " . '<a href="'.$basepath."/forum/index.php?forum=".urlencode($sub).'">' . ucfirst($sub) . "</a>" . $res;
! $q = ofirst_dbquery("SELECT subforum FROM ofirst_forum WHERE name='" . $sub . "'");
!
! if (ofirst_dbnum_rows($q) != 0) {
$sub = ofirst_dbfetch_object($q);
! $q = ofirst_dbquery("SELECT name,subforum FROM ofirst_forum WHERE ID=" . $sub->subforum);
$sub = ofirst_dbfetch_object($q);
! if ($sub->subforum != 0) {
$sub = $sub->name;
} else {
***************
*** 62,92 ****
}
! echo '<div align=left><a href="'.$basepath.'/forum">'.$title." Forums</a> $res</div>";
! if($forum == ""){
$query = "SELECT * FROM ofirst_forum WHERE subforum='0'";
! } else{
$query = "SELECT * FROM ofirst_forum WHERE name='$forum'";
}
! if(!$admin){
$query .= " AND hidden=0";
}
$query = ofirst_dbquery($query);
! if(ofirst_dbnum_rows($query) != 0){
$cat = ofirst_dbfetch_object($query);
! if($cat->subforum == 0){
echo '<table style="border:0px" width=600><tr><td height=350 background=header.jpg><h1> '.$title."</h1></td></tr></table>";
! } else{
echo "<h1>$title Forums</h1>";
}
echo "<table width=600><tr><th width=200><h4><i>";
! if($cat->subforum != 0){
! echo "Forum: ".ucfirst($cat->name);
! } else{
echo "Welcome ";
! if(isset($user->user)){
! echo $user->user."</i></h4>";
echo "<div align=right><a href=login.php>Logout</a></div>";
! } else{
echo "</i></h4>";
echo "<div align=right><a href=login.php>Login</a></div>";
--- 66,98 ----
}
! echo '<div align=left><a href="'.$basepath.'/forum">'.$title.' Forums</a> $res</div>';
! if ($forum == "") {
$query = "SELECT * FROM ofirst_forum WHERE subforum='0'";
! } else {
$query = "SELECT * FROM ofirst_forum WHERE name='$forum'";
}
!
! if( !$admin) {
$query .= " AND hidden=0";
}
+
$query = ofirst_dbquery($query);
! if (ofirst_dbnum_rows($query) != 0) {
$cat = ofirst_dbfetch_object($query);
! if ($cat->subforum == 0) {
echo '<table style="border:0px" width=600><tr><td height=350 background=header.jpg><h1> '.$title."</h1></td></tr></table>";
! } else {
echo "<h1>$title Forums</h1>";
}
echo "<table width=600><tr><th width=200><h4><i>";
! if ($cat->subforum != 0) {
! echo "Forum: " . ucfirst($cat->name);
! } else {
echo "Welcome ";
! if (isset($user->user)) {
! echo $user->user . "</i></h4>";
echo "<div align=right><a href=login.php>Logout</a></div>";
! } else {
echo "</i></h4>";
echo "<div align=right><a href=login.php>Login</a></div>";
***************
*** 97,138 ****
echo "<i>Closed Forum</i></div><div>";
}
! echo "<b>$cat->message</b></div><div>".date("l, j F Y")."</div></td></tr></table>";
showgroup($cat,0);
! if($admin){
showgroup($cat,1);
}
! if($cat->subforum != 0){
$page = 0;
! if(isset($_GET["page"])){
! $page=$_GET["page"]-1;
}
! if($page<0){
$page=0;
}
! $query = ofirst_dbquery("SELECT ID,Title,Author,DatePosted FROM ofirst_forumposts WHERE forum='".$forum."' AND ReplyTo=0 ORDER BY DatePosted DESC");
$num = ofirst_dbnum_rows($query);
! if($num != 0){
// Skip records
for($i=0; $i < $page * posts_page; $i++){
! if(! ofirst_dbfetch_object($query)){
break;
}
}
! echo "<table width=600><tr><th colspan=3>".ucfirst($cat->name)."</th></tr>";
echo "<tr><td class=sub width=400><b>Topic</b></td><td class=sub><b>Author</b></td><td class=sub><b>Date</b></td></tr>";
! for($i=0; $i < posts_page; $i++){
! if($post=ofirst_dbfetch_object($query)){
! if(isset($user)){
! echo"<tr><td>".getimage($_SESSION["forumvisit".$uname],$post->DatePosted).' <a href="thread.php?id='.$post->ID.'">'.$post->Title."</a></td>";
} else {
! echo '<tr><td><img src=old.png align=absmiddle><a href="thread.php?id='.$post->ID.'">'.$post->Title."</a></td>";
}
! echo '<td><a href="../members/profile.php?id='.urlencode($post->Author).'">'.$post->Author."</a></td>";
! echo "<td>".$post->DatePosted."</td></tr>";
} else {
break;
--- 103,145 ----
echo "<i>Closed Forum</i></div><div>";
}
! echo "<b>$cat->message</b></div><div>" . date("l, j F Y") . "</div></td></tr></table>";
showgroup($cat,0);
! if ($admin) {
showgroup($cat,1);
}
! if ($cat->subforum != 0) {
$page = 0;
! if (isset($_GET["page"])) {
! $page = $_GET["page"] - 1;
}
!
! if ($page < 0) {
$page=0;
}
! $query = ofirst_dbquery("SELECT ID,Title,Author,DatePosted FROM ofirst_forumposts WHERE forum='" . $forum . "' AND ReplyTo = 0 ORDER BY DatePosted DESC");
$num = ofirst_dbnum_rows($query);
! if ($num != 0) {
// Skip records
for($i=0; $i < $page * posts_page; $i++){
! if (! ofirst_dbfetch_object($query)) {
break;
}
}
! echo "<table width=600><tr><th colspan=3>" . ucfirst($cat->name) . "</th></tr>";
echo "<tr><td class=sub width=400><b>Topic</b></td><td class=sub><b>Author</b></td><td class=sub><b>Date</b></td></tr>";
! for ($i=0; $i < posts_page; $i++){
! if ($post=ofirst_dbfetch_object($query)) {
! if (isset($user)) {
! echo "<tr><td>".getimage($_SESSION["forumvisit".$uname],$post->DatePosted).' <a href="thread.php?id='.$post->ID.'">'.$post->Title."</a></td>";
} else {
! echo '<tr><td><img src=old.png align=absmiddle><a href="thread.php?id=' . $post->ID . '">' . $post->Title . '</a></td>';
}
! echo '<td><a href="../members/profile.php?id='.urlencode($post->Author).'">' . $post->Author . '</a></td>';
! echo "<td>" . $post->DatePosted . "</td></tr>";
} else {
break;
***************
*** 140,157 ****
}
! if($num > posts_page){
echo "<tr><td class=sub colspan=3 align=right>";
! if($page > 1){
! echo '<a href="index.php?forum='.$forum.'&page=1">[First]</a> ... ';
}
! if($page > 0){
! echo'<a href="index.php?forum='.$forum.'&page='.($page).'"><<Prev</a> ';
}
echo "Page ".($page+1)." of ".ceil($num/posts_page);
! if($page < ceil($num/posts_page) - 1){
! echo ' <a href="index.php?forum='.$forum.'&page='.($page+2).'">Next>></a>';
}
! if($page<ceil($num/posts_page)-2){
! echo ' ... <a href="index.php?forum='.$forum.'&page='.ceil($num/posts_page).'">[Last]</a>';
}
echo "</td></tr>";
--- 147,164 ----
}
! if ($num > posts_page) {
echo "<tr><td class=sub colspan=3 align=right>";
! if ($page > 1) {
! echo '<a href="index.php?forum=' . $forum . '&page=1">[First]</a> ... ';
}
! if ($page > 0) {
! echo'<a href="index.php?forum=' . $forum . '&page=' . ($page) . '"><<Prev</a> ';
}
echo "Page ".($page+1)." of ".ceil($num/posts_page);
! if ($page < ceil($num/posts_page) - 1) {
! echo ' <a href="index.php?forum='.$forum.'&page=' . ($page+2) . '">Next>></a>';
}
! if ($page<ceil($num/posts_page)-2) {
! echo ' ... <a href="index.php?forum='.$forum.'&page=' . ceil($num/posts_page) . '">[Last]</a>';
}
echo "</td></tr>";
***************
*** 164,170 ****
}
! if(isset($cat)){
! if($cat->subforum!=0&&$cat->closed==0){
! echo '<div><a href="newpost.php?forumid='.urlencode($forum).'">New Topic</a></div>';
}
}
--- 171,177 ----
}
! if (isset($cat)) {
! if ($cat->subforum!=0&&$cat->closed == 0) {
! echo '<div><a href="newpost.php?forumid=' . urlencode($forum) . '">New Topic</a></div>';
}
}
***************
*** 173,177 ****
function getimage($userlast, $recentdate){
! if(strtotime($userlast)<strtotime($recentdate)){
return "<img src=new.png align=absmiddle>";
} else {
--- 180,184 ----
function getimage($userlast, $recentdate){
! if (strtotime($userlast)<strtotime($recentdate)) {
return "<img src=new.png align=absmiddle>";
} else {
***************
*** 182,188 ****
function showgroup($cat, $private=0){
$query = ofirst_dbquery("SELECT name,closed FROM ofirst_forum WHERE subforum=$cat->ID AND hidden=$private ORDER BY name");
! if(ofirst_dbnum_rows($query) != 0){
echo "<table width=600><tr><th colspan=4>" ;
! if($private==1){
echo "Private Forums" ;
} else {
--- 189,195 ----
function showgroup($cat, $private=0){
$query = ofirst_dbquery("SELECT name,closed FROM ofirst_forum WHERE subforum=$cat->ID AND hidden=$private ORDER BY name");
! if (ofirst_dbnum_rows($query) != 0) {
echo "<table width=600><tr><th colspan=4>" ;
! if ($private == 1) {
echo "Private Forums" ;
} else {
***************
*** 191,219 ****
echo "</th></tr>";
echo "<tr><td class=sub width=350><b>Forum</b></td><td class=sub align=right><b>Posts</b></td><td class=sub align=right><b>Threads</b></td><td class=sub align=center width=100><b>Last Post</b></td></tr>";
! while($sub=ofirst_dbfetch_object($query)){
echo("<tr><td>");
! $q=ofirst_dbquery("SELECT Author,DatePosted FROM ofirst_forumposts WHERE forum='$sub->name' ORDER BY DatePosted DESC");
! if(ofirst_dbnum_rows($q)!=0){
$lastposter = ofirst_dbfetch_object($q);
$lastdate = $lastposter->DatePosted;
$lastposter = $lastposter->Author;
}
! if(!$sub->closed == 1){
! if(ofirst_dbnum_rows($q) != 0 && isset($user)){
echo getimage($_SESSION["forumvisit".$uname],$lastdate).'<a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">'.ucfirst($sub->name)."</a></td>";
} else {
! echo '<img src=old.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">'.ucfirst($sub->name)."</a></td>";
}
} else {
! echo '<img src=locked.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">'.ucfirst($sub->name)."</a></td>";
}
! echo "<td align=right>".ofirst_dbnum_rows($q)."</td>";
$q = ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='$sub->name' AND ReplyTo='0'");
! echo "<td align=right>".ofirst_dbnum_rows($q)."</td>";
echo "<td align=right> ";
! if(isset($lastposter)){
! echo($lastdate." by ");
! if(is_readable("../members/profile.php")){
! echo '<a href="'.$GLOBALS['basepath']."/members/profile.php?id=".$lastposter.'">';
}
echo $lastposter."</a>";
--- 198,226 ----
echo "</th></tr>";
echo "<tr><td class=sub width=350><b>Forum</b></td><td class=sub align=right><b>Posts</b></td><td class=sub align=right><b>Threads</b></td><td class=sub align=center width=100><b>Last Post</b></td></tr>";
! while ($sub=ofirst_dbfetch_object($query)) {
echo("<tr><td>");
! $q = ofirst_dbquery("SELECT Author,DatePosted FROM ofirst_forumposts WHERE forum='$sub->name' ORDER BY DatePosted DESC");
! if (ofirst_dbnum_rows($q)!=0) {
$lastposter = ofirst_dbfetch_object($q);
$lastdate = $lastposter->DatePosted;
$lastposter = $lastposter->Author;
}
! if (!$sub->closed == 1) {
! if (ofirst_dbnum_rows($q) != 0 && isset($user)) {
echo getimage($_SESSION["forumvisit".$uname],$lastdate).'<a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">'.ucfirst($sub->name)."</a></td>";
} else {
! echo '<img src=old.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=".urlencode($sub->name).'">' . ucfirst($sub->name) . "</a></td>";
}
} else {
! echo '<img src=locked.png align=absmiddle><a href="'.$_SERVER["PHP_SELF"]."?forum=" . urlencode($sub->name) . '">' . ucfirst($sub->name) . "</a></td>";
}
! echo "<td align=right>" . ofirst_dbnum_rows($q) . "</td>";
$q = ofirst_dbquery("SELECT ID FROM ofirst_forumposts WHERE forum='$sub->name' AND ReplyTo='0'");
! echo "<td align=right>" . ofirst_dbnum_rows($q) . "</td>";
echo "<td align=right> ";
! if (isset($lastposter)) {
! echo($lastdate . " by ");
! if (is_readable("../members/profile.php")) {
! echo '<a href="'.$GLOBALS['basepath']."/members/profile.php?id=" . $lastposter . '">';
}
echo $lastposter."</a>";
Index: forumvisit.php
===================================================================
RCS file: /cvsroot/openfirst/forum/forumvisit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** forumvisit.php 24 Dec 2003 17:05:59 -0000 1.4
--- forumvisit.php 24 Dec 2003 19:39:25 -0000 1.5
***************
*** 27,38 ****
*/
! if(isset($user->user)){
! if(!isset($_SESSION["forumvisit".$user->user])){
! $_SESSION["forumvisit".$user->user]=0;
! $q=ofirst_dbquery("SELECT forumvisit FROM ofirst_members WHERE user='$user->user';");
! if(ofirst_dbnum_rows($q)!=0){
! $visit=ofirst_dbfetch_object($q);
! $_SESSION["forumvisit".$user->user]=$visit->forumvisit;
unset($visit);
}
--- 27,38 ----
*/
! if (isset($user->user)) {
! if (!isset($_SESSION["forumvisit" . $user->user])) {
! $_SESSION["forumvisit".$user->user] = 0;
! $q = ofirst_dbquery("SELECT forumvisit FROM ofirst_members WHERE user='$user->user';");
! if (ofirst_dbnum_rows ($q) != 0) {
! $visit = ofirst_dbfetch_object($q);
! $_SESSION["forumvisit" . $user->user] = $visit->forumvisit;
unset($visit);
}
***************
*** 42,50 ****
}
} else {
! $_SESSION["forumvisit"]=date("Y-m-d H:i:s");
}
! function latest_posts($number){
! $query=ofirst_dbquery("SELECT Title, Author, Forum, ofirst_forumposts.ID, ReplyTo
FROM ofirst_forumposts, ofirst_forum
WHERE ofirst_forum.name = ofirst_forumposts.Forum AND ofirst_forum.hidden = 0
--- 42,50 ----
}
} else {
! $_SESSION["forumvisit"] = date("Y-m-d H:i:s");
}
! function latest_posts ($number) {
! $query = ofirst_dbquery("SELECT Title, Author, Forum, ofirst_forumposts.ID, ReplyTo
FROM ofirst_forumposts, ofirst_forum
WHERE ofirst_forum.name = ofirst_forumposts.Forum AND ofirst_forum.hidden = 0
***************
*** 52,75 ****
LIMIT $number");
! if(ofirst_dbnum_rows($query)==0){
! echo("<div>No posts in forums</div>");
! }else{
! echo("<ul>");
! while($post=ofirst_dbfetch_object($query)){
! if($post->ReplyTo==0){
! $msgid=$post->ID;
} else {
! $msgid=$post->ReplyTo;
}
! if($post->Title==""){
! $q=ofirst_dbquery("SELECT Title FROM ofirst_forumposts WHERE ID='$post->ReplyTo'");
! $root=ofirst_dbfetch_object($q);
! $title=$root->Title;
! }else{
! $title=$post->Title;
}
! echo("<li><a href=\"".$GLOBALS["basepath"]."/forum/thread.php?id=$msgid\">$title</a><br />by $post->Author</li>");
}
! echo("</ul>");
}
}
--- 52,75 ----
LIMIT $number");
! if (ofirst_dbnum_rows($query) == 0) {
! echo "<div>No posts in forums</div>";
! } else {
! echo "<ul>";
! while ($post = ofirst_dbfetch_object($query)) {
! if ($post->ReplyTo == 0) {
! $msgid = $post->ID;
} else {
! $msgid = $post->ReplyTo;
}
! if ($post->Title == "") {
! $q = ofirst_dbquery("SELECT Title FROM ofirst_forumposts WHERE ID='$post->ReplyTo'");
! $root = ofirst_dbfetch_object($q);
! $title = $root->Title;
! } else {
! $title = $post->Title;
}
! echo "<li><a href=\"".$GLOBALS["basepath"]."/forum/thread.php?id=$msgid\">$title</a><br />by $post->Author</li>";
}
! echo "</ul>";
}
}
Index: editpost.php
===================================================================
RCS file: /cvsroot/openfirst/forum/editpost.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editpost.php 24 Dec 2003 17:05:59 -0000 1.4
--- editpost.php 24 Dec 2003 19:39:25 -0000 1.5
***************
*** 29,33 ****
include("../config/globals.php");
! $forumid="";
if(isset($_POST["forumid"])){
$forumid=strtolower($_POST["forumid"]);
--- 29,33 ----
include("../config/globals.php");
! $forumid = "";
if(isset($_POST["forumid"])){
$forumid=strtolower($_POST["forumid"]);
***************
*** 43,50 ****
$author = $user->user;
! $errmsg="";
! $msgid=0;
! if(isset($_POST["msgid"])){
! $msgid=$_POST["msgid"];
} else {
if(isset($_GET["id"])){
--- 43,50 ----
$author = $user->user;
! $errmsg = "";
! $msgid = 0;
! if (isset($_POST["msgid"])){
! $msgid = $_POST["msgid"];
} else {
if(isset($_GET["id"])){
***************
*** 53,81 ****
}
! if($msgid!=0){
$query="SELECT * FROM ofirst_forumposts WHERE ID='$msgid'";
! if(!$admin){
! $query.=" AND Author='$author'";
}
$query = ofirst_dbquery($query);
! if(ofirst_dbnum_rows($query)!=0){
! $msg=ofirst_dbfetch_object($query);
! $msgtext=$msg->Message;
! if(isset($_POST["message"])){
! if(isset($_POST["delete"])&&$_POST["delete"]==1){
! if($msg->ReplyTo==0){
! if(!$admin){
$errmsg="You can not delete this message because it is the first message in the thread";
} else {
! $query=ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ReplyTo='".$msg->ID."'");
! $query=ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ID='".$msg->ID."'");
header("Location: index.php?forum=".$msg->forum);
exit;
}
} else {
! $query=ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ID='".$msg->ID."'");
header("Location: thread.php?id=".$forumid);
exit;
--- 53,81 ----
}
! if ($msgid != 0){
$query="SELECT * FROM ofirst_forumposts WHERE ID='$msgid'";
! if (!$admin){
! $query .= " AND Author='$author'";
}
$query = ofirst_dbquery($query);
! if (ofirst_dbnum_rows($query) !=0 ){
! $msg = ofirst_dbfetch_object($query);
! $msgtext = $msg->Message;
! if (isset($_POST["message"])){
! if (isset($_POST["delete"])&&$_POST["delete"]==1){
! if ($msg->ReplyTo==0){
! if (!$admin){
$errmsg="You can not delete this message because it is the first message in the thread";
} else {
! $query = ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ReplyTo='".$msg->ID."'");
! $query = ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ID='".$msg->ID."'");
header("Location: index.php?forum=".$msg->forum);
exit;
}
} else {
! $query = ofirst_dbquery("DELETE FROM ofirst_forumposts WHERE ID='" . $msg->ID . "'");
header("Location: thread.php?id=".$forumid);
exit;
***************
*** 83,102 ****
} else {
! $msgtext=$_POST["message"];
// Update record in database
! if($msg->ReplyTo==0){
! if($_POST["title"]==""){
$errmsg = "New topic must have a title";
}
}
! if($errmsg==""){
! if($author != $msg->Author){
! if($admin){
! $msgtext .= "<br /><i>Edited by $author on ".date("H:i:s d-m-Y")."</i>";
}
}
! $query=ofirst_dbquery("UPDATE ofirst_forumposts SET Title='".$_POST["title"]."', Message='".strip_tags($msgtext,allowed_tags)."' WHERE ID='".$msg->ID."'");
! // Redirect back to forum
header("Location: thread.php?id=".$forumid);
exit;
--- 83,101 ----
} else {
! $msgtext = $_POST["message"];
// Update record in database
! if ($msg->ReplyTo==0){
! if ($_POST["title"] == ""){
$errmsg = "New topic must have a title";
}
}
! if ($errmsg==""){
! if ($author != $msg->Author){
! if ($admin){
! $msgtext .= "<br /><i>Edited by $author on " . date("H:i:s d-m-Y") . "</i>";
}
}
! $query=ofirst_dbquery("UPDATE ofirst_forumposts SET Title='" . $_POST["title"] . "', Message='" . strip_tags($msgtext,allowed_tags) . "' WHERE ID='" . $msg->ID . "'");
header("Location: thread.php?id=".$forumid);
exit;
***************
*** 106,118 ****
include($header);
! if($errmsg!=""){
! echo('<br /><div style="color:red">'.$errmsg."</div><br />");
}
! echo('<form id=EditPost name=EditPost action="'.$_SERVER["PHP_SELF"].'" method=POST>');
! echo("<br /><div><input type=checkbox name=delete id=delete value=1><label for=delete>Delete message?</label></input></div><br />");
! echo('<input type=hidden name=forumid value="'.$forumid.'">');
! echo('<input type=hidden name=msgid value="'.$msgid.'">');
! echo("<table><tr><th colspan=2>Editing ".$msg->Title."</th></tr>");
?>
<tr valign=top><td><label for=title><b>Title</b></label></td>
--- 105,117 ----
include($header);
! if ($errmsg != ""){
! echo '<br /><div style="color:red">'.$errmsg."</div><br />";
}
! echo '<form id=EditPost name=EditPost action="'.$_SERVER["PHP_SELF"].'" method=POST>';
! echo "<br /><div><input type=checkbox name=delete id=delete value=1><label for=delete>Delete message?</label></input></div><br />";
! echo '<input type=hidden name=forumid value="'.$forumid.'">';
! echo '<input type=hidden name=msgid value="'.$msgid.'">';
! echo "<table><tr><th colspan=2>Editing ".$msg->Title."</th></tr>";
?>
<tr valign=top><td><label for=title><b>Title</b></label></td>
***************
*** 123,130 ****
// Show DHTML editing bar or else just a regular textarea
$dhtml = function_exists("make_wysiwyg");
! if($dhtml){
echo("<input type=hidden name=post value=1>");
make_wysiwyg("message", 500, 300, $msgtext);
! } else{
echo("<textarea name=message id=message cols=40 rows=10>$msgtext</textarea></td></tr>");
}
--- 122,129 ----
// Show DHTML editing bar or else just a regular textarea
$dhtml = function_exists("make_wysiwyg");
! if ($dhtml){
echo("<input type=hidden name=post value=1>");
make_wysiwyg("message", 500, 300, $msgtext);
! } else {
echo("<textarea name=message id=message cols=40 rows=10>$msgtext</textarea></td></tr>");
}
***************
*** 132,140 ****
echo("</td></tr><tr><td colspan=2 align=center>");
! if($dhtml){
echo('<input type=button onclick="dhtmlEditorPrepareSubmit(); document.EditPost.submit();" value="Save Changes">');
! }
! else{
! echo('<input type=submit value="Save Changes">');
}
?>
--- 131,138 ----
echo("</td></tr><tr><td colspan=2 align=center>");
! if ($dhtml){
echo('<input type=button onclick="dhtmlEditorPrepareSubmit(); document.EditPost.submit();" value="Save Changes">');
! } else {
! echo '<input type=submit value="Save Changes">';
}
?>
***************
*** 145,151 ****
} else {
include($header);
! echo("<h3>You cannot edit this message</h3>");
! echo("<div>You can only edit your own messages. An administrator can edit all posts.</div><div>You are currently logged in as $user->user.</div>");
! echo('<br /><div><a href="'.$_SERVER["HTTP_REFERER"].'">Back</a></div>');
}
include($footer);
--- 143,149 ----
} else {
include($header);
! echo "<h3>You cannot edit this message</h3>";
! echo "<div>You can only edit your own messages. An administrator can edit all posts.</div><div>You are currently logged in as $user->user.</div>";
! echo '<br /><div><a href="'.$_SERVER["HTTP_REFERER"].'">Back</a></div>';
}
include($footer);
|
|
From: <xt...@us...> - 2003-12-24 19:32:59
|
Update of /cvsroot/openfirst/logger In directory sc8-pr-cvs1:/tmp/cvs-serv25533 Modified Files: NOTES Log Message: Update NOTES Index: NOTES =================================================================== RCS file: /cvsroot/openfirst/logger/NOTES,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NOTES 24 Dec 2003 03:29:49 -0000 1.2 --- NOTES 24 Dec 2003 19:32:56 -0000 1.3 *************** *** 7,11 **** David Di Biase - Module approved. When auditing I found lots of un-important comments that I either removed completely or replaced with shorter comments. I also made a couple of design changes by adding icons from members. ! Tim Ginn - not yet audited ! Greg Inozemtsev - Module approved. Some style changes. \ No newline at end of file --- 7,11 ---- David Di Biase - Module approved. When auditing I found lots of un-important comments that I either removed completely or replaced with shorter comments. I also made a couple of design changes by adding icons from members. ! Tim Ginn - Module approved. ! Greg Inozemtsev - Module approved. Some style changes. |
|
From: <xt...@us...> - 2003-12-24 19:32:24
|
Update of /cvsroot/openfirst/logger
In directory sc8-pr-cvs1:/tmp/cvs-serv25446
Modified Files:
graph.php index.php logger.php rawdata.php stats.php
Log Message:
Bring logger module into compliance with openFIRST coding standards.
Index: graph.php
===================================================================
RCS file: /cvsroot/openfirst/logger/graph.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** graph.php 23 Dec 2003 22:32:58 -0000 1.4
--- graph.php 24 Dec 2003 19:32:20 -0000 1.5
***************
*** 52,60 ****
// Get graph type
! if(isset($_GET["graph"])){
! $graphtype=$_GET["graph"];
! }else {
! // Default to weekly graph
! $graphtype=1;
}
--- 52,60 ----
// Get graph type
! if(isset($_GET["graph"])) {
! $graphtype=$_GET["graph"];
! } else {
! // Default to weekly graph
! $graphtype=1;
}
***************
*** 64,69 ****
// Set variables according to type
//(Note: set $labelskip=0 to remove all labels)
! switch($graphtype){
! case 2: {
$graphtitle="Monthly Usage";
$labelskip=6;
--- 64,69 ----
// Set variables according to type
//(Note: set $labelskip=0 to remove all labels)
! switch($graphtype) {
! case 2: {
$graphtitle="Monthly Usage";
$labelskip=6;
***************
*** 71,76 ****
$days=30;
break;
! }
! case 3: {
$graphtitle="Yearly Usage";
$labelskip=49;
--- 71,76 ----
$days=30;
break;
! }
! case 3: {
$graphtitle="Yearly Usage";
$labelskip=49;
***************
*** 78,83 ****
$days=366;
break;
! }
! default: {
$graphtitle="Weekly Usage";
$labelskip=1;
--- 78,83 ----
$days=366;
break;
! }
! default: {
$graphtitle="Weekly Usage";
$labelskip=1;
***************
*** 85,89 ****
$days=6;
break;
! }
}
--- 85,89 ----
$days=6;
break;
! }
}
***************
*** 96,124 ****
$usedata=array();
! for($i=0;$i<=$days;$i++){
// Get date (86400 seconds in a day)
! $unixtime=time()-86400*($days-$i);
! $date=strftime("%B",$unixtime);
! // Fix for PHP running on Win32 (%e not supported by strftime)
! $day=strftime("%d",$unixtime);
! // Check for single-digit day
! if (substr($day,0,1)=="0"){
! // Remove leading 0
! $day=substr($day,1,1);
! }
! $date.=" ".$day.", ".strftime("%Y",$unixtime);
! // Uses INSTR for partial comparison. May not work with all databases.
! $query = ofirst_dbquery("SELECT * FROM ofirst_logger WHERE (INSTR(Date,'".$date."')!=0)");
! $usedata[$i] = ofirst_dbnum_rows($query);
! // See how many labels to skip
! if((($i % $labelskip)==0)&&($labelskip!=0)){
! // Label on the axis
! imagestring ($im, 1, 10+$dx*$i, ($height-20), strftime($labelformat,$unixtime), $axis_color);
! }
}
--- 96,124 ----
$usedata=array();
! for($i=0;$i<=$days;$i++) {
// Get date (86400 seconds in a day)
! $unixtime=time()-86400*($days-$i);
! $date=strftime("%B",$unixtime);
! // Fix for PHP running on Win32 (%e not supported by strftime)
! $day=strftime("%d",$unixtime);
! // Check for single-digit day
! if (substr($day,0,1)=="0"){
! // Remove leading 0
! $day=substr($day,1,1);
! }
! $date.=" ".$day.", ".strftime("%Y",$unixtime);
! // Uses INSTR for partial comparison. May not work with all databases.
! $query = ofirst_dbquery("SELECT * FROM ofirst_logger WHERE (INSTR(Date,'".$date."')!=0)");
! $usedata[$i] = ofirst_dbnum_rows($query);
! // See how many labels to skip
! if((($i % $labelskip)==0)&&($labelskip!=0)) {
! // Label on the axis
! imagestring ($im, 1, 10+$dx*$i, ($height-20), strftime($labelformat,$unixtime), $axis_color);
! }
}
***************
*** 148,163 ****
$x=20+$dx*$i;
! // Y-coordinate of point (scale up to max hits)
! $y=($height-26)-(($height-50)*($hits/$max));
! // Draw the graph segment
! imageline($im, $px,$py, $x, $y,$text_color);
! if((($i % $labelskip)==0)&&($labelskip!=0)) {
! // Print point label
! imagestring ($im, 1, $x-5, $y-10, $hits, $text_color);
! }
! // Save previous x and y
! $px=$x;
! $py=$y;
! $i++;
}
--- 148,163 ----
$x=20+$dx*$i;
! // Y-coordinate of point (scale up to max hits)
! $y=($height-26)-(($height-50)*($hits/$max));
! // Draw the graph segment
! imageline($im, $px,$py, $x, $y,$text_color);
! if((($i % $labelskip)==0)&&($labelskip!=0)) {
! // Print point label
! imagestring ($im, 1, $x-5, $y-10, $hits, $text_color);
! }
! // Save previous x and y
! $px=$x;
! $py=$y;
! $i++;
}
***************
*** 170,174 ****
function load_png($imgname) {
! $image = @imagecreatefrompng ($imgname); // Attempt to open
if (! $image) {
$image = imagecreate (500, 300);
--- 170,174 ----
function load_png($imgname) {
! $image = @imagecreatefrompng ($imgname); // Attempt to open
if (! $image) {
$image = imagecreate (500, 300);
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/logger/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.php 23 Dec 2003 22:32:58 -0000 1.10
--- index.php 24 Dec 2003 19:32:20 -0000 1.11
***************
*** 83,89 ****
echo " <td>$log->HostLookup</td>";
echo "<td>
! <a href='./?DELETE=$log->IPAddress'><img border='0' src='$home$basepath/members/icons/actions/button_cancel.png'></a>
! <a href='track.php?ID=$log->IPAddress'><img src='$home$basepath/members/icons/actions/filefind.png' border='0'></a>
! </td>";
echo "</tr>";
}
--- 83,89 ----
echo " <td>$log->HostLookup</td>";
echo "<td>
! <a href='./?DELETE=$log->IPAddress'><img border='0' src='$home$basepath/members/icons/actions/button_cancel.png'></a>
! <a href='track.php?ID=$log->IPAddress'><img src='$home$basepath/members/icons/actions/filefind.png' border='0'></a>
! </td>";
echo "</tr>";
}
Index: logger.php
===================================================================
RCS file: /cvsroot/openfirst/logger/logger.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** logger.php 23 Dec 2003 22:32:58 -0000 1.9
--- logger.php 24 Dec 2003 19:32:20 -0000 1.10
***************
*** 54,58 ****
}
! if (ISSET($_SERVER['QUERY_STRING'])){
$QUERYSTRING = $_SERVER['QUERY_STRING'];
} else {
--- 54,58 ----
}
! if (ISSET($_SERVER['QUERY_STRING'])) {
$QUERYSTRING = $_SERVER['QUERY_STRING'];
} else {
***************
*** 61,71 ****
if(ISSET($user->user)){
! $MEMBER = $user->user;
! }else{
! $MEMBER = "null";
}
ofirst_dbquery("INSERT INTO ofirst_logger (IPAddress,Date,Location,QueryString,HostLookup,Browser,Member)
! values('".$IP."'
,'".$DATE."'
,'".$SCRIPT."'
--- 61,71 ----
if(ISSET($user->user)){
! $MEMBER = $user->user;
! } else {
! $MEMBER = "null";
}
ofirst_dbquery("INSERT INTO ofirst_logger (IPAddress,Date,Location,QueryString,HostLookup,Browser,Member)
! VALUES('".$IP."'
,'".$DATE."'
,'".$SCRIPT."'
***************
*** 77,81 ****
// Total Pages Served counter
$totalpg=get_totalpages()+1;
! if ($totalpg==1){
ofirst_dbquery("INSERT INTO ofirst_hitcount (Name,Value) values ('totalpages','1');");
} else {
--- 77,81 ----
// Total Pages Served counter
$totalpg=get_totalpages()+1;
! if ($totalpg==1) {
ofirst_dbquery("INSERT INTO ofirst_hitcount (Name,Value) values ('totalpages','1');");
} else {
***************
*** 86,90 ****
// Visitor counter
! if(!isset($_SESSION["FirstHit"])){
$_SESSION["FirstHit"]=1;
--- 86,90 ----
// Visitor counter
! if(!isset($_SESSION["FirstHit"])) {
$_SESSION["FirstHit"]=1;
***************
*** 101,106 ****
$total=($total->Value)+1;
! if ($total==1){
!
ofirst_dbquery("INSERT INTO ofirst_hitcount (Name,Value) values ('".$BROWSER."','1');");
} else {
--- 101,105 ----
$total=($total->Value)+1;
! if ($total==1) {
ofirst_dbquery("INSERT INTO ofirst_hitcount (Name,Value) values ('".$BROWSER."','1');");
} else {
***************
*** 111,115 ****
! function get_visitors(){
$query=ofirst_dbquery('SELECT Value FROM ofirst_hitcount WHERE Name="total"');
//Get current value
--- 110,114 ----
! function get_visitors() {
$query=ofirst_dbquery('SELECT Value FROM ofirst_hitcount WHERE Name="total"');
//Get current value
***************
*** 118,122 ****
}
! function get_totalpages(){
$query=ofirst_dbquery('SELECT Value FROM ofirst_hitcount WHERE Name="totalpages"');
$visits=ofirst_dbfetch_object($query);
--- 117,121 ----
}
! function get_totalpages() {
$query=ofirst_dbquery('SELECT Value FROM ofirst_hitcount WHERE Name="totalpages"');
$visits=ofirst_dbfetch_object($query);
***************
*** 124,126 ****
}
! ?>
\ No newline at end of file
--- 123,125 ----
}
! ?>
Index: rawdata.php
===================================================================
RCS file: /cvsroot/openfirst/logger/rawdata.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rawdata.php 23 Dec 2003 22:32:58 -0000 1.10
--- rawdata.php 24 Dec 2003 19:32:20 -0000 1.11
***************
*** 71,75 ****
</tr>
<?
! while($log = ofirst_dbfetch_object($query)){
echo "<tr>";
echo " <td>$log->ID</td>";
--- 71,75 ----
</tr>
<?
! while($log = ofirst_dbfetch_object($query)) {
echo "<tr>";
echo " <td>$log->ID</td>";
Index: stats.php
===================================================================
RCS file: /cvsroot/openfirst/logger/stats.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** stats.php 24 Dec 2003 03:29:49 -0000 1.8
--- stats.php 24 Dec 2003 19:32:20 -0000 1.9
***************
*** 30,67 ****
// Check if outputting a graph
! if(isset($_GET["graph"])){
! echo("<br><br><table width=500><tr><th>");
! switch($_GET["graph"]){
! case 3:{
! echo("Yearly Usage Graph");
! break;
! }
! case 2:{
! echo("Monthly Usage Graph");
! break;
! }
! default:{
! echo("Weekly Usage Graph");
! break;
}
- }
! echo('</th></tr><tr><td class="sub">
! <div align=right><a href="'.$_SERVER["PHP_SELF"].'?graph=1">Weekly Graph</a> |
! <a href="'.$_SERVER["PHP_SELF"].'?graph=2">Monthly Graph</a> |
! <a href="'.$_SERVER["PHP_SELF"].'?graph=3">Yearly Graph</a></div></td></tr><tr><td>');
! // Check if GDlib is installed
! if (function_exists("imagecreatefrompng")){
! echo('<img src="'.$basepath.'/logger/graph.php?graph='.$_GET["graph"].'">');
! } else {
! // No GDlib - show error message
! echo('<b>GDlib</b> extension is required for this functionality.');
! }
! echo "</td></tr></table><br><br>";
! }
?>
<h1>Usage Statistics for <?php echo($title); ?></h1>
--- 30,67 ----
// Check if outputting a graph
! if(isset($_GET["graph"])) {
! echo("<br><br><table width=500><tr><th>");
! switch($_GET["graph"]){
! case 3:{
! echo("Yearly Usage Graph");
! break;
! }
! case 2:{
! echo("Monthly Usage Graph");
! break;
! }
! default:{
! echo("Weekly Usage Graph");
! break;
! }
}
! echo('</th></tr><tr><td class="sub">
! <div align=right><a href="'.$_SERVER["PHP_SELF"].'?graph=1">Weekly Graph</a> |
! <a href="'.$_SERVER["PHP_SELF"].'?graph=2">Monthly Graph</a> |
! <a href="'.$_SERVER["PHP_SELF"].'?graph=3">Yearly Graph</a></div></td></tr><tr><td>');
! // Check if GDlib is installed
! if (function_exists("imagecreatefrompng")){
! echo('<img src="'.$basepath.'/logger/graph.php?graph='.$_GET["graph"].'">');
! } else {
! // No GDlib - show error message
! echo('<b>GDlib</b> extension is required for this functionality.');
! }
! echo "</td></tr></table><br><br>";
! }
?>
<h1>Usage Statistics for <?php echo($title); ?></h1>
***************
*** 111,127 ****
</tr>
<?php
! $query=ofirst_dbquery("SELECT * FROM ofirst_hitcount ORDER BY Value DESC;") or die(ofirst_dberror());
! $useragents=ofirst_dbnum_rows($query);
! $browsers=array();
! $platforms=array();
! $total=0;
! if ($useragents != 0){
while($useragent = ofirst_dbfetch_object($query)){
$browser=$useragent->Name;
if($browser=="total"){
$total=$useragent->Value;
! }
! else{
if($browser!="totalpages"){
if(function_exists("identify_browser")){
--- 111,126 ----
</tr>
<?php
! $query=ofirst_dbquery("SELECT * FROM ofirst_hitcount ORDER BY Value DESC;") or die(ofirst_dberror());
! $useragents=ofirst_dbnum_rows($query);
! $browsers=array();
! $platforms=array();
! $total=0;
! if ($useragents != 0) {
while($useragent = ofirst_dbfetch_object($query)){
$browser=$useragent->Name;
if($browser=="total"){
$total=$useragent->Value;
! } else{
if($browser!="totalpages"){
if(function_exists("identify_browser")){
***************
*** 151,155 ****
}
}
! }
?>
<tr>
--- 150,154 ----
}
}
! }
?>
<tr>
***************
*** 170,174 ****
</tr>
<?php
! foreach ($browsers as $i => $value){
echo("<tr><td><b>".$i."</b></td><td align=right>".$value." visitors (".round(($value/$total)*100,1)."%)</td></tr>");
echo('<tr><td colspan=2 align=right><img src="'.$basepath.'/images/back.gif" height=6 width='.round(($value/$total)*150).'></td></tr>');
--- 169,173 ----
</tr>
<?php
! foreach ($browsers as $i => $value) {
echo("<tr><td><b>".$i."</b></td><td align=right>".$value." visitors (".round(($value/$total)*100,1)."%)</td></tr>");
echo('<tr><td colspan=2 align=right><img src="'.$basepath.'/images/back.gif" height=6 width='.round(($value/$total)*150).'></td></tr>');
***************
*** 201,204 ****
supplied by the web server. Consult the openFIRST manual for more information.</font>
<?php
! include_once("$footer");
?>
--- 200,203 ----
supplied by the web server. Consult the openFIRST manual for more information.</font>
<?php
! include_once("$footer");
?>
|
|
From: <xt...@us...> - 2003-12-24 19:06:01
|
Update of /cvsroot/openfirst/guestbook
In directory sc8-pr-cvs1:/tmp/cvs-serv20869
Modified Files:
NOTES deleteentry.php deleteyes.php index.php signthanks.php
Log Message:
Bring guestbook into compliance with openFIRST coding standards
Index: NOTES
===================================================================
RCS file: /cvsroot/openfirst/guestbook/NOTES,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NOTES 23 Dec 2003 22:50:33 -0000 1.1
--- NOTES 24 Dec 2003 19:05:54 -0000 1.2
***************
*** 7,11 ****
David Di Biase - Module approved. Just a bit of syntax fixing, I didnt want to touch too much of it because its pretty good the way it is.
! Tim Ginn - not yet audited
! Greg Inozemtsev - not yet audited
\ No newline at end of file
--- 7,11 ----
David Di Biase - Module approved. Just a bit of syntax fixing, I didnt want to touch too much of it because its pretty good the way it is.
! Tim Ginn - Module approved.
! Greg Inozemtsev - not yet audited
Index: deleteentry.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/deleteentry.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** deleteentry.php 23 Dec 2003 22:50:33 -0000 1.10
--- deleteentry.php 24 Dec 2003 19:05:54 -0000 1.11
***************
*** 31,47 ****
<h1>Delete Guest Book Entry</h1>
<?php
! if(isset($_GET['email'])){
! $email = $_GET["email"];
! $deletecode = $_GET["deletecode"];
! $query = "SELECT * FROM ofirst_guestbook WHERE deletecode='$deletecode' and email='$email';";
! $result = ofirst_dbquery($query);
! if ($result) {
! while ($r = ofirst_dbfetch_object($result)) {
! $date = $r->date;
! $email = $r->email;
! $deletecode = $r->deletecode;
! }
?>
<form method="post" action="deleteyes.php">
--- 31,47 ----
<h1>Delete Guest Book Entry</h1>
<?php
! if(isset($_GET['email'])) {
! $email = $_GET["email"];
! $deletecode = $_GET["deletecode"];
! $query = "SELECT * FROM ofirst_guestbook WHERE deletecode='$deletecode' and email='$email';";
! $result = ofirst_dbquery($query);
! if ($result) {
! while ($r = ofirst_dbfetch_object($result)) {
! $date = $r->date;
! $email = $r->email;
! $deletecode = $r->deletecode;
! }
?>
<form method="post" action="deleteyes.php">
***************
*** 52,61 ****
</form>
<?php
! } else {
! echo("No posting from you (<?php echo($email); ?>) with that delete code appears to exist.");
! }
! }else{
! echo "You may delete entries by viewing them then clicking delete below them.<br><br>";
! }
include_once("$footer");
?>
--- 52,61 ----
</form>
<?php
! } else {
! echo("No posting from you (<?php echo($email); ?>) with that delete code appears to exist.");
! }
! } else {
! echo "You may delete entries by viewing them then clicking delete below them.<br><br>";
! }
include_once("$footer");
?>
Index: deleteyes.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/deleteyes.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** deleteyes.php 23 Dec 2003 22:50:33 -0000 1.9
--- deleteyes.php 24 Dec 2003 19:05:54 -0000 1.10
***************
*** 29,42 ****
include_once("$header");
?>
! <h1>Deleted Guest Book Entry</h1><p>
! <?php
! $email = $_POST["email"];
! $deletecode = $_POST["deletecode"];
!
! $query = "DELETE FROM ofirst_guestbook where deletecode='$deletecode' and email='$email';";
! $result = ofirst_dbquery($query);
! ?>
! </p><p>The selected post has been removed.</p>
<?php
include_once("$footer");
?>
--- 29,42 ----
include_once("$header");
?>
! <h1>Deleted Guest Book Entry</h1>
<?php
+ if(isset($_POST["email"]) && isset($_POST["deletecode"])) {
+ $email = $_POST["email"];
+ $deletecode = $_POST["deletecode"];
+ ofirst_dbquery("DELETE FROM ofirst_guestbook WHERE deletecode='$deletecode' AND email='$email';");
+ echo("<p>The selected post has been removed.</p>");
+ } else {
+ echo("<p>You have not provided an e-mail address or delete code. Both are required to delete an entry in the guest book.</p>");
+ }
include_once("$footer");
?>
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** index.php 23 Dec 2003 22:50:33 -0000 1.11
--- index.php 24 Dec 2003 19:05:54 -0000 1.12
***************
*** 38,48 ****
<br>
<?php
! if(isset($_GET["perpage"]) == false || (int)$_GET["perpage"] == 0) { $_GET["perpage"] = 5; }
! if(isset($_GET["start"]) == false || (int)$_GET["start"] == 0) { $_GET["start"] = 0; }
! echo("<form action='./' method='get'>
! Start at posting <input type='text' name='start' value='" . $_GET["start"] ."' size='3'>
! showing <input type='text' name='perpage' value='" . $_GET["perpage"] ."' size='3'> posts per
! page <input type='submit' value='Show Posts'>
! </form>");
$query = "SELECT * FROM ofirst_guestbook ORDER BY guest LIMIT " . $_GET["start"] . ", " . $_GET["perpage"] . ";";
--- 38,48 ----
<br>
<?php
! if(isset($_GET["perpage"]) == false || (int)$_GET["perpage"] == 0) { $_GET["perpage"] = 5; }
! if(isset($_GET["start"]) == false || (int)$_GET["start"] == 0) { $_GET["start"] = 0; }
! echo("<form action='./' method='get'>
! Start at posting <input type='text' name='start' value='" . $_GET["start"] ."' size='3'>
! showing <input type='text' name='perpage' value='" . $_GET["perpage"] ."' size='3'> posts per
! page <input type='submit' value='Show Posts'>
! </form>");
$query = "SELECT * FROM ofirst_guestbook ORDER BY guest LIMIT " . $_GET["start"] . ", " . $_GET["perpage"] . ";";
***************
*** 56,83 ****
if ($result) {
while ($r = ofirst_dbfetch_object($result)) {
! echo "<hr width='80%' size='1px' style='border:1px' noshade>";
! echo "<table>";
! echo "
! <tr><th></th><th>$r->date</th></tr>
! <tr><td><img src='person.png' alt='Guest: ' /> Guest: </td><td>$r->guest</td></tr>
! <tr><td><img src='email.png' alt='E-mail Address: ' /> E-mail: </td><td><a href='mailto: $r->email'>$r->email</a></td></tr>
! <tr><td><img src='icq.png' alt='ICQ UIN: ' /> ICQ: </td><td>$r->ICQ</td></tr>";
if ($r->ICQ != "") {
echo("<td><img src='http://wwp.icq.com/scripts/online.dll?icq=".$r->ICQ . "&img=5' alt='User status' /></td></tr>");
}
! echo("
! <tr><td><img src='aim.png' alt='AIM Screen name: ' /> AIM: </td><td>$r->AIM</td></tr>
<tr><td><img src='msmsgs.png' alt='MSN Messenger Address: ' /> MSN:</td><td> $r->MSN</td></tr>
<tr><td><img src='yahoo.png' alt='Yahoo! Messenger Address: ' /> YIM: </td><td>$r->YIM");
if ($r->YIM != "") {
echo("<img src='http://opi.yahoo.com/online?u=$r->YIM &m=g&t=1' alt='User Status' />");
! }else{
! echo "</td></tr>";
}
! echo "
! <tr><td><img src='irc.png' alt='IRC: ' /> IRC: </td><td>$r->IRC</td>
! <tr><td><img src='webpage.png' alt='Web Page' /> Web Page: </td><td><a href='$r->webpage'>$r->webpage</a></td></tr>
! <tr><td><img src='world.png' alt='Location: ' /> Location: </td><td>$r->location</td></tr>";
if (function_exists('emoticon_translate')) {
--- 56,80 ----
if ($result) {
while ($r = ofirst_dbfetch_object($result)) {
! echo "<hr width='80%' size='1px' style='border:1px' noshade>";
! echo "<table>";
! echo "<tr><th></th><th>$r->date</th></tr>
! <tr><td><img src='person.png' alt='Guest: ' /> Guest: </td><td>$r->guest</td></tr>
! <tr><td><img src='email.png' alt='E-mail Address: ' /> E-mail: </td><td><a href='mailto: $r->email'>$r->email</a></td></tr>
! <tr><td><img src='icq.png' alt='ICQ UIN: ' /> ICQ: </td><td>$r->ICQ</td></tr>";
if ($r->ICQ != "") {
echo("<td><img src='http://wwp.icq.com/scripts/online.dll?icq=".$r->ICQ . "&img=5' alt='User status' /></td></tr>");
}
! echo("<tr><td><img src='aim.png' alt='AIM Screen name: ' /> AIM: </td><td>$r->AIM</td></tr>
<tr><td><img src='msmsgs.png' alt='MSN Messenger Address: ' /> MSN:</td><td> $r->MSN</td></tr>
<tr><td><img src='yahoo.png' alt='Yahoo! Messenger Address: ' /> YIM: </td><td>$r->YIM");
if ($r->YIM != "") {
echo("<img src='http://opi.yahoo.com/online?u=$r->YIM &m=g&t=1' alt='User Status' />");
! } else {
! echo "</td></tr>";
}
! echo "<tr><td><img src='irc.png' alt='IRC: ' /> IRC: </td><td>$r->IRC</td>
! <tr><td><img src='webpage.png' alt='Web Page' /> Web Page: </td><td><a href='$r->webpage'>$r->webpage</a></td></tr>
! <tr><td><img src='world.png' alt='Location: ' /> Location: </td><td>$r->location</td></tr>";
if (function_exists('emoticon_translate')) {
***************
*** 88,98 ****
echo("<td>Comment: </td><td></p><p>" . $comment . "</td></tr>\n");
! if(isset($user->membertype) && $user->membertype == "administrator") {
! echo("<tr><td> </td><td><a href='deleteentry.php?email=$r->email&deletecode=$r->deletecode'>Delete entry</a></p></td></tr>");
! }
! echo "</table>";
! }
}
include_once("$footer");
! ?>
\ No newline at end of file
--- 85,95 ----
echo("<td>Comment: </td><td></p><p>" . $comment . "</td></tr>\n");
! if(isset($user->membertype) && $user->membertype == "administrator") {
! echo("<tr><td> </td><td><a href='deleteentry.php?email=$r->email&deletecode=$r->deletecode'>Delete entry</a></p></td></tr>");
! }
! echo "</table>";
! }
}
include_once("$footer");
! ?>
Index: signthanks.php
===================================================================
RCS file: /cvsroot/openfirst/guestbook/signthanks.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** signthanks.php 23 Dec 2003 22:50:33 -0000 1.11
--- signthanks.php 24 Dec 2003 19:05:54 -0000 1.12
***************
*** 78,95 ****
}
! $message = "Dear Guest,
! Thank you for visiting our site and signing our guestbook. We hope you enjoyed it!
! We have sent you this E-mail out of thanks and also to give you some information which
! you may later need. If in your guestbook posting, you make a mistake that you didn't inntially
! realize, or just want to delete your post, you can do so by going to the following address:
! http://" . $_SERVER["HTTP_HOST"] . "$basepath/guestbook/deleteentry.php?email=" . $_POST["email"] . "&deletecode=$deletecode
! Thank you once again, and be sure to check in often as we are constantly making updates
! and adding new features.
! $title Web Site Administration";
if (function_exists("multipartmail")) {
--- 78,95 ----
}
! $message = "Dear Guest,
! Thank you for visiting our site and signing our guestbook. We hope you enjoyed it!
! We have sent you this E-mail out of thanks and also to give you some information which
! you may later need. If in your guestbook posting, you make a mistake that you didn't inntially
! realize, or just want to delete your post, you can do so by going to the following address:
! http://" . $_SERVER["HTTP_HOST"] . "$basepath/guestbook/deleteentry.php?email=" . $_POST["email"] . "&deletecode=$deletecode
! Thank you once again, and be sure to check in often as we are constantly making updates
! and adding new features.
! $title Web Site Administration";
if (function_exists("multipartmail")) {
|
|
From: <dav...@us...> - 2003-12-24 18:51:10
|
Update of /cvsroot/openfirst/meetings
In directory sc8-pr-cvs1:/tmp/cvs-serv18519
Modified Files:
viewmeeting.php updatesetup.php updates.php index.php
Added Files:
NOTES
Log Message:
Added notes page. Basic syntax fixes.
--- NEW FILE: NOTES ---
openFIRST.manual
---
** December 25, 2003 Release **
David Di Biase - Module approved.
Tim Ginn - not yet audited
Greg Inozemtsev - not yet audited
Index: viewmeeting.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/viewmeeting.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** viewmeeting.php 9 Nov 2003 20:31:41 -0000 1.3
--- viewmeeting.php 24 Dec 2003 18:51:06 -0000 1.4
***************
*** 26,31 ****
*
*/
-
- // Include globals and set header condense (not coded yet)
include_once("../config/globals.php");
$header_condense = true;
--- 26,29 ----
***************
*** 36,49 ****
showlogin();
} else {
-
// Update buttin process
if(isset($_POST['update'])){
-
- // Check if absent values were set
if(! isset($_POST['absent'])){
echo "<br><br>You must select users who were absent of click none! Click back to continue.<br><br><br>";
die(include_once($footer));
}
-
// Check if absent was a single string or array then add it to a variable
if(is_array($_POST['absent'])){
--- 34,43 ----
***************
*** 52,56 ****
$absentlist = $_POST['absent'];
}
-
// Update information in the database
ofirst_dbquery("UPDATE ofirst_meetings SET
--- 46,49 ----
***************
*** 62,70 ****
die(include_once($footer));
}
-
// Collect information for the current meeting
$query = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE ID = '".$_GET['ID']."'");
$meeting = ofirst_dbfetch_object($query);
-
?>
<h2>Meeting Viewer</h2>
--- 55,61 ----
***************
*** 94,101 ****
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
! <?php
// View extra features if the meeting is done
if($meeting->Status == "done"){
! ?>
<tr>
<th> </th>
--- 85,92 ----
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
! <?php
// View extra features if the meeting is done
if($meeting->Status == "done"){
! ?>
<tr>
<th> </th>
***************
*** 114,118 ****
<td><?php echo str_replace(",",", ",$meeting->AbsentList); ?></td>
</tr>
! <?php } ?>
</table>
<br>
--- 105,109 ----
<td><?php echo str_replace(",",", ",$meeting->AbsentList); ?></td>
</tr>
! <?php } ?>
</table>
<br>
***************
*** 129,134 ****
<td valign="top"> <div align="right">Notes:</div></td>
<td>
! <?php
!
// If WYSIWYG function is set then view the WYSIWYG function module
if (function_exists("make_wysiwyg")) {
--- 120,124 ----
<td valign="top"> <div align="right">Notes:</div></td>
<td>
! <?php
// If WYSIWYG function is set then view the WYSIWYG function module
if (function_exists("make_wysiwyg")) {
***************
*** 137,142 ****
echo "<textarea name='notes'></textarea>";
}
!
! ?>
</td>
</tr>
--- 127,131 ----
echo "<textarea name='notes'></textarea>";
}
! ?>
</td>
</tr>
***************
*** 152,156 ****
<select name="absent[]" size="6" style="width: 250px;" multiple width='60'>
<option value="none">No one absent!</option>
! <?php
// Make a list of people who were present at the meeting
$listdivisions = explode(",",$meeting->ArrangedFor);
--- 141,145 ----
<select name="absent[]" size="6" style="width: 250px;" multiple width='60'>
<option value="none">No one absent!</option>
! <?php
// Make a list of people who were present at the meeting
$listdivisions = explode(",",$meeting->ArrangedFor);
***************
*** 162,166 ****
}
}
! ?>
</select>
<font size="2"></font></p></td>
--- 151,155 ----
}
}
! ?>
</select>
<font size="2"></font></p></td>
***************
*** 177,180 ****
}
}
! include_once($footer);
! ?>
--- 166,168 ----
}
}
! include_once($footer); ?>
Index: updatesetup.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/updatesetup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** updatesetup.php 9 Nov 2003 20:31:41 -0000 1.1
--- updatesetup.php 24 Dec 2003 18:51:06 -0000 1.2
***************
*** 26,31 ****
*
*/
-
- // Include globals and set header condense (not coded yet)
include_once("../config/globals.php");
$header_condense = true;
--- 26,29 ----
***************
*** 36,40 ****
showlogin();
} else {
-
if(isset($_POST['addtask'])){
$time = $_POST['when'];
--- 34,37 ----
***************
*** 53,60 ****
echo "<br><br><b>Command returned:</b> ";
! echo $message;
!
}
-
?>
<h2>Meeting Reminder</h2>
--- 50,55 ----
echo "<br><br><b>Command returned:</b> ";
! echo $message;
}
?>
<h2>Meeting Reminder</h2>
***************
*** 115,119 ****
</p></td>
</tr>
! <?php } else { ?>
<tr>
<th>Unix Crontab Setup</th>
--- 110,114 ----
</p></td>
</tr>
! <?php } else { ?>
<tr>
<th>Unix Crontab Setup</th>
***************
*** 123,128 ****
</tr>
</table>
! <?php }
}
! include_once($footer);
! ?>
--- 118,123 ----
</tr>
</table>
! <?php
! }
}
! include_once($footer); ?>
Index: updates.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/updates.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** updates.php 23 Nov 2003 14:48:56 -0000 1.2
--- updates.php 24 Dec 2003 18:51:06 -0000 1.3
***************
*** 26,58 ****
*
*/
-
- // Include globals and set header condense (not coded yet)
include_once("../config/globals.php");
$meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
while($meeting = ofirst_dbfetch_object($meetquery)){
!
! // Check if this meeting relates to the current date
! if(date("F j, Y",time()) == date("F j, Y",$meeting->ForDate)){
! continue;
! }
!
$message = "$title Meeting Reminder: You have a meeting today at <time>. Don't forget!";
-
$groups = explode(",",$meeting->ArrangedFor);
for($groups as $group){
!
! $mailgroupquery = ofirst_dbquery("SELECT * FROM ofirst_members WHERE cellphonesms = '1' AND division = '$group'") or die(ofirst_dberror());
! while($mailgroup = ofirst_dbfetch_object($mailgroupquery)){
!
! if(! isset($mailgroup->email)){
! continue;
! }
!
! mail($mailgroup->cellphonenumber."@".$mailgroup->cellphonecarrier,"Meeting Reminder",$message);
! echo "<br> Sent to: $mailgroup->cellphonenumber@$mailgroup->cellphonecarrier";
!
! }
! }
! }
?>
--- 26,49 ----
*
*/
include_once("../config/globals.php");
$meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
while($meeting = ofirst_dbfetch_object($meetquery)){
! // Check if this meeting relates to the current date
! if(date("F j, Y",time()) == date("F j, Y",$meeting->ForDate)){
! continue;
! }
$message = "$title Meeting Reminder: You have a meeting today at <time>. Don't forget!";
$groups = explode(",",$meeting->ArrangedFor);
for($groups as $group){
! $mailgroupquery = ofirst_dbquery("SELECT * FROM ofirst_members WHERE cellphonesms = '1' AND division = '$group'") or die(ofirst_dberror());
! while($mailgroup = ofirst_dbfetch_object($mailgroupquery)){
! if(! isset($mailgroup->email)){
! continue;
! }
! mail($mailgroup->cellphonenumber."@".$mailgroup->cellphonecarrier,"Meeting Reminder",$message);
! echo "<br> Sent to: $mailgroup->cellphonenumber@$mailgroup->cellphonecarrier";
! }
! }
! }
?>
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php 27 Nov 2003 02:43:21 -0000 1.3
--- index.php 24 Dec 2003 18:51:06 -0000 1.4
***************
*** 26,31 ****
*
*/
-
- // Include globals and set header condense (not coded yet)
include_once("../config/globals.php");
$header_condense = true;
--- 26,29 ----
***************
*** 39,49 ****
// Create button process
if(isset($_POST['create'])){
-
- // Check if members have been assigned to the meeting
if(! isset($_POST['assign'])){
echo "<br><br>You must assign an arranged for field to this meeting! Click back to continue.<br><br><br>";
die(include_once($footer));
}
-
// Check if assign is a single value or array then give variable a value
if(is_array($_POST['assign'])){
--- 37,44 ----
***************
*** 70,95 ****
EndMinute = '".$_POST['endminute']."',
Dates = '".time()."'") or die(ofirst_dberror());
! echo "<br><br>Meeting created! [ <a href='index.php'>Meetings</a> ]<br><br>";
! // ---------------- SEND E-MAIL NOTICE OUT ----------------
! // Prepare e-mail headers without using the multipartmail function
! $headers = "MIME-Version: 1.0\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! $headers .= "X-Priority: 1\r\n";
! $headers .= "X-MSMail-Priority: High\r\n";
! // Prepare message for email
! $message = "<b>$title</b> Meeting System<br>----------------------------------------------------<br>
! <i>".$user->user."</i> requested a meeting for: ".$fordate.". Here are the topics to be discussed:
! <br><blockquote>".$_POST['description'];
! // Query members and mail out notifications
! $assigned = explode(",",$assign);
! foreach($assigned as $assign){
! $member_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE Division = '".$assign."'");
! while($member = ofirst_dbfetch_object($member_query)){
! mail($member->email,"$title Meeting System: Meeting Call",$message,$headers);
! }
! }
// --------------------------------------------------------
--- 65,90 ----
EndMinute = '".$_POST['endminute']."',
Dates = '".time()."'") or die(ofirst_dberror());
! echo "<br><br>Meeting created! [ <a href='index.php'>Meetings</a> ]<br><br>";
! // ---------------- SEND E-MAIL NOTICE OUT ----------------
! // Prepare e-mail headers without using the multipartmail function
! $headers = "MIME-Version: 1.0\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! $headers .= "X-Priority: 1\r\n";
! $headers .= "X-MSMail-Priority: High\r\n";
! // Prepare message for email
! $message = "<b>$title</b> Meeting System<br>----------------------------------------------------<br>
! <i>".$user->user."</i> requested a meeting for: ".$fordate.". Here are the topics to be discussed:
! <br><blockquote>".$_POST['description'];
! // Query members and mail out notifications
! $assigned = explode(",",$assign);
! foreach($assigned as $assign){
! $member_query = ofirst_dbquery("SELECT * FROM ofirst_members WHERE Division = '".$assign."'");
! while($member = ofirst_dbfetch_object($member_query)){
! mail($member->email,"$title Meeting System: Meeting Call",$message,$headers);
! }
! }
// --------------------------------------------------------
***************
*** 100,115 ****
// Remove button process
if(isset($_POST['remove'])){
-
- // If remove process is confirmed
if(! isset($_POST['confirm'])){
echo "<br><br>Your request to remove the project was denied because you have not confirmed! [ <a href='projects.php?GroupID=".$_GET['GroupID']."'>Projects</a> ]<br><br>";
die(include_once($footer));
}
-
- // Remove meeting information
ofirst_dbquery("DELETE FROM ofirst_meetings WHERE ID = '".$_POST['project']."'") or die(ofirst_dberror());
echo "<br><br>Meetings removed! [ <a href='index.php'>Meetings</a> ]<br><br>";
die(include_once($footer));
-
}
--- 95,105 ----
***************
*** 128,135 ****
<td class="sub" width="65%"><div align="left">Arranged For Divisions</div></td>
</tr>
! <?php
$meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
while($meeting = ofirst_dbfetch_object($meetquery)){
! ?>
<tr>
<td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>"><img src="../members/icons/apps/date.png" width="32" height="32" border="0"></a></div></td>
--- 118,125 ----
<td class="sub" width="65%"><div align="left">Arranged For Divisions</div></td>
</tr>
! <?php
$meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
while($meeting = ofirst_dbfetch_object($meetquery)){
! ?>
<tr>
<td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>"><img src="../members/icons/apps/date.png" width="32" height="32" border="0"></a></div></td>
***************
*** 137,146 ****
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
! <?php
}
if(ofirst_dbnum_rows($meetquery) == 0){
echo "<tr><td> </td><td> </td><td>There are no planned meetings!</td></tr>";
}
! ?>
</table>
<br>
--- 127,136 ----
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
! <?php
}
if(ofirst_dbnum_rows($meetquery) == 0){
echo "<tr><td> </td><td> </td><td>There are no planned meetings!</td></tr>";
}
! ?>
</table>
<br>
***************
*** 155,163 ****
<td class="sub" width="28%"><div align="left">Date </th> </div>
<td class="sub" width="65%"><div align="left">Arranged For Divisions</div></tr>
! <?php
// Check for passed meetings and preview them
$query = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='done'");
while($meeting = ofirst_dbfetch_object($query)){
! ?>
<tr>
<td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>">
--- 145,153 ----
<td class="sub" width="28%"><div align="left">Date </th> </div>
<td class="sub" width="65%"><div align="left">Arranged For Divisions</div></tr>
! <?php
// Check for passed meetings and preview them
$query = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='done'");
while($meeting = ofirst_dbfetch_object($query)){
! ?>
<tr>
<td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>">
***************
*** 166,175 ****
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
! <?php
}
if(ofirst_dbnum_rows($query) == 0){
echo "<tr><td> </td><td> </td><td>There are no past meetings!</td></tr>";
}
! ?>
</table>
<br>
--- 156,165 ----
<td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
</tr>
! <?php
}
if(ofirst_dbnum_rows($query) == 0){
echo "<tr><td> </td><td> </td><td>There are no past meetings!</td></tr>";
}
! ?>
</table>
<br>
***************
*** 183,187 ****
<td valign="top"> <div align="right">Description:</div></td>
<td>
! <?php
// If the WYSIWYG function is set then use the WYSIWYG module
if (function_exists("make_wysiwyg")) {
--- 173,177 ----
<td valign="top"> <div align="right">Description:</div></td>
<td>
! <?php
// If the WYSIWYG function is set then use the WYSIWYG module
if (function_exists("make_wysiwyg")) {
***************
*** 190,195 ****
echo "<textarea name='description'></textarea>";
}
!
! ?>
</td>
</tr>
--- 180,184 ----
echo "<textarea name='description'></textarea>";
}
! ?>
</td>
</tr>
***************
*** 278,282 ****
<td><p>
<select name="assign[]" size="6" multiple="multiple" style="width: 250px;" id="assign">
! <?php
// Output a list of current groups
$divisionquery = ofirst_dbquery("SELECT * FROM ofirst_divisions;");
--- 267,271 ----
<td><p>
<select name="assign[]" size="6" multiple="multiple" style="width: 250px;" id="assign">
! <?php
// Output a list of current groups
$divisionquery = ofirst_dbquery("SELECT * FROM ofirst_divisions;");
***************
*** 284,289 ****
echo "<option value='".$divisions->division."'>".$divisions->division."</option>";
}
!
! ?>
</select>
<br>
--- 273,277 ----
echo "<option value='".$divisions->division."'>".$divisions->division."</option>";
}
! ?>
</select>
<br>
***************
*** 307,311 ****
<td><div align="right">Meeting Date:</div></td>
<td><select name="project" id="project">
! <?php
// Output a list of meetings by date
$query = ofirst_dbquery("SELECT * FROM ofirst_meetings ORDER BY ForDate");
--- 295,299 ----
<td><div align="right">Meeting Date:</div></td>
<td><select name="project" id="project">
! <?php
// Output a list of meetings by date
$query = ofirst_dbquery("SELECT * FROM ofirst_meetings ORDER BY ForDate");
***************
*** 313,318 ****
echo "<option value='".$meeting->ID."'>".date("F j, Y h:i a",$meeting->ForDate)."</option>";
}
!
! ?>
</select></td>
</tr>
--- 301,305 ----
echo "<option value='".$meeting->ID."'>".date("F j, Y h:i a",$meeting->ForDate)."</option>";
}
! ?>
</select></td>
</tr>
***************
*** 333,336 ****
}
}
! include_once($footer);
! ?>
--- 320,322 ----
}
}
! include_once($footer); ?>
|
|
From: <xt...@us...> - 2003-12-24 18:22:51
|
Update of /cvsroot/openfirst/feedback In directory sc8-pr-cvs1:/tmp/cvs-serv15103 Modified Files: NOTES Log Message: Update NOTES Index: NOTES =================================================================== RCS file: /cvsroot/openfirst/feedback/NOTES,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NOTES 23 Dec 2003 23:14:00 -0000 1.1 --- NOTES 24 Dec 2003 18:22:48 -0000 1.2 *************** *** 7,11 **** David Di Biase - Module approved. Just a bit of syntax fixing. ! Tim Ginn - not yet audited ! Greg Inozemtsev - not yet audited \ No newline at end of file --- 7,11 ---- David Di Biase - Module approved. Just a bit of syntax fixing. ! Tim Ginn - Module approved. ! Greg Inozemtsev - not yet audited |
|
From: <xt...@us...> - 2003-12-24 18:22:22
|
Update of /cvsroot/openfirst/feedback/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv15060/admin
Modified Files:
index.php
Log Message:
Bring feedback module into compliance with openFIRST coding standards
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/feedback/admin/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** index.php 23 Dec 2003 23:29:17 -0000 1.12
--- index.php 24 Dec 2003 18:22:18 -0000 1.13
***************
*** 29,51 ****
include_once($header);
! if(isset($user->membertype)&&$user->membertype=="administrator"){
if(isset($_POST["feedbackusers"])) {
! // Delete current users, as they will all be replaced with new users.
! if(isset($_POST['feedbackusers'])){
! $query = ofirst_dbquery("DELETE FROM ofirst_feedbackusers;");
! $line = explode("\n", $_POST["feedbackusers"]);
! foreach ($line as $lin) {
! $fname = trim(substr($lin, strpos($lin, " ") - strlen($lin)));
! $femail = trim(substr($lin, 0, strpos($lin, " ")));
! // Create the new users for the feedback list
! $query = ofirst_dbquery("INSERT INTO ofirst_feedbackusers (name, email) VALUES ('$fname', '$femail');") or die(mysql_error());
}
- echo("<p><br>The feedback users have been modified as per your request. [ <a href='index.php'>Manage</a> ]<br></p>");
- die(include_once($footer));
}
- }
! echo("<h1>Feedback</h1>
<p>Use this form to setup the users of the feedback system. Each user should be on a
new line with their email address first,<br> then a space and their name (as it should appear on
--- 29,51 ----
include_once($header);
! if(isset($user->membertype) && $user->membertype=="administrator") {
if(isset($_POST["feedbackusers"])) {
! // Delete current users, as they will all be replaced with new users.
! if(isset($_POST['feedbackusers'])){
! $query = ofirst_dbquery("DELETE FROM ofirst_feedbackusers;");
! $line = explode("\n", $_POST["feedbackusers"]);
! foreach ($line as $lin) {
! $fname = trim(substr($lin, strpos($lin, " ") - strlen($lin)));
! $femail = trim(substr($lin, 0, strpos($lin, " ")));
! // Create the new users for the feedback list
! $query = ofirst_dbquery("INSERT INTO ofirst_feedbackusers (name, email) VALUES ('$fname', '$femail');") or die(mysql_error());
! }
! echo("<p><br>The feedback users have been modified as per your request. [ <a href='index.php'>Manage</a> ]<br></p>");
! die(include_once($footer));
}
}
! echo("<h1>Feedback</h1>
<p>Use this form to setup the users of the feedback system. Each user should be on a
new line with their email address first,<br> then a space and their name (as it should appear on
***************
*** 53,63 ****
<form method='post' action='index.php'>");
! $query = ofirst_dbquery("SELECT * FROM ofirst_feedbackusers ORDER BY name;");
! if (ofirst_dbnum_rows($query) != 0){
! echo("<textarea name='feedbackusers' rows='10' cols='50'>");
! while($feedback = ofirst_dbfetch_object($query)){
! echo("$feedback->email $feedback->name\n");
}
--- 53,63 ----
<form method='post' action='index.php'>");
! $query = ofirst_dbquery("SELECT * FROM ofirst_feedbackusers ORDER BY name;");
! if (ofirst_dbnum_rows($query) != 0) {
! echo("<textarea name='feedbackusers' rows='10' cols='50'>");
! while($feedback = ofirst_dbfetch_object($query)) {
! echo("$feedback->email $feedback->name\n");
}
***************
*** 65,72 ****
echo("<textarea name='feedbackusers' rows='10' cols='50'>jo...@so... Joe Somebody");
}
! echo("</textarea><br /><input type='submit' value='Update Feedback Users' /></form>");
} else {
! echo("<h1>Feedback</h1><p>Only administrators can use this feature</p>");
}
! include_once($footer); ?>
\ No newline at end of file
--- 65,72 ----
echo("<textarea name='feedbackusers' rows='10' cols='50'>jo...@so... Joe Somebody");
}
! echo("</textarea><br /><input type='submit' value='Update Feedback Users' /></form>");
} else {
! echo("<h1>Feedback</h1><p>Only administrators can use this feature</p>");
}
! include_once($footer); ?>
|
|
From: <xt...@us...> - 2003-12-24 18:22:21
|
Update of /cvsroot/openfirst/feedback
In directory sc8-pr-cvs1:/tmp/cvs-serv15060
Modified Files:
index.php
Log Message:
Bring feedback module into compliance with openFIRST coding standards
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/feedback/index.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** index.php 23 Dec 2003 23:29:35 -0000 1.16
--- index.php 24 Dec 2003 18:22:18 -0000 1.17
***************
*** 49,63 ****
<td><select name="to">
<?php
! }
! while($feedback = ofirst_dbfetch_object($query)){
! if(! isset($_POST["to"])) {
! echo("<option value='$feedback->email'>$feedback->name</option>");
! } else {
! if ($_POST["to"] == $feedback->email) {
! $messageallowed = true;
}
}
! }
! if(isset($_POST["to"]) == false) {
?>
</select></td>
--- 49,63 ----
<td><select name="to">
<?php
! }
! while($feedback = ofirst_dbfetch_object($query)){
! if(! isset($_POST["to"])) {
! echo("<option value='$feedback->email'>$feedback->name</option>");
! } else {
! if ($_POST["to"] == $feedback->email) {
! $messageallowed = true;
! }
}
}
! if(isset($_POST["to"]) == false) {
?>
</select></td>
***************
*** 72,85 ****
<td>
<?php
! if (function_exists("make_wysiwyg")) {
! if(isset($user->signature)){ $msg = "Insert your feedback here.<br>\n\n$user->signature"; }else{ $msg = "Insert your feedback here.";
! }
! make_wysiwyg("message",400,200,$msg);
! } else {
?>
<textarea name="message" cols="40" rows="20">Insert your feedback here.
! <?php echo($user->signature); ?>
</textarea>
! <?php } ?>
<br> <input type="radio" name="type" value="comment" />
Comment
--- 72,84 ----
<td>
<?php
! if (function_exists("make_wysiwyg")) {
! if(isset($user->signature)){ $msg = "Insert your feedback here.<br>\n\n$user->signature"; }else{ $msg = "Insert your feedback here."; }
! make_wysiwyg("message",400,200,$msg);
! } else {
?>
<textarea name="message" cols="40" rows="20">Insert your feedback here.
! <?php echo($user->signature); ?>
</textarea>
! <?php } ?>
<br> <input type="radio" name="type" value="comment" />
Comment
***************
*** 99,126 ****
<?php
! } else {
! if ($messageallowed == true) {
! // Mail who they wish to contact.
! if (isset($user->user)) { $isuser = "registered user"; } else { $isuser = "unregistered user"; }
! if (function_exists("multipartmail")) {
! multipartmail($_POST["to"], "Feedback: $isuser " . $_POST["type"], $_POST["message"]
! . "\r\n\r\n--\r\nMessage generated by openfirst.feedback.
! For more information about openFIRST, see:
! http://openfirst.sourceforge.net","From: " . $_POST["from"] ."\r\nReply-To: ". $_POST["from"] ."\r\n");
! } else {
! mail($_POST["to"], "Feedback: $isuser " . $_POST["type"], $_POST["message"]
! . "\r\n\r\n--\r\nMessage generated by openfirst.feedback. For more information about openFIRST, see:
! http://openfirst.sourceforge.net","From: " . $_POST["from"] ."\r\nReply-To: ". $_POST["from"] ."\r\n");
! }
// Inform user of message being sent.
echo("Your message has been sent. You should receive it in the near future.");
! } else {
! // Give an error.
! echo("You cannot use the feedback form to contact that person as the administrator of this web site has not allowed it. If you believe you should be able to contact this person, contact the administrator asking them to change their settings.");
}
- }
} else {
! echo("Before you can use this, someone must first set up users able to be e-mailed by modifying the database.");
}
! include_once($footer); ?>
\ No newline at end of file
--- 98,125 ----
<?php
! } else {
! if ($messageallowed == true) {
! // Mail who they wish to contact.
! if (isset($user->user)) { $isuser = "registered user"; } else { $isuser = "unregistered user"; }
! if (function_exists("multipartmail")) {
! multipartmail($_POST["to"], "Feedback: $isuser " . $_POST["type"], $_POST["message"]
! . "\r\n\r\n--\r\nMessage generated by openFIRST.feedback.
! For more information about openFIRST, see:
! http://www.openfirst.org/","From: " . $_POST["from"] ."\r\nReply-To: ". $_POST["from"] ."\r\n");
! } else {
! mail($_POST["to"], "Feedback: $isuser " . $_POST["type"], $_POST["message"]
! . "\r\n\r\n--\r\nMessage generated by openFIRST.feedback. For more information about openFIRST, see:
! http://www.openfirst.org/","From: " . $_POST["from"] ."\r\nReply-To: ". $_POST["from"] ."\r\n");
! }
// Inform user of message being sent.
echo("Your message has been sent. You should receive it in the near future.");
! } else {
! // Give an error.
! echo("You cannot use the feedback form to contact that person as the administrator of this web site has not allowed it. If you believe you should be able to contact this person, contact the administrator asking them to change their settings.");
! }
}
} else {
! echo("Before you can use this, someone must first set up users able to be e-mailed by modifying the database.");
}
! include_once($footer); ?>
|
|
From: <dav...@us...> - 2003-12-24 18:07:44
|
Update of /cvsroot/openfirst/manual In directory sc8-pr-cvs1:/tmp/cvs-serv13063 Added Files: NOTES Log Message: initial upload --- NEW FILE: NOTES --- openFIRST.manual --- ** December 25, 2003 Release ** David Di Biase - Module approved. Made lots of content changes, I approve this temporarily as Greg still has to update his module manuals. Tim Ginn - not yet audited Greg Inozemtsev - not yet audited |
|
From: <dav...@us...> - 2003-12-24 18:07:05
|
Update of /cvsroot/openfirst/manual/openfirst.search
In directory sc8-pr-cvs1:/tmp/cvs-serv12961
Modified Files:
search.php
Log Message:
Content update, spelling/grammer updates and syntax in code.
Index: search.php
===================================================================
RCS file: /cvsroot/openfirst/manual/openfirst.search/search.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** search.php 12 Oct 2003 22:40:50 -0000 1.2
--- search.php 24 Dec 2003 18:07:02 -0000 1.3
***************
*** 26,33 ****
*
*/
-
include("../../config/globals.php");
include("$header");
-
?>
<h2>openFIRST Manual Module</h2>
--- 26,31 ----
|
|
From: <dav...@us...> - 2003-12-24 18:06:50
|
Update of /cvsroot/openfirst/manual/openfirst.projects
In directory sc8-pr-cvs1:/tmp/cvs-serv12922
Modified Files:
projects.php
Log Message:
Content update, spelling/grammer updates and syntax in code.
Index: projects.php
===================================================================
RCS file: /cvsroot/openfirst/manual/openfirst.projects/projects.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** projects.php 12 Oct 2003 22:40:50 -0000 1.3
--- projects.php 24 Dec 2003 18:06:47 -0000 1.4
***************
*** 26,33 ****
*
*/
-
include("../../config/globals.php");
include("$header");
-
?>
<h2>openFIRST Manual Module</h2>
--- 26,31 ----
***************
*** 108,118 ****
</tr>
<tr>
! <td><p>We are planning to expand this module by adding a crontab and MS Event
! Scheduler install script. The module will also be modified with image/document
! uploading features to allow for better documentation and system tracking.
! We also plan to add a complete projects logger which tracks every little
! change made by every user.</p>
! <p>We are also planning to create an automatic crontab setup script for
! Unix systems only. This will be unveiled in the next openFIRST release.</p></td>
</tr>
<tr>
--- 106,115 ----
</tr>
<tr>
! <td><p>We are looking into making some major changes into this massive module.
! New features such as action register information saving, editing, deleting,
! printing etc. As well as a more advanced file manager for the files (instead
! of using database it should use a basic file system). Expect these new
! changes in the next release.</p>
! </td>
</tr>
<tr>
|
|
From: <dav...@us...> - 2003-12-24 18:06:35
|
Update of /cvsroot/openfirst/manual/openfirst.photogallery
In directory sc8-pr-cvs1:/tmp/cvs-serv12895
Modified Files:
photogallery.php
Log Message:
Content update, spelling/grammer updates and syntax in code.
Index: photogallery.php
===================================================================
RCS file: /cvsroot/openfirst/manual/openfirst.photogallery/photogallery.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** photogallery.php 12 Oct 2003 22:40:50 -0000 1.2
--- photogallery.php 24 Dec 2003 18:06:31 -0000 1.3
***************
*** 26,33 ****
*
*/
-
include("../../config/globals.php");
include("$header");
-
?>
<h2>openFIRST Manual Module</h2>
--- 26,31 ----
***************
*** 99,106 ****
</tr>
<tr>
! <td>We are planning to expand this module by adding new features such as:
! image voting, top images of the month, and a newly added images feature.
! The randomimg() function will also be completed to allow you to preview
! random images anywhere on the website.</td>
</tr>
<tr>
--- 97,103 ----
</tr>
<tr>
! <td>The randomimg() function will also be completed to allow you to preview
! random images anywhere on the website. We also want to find a new thumbnail
! system as we know the quality is not that great.</td>
</tr>
<tr>
|
|
From: <dav...@us...> - 2003-12-24 18:06:21
|
Update of /cvsroot/openfirst/manual/openfirst.news
In directory sc8-pr-cvs1:/tmp/cvs-serv12852
Modified Files:
news.php
Log Message:
Content update, spelling/grammer updates and syntax in code.
Index: news.php
===================================================================
RCS file: /cvsroot/openfirst/manual/openfirst.news/news.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** news.php 12 Oct 2003 22:40:49 -0000 1.2
--- news.php 24 Dec 2003 18:06:18 -0000 1.3
***************
*** 26,33 ****
*
*/
-
include("../../config/globals.php");
include("$header");
-
?>
<h2>openFIRST Manual Module</h2>
--- 26,31 ----
***************
*** 67,74 ****
</tr>
<tr>
! <td>The news module asks the administrator to enter news then inserts
! it into the databae. There are functions included in the module that allow
! the system to view headlines. These functions may be used by webdevelopers
! in their own modules.</td>
</tr>
<tr>
--- 65,73 ----
</tr>
<tr>
! <td>The news module asks the administrator to enter news, then inserts it
! into the database. There are functions included in the module that allow
! the system to view headlines. These functions may be used by web developers
! in their own modules. This module also intergrates with the forums to allow
! news discussion.</td>
</tr>
<tr>
***************
*** 76,82 ****
</tr>
<tr>
! <td>The news module has many new changes coming its way. In the coming future
! we plan to update it with image relations to the photogallery system, or
! photo uploads directly from the module and a new headline viewing system.</td>
</tr>
<tr>
--- 75,79 ----
</tr>
<tr>
! <td>Photo uploads directly from the module and a new headline viewing system.</td>
</tr>
<tr>
***************
*** 94,98 ****
admin/index.php - allows admins to edit/add/delete news headlines<br>
rssfeed.php - allows users to find links to RSS feeds<br>
! rss/rss.php - the actual RSS feed file which displays daily news.</td>
</tr>
<tr>
--- 91,101 ----
admin/index.php - allows admins to edit/add/delete news headlines<br>
rssfeed.php - allows users to find links to RSS feeds<br>
! rss/rss.php - the actual RSS feed file which displays daily news.<br>
! newcomment.php - allows users to enter comments to news<br>
! comments.php - allows visitors to view all the comments for the news clipping<br>
! admin/delcomment.php - used to delete comments<br>
! admin/editnews.php - used to edit news<br>
! admin/index.php - main news admin page<br>
! admin/killnews.php - used to delete news entirely</td>
</tr>
<tr>
|
7 messages has been excluded from this view by a project administrator.
