From: <za...@us...> - 2003-08-07 22:16:53
|
Update of /cvsroot/tikiwiki/tiki/lib/usermodules In directory sc8-pr-cvs1:/tmp/cvs-serv19359 Modified Files: usermoduleslib.php Log Message: Remove debug code Index: usermoduleslib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/usermodules/usermoduleslib.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- usermoduleslib.php 7 Aug 2003 20:54:18 -0000 1.8 +++ usermoduleslib.php 7 Aug 2003 22:16:48 -0000 1.9 @@ -6,8 +6,6 @@ * */ -include_once ('lib/debug/debugger.php'); - class UserModulesLib extends TikiLib { function UserModulesLib($db) { # this is probably uneeded now @@ -225,39 +223,35 @@ return $ret; } - /// Swap current module and above one + /// Swap current module and above one function swap_up_user_module($name, $user) - { - $this->swap_adjacent($name, $user, '<'); + { + $this->swap_adjacent($name, $user, '<'); } - /// Swap current module and below one + /// Swap current module and below one function swap_down_user_module($name, $user) - { - $this->swap_adjacent($name, $user, '>'); - } - /// Function to swap (up/down) two adjacent modules - function swap_adjacent($name, $user, $op) - { - global $debugger; - // - $query = "select ord, position from tiki_user_assigned_modules where name='$name' and user='$user'"; - $r = $this->query($query); - $cur = $r->fetchRow(); - // - $query = "select name, ord from tiki_user_assigned_modules where position='".$cur['position']."' and ord".$op."'".$cur['ord']."' and user='$user' order by ord desc"; - $r = $this->query($query); - $swap = $r->fetchRow(); - if (!empty($swap)) { - $debugger->msg(print_r($swap, true)); - $query = "update tiki_user_assigned_modules set ord=".$swap['ord']." where name='$name' and user='$user'"; - $r = $this->query($query); - $query = "update tiki_user_assigned_modules set ord=".$cur['ord']." where name='".$swap['name']."' and user='$user'"; - $r = $this->query($query); + $this->swap_adjacent($name, $user, '>'); + } + /// Function to swap (up/down) two adjacent modules + function swap_adjacent($name, $user, $op) + { + $query = "select ord, position from tiki_user_assigned_modules where name='$name' and user='$user'"; + $r = $this->query($query); + $cur = $r->fetchRow(); + // + $query = "select name, ord from tiki_user_assigned_modules where position='".$cur['position']."' and ord".$op."'".$cur['ord']."' and user='$user' order by ord desc"; + $r = $this->query($query); + $swap = $r->fetchRow(); + if (!empty($swap)) + { + // Swap 2 adjacent modules + $query = "update tiki_user_assigned_modules set ord=".$swap['ord']." where name='$name' and user='$user'"; + $r = $this->query($query); + $query = "update tiki_user_assigned_modules set ord=".$cur['ord']." where name='".$swap['name']."' and user='$user'"; + $r = $this->query($query); + } } - else - $debugger->msg('$swap is not set -- cant up more...'); - } } $usermoduleslib = new UserModulesLib($dbTiki); |