projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reference operator removed because class are passed by reference as default in php5
[brisk.git]
/
web
/
index_rd.php
diff --git
a/web/index_rd.php
b/web/index_rd.php
index
80c41d1
..
9b82158
100644
(file)
--- a/
web/index_rd.php
+++ b/
web/index_rd.php
@@
-22,6
+22,8
@@
*
*/
*
*/
+$G_base = "";
+
require_once("Obj/brisk.phh");
// require_once("Obj/proxyscan.phh");
require_once("briskin5/Obj/briskin5.phh");
require_once("Obj/brisk.phh");
// require_once("Obj/proxyscan.phh");
require_once("briskin5/Obj/briskin5.phh");
@@
-133,7
+135,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if (($proxy_step = step_get($sess)) != FALSE) {
// log_rd2("Postget".$proxy_step."zizi");
if (($proxy_step = step_get($sess)) != FALSE) {
// log_rd2("Postget".$proxy_step."zizi");
- if ($cur_step == $proxy_step) {
+ if ($cur_step == $proxy_step
['s']
) {
log_lock("P");
return (FALSE);
}
log_lock("P");
return (FALSE);
}
@@
-294,7
+296,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if ($user->subst == 'sitdown') {
log_load("ROOM WAKEUP");
if ($user->subst == 'sitdown') {
log_load("ROOM WAKEUP");
- $room->room_wakeup(
&
$user);
+ $room->room_wakeup($user);
}
else if ($user->subst == 'standup')
$room->room_outstandup(&$user);
}
else if ($user->subst == 'standup')
$room->room_outstandup(&$user);