projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Content-type sanification
[brisk.git]
/
web
/
briskin5
/
index_rd.php
diff --git
a/web/briskin5/index_rd.php
b/web/briskin5/index_rd.php
index
43e2a0d
..
177eff9
100644
(file)
--- a/
web/briskin5/index_rd.php
+++ b/
web/briskin5/index_rd.php
@@
-2,7
+2,10
@@
/*
* brisk - index_rd.php
*
/*
* brisk - index_rd.php
*
- * Copyright (C) 2006-2007 matteo.nastasi@milug.org
+ * Copyright (C) 2006-2008 Matteo Nastasi
+ * mailto: nastasi@alternativeoutput.it
+ * matteo.nastasi@milug.org
+ * web: http://www.alternativeoutput.it
*
* 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
*
* 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
@@
-22,8
+25,15
@@
*/
require_once("../Obj/brisk.phh");
*/
require_once("../Obj/brisk.phh");
+// require_once("../Obj/proxyscan.phh");
require_once("Obj/briskin5.phh");
require_once("Obj/briskin5.phh");
+// Use of proxies isn't allowed.
+// if (is_proxy()) {
+// sleep(5);
+// exit;
+// }
+
log_load("LOAD: bin5/index_rd.php ".$QUERY_STRING);
$first_loop = TRUE;
log_load("LOAD: bin5/index_rd.php ".$QUERY_STRING);
$first_loop = TRUE;
@@
-99,7
+109,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$first_loop = FALSE;
}
$first_loop = FALSE;
}
- log_
only
("U");
+ log_
lock
("U");
Briskin5::unlock_data($sem);
ignore_user_abort(FALSE);
}
Briskin5::unlock_data($sem);
ignore_user_abort(FALSE);
}
@@
-111,7
+121,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
// log_rd2("Postget".$proxy_step."zizi");
if ($cur_step == $proxy_step) {
// log_rd2("Postget".$proxy_step."zizi");
if ($cur_step == $proxy_step) {
- log_
only2
("P");
+ log_
lock
("P");
return (FALSE);
}
else {
return (FALSE);
}
else {
@@
-128,7
+138,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if (($sem = Briskin5::lock_data($table_idx)) == FALSE)
break;
if (($sem = Briskin5::lock_data($table_idx)) == FALSE)
break;
- log_
only
("P");
+ log_
lock
("P");
if (($bri = &Briskin5::load_data($table_idx, $table_token)) == FALSE)
break;
} while (0);
if (($bri = &Briskin5::load_data($table_idx, $table_token)) == FALSE)
break;
} while (0);
@@
-177,6
+187,12
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
}
else {
log_rd2("TRANS NON ATTIVATO");
}
else {
log_rd2("TRANS NON ATTIVATO");
+
+// ARRAY_POP DISABLED
+// while (array_pop($user->comm) != NULL);
+// // $user->step_inc(COMM_N + 1);
+// Briskin5::save_data($bri);
+
Briskin5::unlock_data($sem);
ignore_user_abort(FALSE);
}
Briskin5::unlock_data($sem);
ignore_user_abort(FALSE);
}
@@
-204,7
+220,11
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
else {
ignore_user_abort(TRUE);
$sem = Briskin5::lock_data($table_idx);
else {
ignore_user_abort(TRUE);
$sem = Briskin5::lock_data($table_idx);
- $bri = &Briskin5::load_data($table_idx, $table_token);
+ if (($bri = &Briskin5::load_data($table_idx, $table_token)) == FALSE) {
+ Briskin5::unlock_data($sem);
+ ignore_user_abort(FALSE);
+ return (unrecerror());
+ }
if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
Briskin5::unlock_data($sem);
ignore_user_abort(FALSE);
if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
Briskin5::unlock_data($sem);
ignore_user_abort(FALSE);
@@
-279,6
+299,8
@@
$is_page_streaming = ((stristr($HTTP_USER_AGENT, "linux") &&
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
+// header('Content-type: application/xml; charset="utf-8"',true);
+header('Content-type: text/plain; charset="utf-8"',true);
if (!isset($myfrom))
$myfrom = "";
if (!isset($myfrom))
$myfrom = "";