X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fbrisk.phh;h=fb006922261f1880175ff73cd389284797aa6078;hb=74cad9e7d70f147fa2977d4f5e471947853be5c7;hp=868c53830ffdd4d644d89e9961fd21b0e5050091;hpb=7a9493d9c85c2ed4e0ab56a101f16b8d3d817f13;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 868c538..fb00692 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -2,7 +2,7 @@
/*
* brisk - brisk.phh
*
- * Copyright (C) 2006 matteo.nastasi@milug.org
+ * Copyright (C) 2006-2007 matteo.nastasi@milug.org
*
* 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
@@ -19,7 +19,9 @@
*
*/
-define( FTOK_PATH, "/var/lib/brisk");
+define(FTOK_PATH, "/var/lib/brisk");
+define(LEGAL_PATH, "/tmp/legal_brisk");
+define(PROXY_PATH, "/var/lib/brisk_proxy");
define(TABLES_N, 8);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
@@ -30,17 +32,19 @@ define(SESS_LEN, 13);
define(STREAM_TIMEOUT, 20);
define(EXPIRE_TIME_RD, 180);
define(EXPIRE_TIME_SMAMMA, 360);
+// BAN_TIME da allineare anche in commons.js
+define(BAN_TIME, 900);
define(GARBAGE_TIMEOUT, 10);
define(NICKSERV, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.4.6";
+$G_brisk_version = "0.7.0";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.').',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
-$table_wellarr = Array ( 'Benvenuto al tavolo.');
+$table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
$G_room_help= '
@@ -48,6 +52,11 @@ $G_room_help= '
Descrizione
Questa è un\'implementazione della briscola in cinque, così come è spiegata su
Wikipedia; in breve è la variante con l\'asta prima sulla carta e poi sui punti.
+Configurazione del browser.
+Occorre abilitare i cookies.
+Se usate Internet Explorer 6 dovete settare: strumenti -> opzioni internet -> file temporanei:impostazioni->\\"verifica per nuove versioni della pagina scaricata\\" ad: \\"ogni volta che si visita la pagina\\".
+Se usate Internet Explorer 7 dovete settare: strumenti -> opzioni internet -> etichetta \\"Generale\\" -> cronologia esplorazioni -> impostazioni ad \\"apertura alla pagina web\\".
+
Uso del sito
Potete sedervi a un tavolo o rimanere in piedi.
Se al vostro tavolo si raggiungono i 5 giocatori inizia automaticamente la partita.
@@ -56,8 +65,9 @@ Se al vostro tavolo si raggiungono i 5 giocatori inizia automaticamente la parti
All\'inizio vengono distribuite le carte e parte l\'asta; per partecipare all\'asta, quando sarà il vostro turno, potrete scegliere se andare avanti o passare cliccando sulle icone corrispondenti. Se si arriva ai punti, scrivete nella textbox il vostro rilancio e cliccate PUNTI.
Chi vince l\'asta dovrà decidere il seme della carta scelta e inizierà la mano.
Per giocare le carte dovrete trascinarle nel quadrato al centro del vostro schermo.
-Il vostro turno è sempre segnalato da una cornice verde lampeggiante intorno quadrato al centro del vostro schermo.
+Il vostro turno è sempre segnalato da una cornice verde lampeggiante intorno al quadrato al centro del vostro schermo.
Durante la partita, se vorrete ricaricare la pagina, usate l\'apposito bottone \\"reload\\" in basso a destra.
+Dopo che è iniziata una partita per uscirne dovete chiedere agli altri giocatori di sbloccarla cliccando sul lucchetto. Se non si segue questa prassi, una volta usciti, non vi potrete sedere a nessun tavolo per '.floor(BAN_TIME/60).' minuti.
- Comandi della chat
- /nick <nuovo_nickname> - cambio di nickname
@@ -95,13 +105,13 @@ class Card {
function Card($value, $stat, $owner)
{
$this->value = $value;
- $this->stat = $stat;
+ $this->stat = $stat; // Card stat
$this->owner = $owner;
}
function assign($stat,$owner)
{
- $this->stat = $stat;
+ $this->stat = $stat; // Card stat
$this->owner = $owner;
}
@@ -112,14 +122,14 @@ class Card {
function play($x,$y)
{
- $this->stat = 'table';
+ $this->stat = 'table'; // Card stat
$this->x = $x;
$this->y = $y;
}
function take($newown)
{
- $this->stat = 'take';
+ $this->stat = 'take'; // Card stat
$this->owner = $newown;
}
}
@@ -182,10 +192,11 @@ class Table {
$ret = array();
for ($i = 0 ; $i < 40 ; $i++) {
- $ret[$i] = new Card($i, 'bunch', 'no_owner');
+ $ret[$i] =& new Card($i, 'bunch', 'no_owner');
}
- return ($ret);
+ $oret = &$ret;
+ return ($oret);
}
function bunch_make()
@@ -341,8 +352,10 @@ class Table {
class User {
var $name; // name of the user
var $sess; // session of the user
+ var $ip; // ip of the user
var $lacc; // last access (for the cleanup)
var $laccwr; // last access (for the cleanup)
+ var $bantime; // timeout to temporary ban
var $stat; // status (outdoor, room, table, game, ...)
var $subst; // substatus for each status
var $step; // step of the current status
@@ -355,11 +368,13 @@ class User {
var $table; // id of the current table (if in table state)
var $table_pos; // idx on the table
- function User($name, $sess, $stat = "", $subst = "", $table = -1) {
+ function User($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
$this->name = $name;
$this->sess = $sess;
+ $this->ip = $ip;
$this->lacc = time();
$this->laccwr = time();
+ $this->bantime = 0;
$this->stat = $stat;
$this->subst = $subst;
$this->step = 1;
@@ -369,11 +384,82 @@ class User {
$this->asta_pnt = -1;
$this->handpt = -1;
$this->exitislock = TRUE;
-
+
$this->table = $table;
}
+
+ function stat_set($stat) {
+ $this->stat = "$stat";
+
+ /*
+ if (validate_sess($this->sess)) {
+ $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
+ fwrite($fp, sprintf("%s\n",$this->stat));
+ fclose($fp);
+ }
+ */
+ }
+
+ function step_set($step) {
+ $this->step = $step;
+
+ do {
+ if (validate_sess($this->sess) == FALSE)
+ break;
+ if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+ break;
+ fwrite($fp, pack("l",$this->step), 4);
+ fclose($fp);
+ } while (0);
+ }
+
+ function step_inc() {
+ $this->step++;
+
+ if (validate_sess($this->sess)) {
+ $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+ fwrite($fp, pack("l",$this->step), 4);
+ fclose($fp);
+ }
+ }
}
+function step_get($sess) {
+ $fp = FALSE;
+ $ct = 0;
+ do {
+ if (validate_sess($sess) == FALSE)
+ break;
+ $ct = 1;
+ if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+ break;
+ $ct = 2;
+ if (($s = fread($fp, 4)) == FALSE)
+ break;
+ $ct = 3;
+ if (strlen($s) != 4)
+ break;
+ $ct = 4;
+ $arr = unpack('l', $s);
+ fclose($fp);
+
+ // log_rd2($sess, "A0: ".$arr[0]." A1: ".$arr[1]);
+ return ($arr[1]);
+ } while (0);
+
+ if ($fp != FALSE)
+ fclose($fp);
+
+ log_rd2($sess, "STEP_GET: return false ".$ct);
+ return (FALSE);
+}
+
+function step_unproxy($sess) {
+ log_rd2($sess, "UNPROXY: ".PROXY_PATH."/".$sess.".step");
+ unlink(PROXY_PATH."/".$sess.".step");
+}
+
+
class brisco {
var $user;
var $table;
@@ -385,10 +471,10 @@ class brisco {
$this->user = array();
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $this->user[$i] = new User("", "");
+ $this->user[$i] =& new User("", "");
}
for ($i = 0 ; $i < TABLES_N ; $i++)
- $this->table[$i] = new Table();
+ $this->table[$i] =& new Table();
$this->garbage_timeout = 0;
}
@@ -410,14 +496,15 @@ class brisco {
if ($user_cur->stat == 'table' || $user_cur->stat == 'room') {
log_auth($user_cur->sess, "Autologout session.");
+ $tmp_sess = $user_cur->sess;
$user_cur->sess = "";
+ step_unproxy($tmp_sess);
$user_cur->name = "";
$user_cur->the_end = FALSE;
log_rd2($user_cur->sess, "AUTO LOGOUT.");
if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
- $this->room_wakeu
-p(&$user_cur);
+ $this->room_wakeup(&$user_cur);
else if ($user_cur->subst == 'standup')
$this->room_outstandup(&$user_cur);
else
@@ -430,7 +517,7 @@ p(&$user_cur);
$this->room_wakeup(&$user_cur);
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
$user_cur->comm[$user_cur->step % COMM_N] .= show_notify("
Sei stato inattivo per ".(EXPIRE_TIME_SMAMMA/60.0)." minuti.
Quindi ritorni tra i Giocatori in piedi.", 0, "torna ai tavoli", 400, 100);
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
}
@@ -438,6 +525,9 @@ p(&$user_cur);
$this->garbage_timeout = time() + GARBAGE_TIMEOUT;
}
+
+ // BAN_IP_CLEAN
+
}
@@ -453,23 +543,18 @@ p(&$user_cur);
$from_table = ($user->stat == "table");
if ($from_table) {
log_main("WAKEUP", "from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
- $lockcalc = $table->exitlock_calc(&$this->user, $table_pos);
- if ($lockcalc < 3) {
- // BAN TEMP!
-asdasdasdas
- }
for ($i = 0 ; $i < $table->player_n ; $i++) {
$user_cur = &$this->user[$table->player[$i]];
log_main("PREIMPOST", "INLOOP name: ".$user_cur->name);
if ($user_cur != $user) {
- $user_cur->stat = "room";
+ $user_cur->stat_set("room");
$user_cur->subst = "sitdown";
$user_cur->laccwr = $curtime;
}
else if ($user->sess != "") {
- $user_cur->stat = "room";
+ $user_cur->stat_set("room");
$user_cur->subst = "standup";
$user_cur->laccwr = $curtime;
$user_cur->table = -1;
@@ -477,7 +562,7 @@ asdasdasdas
}
}
else {
- $user->stat = "room";
+ $user->stat_set("room");
$user->subst = "standup";
$user->laccwr = $curtime;
}
@@ -523,7 +608,7 @@ asdasdasdas
}
log_wr($user_cur->sess, "ROOM_WAKEUP: ".$ret);
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
@@ -558,7 +643,7 @@ asdasdasdas
$ret .= sprintf('$("myname").innerHTML = "%s: ";', xcape($user->name));
}
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step++;
+ $user_cur->step_inc();
}
log_main("table_update", "post");
@@ -597,7 +682,7 @@ asdasdasdas
}
}
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
@@ -609,14 +694,16 @@ asdasdasdas
$user_mesg = substr($mesg,6);
- $dt = date("H:i ",time());
+ $timecur = time();
+
+ $dt = date("H:i ", $timecur);
if (strncmp($user_mesg, "/nick ", 6) == 0) {
log_main($user->sess, "chatt_send BEGIN");
if (($name_new = validate_name(substr($user_mesg, 6))) == FALSE) {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Il nickname deve contenere almeno una lettera o una cifra.");', $dt.NICKSERV, xcape($name_new));
- $user->step++;
+ $user->step_inc();
return;
}
@@ -633,7 +720,7 @@ asdasdasdas
if ($user_cur->name == $name_new) {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s","Nickname %s già in uso.");', $dt.NICKSERV, xcape($name_new));
- $user->step++;
+ $user->step_inc();
break;
}
}
@@ -675,7 +762,7 @@ asdasdasdas
if ($user_cur == $user)
$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s";',
xcape($user->name,ENT_COMPAT,"UTF-8"));
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
}
@@ -694,21 +781,24 @@ asdasdasdas
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
$user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s","%s");',
$dt.xcape($user->name), xcape($user_mesg));
- $user_cur->step++;
+ $user_cur->step_inc();
}
+ log_legal($timecur, $user->sess, $user->name,
+ ($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
}
}
function &get_user($sess, &$idx)
{
GLOBAL $PHP_SELF;
-
- if (strlen($sess) == SESS_LEN) {
+
+ if (validate_sess($sess)) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
if (strcmp($sess, $this->user[$i]->sess) == 0) {
// find it
$idx = $i;
- return ($this->user[$i]);
+ $ret = &$this->user[$i];
+ return ($ret);
}
}
log_main($sess, sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF));
@@ -722,7 +812,7 @@ asdasdasdas
}
/*
- * function &add_user(&$bri, &$sess, &$idx, $name)
+ * function &add_user(&$bri, &$sess, &$idx, $name, $ip)
*
* RETURN VALUE:
* if ($idx != -1 && ret == FALSE) => duplicated nick
@@ -730,7 +820,7 @@ asdasdasdas
* if ($idx == -1 && ret == FALSE) => no space left
* if (ret == TRUE) => SUCCESS
*/
- function &add_user(&$sess, &$idx, $name)
+ function &add_user(&$sess, &$idx, $name, $ip)
{
$idx = -1;
$idfree = -1;
@@ -765,6 +855,7 @@ asdasdasdas
if ($idx != -1 && $i == MAX_PLAYERS) {
/* SUCCESS */
+ $curtime = time();
if ($sess == "") {
$this->user[$idx]->sess = uniqid("");
$sess = $this->user[$idx]->sess;
@@ -774,10 +865,12 @@ asdasdasdas
$this->user[$idx]->sess = $sess;
}
$this->user[$idx]->name = $name_new;
- $this->user[$idx]->stat = "room";
+ $this->user[$idx]->stat_set("room");
$this->user[$idx]->subst = "standup";
- $this->user[$idx]->laccwr = time();
-
+ $this->user[$idx]->lacc = $curtime;
+ $this->user[$idx]->laccwr = $curtime;
+ $this->user[$idx]->bantime = 0;
+ $this->user[$idx]->ip = $ip;
log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
return ($this->user[$idx]);
@@ -802,7 +895,7 @@ asdasdasdas
log_main("FROM STANDUP", "NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
- $user_cur->step++;
+ $user_cur->step_inc();
}
}
}
@@ -820,68 +913,98 @@ function log_main($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_main.log", 'a');
- fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_main.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
}
function log_rd($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_rd.log", 'a');
- fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_rd.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
}
function log_rd2($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_rd2.log", 'a');
- fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_rd2.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
}
function log_send($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_send.log", 'a');
- fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_send.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
}
function log_auth($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_auth.log", 'a');
- fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_auth.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
+ fclose($fp);
+ }
+}
+
+function log_lock($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
+ if (($fp = @fopen("/tmp/brisk_lock.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
+ fclose($fp);
+ }
}
function log_wr($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_wr.log", 'a');
- fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_wr.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
}
function log_load($sess, $log) {
if (BRISK_DEBUG != TRUE)
return;
- $fp = fopen("/tmp/brisk_load.log", 'a');
- fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
- fclose($fp);
+ if (($fp = @fopen("/tmp/brisk_load.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
}
+function log_legal($timecur, $sess, $name, $where, $mesg)
+{
+ GLOBAL $_SERVER;
+
+ if (($fp = @fopen(LEGAL_PATH, 'a')) != FALSE) {
+ /* Unix time | session | nickname | IP | where was | mesg */
+ fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
+ fclose($fp);
+ }
+}
+
+
+
function init_data()
{
- $brisco = new brisco();
+ $brisco =& new brisco();
return $brisco;
}
@@ -899,13 +1022,38 @@ function lock_data()
echo "SEM_GET FAILED";
exit;
}
- if (sem_acquire($res))
+ if (sem_acquire($res)) {
+ log_lock($sess, "LOCK");
return ($res);
+ }
else
return (false);
}
function unlock_data($res)
+{
+ log_lock($sess, "UNLOCK");
+ return (sem_release($res));
+}
+
+
+function lock_banlist()
+{
+ if (($tok = ftok(FTOK_PATH."/main", "L")) == -1) {
+ echo "FTOK FAILED";
+ exit;
+ }
+ if (($res = sem_get($tok)) == FALSE) {
+ echo "SEM_GET FAILED";
+ exit;
+ }
+ if (sem_acquire($res))
+ return ($res);
+ else
+ return (false);
+}
+
+function unlock_banlist($res)
{
return (sem_release($res));
}
@@ -918,7 +1066,7 @@ function &load_data()
exit;
}
- if ($shm = shm_attach($tok,100000 * TABLES_N)) {
+ if ($shm = shm_attach($tok,200000 * TABLES_N)) {
if(($bri = @shm_get_var($shm, $tok)) == false) {
log_main("XXX", "INIT MAIN DATA");
@@ -928,7 +1076,8 @@ function &load_data()
shm_detach($shm);
- return ($bri);
+ $ret = &$bri;
+ return ($ret);
}
return (NULL);
@@ -949,11 +1098,13 @@ function save_data(&$bri)
do {
$isacq = TRUE;
- if (($shm = shm_attach($tok,100000 * TABLES_N)) == FALSE)
+ if (($shm = shm_attach($tok,200000 * TABLES_N)) == FALSE)
break;
- if (shm_put_var($shm, $tok, $bri) == FALSE)
+ if (shm_put_var($shm, $tok, $bri) == FALSE) {
+ echo "DANNO: ".strlen(serialize($bri));
break;
+ }
// log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");
$ret = TRUE;
} while (0);
@@ -1487,7 +1638,7 @@ function calculate_winner(&$table)
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
$table->card[$ontid[$i]]->owner = $cur_win;
- $table->card[$ontid[$i]]->stat = "take";
+ $table->card[$ontid[$i]]->stat = "take"; // Card stat
}
return ($cur_win);
}
@@ -1581,4 +1732,17 @@ function playsound($filename)
return (sprintf('playsound("flasou", "%s");', $filename));
}
+function secstoword($secs)
+{
+ $mins = floor($secs / 60);
+ $secs = $secs % 60;
+ if ($mins > 0)
+ $ret = sprintf("%d minut%s%s", $mins, ($mins > 1 ? "i" : "o"), ($secs > 0 ? " e " : ""));
+
+ if ($secs > 0)
+ $ret .= sprintf("%d second%s", $secs, ($secs > 1 ? "i" : "o"));
+
+ return ($ret);
+}
+
?>