X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fbrisk.phh;h=dae746babb94fc2737546bb5a8a691a2836f685b;hb=acfe937dabf7bbe63e57c2709be2131e783990f9;hp=f929470be892e2a201e01032adcb710261f40170;hpb=04e1d4690aafd42fb24abf8c24dd9f036b4b08a8;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index f929470..dae746b 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -29,13 +29,13 @@ define(COMM_GEN_N, 50);
define(SESS_LEN, 13);
define(STREAM_TIMEOUT, 20);
define(EXPIRE_TIME_RD, 180);
-define(EXPIRE_TIME_SMAMMA, 300);
+define(EXPIRE_TIME_SMAMMA, 180);
define(GARBAGE_TIMEOUT, 10);
define(NICKSERV, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
-$G_brisk_version = "0.4.4";
+$G_brisk_version = "0.4.6";
$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.').',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
@@ -374,8 +374,6 @@ class brisco {
else
log_rd2($sess, "LOGOUT FROM WHAT ???");
}
- // } // if (0 == 1)
-
}
if ($user_cur->laccwr + EXPIRE_TIME_SMAMMA < $curtime) { // lo rimettiamo in piedi
@@ -401,6 +399,8 @@ class brisco {
log_main("WAKEUP", "begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst);
+ $curtime = time();
+
$from_table = ($user->stat == "table");
if ($from_table) {
log_main("WAKEUP", "from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
@@ -411,10 +411,12 @@ class brisco {
if ($user_cur != $user) {
$user_cur->stat = "room";
$user_cur->subst = "sitdown";
+ $user_cur->laccwr = $curtime;
}
else if ($user->sess != "") {
$user_cur->stat = "room";
$user_cur->subst = "standup";
+ $user_cur->laccwr = $curtime;
$user_cur->table = -1;
}
}
@@ -422,6 +424,7 @@ class brisco {
else {
$user->stat = "room";
$user->subst = "standup";
+ $user->laccwr = $curtime;
}
/* aggiorna l'array dei giocatori al tavolo. */
$table->user_rem(&$this, &$user);
@@ -555,7 +558,13 @@ class brisco {
if (strncmp($user_mesg, "/nick ", 6) == 0) {
log_main($user->sess, "chatt_send BEGIN");
- $name_new = str_replace(' ', '_', substr(trim(substr($user_mesg, 6)),0,12));
+ 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++;
+
+ return;
+ }
$user_mesg = "COMMAND ".$user_mesg;
// Search dup name
// change
@@ -662,6 +671,7 @@ class brisco {
*
* RETURN VALUE:
* if ($idx != -1 && ret == FALSE) => duplicated nick
+ * if ($idx == -2 && ret == FALSE) => invalid name
* if ($idx == -1 && ret == FALSE) => no space left
* if (ret == TRUE) => SUCCESS
*/
@@ -670,6 +680,11 @@ class brisco {
$idx = -1;
$idfree = -1;
+ if (($name_new = validate_name($name)) == FALSE) {
+ $idx = -2;
+ return (FALSE);
+ }
+
log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
if (validate_sess($sess) == FALSE)
$sess = "";
@@ -683,7 +698,7 @@ class brisco {
if ($idfree == -1 && strcmp("", $this->user[$i]->sess) == 0) {
$idfree = $i;
}
- if (strcmp($this->user[$i]->name, $name) == 0) {
+ if (strcmp($this->user[$i]->name, $name_new) == 0) {
$idx = $i;
break;
}
@@ -691,7 +706,7 @@ class brisco {
if ($idx == -1)
$idx = $idfree;
- log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name));
+ log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
if ($idx != -1 && $i == MAX_PLAYERS) {
/* SUCCESS */
@@ -703,11 +718,12 @@ class brisco {
else {
$this->user[$idx]->sess = $sess;
}
- $this->user[$idx]->name = $name;
+ $this->user[$idx]->name = $name_new;
$this->user[$idx]->stat = "room";
$this->user[$idx]->subst = "standup";
+ $this->user[$idx]->laccwr = time();
- log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name));
+ log_main("XXX", sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
return ($this->user[$idx]);
}
@@ -1484,10 +1500,25 @@ function calculate_points(&$table)
$table->mult = 1;
}
-function validate_sess($sess) {
+function validate_sess($sess)
+{
if (strlen($sess) == SESS_LEN)
return (TRUE);
else
return (FALSE);
}
+
+function validate_name($name)
+{
+ $name_new = str_replace(' ', '_', substr(trim($name),0,12));
+
+ for ($i = 0 ; $i < strlen($name_new) ; $i++) {
+ $c = $name_new[$i];
+ if (($c >= "a" && $c <= "z") || ($c >= "A" && $c <= "Z") || ($c >= "0" && $c <= "9"))
+ return ($name_new);
+ }
+
+ return (FALSE);
+}
+
?>