Merge remote-tracking branch 'origin/master'

Author: arnebratt

filters/fetchnodelist.php

@@ -37,8 +37,8 @@ function setParameters( $parm_array )
 
         // Store values of optional parameters
         $this->limit = isset( $parm_array[ 'limit' ] ) ? intval( $parm_array[ 'limit' ] ) : -1;
-        $this->offset = intval( $parm_array[ 'offset' ] );
-        $this->depth = intval( $parm_array[ 'depth' ] );
+        $this->offset = isset( $parm_array[ 'offset' ] ) ? intval( $parm_array[ 'offset' ] ) : 0;
+        $this->depth = isset( $parm_array[ 'depth' ] ) ? intval( $parm_array[ 'depth' ] ) : 1;
         if ( $this->depth == 0 )
             $this->depth = 1;
         $this->ignore_visibility = isset( $parm_array[ 'ignore_visibility' ] ) ? true : false;

operations/nodealwaysavailable.php

@@ -14,11 +14,25 @@ function getHelpText()
 
     function setParameters( $parm_array )
     {
-        $this->available = ( $parm_array[ 'available' ] == 'true' ) ? 1 : -1;
-        if ( $parm_array[ 'available' ] == 'false' )
-            $this->available = 0;
-        if ( $this->available == -1 )
-            return 'Missing or illegal availability value';
+        if( !isset( $parm_array[ 'available' ] ) )
+        {
+            return 'Missing availability value';
+        }
+
+        switch( $parm_array[ 'available' ] )
+        {
+            case 'true':
+                $this->available = 1;
+                break;
+
+            case 'false':
+                $this->available = 0;
+                break;
+
+            default:
+                return 'Illegal availability value';
+        }
+
         return true;
     }