X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=8397e2c7924892fd7d2da766e00571f89eca62ac;hb=refs%2Fheads%2Favoid-domino;hp=3dc4896dda5fe951c2938632b39499127bd7da30;hpb=16a41a69d1a020612c8db3c88657ac8cfab3c0d2;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 3dc4896..8397e2c 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -89,6 +89,8 @@ define('BRISK_SINGLE_DEBUG',0);
define('BRISK_SINGLE_SESS', "");
define('DEBUGGING', "no-debugging");
+define('BSK_BUSTING', "dev");
+
require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
require_once("${G_base}Obj/ipclass.phh");
@@ -133,10 +135,8 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
'listmust' => array( 'it' => 'Per andare in isolamento non bisogna essere seduti a tavoli non riservati.',
'en' => 'To go to isolation you must don\'t stay on not reserved tables'),
- 'tit_onauth'=>array( 'it' => '(solo aut.)',
- 'en' => '(only aut.)'),
- 'tit_onisol'=>array( 'it' => '(isolam.to)',
- 'en' => '(isolation)'),
+ 'tit_onisol'=>array( 'it' => '(autenticati)',
+ 'en' => '(authenticated)'),
'db_failed' =>array('it' => '
Il collegamento al database è fallito.
Temporaneamente tutte le autenticazioni verranno sospese, accederai a Brisk come un utente normale.
Ci scusiamo per il disagio.',
'en' => 'Connection to the database failed
All authentications are suspended temporarly, you login as normal user.
We are about the limitation'),
@@ -153,11 +153,11 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "5.8.0";
+$G_brisk_version = "5.9.1";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': dati dai client via web-socket.',
- 'Se vuoi iscriverti alla Mailing List, cliccala!' ),
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': possibilità di vedere solo tavoli e utenti registrati.' ),
+ # , 'Se vuoi iscriverti alla Mailing List, cliccala!' ),
'en' => array ( 'EN Brisk (Ver. '.$G_brisk_version.'), NOVITA\': puoi creare la tua rete di amicizie con /info,',
'vedere cosa pensano i tuoi amici degli altri utenti e tavoli riservati per registrati e apprendisti.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ) );
@@ -1428,9 +1428,6 @@ class Brisk
if ($user->flags & USER_FLAG_ISOLAUTH) {
$ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
}
- else if ($user->flags & USER_FLAG_LISTAUTH) {
- $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
- }
else {
$ret .= 'list_set(\'all\', false, \'\' ); ';
}
@@ -2044,12 +2041,6 @@ class Brisk
$to_user = 'list_set(\'isolation\', true, \''.$mlang_brisk['tit_onisol'][$G_lang].'\'); ';
}
}
- else if (strcasecmp($arg, "auth") == 0) {
- $flags_old = $user->flags;
- $user->flags &= ~USER_FLAG_MAP_AUTH;
- $user->flags |= USER_FLAG_LISTAUTH;
- $to_user = 'list_set(\'auth\', true, \''.$mlang_brisk['tit_onauth'][$G_lang].'\'); ';
- }
else {
$flags_old = $user->flags;
$user->flags &= ~USER_FLAG_MAP_AUTH;
@@ -2561,28 +2552,6 @@ class Brisk
if ($authenticate != FALSE) {
$this->user[$idx]->code = $authenticate->code_get();
- if (0 == 1) {
- // all this part is included in the db server
- $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
-
- if (isset($cookie['CO_list'])) {
- // fprintf(STDERR, "QQ: %s CO_list: [%s]\n", __FUNCTION__, $cookie['CO_list']);
- if (strcmp($cookie['CO_list'], "auth") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
- }
- if (strcmp($cookie['CO_list'], "isolation") == 0) {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- $this->user[$idx]->flags |= USER_FLAG_ISOLAUTH;
- }
- else {
- $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
- }
- }
- }
- // else {
- // fprintf(STDERR, "QQ: CO_list not set flags: %x\n", __FUNCTION__, $this->user[$idx]->flags);
- // }
}
// fprintf(STDERR, "QQ %s: flag %x\n", __FUNCTION__, $this->user[$idx]->flags);
if ($ghost > -1) {
@@ -2818,15 +2787,22 @@ class Brisk
do {
if (!isset($cookie['sess'])
|| (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)) {
-
- $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
+ // || (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)
+ // || $user->page_id != $get['page_id']) {
+ $content = "";
+ // if ($user->page_id != $get['page_id']) {
+ // $content .= "OLD_PAGE";
+ // }
+ printf("\ndiscarded here\n");
+ printf("Is Cookie %s\n", (isset($cookie['sess']) ? TRUE : FALSE));
+ $content .= User::stream_fini($transp, $s_a_p->rndstr, TRUE);
$s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
return TRUE;
break;
- }
- $this->sess_cur_set($user->sess);
+ }
+ $this->sess_cur_set($user->sess);
// close a previous opened index_read_ifra socket, if exists
if (($prev = $user->rd_socket_get()) != NULL) {
$s_a_p->socks_unset($user->rd_socket_get());