From: Matteo Nastasi (mop) Date: Thu, 29 Jan 2015 06:40:17 +0000 (+0100) Subject: first part of restyle X-Git-Tag: v4.18.0~7 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=131fa3f1c1c059e7a7aa9e485d29cb5249b0901f;p=brisk.git first part of restyle --- diff --git a/RESTYLE.txt b/RESTYLE.txt new file mode 100644 index 0000000..a72af0c --- /dev/null +++ b/RESTYLE.txt @@ -0,0 +1,40 @@ +DONE - web/admin.php +DONE - web/brisk-fb-whois.php +- web/briskin5/explain.php +- web/briskin5/index.php +- web/briskin5/index_wr.php +- web/briskin5/Obj/briskin5.phh +- web/briskin5/Obj/placing.phh +- web/briskin5/players-corr.php +- web/briskin5/statadm.php +- web/briskin5/stat-day.php +- web/bug.php +- web/doc_download.php +DONE - web/donometer.php +DONE - web/error.php +DONE - web/index.php +- web/index_wr.php +- web/mailmgr.php +- web/notidoc_test.php +- web/Obj/auth.phh +- web/Obj/brisk.conf-templ.pho +- web/Obj/brisk.phh +- web/Obj/brisk.phh.rej +- web/Obj/dbase_base.phh +- web/Obj/dbase_file.phh +- web/Obj/dbase_pgsql.phh +- web/Obj/hardban.phh +- web/Obj/mail.phh +- web/Obj/proxyscan.phh +- web/Obj/sac-a-push.phh +- web/Obj/singlemsg.phh +- web/Obj/transports.phh +- web/Obj/user.phh +- web/Obj/zlibstream.phh +- web/spush/brisk-spush.phh +- web/spush/brisk-spush.php +- web/suprend.php +- web/usermgmt.php +- web/weboftrust.php +- web/ws.php +- web/xynt_test01.php diff --git a/web/admin.php b/web/admin.php index 55674ba..c3428e6 100644 --- a/web/admin.php +++ b/web/admin.php @@ -2,7 +2,7 @@ /* * brisk - admin.php * - * Copyright (C) 2011-2012 Matteo Nastasi + * Copyright (C) 2011-2015 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -23,7 +23,7 @@ */ $G_base = ""; - + require_once("Obj/brisk.phh"); require_once("Obj/dbase_pgsql.phh"); @@ -43,7 +43,7 @@ class ImpPoints var $nplayers; var $logins; var $pts; - + function ImpPoints($s) { $arr = explode('|', $s); @@ -52,7 +52,7 @@ class ImpPoints return FALSE; } - + $this->time = $arr[0]; $this->usess = $arr[1]; $this->isauth = $arr[2]; @@ -62,7 +62,7 @@ class ImpPoints $this->ttok = $arr[6]; $this->tidx = $arr[7]; $this->nplayers = $arr[8]; - + $this->logins = array(); $this->pts = array(); @@ -80,7 +80,7 @@ function main() { GLOBAL $cont, $G_dbpfx, $G_alarm_passwd, $F_pass_private, $F_ACT, $F_filename; - + if (FALSE && $F_pass_private != $G_alarm_passwd) { $cont .= sprintf("Wrong password, operation aborted.
\n"); return; @@ -89,10 +89,10 @@ function main() if ($F_ACT == "append") { do { /* - if ($F_pass_private != $G_alarm_passwd) { - $cont .= sprintf("Wrong password, operation aborted.
\n"); - break; - }*/ + if ($F_pass_private != $G_alarm_passwd) { + $cont .= sprintf("Wrong password, operation aborted.
\n"); + break; + }*/ $cont .= sprintf("FILENAME: %s
\n", $F_filename); if (($olddb = new LoginDBOld($F_filename)) == FALSE) { $cont .= sprintf("Loading failed.
\n"); @@ -118,7 +118,7 @@ function main() } $cont .= sprintf("FILENAME: %s
\n", $F_filename); - + if (!($fp = @fopen($F_filename, "r"))) { $cont .= sprintf("Open file [%s] failed.
\n", $F_filename); break; @@ -146,7 +146,7 @@ function main() // else { // $cont .= sprintf("ttok: %s
\n", $pts->ttok); // } - + /* * matches management */ @@ -161,7 +161,7 @@ function main() eschtml($bf), eschtml($mtc_sql)); break; } - + } $mtc_obj = pg_fetch_object($mtc_pg,0); // $cont .= sprintf("MTC: %s
\n", esclfhtml(print_r($mtc_obj, TRUE))); @@ -201,7 +201,7 @@ function main() continue; } $usr_obj = pg_fetch_object($usr_pg,0); - + /* put points */ $pts_sql = sprintf("INSERT INTO %sbin5_points (gcode, ucode, pts) VALUES (%d, %d, %d) RETURNING *;", @@ -212,9 +212,9 @@ function main() eschtml($bf), eschtml($gam_sql), $i); break; } - + } - + } fclose($fp); } while (0); @@ -229,7 +229,6 @@ function save_rej($s) fwrite($fp, sprintf("%s\n", $s)); fclose($fp); - } main(); @@ -242,7 +241,7 @@ main(); Append users from a file
diff --git a/web/brisk-fb-whois.php b/web/brisk-fb-whois.php index 9f6277a..70cc3c4 100644 --- a/web/brisk-fb-whois.php +++ b/web/brisk-fb-whois.php @@ -14,7 +14,7 @@ function retrieve_login($userid) $cache_file = '/var/www/webspace/brisk-priv/brisk-fb-whois.cache'; // $cache_file = '/tmp/brisk-fb-whois.cache'; $cache_max_age = 3600; - + $page_name = 'http://www.alternativeoutput.it/briskblog/doku.php?id=utenti:social&do=edit'; $userid_pfx = 'https://www.facebook.com/'; diff --git a/web/donometer.php b/web/donometer.php index 155e198..76e5091 100644 --- a/web/donometer.php +++ b/web/donometer.php @@ -2,7 +2,7 @@ /* * brisk - donometer.php * - * Copyright (C) 2006-2012 Matteo Nastasi + * Copyright (C) 2006-2015 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it diff --git a/web/error.php b/web/error.php index 3e5625f..79ed872 100644 --- a/web/error.php +++ b/web/error.php @@ -2,7 +2,7 @@ /* * brisk - error.php * - * Copyright (C) 2014 Matteo Nastasi + * Copyright (C) 2014-2015 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -65,14 +65,14 @@ $redir_meta = sprintf('', $re '; - printf($brisk_header_form); +printf($brisk_header_form); ?>
-
- - +
+
diff --git a/web/index.php b/web/index.php index 52d878f..9486808 100644 --- a/web/index.php +++ b/web/index.php @@ -2,7 +2,7 @@ /* * brisk - index.php * - * Copyright (C) 2006-2012 Matteo Nastasi + * Copyright (C) 2006-2015 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -222,15 +222,14 @@ $mlang_room = array( 'userpasserr' => array('it' => 'Utente e/o password errati 'en' => 'Close.') ); - - require_once("briskin5/Obj/briskin5.phh"); -function poll_dom() { - GLOBAL $G_with_poll, $G_poll_title, $G_poll_entries; +function poll_dom() +{ + GLOBAL $G_with_poll, $G_poll_title, $G_poll_entries; - if ($G_with_poll) { - $ret = sprintf('
+ if ($G_with_poll) { + $ret = sprintf('
@@ -238,16 +237,16 @@ function poll_dom() { %s

', $G_poll_title); - for ($i = 0 ; $i < count($G_poll_entries) ; $i++) { - $ret .= sprintf('%s

', $G_poll_entries[$i]['id'], - $G_poll_entries[$i]['cont']); - } - $ret .= sprintf('
+ for ($i = 0 ; $i < count($G_poll_entries) ; $i++) { + $ret .= sprintf('%s

', $G_poll_entries[$i]['id'], + $G_poll_entries[$i]['cont']); + } + $ret .= sprintf('
'); - return ($ret); - } - else - return ''; + return ($ret); + } + else + return ''; } function sidebanners_init($sidebanner_idx) @@ -337,257 +336,243 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f return FALSE; } - $is_login = FALSE; - $body = ""; - $tables = ""; - $standup = ""; - $ACTION = "login"; - $last_msg = ""; - - if (isset($BRISK_SHOWHTML) == FALSE) { - $is_table = FALSE; - log_main("lock Brisk"); - $curtime = time(); - - /* Actions */ - if (($ghost_sess = $brisk->ghost_sess->pop($sess)) != FALSE) { - switch ($ghost_sess->reas) { - case GHOST_SESS_REAS_LOUT: - $last_msg = $mlang_room['reas_lout'][$G_lang]; - break; - case GHOST_SESS_REAS_ANOT: - $last_msg = $mlang_room['reas_anot'][$G_lang]; - break; - case GHOST_SESS_REAS_TOUT: - $last_msg = $mlang_room['reas_tout'][$G_lang]; - break; - case GHOST_SESS_REAS_TTOT: - $last_msg = $mlang_room['reas_ttot'][$G_lang]; - break; - case GHOST_SESS_REAS_ANON: - $last_msg = $mlang_room['reas_anon'][$G_lang]; - break; - default: - $last_msg = $mlang_room['reas_unkn'][$G_lang]; - break; - } - } - if (validate_sess($sess)) { - log_main("pre garbage_manager UNO"); - $brisk->garbage_manager(TRUE); - log_main("post garbage_manager"); - if (($user = &$brisk->get_user($sess, &$idx)) != FALSE) { - if ($user->the_end == FALSE) { - $brisk->sess_cur_set($user->sess); - log_main("user stat: ".$user->stat); - if ($user->stat == "table") { - $cookies = new Cookies(); - $cookies->add("table_token", $user->table_token, $curtime + 31536000); - $cookies->add("table_idx", $user->table, $curtime + 31536000); - $header_out['cookies'] = $cookies; - $header_out['Location'] = "briskin5/index.php"; - return TRUE; - } - $ACTION = "room"; - } - } - } - - $banned = FALSE; - if ($ACTION == "login" && isset($name)) { - log_main("pre garbage_manager DUE"); - - if (isset($pass_private) == FALSE || $pass_private == "") { - $pass_private = FALSE; - - if ($brisk->ban_check($remote_addr)) { - // TODO: find a way to add a nonblocking sleep(5) here - $banned = TRUE; - $idx = -1; - } - } - - $brisk->garbage_manager(TRUE); - /* try login */ - - if ($banned == FALSE && - ($user = $brisk->add_user(&$sess, &$idx, $name, $pass_private, $remote_addr, $header, $cookie)) != FALSE) { - $brisk->sess_cur_set($user->sess); - $ACTION = "room"; - if ($idx < 0) { - $idx = -$idx - 1; - $is_login = TRUE; - } - - log_legal($curtime, $remote_addr, $user, "STAT:LOGIN", ''); - - // recovery lost game - if ($user->stat == "table") { - $cookies = new Cookies(); - $cookies->add("table_token", $user->table_token, $curtime + 31536000); - $cookies->add("table_idx", $user->table, $curtime + 31536000); - $header_out['cookies'] = $cookies; - $header_out['Location'] = "briskin5/index.php"; - return TRUE; - } - } - else { - /* Login Rendering */ - /* MLANG: "Utente e/o password errati.", "Il nickname deve contenere almeno una lettera o una cifra.", "Spiacenti, non ci sono più posti liberi. Riprova più tardi.", "Il tuo nickname è già in uso." */ - /* - if ($idx == -3) - $body .= '
'.$mlang_room['userpasserr'][$G_lang].'
'; - else if ($idx == -2) - // $body .= '
Il nickname deve contenere almeno una lettera o una cifra.
'; - $body .= '
'.$mlang_room['userpassmust'][$G_lang].'
'; - else if ($idx == -1) - // $body .= '
Spiacenti, non ci sono più posti liberi. Riprova più tardi.
'; - $body .= '
'.$mlang_room['userpassend'][$G_lang].'
'; - else - // $body .= '
Il tuo nickname è già in uso.
'; - $body .= '
'.$mlang_room['userpassuse'][$G_lang].'
'; - */ - - if ($idx == -3) - $sfx = 'err'; - else if ($idx == -2) - $sfx = 'must'; - else if ($idx == -1) - $sfx = 'end'; - else - $sfx = 'use'; - - $body .= '
'.$mlang_room['userpass'.$sfx][$G_lang].'
'; - } - } - } - /* Rendering. */ - - if ($BRISK_SHOWHTML == "debugtable") { - $ACTION = "room"; - } - else if ($BRISK_SHOWHTML == "debuglogin") { - $ACTION = "login"; - } - - if ($ACTION == "room") { - $tables .= '
'; - $tables .= ''; - for ($ii = 0 ; $ii < TABLES_N ; $ii++) { - if ($user->is_auth()) - $i = $ii; - else - $i = TABLES_N - $ii - 1; - - if ($ii % 4 == 0) { - $tables .= ''; - } - if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $ii < TABLES_AUTH_N) { - $tables .= ''."\n"; - } - if ($ii % 4 == 3) { - $tables .= ''; - } - } - $tables .= '
'; - - $tables .= '
'.$mlang_room['tit_tabl'][$G_lang].$i.'
'; - $tables .= sprintf('
', $i); - $tables .= sprintf('
', $i); - $tables .= '
'; - $tables .= '
'; - - $standup .= '
'; - $standup .= '
'; - /* MLANG: "Giocatori in piedi" */ - // $standup .= '
Giocatori in piedi - Come ottenere user e password -
'; - $standup .= '
'.$mlang_room['standing'][$G_lang].'
'; - - $standup .= sprintf('
'); - // MLANG Esco. - $standup .= '
'; - $standup .= '
'; - } - - $altout_sponsor_arr = array( array ( 'id' => 'btn_altout', - 'url' => 'http://www.alternativeoutput.it', - 'content' => 'img/altout80x15.png', - 'content_big' => 'img/logotxt_banner.png'), - array ( 'id' => 'btn_virtualsky', - 'url' => 'http://virtualsky.alternativeoutput.it', - 'content' => 'img/virtualsky80x15a.gif', - 'content_big' => 'img/virtualsky_big.png'), - array ( 'id' => 'btn_dynamica', - 'url' => 'http://www.dynamica.it', - 'content' => 'img/dynamica.png', - 'content_big' => 'img/dynamica_big.png') - ); - - $altout_support_arr = array( array ( 'id' => 'btn_brichi', - 'url' => 'http://www.briscolachiamata.it', - 'content' => 'img/brichi.png', - 'content_big' => 'img/brichi_big.png'), - array ( 'id' => 'btn_foroli', - 'url' => 'http://www.forumolimpia.it', - 'content' => 'img/forumolimpia.gif', - 'content_big' => 'img/forumolimpia_big.png' ), - array ( 'id'=> 'btn_niini', - 'url' => 'http://www.niinivirta.it', - 'content' => 'img/niinivirta.png', - 'content_big' => 'img/niinivirta_big.png') ); - - - - $altout_support = ""; - $altout_support_big = ""; - for ($i = 0 ; $i < 4 ; $i++) { - $ii = ($i < 3 ? $i : 0); - - $altout_support .= sprintf('
', - $i * 20, $altout_support_arr[$ii]['url'], - $altout_support_arr[$ii]['id'], $altout_support_arr[$ii]['content']); - - $altout_support_big .= sprintf('', - $altout_support_arr[$ii]['id'], $altout_support_arr[$ii]['content_big']); - } - - - // seed with microseconds since last "whole" second - // srand ((double) microtime() * 1000000); - // $randval = rand(0,count($altout_sponsor_arr)-1); - $altout_sponsor = ""; - $altout_sponsor_big = ""; - for ($i = 0 ; $i < 4 ; $i++) { - $ii = ($i < 3 ? $i : 0); - - $altout_sponsor .= sprintf('
', - $i * 20, $altout_sponsor_arr[$ii]['url'], - $altout_sponsor_arr[$ii]['id'], $altout_sponsor_arr[$ii]['content']); - - $altout_sponsor_big .= sprintf('', - $altout_sponsor_arr[$ii]['id'], $altout_sponsor_arr[$ii]['content_big']); - } - - - - /* NOTE: Brisk donate or donate fake if local */ - if (!$G_is_local) - $brisk_donate = file_get_contents(FTOK_PATH."/brisk_donate.txt"); - else - $brisk_donate = '
BRISK_DONATE
'; - - if ($brisk_donate == FALSE) - $brisk_donate = ""; - - - /* MLANG: "briscola chiamata in salsa ajax", */ - - mt_srand(make_seed()); - if (!$G_is_local) { - $rn = rand(0, 1); - - if ($rn == 0) { - $banner_top_left = ' -'; - $banner_top_right = carousel_top(); - } - else { - $banner_top_left = carousel_top(); - $banner_top_right = ' -'; - } - } - else { // !$G_is_local - $banner_top_left = carousel_top(); - $banner_top_right = carousel_top(); - } - - $brisk_header_form = '
+'; + } + } + else { // !$G_is_local + $banner_top_left = carousel_top(); + $banner_top_right = carousel_top(); + } + + $brisk_header_form = '
'; -/* MLANG: ALL THE VERTICAL MENU */ - $brisk_vertical_menu = ' + /* MLANG: ALL THE VERTICAL MENU */ + $brisk_vertical_menu = '
@@ -661,42 +642,42 @@ google_color_url = "000000"; '.$mlang_room['itm_help'][$G_lang].'
-homepage
-'.$mlang_room['itm_what'][$G_lang].'
-'.$mlang_room['itm_rules'][$G_lang].'
-screenshoots
-'.$mlang_room['itm_comp'][$G_lang].'
-'.$mlang_room['itm_src'][$G_lang].'
-'.$mlang_room['itm_ml'][$G_lang].'
-'.$mlang_room['itm_pro'][$G_lang].'
about
-'.$mlang_room['itm_mail'][$G_lang].'
@@ -719,7 +700,7 @@ google_color_url = "000000"; onmouseover="menu_hide(0,1);" title="'.$mlang_room['tit_rmap'][$G_lang].'" onclick="act_roadmap();">'.$mlang_room['itm_rmap'][$G_lang].'
-'.$mlang_room['itm_meet'][$G_lang].'
-ticker  
' // MLANG garantisci .$mlang_room['itm_warr'][$G_lang]. @@ -904,7 +885,7 @@ google_color_url = "000000"; ' // MLANG garantisci .$mlang_room['tit_splash'][$G_lang]. @@ -942,7 +923,7 @@ sponsored by:
supported by:
-
'.$altout_support.'
+
'.$altout_support.'
@@ -959,17 +940,17 @@ supported by:
%s %s
'; - - /* Templates. */ - if ($ACTION == 'login') { - $header_out['Content-type'] = "text/html; charset=\"utf-8\""; + + /* Templates. */ + if ($ACTION == 'login') { + $header_out['Content-type'] = "text/html; charset=\"utf-8\""; ?> Brisk - + @@ -984,131 +965,131 @@ supported by:
- + g_withflash = DetectFlashVer(6,0,0); + if (g_withflash == false) { + $("proflash").innerHTML = 'Audio con Flash.
'; + } + else + $("proflashext").innerHTML = ""; + $("nameid").focus(); +} +//--> +
- -\n"); - printf($brisk_vertical_menu, '', ''); + } + printf($brisk_header_form); + printf("
\n"); + printf($brisk_vertical_menu, '', ''); - sidebanners_render($G_sidebanner, $G_sidebanner_idx); - printf(""); -?> + sidebanners_render($G_sidebanner, $G_sidebanner_idx); + printf(""); +?> -
-
-
-
-
+ echo "$body"; +?> +
+
+
+
+
-

-
- - - - - - - - -

-

+

+
+ + + + + + + + +

+


-
-



-



-



-



-



- -
-
-
-
-
-
-
-
-
-
+
+



+



+



+



+



+ +
+
+
+
+
+
+
+    
+
+
+ } + else if ($ACTION == 'room') { + $header_out['Content-type'] = "text/html; charset=\"utf-8\""; +?> Brisk @@ -1128,7 +1109,7 @@ echo "$body"; ?> - +//--> + -
\n"); - printf($brisk_vertical_menu, '', $brisk_donate); + } + printf($brisk_header_form); + printf("
\n"); + printf($brisk_vertical_menu, '', $brisk_donate); - sidebanners_render($G_sidebanner, $G_sidebanner_idx); + sidebanners_render($G_sidebanner, $G_sidebanner_idx); - printf(""); + printf(""); ?> sess"; ?>">
- +
- +
-
+
Chat
@@ -1266,7 +1243,7 @@ if ($is_login) {
- +

@@ -1284,7 +1261,7 @@ if ($is_login) { type="submit" onclick="this.form.elements['realsub'].value = 'invia';" class="button">      " +"" type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chiudi';">
@@ -1350,7 +1327,7 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
is_supp_custom()) { + if ($user->is_supp_custom()) { ?> @@ -1402,8 +1379,8 @@ if ($user->is_supp_custom()) { @@ -1413,18 +1390,16 @@ else {


- +
- -
- +
@@ -1432,7 +1407,6 @@ else {