[LinksOS CVS Commit]website/include func_general.php,1.3,1.4 news.php,1.2,1.3 top.php,1.11,1.12

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linksos/website/include
In directory sc8-pr-cvs1:/tmp/cvs-serv10170/include

Modified Files:
	func_general.php news.php top.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: func_general.php
===================================================================
RCS file: /cvsroot/linksos/website/include/func_general.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** func_general.php	28 Dec 2002 19:52:37 -0000	1.3
--- func_general.php	30 Dec 2002 09:18:08 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  <?
  function makelink($mod, $arg, $text) {
+   /* return a link (<a> tag) to the module with arguments, as text */
    return "<a href=\"$PHP_SELF?module=$mod" . ( $arg ? "&$arg" : "" ) . '">' 
      . $text . '</a>';
***************
*** 6,13 ****
--- 7,16 ----

  function perslink($uid, $txt) {
+   /* return a link to the person summary of uid, as txt. */
    return '<a href="' . $PHP_SELF . '?module=person_summary&uid=' . $uid . '">' . $txt . '</a>';
  }

  function doclink($docid, $txt) {
+   /* return a link to the document docid, as txt */
    return '<a href="' . $PHP_SELF . '?module=doc&doc_id=' . $docid . '">' . $txt . '</a>';
  }

Index: news.php
===================================================================
RCS file: /cvsroot/linksos/website/include/news.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** news.php	27 Dec 2002 21:21:19 -0000	1.2
--- news.php	30 Dec 2002 09:18:08 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
  class news {
    function show($num_art) {
+     /* Show the num_art most recent articles. *
+      * If num_art is not defined, show all articles, *
+      * most recent first. Direct echo. */
      $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');

Index: top.php
===================================================================
RCS file: /cvsroot/linksos/website/include/top.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** top.php	28 Dec 2002 03:32:47 -0000	1.11
--- top.php	30 Dec 2002 09:18:08 -0000	1.12
***************
*** 4,8 ****
  <title>LinksOS</title>
  <link rel="stylesheet" href="style.css" type="text/css">
! <? if ( $_REQUEST["module"] == 'logout')
       echo '<meta http-equiv="refresh" content="5; URL=./?module=welcome">';
  ?>
--- 4,8 ----
  <title>LinksOS</title>
  <link rel="stylesheet" href="style.css" type="text/css">
! <? if ( $_REQUEST["module"] == 'logout') // logging out - forward to  index
       echo '<meta http-equiv="refresh" content="5; URL=./?module=welcome">';
  ?>
***************
*** 15,19 ****
  </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">') .
--- 15,19 ----
  </td>
  <td style="text-align: center" valign="top">
! <? //echo /* teams are replaced with user-oriented links */
  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">') .
***************
*** 21,29 ****
  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>
--- 21,30 ----
  makelink('team_summary', 'team_id=4', '<img src="image/hardwareteam.jpg" align="top">') .
  ""; 
! 
! echo makelink('docs_index', '', '<img src="image/icons/documentation-small.png">') . ' ' . // docs
! makelink('doc', 'doc_id=1', '<img src="image/icons/faq-small.png">') . ' ' . //faq
! makelink('teams', '', '<img src="image/icons/teams-small.png">') . // teams list
! '<a href="http://www.linksos.org/bugzilla/"><img src="image/icons/bugtracking-small.png"></a>' . // bugzilla
! '<a href="http://www.linksos.org/forums/"><img src="image/icons/forums-small.png"></a>'; // forums
  ?>
  </td>
***************
*** 31,43 ****
  <tr>
  <td align="center" style="font-size: 12px; font-family: arial;" colspan="1" nowrap="nowrap">
! <? if (!$_POST["username"] && !$_SESSION["user"][0]) {
    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']) . ' / ';
! ?>
!  <a href="http://linksos.sourceforge.net/bugzilla/"><? echo $lang['got_bugs']; ?></a>
!  <? if ($f_st) echo '</form>'; ?>
  </td>
  </tr>
--- 32,45 ----
  <tr>
  <td align="center" style="font-size: 12px; font-family: arial;" colspan="1" nowrap="nowrap">
! <? 
! /* if not logging in and not logged in, print the login link. */
! if (!$_POST["username"] && !$_SESSION["user"][0]) {
    echo makelink('login', '', $lang['login_v'] ) . ' / ';
! } else { /* logged in or logging in, print logout link and acct options link */
    echo makelink('logout', '', $lang['logout_v'] ) . ' / ' . makelink('person_edit', '', $lang['acct_options']) . ' / ';
  }
! echo makelink('lang_switch', '', $lang['language']) . ' / '; // everyone can change language
! echo '<a href="http://linksos.sourceforge.net/bugzilla/">' . $lang['got_bugs'] . '</a>';
! if ($f_st) echo '</form>'; ?>
  </td>
  </tr>