Minor corrections to the last adjustments

Author: DanProgs

lib/api/xmlrpc/v1/xmlrpc.class.php

@@ -23,8 +23,6 @@
 /**
  * IXR is the class used for the XML-RPC server
  */
-use const Collator\OFF;
-
 define("TL_APICALL", 'XML-RPC');
 
 require_once '../../../../config.inc.php';
@@ -50,8 +48,6 @@
 class TestlinkXMLRPCServer extends IXR_Server
 {
 
-    public $methods;
-
     public static $version = "1.1";
 
     const OFF = false;
@@ -577,8 +573,8 @@ protected function userHasRight($rightToCheck,
         $tprojectid = intval(
             isset($context[self::$testProjectIDParamName]) ? $context[self::$testProjectIDParamName] : 0);
 
-        if ($tprojectid == 0 && isset(
-            $this->args[self::$testProjectIDParamName])) {
+        if ($tprojectid == 0 &&
+            isset($this->args[self::$testProjectIDParamName])) {
             $tprojectid = $this->args[self::$testProjectIDParamName];
         }
 
@@ -606,8 +602,8 @@ protected function userHasRight($rightToCheck,
             // Try using TestSuiteID to get TestProjectID
             $tsuiteid = intval(
                 isset($context[self::$testSuiteIDParamName]) ? $context[self::$testSuiteIDParamName] : 0);
-            if ($tsuiteid == 0 && isset(
-                $this->args[self::$testSuiteIDParamName])) {
+            if ($tsuiteid == 0 &&
+                isset($this->args[self::$testSuiteIDParamName])) {
                 $tsuiteid = intval($this->args[self::$testSuiteIDParamName]);
             }
             if ($tsuiteid > 0) {
@@ -1541,7 +1537,12 @@ protected function _isDevKeyValid($devKey)
         $this->devKey = $this->dbObj->prepare_string($devKey);
         $query = "SELECT id FROM {$this->tables['users']} WHERE script_key='{$this->devKey}'";
         $this->userID = $this->dbObj->fetchFirstRowSingleColumn($query, "id");
-        return null == $this->userID;
+
+        if (null == $this->userID) {
+            return false;
+        } else {
+            return true;
+        }
     }
 
     /**
@@ -4652,8 +4653,8 @@ public function getTestCaseAttachments($args)
             return $this->errors;
         }
 
-        if ($status_ok && ! $this->_isParamPresent(
-            self::$versionNumberParamName)) {
+        if ($status_ok &&
+            ! $this->_isParamPresent(self::$versionNumberParamName)) {
             try {
                 $tc = $this->getTestCase($args, self::THROW_ON_ERROR);
                 $this->args[self::$versionNumberParamName] = $tc[0][self::$versionNumberParamName];
@@ -7210,8 +7211,8 @@ public function setTestCaseExecutionType($args)
             'checkTestCaseVersionNumber'
         ];
         $status_ok = $this->_runChecks($checkFunctions, $msg_prefix);
-        if ($status_ok &&
-            ! $this->_isParamPresent(self::$executionTypeParamName)) {
+        if ($status_ok && ! $this->_isParamPresent(
+            self::$executionTypeParamName)) {
             $status_ok = false;
             $msg = sprintf(MISSING_REQUIRED_PARAMETER_STR,
                 self::$customFieldsParamName);
@@ -8154,8 +8155,8 @@ public function getTestCaseBugs($args)
                     " WHERE parent_id = {$this->args[self::$testCaseIDParamName]})";
 
                 if (! is_null($execContext['build_id'])) {
-                    $sql .= " AND build_id = " . intval(
-                        $execContext['build_id']);
+                    $sql .= " AND build_id = " .
+                        intval($execContext['build_id']);
                 }
 
                 if (! is_null($execContext['platform_id'])) {

lib/api/xmlrpc/v1/xmlrpc.php

@@ -12,5 +12,5 @@
  *
  *
  */
-require_once "xmlrpc.class.php";
+require_once 'xmlrpc.class.php';
 $XMLRPCServer = new TestlinkXMLRPCServer();