Changeset 189 for trunk/lib/ACL.inc.php

Timestamp:

Jul 1, 2006 12:25:24 AM (18 years ago)

Author:

scdev

Message:

Q - Added reset_password service. Fixed some bugs. Change the interface of humanTime() (it was called timeElapsed).

File:

• trunk/lib/ACL.inc.php (modified) (4 diffs)

trunk/lib/ACL.inc.php

@@ -398 +398 @@
         }
         
-        // If $parent is null, use root object.
-        if (is_null($parent)) {
-            $parent = 'root';
+        // If $new_parent is null, use root object.
+        if (is_null($new_parent)) {
+            $new_parent = 'root';
         }
         
         // Ensure node and parent name aren't empty.
-        if ('' == trim($name) || '' == trim($parent)) {
-            $app->logMsg(sprintf('Cannot add node, parent (%s) or name (%s) missing.', $name, $parent), LOG_WARNING, __FILE__, __LINE__);
+        if ('' == trim($name) || '' == trim($new_parent)) {
+            $app->logMsg(sprintf('Cannot add node, parent (%s) or name (%s) missing.', $name, $new_parent), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -412 +412 @@
         $qid = $db->query("SELECT lft, rgt FROM $tbl WHERE name = '" . $db->escapeString($name) . "'");
         if (!list($lft, $rgt) = mysql_fetch_row($qid)) {
-            $app->logMsg(sprintf('Cannot delete nonexistant %s name: %s', $type, $name), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot move nonexistant %s name: %s', $type, $name), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -448 +448 @@
         $db->query("UPDATE $tbl SET lft = lft - $total_transversal_value WHERE lft > $rgt");
         $db->query("UPDATE $tbl SET rgt = rgt - $total_transversal_value WHERE rgt > $rgt");
+
         // Apply transformation to new parent rgt also.
         $new_parent_rgt = $new_parent_rgt > $rgt ? $new_parent_rgt - $total_transversal_value : $new_parent_rgt;
@@ -463 +464 @@
         $db->query("UPDATE $tbl SET rgt = rgt + $total_transversal_value WHERE rgt >= $new_parent_rgt AND $primary_key NOT IN ('" . join("','", $ids) . "')");
 
-        die;
         $app->logMsg(sprintf('Moved %s node %s to new parent %s.', $type, $name, $new_parent), LOG_DEBUG, __FILE__, __LINE__);
         return true;