[LinksOS CVS Commit]website/content doc.php,1.2,1.3 docs_index.php,1.1,1.2 faq.php,1.1.1.1,1.2 lang_
Status: Inactive
Brought to you by:
terencevs
|
From: <ke...@us...> - 2002-12-30 09:18:11
|
Update of /cvsroot/linksos/website/content
In directory sc8-pr-cvs1:/tmp/cvs-serv10170/content
Modified Files:
doc.php docs_index.php faq.php lang_switch.php login.php
logout.php person_list.php person_summary.php
team_changeleader.php team_changeusers.php team_edit.php
teams.php time.php welcome.php
Log Message:
Title: Site Comments
Changes: Added lots and lots of delicious comments for you!
Effects: Other website-code users can (possibly) understand what's going on in my (twisted) mind.
a=kennyt
Index: doc.php
===================================================================
RCS file: /cvsroot/linksos/website/content/doc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** doc.php 30 Dec 2002 08:12:22 -0000 1.2
--- doc.php 30 Dec 2002 09:18:08 -0000 1.3
***************
*** 6,15 ****
--- 6,19 ----
die('Could not find this document.'); }
+ /* tell user which language the doc is in */
$doc = mysql_fetch_row($result);
echo 'Showing in language: ' . $_SESSION["language"][1];
+ /* title */
echo '<div align="center" style="font-weight: bold;">' . $doc[1] . '</div>';
echo '<p />';
$entries = mysql_query('SELECT * FROM linksos_docs_entries WHERE language = ' . $_SESSION["language"][0] . ' AND doc_id = ' . $_REQUEST["doc_id"]);
+
+ /* print a list of entries, with links to their content */
while ( $entry_list = mysql_fetch_row($entries) ) {
echo '<a href="#entry' . $entry_list[0] . '">' . $entry_list[3] . '</a><br>';
***************
*** 18,21 ****
--- 22,26 ----
$entries = mysql_query('SELECT * FROM linksos_docs_entries WHERE language = ' . $_SESSION["language"][0] . ' AND doc_id = ' . $_REQUEST["doc_id"]);
+ /* print entries in our current boring style :P */
if (mysql_num_rows($entries)) {
while ( $entry = mysql_fetch_row($entries) ) {
***************
*** 23,27 ****
. $entry[4] . '<p />';
}
! } else
echo 'No entries found (in this language)<br>' . doclink($_REQUEST["doc_id"] . '&language=1', $lang['view_in_english']);
--- 28,32 ----
. $entry[4] . '<p />';
}
! } else /* argh! no entries? better try english, the coder's choice ;) */
echo 'No entries found (in this language)<br>' . doclink($_REQUEST["doc_id"] . '&language=1', $lang['view_in_english']);
Index: docs_index.php
===================================================================
RCS file: /cvsroot/linksos/website/content/docs_index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** docs_index.php 28 Dec 2002 19:58:00 -0000 1.1
--- docs_index.php 30 Dec 2002 09:18:08 -0000 1.2
***************
*** 8,12 ****
<?
$result = mysql_query('SELECT * FROM linksos_docs');
!
while ($doc = mysql_fetch_row($result) ) {
echo doclink($doc[0], $doc[1]). '<br>';
--- 8,12 ----
<?
$result = mysql_query('SELECT * FROM linksos_docs');
! /* print a list of documents - we need entry and access checking */
while ($doc = mysql_fetch_row($result) ) {
echo doclink($doc[0], $doc[1]). '<br>';
Index: faq.php
===================================================================
RCS file: /cvsroot/linksos/website/content/faq.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** faq.php 22 Dec 2002 03:15:36 -0000 1.1.1.1
--- faq.php 30 Dec 2002 09:18:08 -0000 1.2
***************
*** 1,3 ****
--- 1,4 ----
<?
+ /* THIS FILE IS OBSOLETE - USE DOC.PHP */
if (isSet($_REQUEST["question"]))
$question = $_REQUEST["question"];
Index: lang_switch.php
===================================================================
RCS file: /cvsroot/linksos/website/content/lang_switch.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lang_switch.php 28 Dec 2002 03:30:21 -0000 1.5
--- lang_switch.php 30 Dec 2002 09:18:08 -0000 1.6
***************
*** 5,8 ****
--- 5,11 ----
<?
$languages = mysql_query('SELECT lang_id, longname FROM linksos_languages');
+ /* print a list of languages available *
+ * We'll want to either change this to a list of A links, *
+ * or make the current language be selected. */
while ( $language = mysql_fetch_row($languages) ) {
echo '<option value="' . $language[0] . '">' . $language[1] . '</option>';
Index: login.php
===================================================================
RCS file: /cvsroot/linksos/website/content/login.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** login.php 27 Dec 2002 03:36:18 -0000 1.4
--- login.php 30 Dec 2002 09:18:08 -0000 1.5
***************
*** 1,5 ****
--- 1,8 ----
<?
+ /* if the form was actually used */
if ( $_POST["submit"] ) {
+ /* require inputs */
if ( $_POST["username"] && $_POST["password"] ) {
+ /* if user is already logged in, log em out first */
if ($_SESSION["user"][0]) {
echo '<span style="color: #00CC00">' . $lang['logout_from_acct'] . $_SESSION["user"][1] . '</span><br>';
***************
*** 7,11 ****
}
echo '<span style="color: #00CC00">' . $lang['login_to_acct'] . $_POST["username"] . '.</span><br>';
!
if ( mysql_num_rows($user_query = mysql_query('SELECT * FROM linksos_people WHERE unixname = \'' . $_POST["username"]
. '\' AND password = PASSWORD(\'' . $_POST["password"] . '\')' ) ) ) {
--- 10,14 ----
}
echo '<span style="color: #00CC00">' . $lang['login_to_acct'] . $_POST["username"] . '.</span><br>';
! /* if mysql likes the user, set them up */
if ( mysql_num_rows($user_query = mysql_query('SELECT * FROM linksos_people WHERE unixname = \'' . $_POST["username"]
. '\' AND password = PASSWORD(\'' . $_POST["password"] . '\')' ) ) ) {
***************
*** 18,22 ****
echo $lang['username_passwd_req'];
}
! } else {
echo '<form method="post" action="' . $PHP_SELF . '?module=login">' .
'<input type="hidden" name="submit" value="1">'
--- 21,25 ----
echo $lang['username_passwd_req'];
}
! } else { // form not submitted? echo form
echo '<form method="post" action="' . $PHP_SELF . '?module=login">' .
'<input type="hidden" name="submit" value="1">'
Index: logout.php
===================================================================
RCS file: /cvsroot/linksos/website/content/logout.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** logout.php 27 Dec 2002 03:41:52 -0000 1.4
--- logout.php 30 Dec 2002 09:18:08 -0000 1.5
***************
*** 1,8 ****
<?
if ($_SESSION["user"][0]) {
echo '<span style="color: #00CC00">' . $lang['logout_from_acct'] . $_SESSION["user"][1] . '.</span><br>';
unset($_SESSION["user"]);
$_SESSION["user"][0] = 0;
! } else
echo '<span style="color: #CC0000">' . $lang['not_logged_in'] . '</span>';
?>
--- 1,9 ----
<?
if ($_SESSION["user"][0]) {
+ /* reset user vars */
echo '<span style="color: #00CC00">' . $lang['logout_from_acct'] . $_SESSION["user"][1] . '.</span><br>';
unset($_SESSION["user"]);
$_SESSION["user"][0] = 0;
! } else // logout requires the user to be logged IN first.
echo '<span style="color: #CC0000">' . $lang['not_logged_in'] . '</span>';
?>
Index: person_list.php
===================================================================
RCS file: /cvsroot/linksos/website/content/person_list.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** person_list.php 24 Dec 2002 01:48:23 -0000 1.2
--- person_list.php 30 Dec 2002 09:18:08 -0000 1.3
***************
*** 1,10 ****
--- 1,16 ----
<?
+ /* ugh! just found this! *
include('../linksos-dbauth.php');
$link = mysql_connect($linksos_dbhost, $linksos_dbuser, $linksos_dbpass);
mysql_select_db($linksos_dbdb);
+ */
+
$result = mysql_query('SELECT * FROM linksos_people ORDER BY fullname ASC');
echo '<table><tr><td>' . $lang['developers'] . ':</td></tr><tr><td valign="top">';
if (mysql_num_rows($result)) {
$i=0;
+ /* you guessed it! print the users list! and throw in *
+ * a column split while you're at it *
+ * - could break into 3 columns. */
while($row = mysql_fetch_row($result)) {
$i++;
Index: person_summary.php
===================================================================
RCS file: /cvsroot/linksos/website/content/person_summary.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** person_summary.php 24 Dec 2002 01:48:23 -0000 1.3
--- person_summary.php 30 Dec 2002 09:18:08 -0000 1.4
***************
*** 5,9 ****
if (mysql_num_rows($person_res = mysql_query('SELECT * FROM linksos_people WHERE uid = ' . $_REQUEST["uid"]) ) ) {
$person = mysql_fetch_row($person_res);
!
echo '<table style="border: 1px solid silver"><tr><td>' . $lang['login'] . ':</td><td><b>' . $person[1] . '</b></td></tr>'.
'<tr><td>' . $lang['real_name'] . ':</td><td><b>' . $person[2] . '</b></td></tr>' .
--- 5,9 ----
if (mysql_num_rows($person_res = mysql_query('SELECT * FROM linksos_people WHERE uid = ' . $_REQUEST["uid"]) ) ) {
$person = mysql_fetch_row($person_res);
! /* echo the person's info table... */
echo '<table style="border: 1px solid silver"><tr><td>' . $lang['login'] . ':</td><td><b>' . $person[1] . '</b></td></tr>'.
'<tr><td>' . $lang['real_name'] . ':</td><td><b>' . $person[2] . '</b></td></tr>' .
***************
*** 11,14 ****
--- 11,15 ----
$user_grouplist_res = mysql_query('SELECT gid,uid,status FROM linksos_members WHERE uid = ' . $person[0]);
echo '<tr><td valign="top">' . $lang['teams'] . ':</td><td>';
+ /* throw out that grouplist, and mark leaderships */
if (mysql_num_rows($user_grouplist_res)) {
while ($user_grouplist = mysql_fetch_row($user_grouplist_res)) {
***************
*** 17,21 ****
}
} else
! echo $lang['none'];
echo '</td></tr>';
echo '</table>';
--- 18,22 ----
}
} else
! echo $lang['none']; // lonely little developer :(
echo '</td></tr>';
echo '</table>';
Index: team_changeleader.php
===================================================================
RCS file: /cvsroot/linksos/website/content/team_changeleader.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** team_changeleader.php 24 Dec 2002 01:48:23 -0000 1.4
--- team_changeleader.php 30 Dec 2002 09:18:08 -0000 1.5
***************
*** 11,14 ****
--- 11,15 ----
switch($_REQUEST["editstage"]){
case 'set':
+ /* set the new leader and kill the old one */
if ( mysql_query('UPDATE linksos_members SET status = 1 WHERE gid = ' . $_REQUEST["team_id"]) )
echo $lang['old_leader_remd'] . '<br>';
***************
*** 25,28 ****
--- 26,30 ----
break;
default:
+ /* setup list of possible peoplez... this may be limited to the team */
echo $lang['team_leader_head'];
echo makelink('team_changeleader', 'team_id=' . $_REQUEST["team_id"] . '&editstage=set', 'none') . '<br>';
Index: team_changeusers.php
===================================================================
RCS file: /cvsroot/linksos/website/content/team_changeusers.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** team_changeusers.php 25 Dec 2002 03:50:03 -0000 1.4
--- team_changeusers.php 30 Dec 2002 09:18:08 -0000 1.5
***************
*** 13,26 ****
switch($_REQUEST["editstage"]) {
case 'add':
if (!mysql_num_rows(mysql_query('SELECT * FROM linksos_members WHERE uid = ' . $_REQUEST["person"] . ' AND gid = ' . $_REQUEST["team_id"]))) {
mysql_query('INSERT INTO linksos_members ( `uid` , `gid` , `status` ) VALUES (' . $_REQUEST["person"] . ', ' . $_REQUEST["team_id"] . ', 1 )') or die('Couldn\'t add user.');
! } else {
echo $lang['user_exists_team'];
}
break;
case 'remove':
! mysql_query('DELETE FROM linksos_members WHERE uid = ' . $_REQUEST["person"] . ' AND gid = ' . $_REQUEST["team_id"]);
! break;
default:
echo '<table>';
$res_alldevs = mysql_query('SELECT linksos_people.* FROM linksos_people ORDER BY fullname');
--- 13,28 ----
switch($_REQUEST["editstage"]) {
case 'add':
+ /* add a user */
if (!mysql_num_rows(mysql_query('SELECT * FROM linksos_members WHERE uid = ' . $_REQUEST["person"] . ' AND gid = ' . $_REQUEST["team_id"]))) {
mysql_query('INSERT INTO linksos_members ( `uid` , `gid` , `status` ) VALUES (' . $_REQUEST["person"] . ', ' . $_REQUEST["team_id"] . ', 1 )') or die('Couldn\'t add user.');
! } else { // nope, they're here already.
echo $lang['user_exists_team'];
}
break;
case 'remove':
! mysql_query('DELETE FROM linksos_members WHERE uid = ' . $_REQUEST["person"] . ' AND gid = ' . $_REQUEST["team_id"]); // remove user - don't worry if they're not in the team
! break;
default:
+ /* list users and their add/remove links */
echo '<table>';
$res_alldevs = mysql_query('SELECT linksos_people.* FROM linksos_people ORDER BY fullname');
Index: team_edit.php
===================================================================
RCS file: /cvsroot/linksos/website/content/team_edit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** team_edit.php 25 Dec 2002 03:51:18 -0000 1.4
--- team_edit.php 30 Dec 2002 09:18:08 -0000 1.5
***************
*** 15,18 ****
--- 15,19 ----
case 'commit':
if ($_POST["newdesc"] != $team[2]) {
+ /* update summary */
if (mysql_query('UPDATE linksos_teams SET summary = \'' . addslashes($_POST["newdesc"]) . '\' WHERE team_id = ' . $_REQUEST["team_id"]) )
echo $lang['summ_changed'] . '<br>';
***************
*** 22,25 ****
--- 23,27 ----
break;
default:
+ /* print form - sumamry only atm */
echo '<form action="' . $PHP_SELF . '?module=team_edit&team_id=' . $_REQUEST["team_id"] . '&editstage=commit" method="post">' .
$lang['description'] . ':<br><textarea name="newdesc" rows="5" cols="80">' . $team[2] . '</textarea><br>';
Index: teams.php
===================================================================
RCS file: /cvsroot/linksos/website/content/teams.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** teams.php 28 Dec 2002 03:31:46 -0000 1.2
--- teams.php 30 Dec 2002 09:18:08 -0000 1.3
***************
*** 7,10 ****
--- 7,11 ----
echo $lang['teams'] . '<p />';
+ /* list teams with image links */
while ( $team = mysql_fetch_row($teams) ) {
echo makelink('team_summary', "team_id=$team[0]", '<img src="image/teams/' . $team[0] . 'team.jpg"></a>') . ' ';
Index: time.php
===================================================================
RCS file: /cvsroot/linksos/website/content/time.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** time.php 24 Dec 2002 05:39:52 -0000 1.1
--- time.php 30 Dec 2002 09:18:08 -0000 1.2
***************
*** 1,4 ****
--- 1,5 ----
<table style="font-size: 12px"><tr>
<?
+ /* go through by the hour and list devs */
for ( $h = -12; $h < 13; $h++ ) {
echo '<td valign="top"' . ( is_integer($h/2) ? 'bgcolor="#CCCCCC"' : '' ). '><b>' . ( $h>0 ? '+' . $h : $h ) . '</b><br>';
Index: welcome.php
===================================================================
RCS file: /cvsroot/linksos/website/content/welcome.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** welcome.php 27 Dec 2002 19:38:20 -0000 1.3
--- welcome.php 30 Dec 2002 09:18:08 -0000 1.4
***************
*** 4,7 ****
--- 4,8 ----
<p /> -->
<?
+ /* duh. call news viewer */
include('include/news.php');
$newsObj = new news();
|