linksos-commit Mailing List for Links OS: Swift, Secure, Straightforward (Page 10)
Status: Inactive
Brought to you by:
terencevs
Menu
▾
▴
linksos-commit — Automatic CVS Commit Notifications
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(135) |
Feb
(3) |
Mar
(86) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
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();
|
|
From: <ke...@us...> - 2002-12-30 09:18:10
|
Update of /cvsroot/linksos/website
In directory sc8-pr-cvs1:/tmp/cvs-serv10170
Modified Files:
index.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: index.php
===================================================================
RCS file: /cvsroot/linksos/website/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php 27 Dec 2002 05:08:01 -0000 1.7
--- index.php 30 Dec 2002 09:18:08 -0000 1.8
***************
*** 1,3 ****
--- 1,4 ----
<?
+ /* if user's query line isn't sufficient, assume module is welcome */
if (!isSet($_REQUEST["module"])) {
$module = "welcome";
***************
*** 5,16 ****
$module = $_REQUEST["module"];
}
! /* prepare for db connections */
include('../linksos-dbauth.php');
$link=mysql_pconnect($linksos_dbhost, $linksos_dbuser, $linksos_dbpass);
mysql_select_db($linksos_dbdb, $link);
ini_set('session.save_path', '../../sessions');
session_start();
if ( $_REQUEST["language"] ) {
if (!is_numeric($_REQUEST["language"]))
--- 6,21 ----
$module = $_REQUEST["module"];
}
!
! /* initialize db connection - all access will use this link */
include('../linksos-dbauth.php');
$link=mysql_pconnect($linksos_dbhost, $linksos_dbuser, $linksos_dbpass);
mysql_select_db($linksos_dbdb, $link);
+ /* sf uses a server farm which requires sessions to be stored *
+ * in a common area - we'll use this */
ini_set('session.save_path', '../../sessions');
session_start();
+ /* Assign new language if user defined $_REQUEST["language"] */
if ( $_REQUEST["language"] ) {
if (!is_numeric($_REQUEST["language"]))
***************
*** 24,28 ****
die('Couldn\'t open language file. Ouch.');
}
!
if ( !$_SESSION["language"] ) {
$_SESSION["language"] = array (
--- 29,33 ----
die('Couldn\'t open language file. Ouch.');
}
! /* if lang. isn't defined in request or session, set it to english. */
if ( !$_SESSION["language"] ) {
$_SESSION["language"] = array (
***************
*** 47,59 ****
if (mysql_num_rows($result = mysql_query('SELECT * FROM linksos_people WHERE uid = \'' . $_SESSION["user"][0] . '\''))) {
$_SESSION["user"] = mysql_fetch_row($result);
! } else {
unset($_SESSION["user"]);
}
}
! include('include/top.php');
include( 'content/' . ( file_exists('content/' . basename($module) . '.php') ? basename($module) : 'notfound' ) . '.php' );
- include('include/bottom.php');
mysql_close($link);
?>
--- 52,68 ----
if (mysql_num_rows($result = mysql_query('SELECT * FROM linksos_people WHERE uid = \'' . $_SESSION["user"][0] . '\''))) {
$_SESSION["user"] = mysql_fetch_row($result);
! } else { // record gone? kill user!
unset($_SESSION["user"]);
}
}
! include('include/top.php'); // header
!
! /* include module if found, otherwise include notfound.php */
include( 'content/' . ( file_exists('content/' . basename($module) . '.php') ? basename($module) : 'notfound' ) . '.php' );
+ include('include/bottom.php'); // footer
+
+ /* free link resource */
mysql_close($link);
?>
|
|
From: <ke...@us...> - 2002-12-30 08:12:27
|
Update of /cvsroot/linksos/website/content
In directory sc8-pr-cvs1:/tmp/cvs-serv29399/content
Modified Files:
doc.php
Log Message:
English Doc Link
Added link to english version of current doc.
Users of other languages will be able to easily switch into english to view english-only documentation.
a=kennyt
Index: doc.php
===================================================================
RCS file: /cvsroot/linksos/website/content/doc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** doc.php 27 Dec 2002 19:39:23 -0000 1.1
--- doc.php 30 Dec 2002 08:12:22 -0000 1.2
***************
*** 24,28 ****
}
} else
! echo 'No entries found (in this language)<br>';
?>
--- 24,28 ----
}
} else
! echo 'No entries found (in this language)<br>' . doclink($_REQUEST["doc_id"] . '&language=1', $lang['view_in_english']);
?>
|
|
From: <ke...@us...> - 2002-12-30 08:12:27
|
Update of /cvsroot/linksos/website/language
In directory sc8-pr-cvs1:/tmp/cvs-serv29399/language
Modified Files:
en.php
Log Message:
English Doc Link
Added link to english version of current doc.
Users of other languages will be able to easily switch into english to view english-only documentation.
a=kennyt
Index: en.php
===================================================================
RCS file: /cvsroot/linksos/website/language/en.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** en.php 25 Dec 2002 19:00:23 -0000 1.8
--- en.php 30 Dec 2002 08:12:22 -0000 1.9
***************
*** 75,78 ****
--- 75,81 ----
// customization
'choose_language_head' => 'Choose your language below. This choice will remain until you end this browser session.',
+
+ // documentation
+ 'view_in_english' => 'View in English',
);
?>
|
|
From: <kye...@us...> - 2002-12-29 07:54:05
|
Update of /cvsroot/linksos/linksos/main In directory sc8-pr-cvs1:/tmp/cvs-serv31175 Modified Files: strap.asm Log Message: strap.asm NASM 32-BIT RELOCATION FIX Changed 16 bit declaration to 32 bit, and changed 3 lines to make them conform with this structure. Now Compiles + Links with all versions of NASM (but does not link with DJGPP LD) Reason = Bug Fix a=kyethespy b=16 Index: strap.asm =================================================================== RCS file: /cvsroot/linksos/linksos/main/strap.asm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** strap.asm 28 Dec 2002 21:23:25 -0000 1.3 --- strap.asm 29 Dec 2002 07:54:00 -0000 1.4 *************** *** 1,20 **** ;----------------------------------------------------------------------------- ! ;- filename: strap.asm -- ! ;- creation date: unknown -- ! ;- author: Charles Banas -- ! ;- version: 0.01 -- ;----------------------------------------------------------------------------- ! ;- revision history: -- ! ;- 12/22/2002 - 1136 MST - Charles Banas -- ! ;- prepared for CVS commit. added comments. -- ;----------------------------------------------------------------------------- ! ;- description: -- ! ;- this file provides the ability for the kernel to boot with a -- ! ;- minimal bootloader that does not provide A20 or p-mode support. -- ! ;- if the kernel is used in conjunction with GRUB or similar -- ! ;- bootloaders, multiboot.s is linked rather than this file. -- ;----------------------------------------------------------------------------- ! [BITS 16] [SECTION .text] [GLOBAL _start] --- 1,27 ---- ;----------------------------------------------------------------------------- ! ; filename: strap.asm ! ; creation date: unknown ! ; author: Charles Banas ! ; Edited by Kye Lewis (kye...@us...) ! ; version: 0.02 ;----------------------------------------------------------------------------- ! ; revision history: ! ; 12/22/2002 - 1136 MST - Charles Banas ! ; prepared for CVS commit. added comments. ! ! ; 20021229 - 0738GMT - Kye Lewis (kye...@us...) ! ! ; Changed so the file links and compiles on NASM correctly ! ; Changed BITS 16 to BITS 32, and fixed 3 other lines. ! ;----------------------------------------------------------------------------- ! ; description: ! ; this file provides the ability for the kernel to boot with a ! ; minimal bootloader that does not provide A20 or p-mode support. ! ;----------------------------------------------------------------------------- ! ;[BITS 16] ! [BITS 32] [SECTION .text] [GLOBAL _start] *************** *** 43,47 **** sti ! mov si,booting call _disp_str --- 50,54 ---- sti ! mov si,[booting] call _disp_str *************** *** 74,78 **** or al,1 mov cr0,eax ! mov si,pmodeswitch call _disp_str jmp SYS_CODE_SEL:do_pm --- 81,85 ---- or al,1 mov cr0,eax ! mov si,[pmodeswitch] call _disp_str jmp SYS_CODE_SEL:do_pm *************** *** 83,87 **** ; dumps because a20 is not set _a20_dump: ! mov si,a20fail call _disp_str ; xor ax,ax --- 90,94 ---- ; dumps because a20 is not set _a20_dump: ! mov si,[a20fail] call _disp_str ; xor ax,ax *************** *** 281,285 **** ; Protected-mode segment ;--------------- ! [BITS 32] do_pm: mov ax,SYS_DATA_SEL ; now in 32-bit pmode --- 288,292 ---- ; Protected-mode segment ;--------------- ! do_pm: mov ax,SYS_DATA_SEL ; now in 32-bit pmode |
|
From: <bg...@us...> - 2002-12-28 21:23:31
|
Update of /cvsroot/linksos/linksos/main In directory sc8-pr-cvs1:/tmp/cvs-serv2915/main Modified Files: Makefile strap.asm Log Message: Added line for strap.asm in Makefile Index: Makefile =================================================================== RCS file: /cvsroot/linksos/linksos/main/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 28 Dec 2002 16:53:16 -0000 1.3 --- Makefile 28 Dec 2002 21:23:25 -0000 1.4 *************** *** 7,10 **** --- 7,13 ---- GCC = gcc + #The assembler + ASM = nasm + # The linker LD = ld *************** *** 14,21 **** # The object files ! OBJS = kstdio.o main.o #Compiler parameters CFLAGS = -I$(INCLUDE) -Wall -O -fomit-frame-pointer -c -o ALL: $(KERNELFN) --- 17,28 ---- # The object files ! OBJS = kstdio.o main.o strap.o #Compiler parameters CFLAGS = -I$(INCLUDE) -Wall -O -fomit-frame-pointer -c -o + ASMFLAGS = -f elf + + + .SUFFIXES: .asm ALL: $(KERNELFN) *************** *** 26,29 **** --- 33,39 ---- .c.o: $(CC) $(CFLAGS) $@ $< + + .asm.o: + $(ASM) $(ASMFLAGS) $< clean: Index: strap.asm =================================================================== RCS file: /cvsroot/linksos/linksos/main/strap.asm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** strap.asm 22 Dec 2002 18:42:12 -0000 1.2 --- strap.asm 28 Dec 2002 21:23:25 -0000 1.3 *************** *** 19,23 **** [SECTION .text] [GLOBAL _start] ! ; this part is meant for compatibility with the standard BeFS bootloader. ; the BeFS bootloader loads the kernel image at 1000h:0000h and jumps to --- 19,23 ---- [SECTION .text] [GLOBAL _start] ! ; this part is meant for compatibility with the standard BeFS bootloader. ; the BeFS bootloader loads the kernel image at 1000h:0000h and jumps to *************** *** 299,301 **** ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; time to link to C code now! ;; ! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; \ No newline at end of file --- 299,301 ---- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; time to link to C code now! ;; ! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
|
From: <ke...@us...> - 2002-12-28 20:16:09
|
Update of /cvsroot/linksos/website/language In directory sc8-pr-cvs1:/tmp/cvs-serv17340/language Added Files: se.php Log Message: Swedish New language (phc) n/r a=kennyt --- NEW FILE: se.php --- (This appears to be a binary file; contents omitted.) |
|
From: <ke...@us...> - 2002-12-28 19:58:03
|
Update of /cvsroot/linksos/website/content
In directory sc8-pr-cvs1:/tmp/cvs-serv13427/content
Added Files:
docs_index.php
Log Message:
Added search page and docs index.
--- NEW FILE: docs_index.php ---
Documentation Search:
<form action="<? echo $PHP_SELF; ?>?module=doc" method="post">
Document Number: <input type="text" class="textinput" cols="3" name="doc_id"><br>
<input type="submit" class="textinput" value="Show">
</form>
<p />
Documents:<br>
<?
$result = mysql_query('SELECT * FROM linksos_docs');
while ($doc = mysql_fetch_row($result) ) {
echo doclink($doc[0], $doc[1]). '<br>';
}
?>
|
|
From: <ke...@us...> - 2002-12-28 19:52:40
|
Update of /cvsroot/linksos/website/include
In directory sc8-pr-cvs1:/tmp/cvs-serv12067/include
Modified Files:
func_general.php
Log Message:
doclink
Added doclink() to reference documentation
makelink() had to be used to do docs
a=kennyt
Index: func_general.php
===================================================================
RCS file: /cvsroot/linksos/website/include/func_general.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** func_general.php 27 Dec 2002 21:20:54 -0000 1.2
--- func_general.php 28 Dec 2002 19:52:37 -0000 1.3
***************
*** 8,10 ****
--- 8,14 ----
return '<a href="' . $PHP_SELF . '?module=person_summary&uid=' . $uid . '">' . $txt . '</a>';
}
+
+ function doclink($docid, $txt) {
+ return '<a href="' . $PHP_SELF . '?module=doc&doc_id=' . $docid . '">' . $txt . '</a>';
+ }
?>
|
|
From: <ke...@us...> - 2002-12-28 19:50:45
|
Update of /cvsroot/linksos/website
In directory sc8-pr-cvs1:/tmp/cvs-serv12008
Modified Files:
style.css
Log Message:
Added black textinput style.
Index: style.css
===================================================================
RCS file: /cvsroot/linksos/website/style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** style.css 27 Dec 2002 22:13:13 -0000 1.2
--- style.css 28 Dec 2002 19:50:39 -0000 1.3
***************
*** 25,26 ****
--- 25,30 ----
.textinput_login { font-family: Arial, Tahoma, Verdana, Helvetica, san-serif; font-size: 10px; background-color: #FFFFFF; background-image: none; height: auto; width: auto; border: 1px #0000CC solid; font-style: normal; line-height: normal; color: #000000; text-decoration: none; font-weight: normal }
+
+ .textinput {
+ font-family: Arial, Tahoma, Verdana; font-size: 10px; background-color: #ffffff; height: auto; width: auto; border: 1px #000000 solid; font-style: normal; line-height: normal; color: #000000; text-decoration: none; font-weight: normal;
+ }
|
|
From: <bg...@us...> - 2002-12-28 16:53:22
|
Update of /cvsroot/linksos/linksos/main
In directory sc8-pr-cvs1:/tmp/cvs-serv31411/main
Modified Files:
Makefile kernel.ls main.c
Log Message:
Realised that some parameters I was passing to the linker in the Makefile were already taken care of by the linker script :o
Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/main/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 25 Dec 2002 08:49:30 -0000 1.2
--- Makefile 28 Dec 2002 16:53:16 -0000 1.3
***************
*** 22,26 ****
$(KERNELFN): $(OBJS)
! $(LD) -Bstatic -o $(KERNELFN) $(OBJS) -Ttext 0x100000 --oformat binary -Map kernel.map -T kernel.ls
.c.o:
--- 22,26 ----
$(KERNELFN): $(OBJS)
! $(LD) -Bstatic -o $(KERNELFN) $(OBJS) -Map kernel.map -T kernel.ls
.c.o:
Index: kernel.ls
===================================================================
RCS file: /cvsroot/linksos/linksos/main/kernel.ls,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kernel.ls 22 Dec 2002 18:42:12 -0000 1.1
--- kernel.ls 28 Dec 2002 16:53:16 -0000 1.2
***************
*** 14,16 ****
*(COMMON)
. = ALIGN(4096);
! end = .; _end = .; }}
\ No newline at end of file
--- 14,16 ----
*(COMMON)
. = ALIGN(4096);
! end = .; _end = .; }}
Index: main.c
===================================================================
RCS file: /cvsroot/linksos/linksos/main/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.c 22 Dec 2002 18:42:12 -0000 1.1
--- main.c 28 Dec 2002 16:53:16 -0000 1.2
***************
*** 16,19 ****
void main(void)
{
! kprintf("LinksOS v0.0.1a kernel booted.");
}
--- 16,20 ----
void main(void)
{
! while(1);
! kprintf("LinksOS v0.0.1a kernel booted.");
}
|
|
From: <ke...@us...> - 2002-12-28 03:34:44
|
Update of /cvsroot/linksos/website/image/icons In directory sc8-pr-cvs1:/tmp/cvs-serv2639/image/icons Added Files: bugtracking-small.png bugtracking.png documentation-small.png documentation.png faq-small.png faq.png forums-small.png forums.png teams-small.png teams.png Log Message: Added icons :) bugtracking docs faq forums teams --- NEW FILE: bugtracking-small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bugtracking.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: documentation-small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: documentation.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: faq-small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: faq.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: forums-small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: forums.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: teams-small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: teams.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ke...@us...> - 2002-12-28 03:32:50
|
Update of /cvsroot/linksos/website/include
In directory sc8-pr-cvs1:/tmp/cvs-serv2378/include
Modified Files:
top.php
Log Message:
Replaced links with userfriendly links. Old code is commented out.
Index: top.php
===================================================================
RCS file: /cvsroot/linksos/website/include/top.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** top.php 27 Dec 2002 05:09:15 -0000 1.10
--- top.php 28 Dec 2002 03:32:47 -0000 1.11
***************
*** 15,24 ****
</td>
<td style="text-align: center" valign="top">
! <? echo
makelink('team_summary', 'team_id=1', '<img src="image/kernelteam.jpg" align="top">') .
makelink('team_summary', 'team_id=2', '<img src="image/webteam.jpg" align="top">') .
makelink('team_summary', 'team_id=3', '<img src="image/appteam.jpg" align="top">') .
makelink('team_summary', 'team_id=4', '<img src="image/hardwareteam.jpg" align="top">') .
! ""; ?>
</td>
</tr>
--- 15,30 ----
</td>
<td style="text-align: center" valign="top">
! <? //echo
makelink('team_summary', 'team_id=1', '<img src="image/kernelteam.jpg" align="top">') .
makelink('team_summary', 'team_id=2', '<img src="image/webteam.jpg" align="top">') .
makelink('team_summary', 'team_id=3', '<img src="image/appteam.jpg" align="top">') .
makelink('team_summary', 'team_id=4', '<img src="image/hardwareteam.jpg" align="top">') .
! "";
! echo makelink('docs_index', '', '<img src="image/icons/documentation-small.png">') . ' ' .
! makelink('doc', 'doc_id=1', '<img src="image/icons/faq-small.png">') . ' ' .
! makelink('teams', '', '<img src="image/icons/teams-small.png">') .
! '<a href="http://www.linksos.org/bugzilla/"><img src="image/icons/bugtracking-small.png"></a>' .
! '<a href="http://www.linksos.org/forums/"><img src="image/icons/forums-small.png"></a>';
! ?>
</td>
</tr>
***************
*** 28,32 ****
echo makelink('login', '', $lang['login_v'] ) . ' / ';
} else {
! echo makelink('logout', '', $lang['logout_v'] ) . ' / ';
}
echo makelink('lang_switch', '', $lang['language']) . ' / ';
--- 34,38 ----
echo makelink('login', '', $lang['login_v'] ) . ' / ';
} else {
! echo makelink('logout', '', $lang['logout_v'] ) . ' / ' . makelink('person_edit', '', $lang['acct_options']) . ' / ';
}
echo makelink('lang_switch', '', $lang['language']) . ' / ';
|
|
From: <ke...@us...> - 2002-12-28 03:31:49
|
Update of /cvsroot/linksos/website/content
In directory sc8-pr-cvs1:/tmp/cvs-serv2205/content
Modified Files:
teams.php
Log Message:
Teams are displayed by their images.
Index: teams.php
===================================================================
RCS file: /cvsroot/linksos/website/content/teams.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** teams.php 27 Dec 2002 19:39:45 -0000 1.1
--- teams.php 28 Dec 2002 03:31:46 -0000 1.2
***************
*** 8,12 ****
while ( $team = mysql_fetch_row($teams) ) {
! echo makelink('team_summary', "team_id=$team[0]", $team[1]) . '<br>';
}
?>
--- 8,12 ----
while ( $team = mysql_fetch_row($teams) ) {
! echo makelink('team_summary', "team_id=$team[0]", '<img src="image/teams/' . $team[0] . 'team.jpg"></a>') . ' ';
}
?>
|
|
From: <ke...@us...> - 2002-12-28 03:30:26
|
Update of /cvsroot/linksos/website/content In directory sc8-pr-cvs1:/tmp/cvs-serv1954/content Modified Files: lang_switch.php Log Message: Let's wait a while for acct-based Language support (it's a pain for translators too) Index: lang_switch.php =================================================================== RCS file: /cvsroot/linksos/website/content/lang_switch.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_switch.php 25 Dec 2002 18:58:59 -0000 1.4 --- lang_switch.php 28 Dec 2002 03:30:21 -0000 1.5 *************** *** 1,3 **** ! <? if ($_SESSION["user"][0]) die ($lang['anon_only_use_acct']); ?> <form> <? echo $lang['choose_language_head'] . '<p />'; ?> --- 1,3 ---- ! <? // if ($_SESSION["user"][0]) die ($lang['anon_only_use_acct']); ?> <form> <? echo $lang['choose_language_head'] . '<p />'; ?> |
|
From: <st...@us...> - 2002-12-28 00:04:27
|
Update of /cvsroot/linksos/website/language
In directory sc8-pr-cvs1:/tmp/cvs-serv23135
Modified Files:
no.php
Log Message:
Decided it sounds better to use the norwegian word for group instead of team
to get a better flow.
Index: no.php
===================================================================
RCS file: /cvsroot/linksos/website/language/no.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** no.php 26 Dec 2002 04:03:25 -0000 1.11
--- no.php 28 Dec 2002 00:04:23 -0000 1.12
***************
*** 21,28 ****
'user_not_found' => 'Kunne ikke finne den brukeren.',
! 'team_not_found' => 'Kunne ikke finne find laget.',
! 'num_team_id' => 'Du må taste inn en numerisk lag id.',
'page_admin_only' => 'Kun administratorer kan se denne siden.',
! 'page_lead_admin_only' => 'Kun lagledere og administratorer har tilgang til denne siden.',
'anon_only_use_acct' => 'Denne siden er kun for anonyme brukere.<br>Når du er logget inn kan du velge språk i kontoinnstillingene.',
--- 21,28 ----
'user_not_found' => 'Kunne ikke finne den brukeren.',
! 'team_not_found' => 'Kunne ikke finne finne gruppen.', // group used instead of team for better sounding translation (done throughout the translation)
! 'num_team_id' => 'Du må taste inn en numerisk gruppe id.',
'page_admin_only' => 'Kun administratorer kan se denne siden.',
! 'page_lead_admin_only' => 'Kun gruppeledere og administratorer har tilgang til denne siden.',
'anon_only_use_acct' => 'Denne siden er kun for anonyme brukere.<br>Når du er logget inn kan du velge språk i kontoinnstillingene.',
***************
*** 40,49 ****
'real_name' => 'Fullt navn',
'email' => 'E-post',
! 'teams' => 'Lag',
! 'team' => 'Lag',
'none' => 'ingen',
'edit' => 'rediger',
'change' => 'endre',
! 'team_leader' => 'Lagleder',
'status' => 'Status',
'status_detail' => 'Status Detaljer',
--- 40,49 ----
'real_name' => 'Fullt navn',
'email' => 'E-post',
! 'teams' => 'Grupper',
! 'team' => 'Gruppe',
'none' => 'ingen',
'edit' => 'rediger',
'change' => 'endre',
! 'team_leader' => 'Gruppeleder',
'status' => 'Status',
'status_detail' => 'Status Detaljer',
***************
*** 52,59 ****
// administration
'old_leader_remd' => 'Tidligere leder fjernet.',
! 'user_prom_lead' => 'Bruker forfremmet til lagleder.',
! 'added_team_lead' => 'Bruker lagt til som lagleder.',
'no_leader_added' => 'Ingen leder lagt til.',
! 'user_exists_team' => 'Bruker eksisterer allerede i dette laget.',
'remove' => 'Fjern',
'add' => 'Legg til',
--- 52,59 ----
// administration
'old_leader_remd' => 'Tidligere leder fjernet.',
! 'user_prom_lead' => 'Bruker forfremmet til gruppeleder.',
! 'added_team_lead' => 'Bruker lagt til som gruppeleder.',
'no_leader_added' => 'Ingen leder lagt til.',
! 'user_exists_team' => 'Brukeren eksisterer allerede i dette gruppen.',
'remove' => 'Fjern',
'add' => 'Legg til',
***************
*** 63,67 ****
! 'team_leader_head' => 'Klikk på en person for å forfremme den til lagleder.<br>Ved å forfremme noen vil forrige leder bli degradert.<p />',
// links, etc
--- 63,67 ----
! 'team_leader_head' => 'Klikk på en person for å forfremme den til gruppeleder.<br>Ved å forfremme noen vil forrige leder bli degradert.<p />',
// links, etc
|
|
From: <ke...@us...> - 2002-12-27 22:22:12
|
Update of /cvsroot/linksos/website/image/icons In directory sc8-pr-cvs1:/tmp/cvs-serv28094/icons Log Message: Directory /cvsroot/linksos/website/image/icons added to the repository |
|
From: <ke...@us...> - 2002-12-27 22:21:39
|
Update of /cvsroot/linksos/website/image/teams In directory sc8-pr-cvs1:/tmp/cvs-serv27808/teams Added Files: 1team.jpg 2team.jpg 3team.jpg 4team.jpg Log Message: Moved teams to the teams/ dir and sort by team_id. --- NEW FILE: 1team.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 2team.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 3team.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 4team.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: <ke...@us...> - 2002-12-27 22:21:38
|
Update of /cvsroot/linksos/website/image In directory sc8-pr-cvs1:/tmp/cvs-serv27808 Removed Files: appteam.jpg hardwareteam.jpg kernelteam.jpg webteam.jpg Log Message: Moved teams to the teams/ dir and sort by team_id. --- appteam.jpg DELETED --- --- hardwareteam.jpg DELETED --- --- kernelteam.jpg DELETED --- --- webteam.jpg DELETED --- |
|
From: <ke...@us...> - 2002-12-27 22:20:58
|
Update of /cvsroot/linksos/website/image/teams In directory sc8-pr-cvs1:/tmp/cvs-serv27713/teams Log Message: Directory /cvsroot/linksos/website/image/teams added to the repository |
|
From: <ke...@us...> - 2002-12-27 22:13:19
|
Update of /cvsroot/linksos/website
In directory sc8-pr-cvs1:/tmp/cvs-serv25416
Modified Files:
style.css
Log Message:
Added bgcolor definition to body (bobertlo got grey bgcolor)
Index: style.css
===================================================================
RCS file: /cvsroot/linksos/website/style.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** style.css 22 Dec 2002 03:15:36 -0000 1.1.1.1
--- style.css 27 Dec 2002 22:13:13 -0000 1.2
***************
*** 1,4 ****
--- 1,5 ----
body {
margin: 5px 1px 1px 5px;
+ background: #ffffff;
}
|
|
From: <ke...@us...> - 2002-12-27 21:21:21
|
Update of /cvsroot/linksos/website/include
In directory sc8-pr-cvs1:/tmp/cvs-serv8954/include
Modified Files:
news.php
Log Message:
Made name a link.
Index: news.php
===================================================================
RCS file: /cvsroot/linksos/website/include/news.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** news.php 27 Dec 2002 19:40:00 -0000 1.1
--- news.php 27 Dec 2002 21:21:19 -0000 1.2
***************
*** 16,20 ****
echo '<table width="100%" style="background-repeat: repeat-x; font-family: Arial; margin: 0px 0px 10px 0px; font-size: 12px; padding: 0; border: 0" cellspacing="0" cellpadding="0"><tr><td valign="top" height="12" width="50%"><b>';
echo date('l j F Y', $article[0]);
! echo ' by ' . $article[4];
echo '</b></td><td valign="top" style="font-weight: bold; color: #ff0000;">' . $article[1] . '</td></tr>' .
'<tr><td height="7" colspan="2" background="image/line_off5.png"></td></tr>' .
--- 16,20 ----
echo '<table width="100%" style="background-repeat: repeat-x; font-family: Arial; margin: 0px 0px 10px 0px; font-size: 12px; padding: 0; border: 0" cellspacing="0" cellpadding="0"><tr><td valign="top" height="12" width="50%"><b>';
echo date('l j F Y', $article[0]);
! echo ' by ' . perslink($article[3], $article[4]);
echo '</b></td><td valign="top" style="font-weight: bold; color: #ff0000;">' . $article[1] . '</td></tr>' .
'<tr><td height="7" colspan="2" background="image/line_off5.png"></td></tr>' .
|
|
From: <ke...@us...> - 2002-12-27 21:20:59
|
Update of /cvsroot/linksos/website/include
In directory sc8-pr-cvs1:/tmp/cvs-serv8833/include
Modified Files:
func_general.php
Log Message:
Added person link function.
Index: func_general.php
===================================================================
RCS file: /cvsroot/linksos/website/include/func_general.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** func_general.php 22 Dec 2002 03:15:36 -0000 1.1.1.1
--- func_general.php 27 Dec 2002 21:20:54 -0000 1.2
***************
*** 4,6 ****
--- 4,10 ----
. $text . '</a>';
}
+
+ function perslink($uid, $txt) {
+ return '<a href="' . $PHP_SELF . '?module=person_summary&uid=' . $uid . '">' . $txt . '</a>';
+ }
?>
|
|
From: <ke...@us...> - 2002-12-27 19:40:03
|
Update of /cvsroot/linksos/website/include
In directory sc8-pr-cvs1:/tmp/cvs-serv10184/include
Added Files:
news.php
Log Message:
News class and display function.
--- NEW FILE: news.php ---
<?
class news {
function show($num_art) {
$news_result = mysql_query('SELECT UNIX_TIMESTAMP(linksos_news.date),linksos_news.title,linksos_news.body,linksos_people.uid,linksos_people.fullname FROM linksos_news,linksos_people WHERE linksos_news.poster = linksos_people.uid ORDER BY linksos_news.news_id DESC');
if (mysql_num_rows($news_result)) {
$art_step = 0;
while ( $article = mysql_fetch_row($news_result) ) {
if ($num_art) if ( $art_step == $num_art ) {
if (mysql_num_rows($news_result))
echo makelink('news', '', 'Older News');
break;
}
$art_step++;
echo '<table width="100%" style="background-repeat: repeat-x; font-family: Arial; margin: 0px 0px 10px 0px; font-size: 12px; padding: 0; border: 0" cellspacing="0" cellpadding="0"><tr><td valign="top" height="12" width="50%"><b>';
echo date('l j F Y', $article[0]);
echo ' by ' . $article[4];
echo '</b></td><td valign="top" style="font-weight: bold; color: #ff0000;">' . $article[1] . '</td></tr>' .
'<tr><td height="7" colspan="2" background="image/line_off5.png"></td></tr>' .
'<tr><td colspan="3">' . $article[2] . '</td></tr>' .
'</tr></table>';
}
}
}
}
?>
|
|
From: <ke...@us...> - 2002-12-27 19:39:48
|
Update of /cvsroot/linksos/website/content
In directory sc8-pr-cvs1:/tmp/cvs-serv10105/content
Added Files:
teams.php
Log Message:
Textual display of teams.
--- NEW FILE: teams.php ---
<?
$teams = mysql_query('SELECT * FROM linksos_teams');
if (!mysql_num_rows($teams))
die();
echo $lang['teams'] . '<p />';
while ( $team = mysql_fetch_row($teams) ) {
echo makelink('team_summary', "team_id=$team[0]", $team[1]) . '<br>';
}
?>
|
