@@ -141,6 +141,9 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | |
| 144 | +/** |
|
| 145 | + * @param string $setting |
|
| 146 | + */ |
|
| 144 | 147 | function getSettingValue($setting) { |
| 145 | 148 | |
| 146 | 149 | // get default language |
@@ -1999,6 +2002,9 @@ discard block |
||
| 1999 | 2002 | } |
| 2000 | 2003 | } |
| 2001 | 2004 | |
| 2005 | +/** |
|
| 2006 | + * @param string $type |
|
| 2007 | + */ |
|
| 2002 | 2008 | function rest_error ($type,$detail = 'N/A') { |
| 2003 | 2009 | switch ($type) { |
| 2004 | 2010 | case 'APIKEY': |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | 'renewal_period' => $params[3], |
| 973 | 973 | 'bloquer_creation' => '0', |
| 974 | 974 | 'bloquer_modification' => '0' |
| 975 | - ) |
|
| 975 | + ) |
|
| 976 | 976 | ); |
| 977 | 977 | $newId = DB::insertId(); |
| 978 | 978 | |
@@ -1790,7 +1790,7 @@ discard block |
||
| 1790 | 1790 | 'intitule' => "f".$array_category[$i], |
| 1791 | 1791 | 'valeur' => $folder->id.', '.$folder->parent_id.', '. |
| 1792 | 1792 | $folder->title.', '.$folder->nleft.', '.$folder->nright.', '. $folder->nlevel.', 0, 0, 0, 0' |
| 1793 | - ) |
|
| 1793 | + ) |
|
| 1794 | 1794 | ); |
| 1795 | 1795 | //delete folder |
| 1796 | 1796 | DB::delete(prefix_table("nested_tree"), "id = %i", $folder->id); |
@@ -40,6 +40,10 @@ |
||
| 40 | 40 | return $response['flickerCode']; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | + /** |
|
| 44 | + * @param string $response |
|
| 45 | + * @param string $hedgeId |
|
| 46 | + */ |
|
| 43 | 47 | function verifyResponse($apn, $response, $hedgeId) { |
| 44 | 48 | |
| 45 | 49 | $serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response; |
@@ -1,54 +1,54 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | class AXSILPortal_V1_Auth { |
| 3 | - var $server; |
|
| 3 | + var $server; |
|
| 4 | 4 | |
| 5 | - private $url = ""; |
|
| 6 | - private $AAId = ""; |
|
| 7 | - private $apiKey = ""; |
|
| 5 | + private $url = ""; |
|
| 6 | + private $AAId = ""; |
|
| 7 | + private $apiKey = ""; |
|
| 8 | 8 | |
| 9 | - private $baseUrl = ""; |
|
| 9 | + private $baseUrl = ""; |
|
| 10 | 10 | |
| 11 | - function setUrl($url) { |
|
| 12 | - $this->url = $url; |
|
| 13 | - } |
|
| 11 | + function setUrl($url) { |
|
| 12 | + $this->url = $url; |
|
| 13 | + } |
|
| 14 | 14 | |
| 15 | - function setAAId($AAId) { |
|
| 16 | - $this->AAId = $AAId; |
|
| 17 | - } |
|
| 15 | + function setAAId($AAId) { |
|
| 16 | + $this->AAId = $AAId; |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | - function setApiKey($apiKey) { |
|
| 20 | - $this->apiKey = $apiKey; |
|
| 21 | - } |
|
| 19 | + function setApiKey($apiKey) { |
|
| 20 | + $this->apiKey = $apiKey; |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | 23 | |
| 24 | - // Verify that you can open the URL from the web server. |
|
| 25 | - function create() { |
|
| 26 | - if ($this->url != "" && $this->AAId != "" && $this->apiKey != "") { |
|
| 27 | - $this->baseUrl = $this->url."".$this->apiKey."/".$this->AAId; |
|
| 28 | - } else { |
|
| 29 | - die("Cannot initialize Agses webservice without credentials, please set them in settings"); |
|
| 30 | - } |
|
| 31 | - } |
|
| 24 | + // Verify that you can open the URL from the web server. |
|
| 25 | + function create() { |
|
| 26 | + if ($this->url != "" && $this->AAId != "" && $this->apiKey != "") { |
|
| 27 | + $this->baseUrl = $this->url."".$this->apiKey."/".$this->AAId; |
|
| 28 | + } else { |
|
| 29 | + die("Cannot initialize Agses webservice without credentials, please set them in settings"); |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - function createAuthenticationMessage($apn, $createFlickerCode, $returnPath, $authenticationLevel, $hedgeId) { |
|
| 33 | + function createAuthenticationMessage($apn, $createFlickerCode, $returnPath, $authenticationLevel, $hedgeId) { |
|
| 34 | 34 | |
| 35 | - $serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId; |
|
| 35 | + $serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId; |
|
| 36 | 36 | |
| 37 | - $json = file_get_contents($serviceCall); |
|
| 38 | - $response = json_decode($json,true); |
|
| 37 | + $json = file_get_contents($serviceCall); |
|
| 38 | + $response = json_decode($json,true); |
|
| 39 | 39 | |
| 40 | - return $response['flickerCode']; |
|
| 41 | - } |
|
| 40 | + return $response['flickerCode']; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - function verifyResponse($apn, $response, $hedgeId) { |
|
| 43 | + function verifyResponse($apn, $response, $hedgeId) { |
|
| 44 | 44 | |
| 45 | - $serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response; |
|
| 45 | + $serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response; |
|
| 46 | 46 | |
| 47 | - $json = file_get_contents($serviceCall); |
|
| 48 | - $response = json_decode($json,true); |
|
| 47 | + $json = file_get_contents($serviceCall); |
|
| 48 | + $response = json_decode($json,true); |
|
| 49 | 49 | |
| 50 | - return $response['response']; |
|
| 51 | - } |
|
| 50 | + return $response['response']; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | 53 | } |
| 54 | 54 | ?> |
| 55 | 55 | \ No newline at end of file |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | * Base64 character set "./[A-Z][a-z][0-9]" |
| 83 | 83 | * |
| 84 | 84 | * @param string $src |
| 85 | - * @return string|bool |
|
| 85 | + * @return string|false |
|
| 86 | 86 | * @throws \RangeException |
| 87 | 87 | */ |
| 88 | 88 | public static function decode($src, $strictPadding = false) |
@@ -1458,7 +1458,7 @@ discard block |
||
| 1458 | 1458 | * |
| 1459 | 1459 | * May need to be overwritten by classes extending this one in some cases |
| 1460 | 1460 | * |
| 1461 | - * @return int |
|
| 1461 | + * @return string|null |
|
| 1462 | 1462 | * @access private |
| 1463 | 1463 | */ |
| 1464 | 1464 | function _openssl_translate_mode() |
@@ -2541,7 +2541,7 @@ discard block |
||
| 2541 | 2541 | * |
| 2542 | 2542 | * @see self::_setupInlineCrypt() |
| 2543 | 2543 | * @access private |
| 2544 | - * @param $bytes |
|
| 2544 | + * @param string $bytes |
|
| 2545 | 2545 | * @return string |
| 2546 | 2546 | */ |
| 2547 | 2547 | function _hashInlineCryptFunction($bytes) |
@@ -147,7 +147,7 @@ |
||
| 147 | 147 | * As set by the constructor or by the setHash() method. |
| 148 | 148 | * |
| 149 | 149 | * @access public |
| 150 | - * @return string |
|
| 150 | + * @return integer |
|
| 151 | 151 | */ |
| 152 | 152 | function getHash() |
| 153 | 153 | { |
@@ -336,16 +336,16 @@ |
||
| 336 | 336 | // Extend the sixteen 32-bit words into eighty 32-bit words |
| 337 | 337 | for ($i = 16; $i < 80; $i++) { |
| 338 | 338 | $temp = array( |
| 339 | - $w[$i - 15]->bitwise_rightRotate(1), |
|
| 340 | - $w[$i - 15]->bitwise_rightRotate(8), |
|
| 341 | - $w[$i - 15]->bitwise_rightShift(7) |
|
| 339 | + $w[$i - 15]->bitwise_rightRotate(1), |
|
| 340 | + $w[$i - 15]->bitwise_rightRotate(8), |
|
| 341 | + $w[$i - 15]->bitwise_rightShift(7) |
|
| 342 | 342 | ); |
| 343 | 343 | $s0 = $temp[0]->bitwise_xor($temp[1]); |
| 344 | 344 | $s0 = $s0->bitwise_xor($temp[2]); |
| 345 | 345 | $temp = array( |
| 346 | - $w[$i - 2]->bitwise_rightRotate(19), |
|
| 347 | - $w[$i - 2]->bitwise_rightRotate(61), |
|
| 348 | - $w[$i - 2]->bitwise_rightShift(6) |
|
| 346 | + $w[$i - 2]->bitwise_rightRotate(19), |
|
| 347 | + $w[$i - 2]->bitwise_rightRotate(61), |
|
| 348 | + $w[$i - 2]->bitwise_rightShift(6) |
|
| 349 | 349 | ); |
| 350 | 350 | $s1 = $temp[0]->bitwise_xor($temp[1]); |
| 351 | 351 | $s1 = $s1->bitwise_xor($temp[2]); |
@@ -201,8 +201,8 @@ |
||
| 201 | 201 | * Keys can be between 1 and 256 bytes long. |
| 202 | 202 | * |
| 203 | 203 | * @access public |
| 204 | - * @param int $length |
|
| 205 | 204 | * @throws \LengthException if the key length is invalid |
| 205 | + * @param string $key |
|
| 206 | 206 | */ |
| 207 | 207 | function setKey($key) |
| 208 | 208 | { |
@@ -402,7 +402,6 @@ discard block |
||
| 402 | 402 | * @access public |
| 403 | 403 | * @param int $bits |
| 404 | 404 | * @param int $timeout |
| 405 | - * @param array $p |
|
| 406 | 405 | */ |
| 407 | 406 | static function createKey($bits = 2048, $timeout = false, $partial = array()) |
| 408 | 407 | { |
@@ -608,7 +607,7 @@ discard block |
||
| 608 | 607 | * @see self::load() |
| 609 | 608 | * @param string $fullname |
| 610 | 609 | * @access public |
| 611 | - * @return bool |
|
| 610 | + * @return boolean|null |
|
| 612 | 611 | */ |
| 613 | 612 | static function addFileFormat($fullname) |
| 614 | 613 | { |
@@ -750,7 +749,7 @@ discard block |
||
| 750 | 749 | * |
| 751 | 750 | * @see self::load() |
| 752 | 751 | * @access public |
| 753 | - * @return mixed |
|
| 752 | + * @return false|string |
|
| 754 | 753 | */ |
| 755 | 754 | function getLoadedFormat() |
| 756 | 755 | { |
@@ -971,7 +970,7 @@ discard block |
||
| 971 | 970 | * @access public |
| 972 | 971 | * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned |
| 973 | 972 | * for invalid values. |
| 974 | - * @return mixed |
|
| 973 | + * @return false|string |
|
| 975 | 974 | */ |
| 976 | 975 | function getPublicKeyFingerprint($algorithm = 'md5') |
| 977 | 976 | { |
@@ -1154,7 +1153,6 @@ discard block |
||
| 1154 | 1153 | * of the hash function Hash) and 0. |
| 1155 | 1154 | * |
| 1156 | 1155 | * @access public |
| 1157 | - * @param int $format |
|
| 1158 | 1156 | */ |
| 1159 | 1157 | function setSaltLength($sLen) |
| 1160 | 1158 | { |
@@ -1169,7 +1167,7 @@ discard block |
||
| 1169 | 1167 | * @access private |
| 1170 | 1168 | * @param bool|\phpseclib\Math\BigInteger $x |
| 1171 | 1169 | * @param int $xLen |
| 1172 | - * @return bool|string |
|
| 1170 | + * @return false|string |
|
| 1173 | 1171 | */ |
| 1174 | 1172 | function _i2osp($x, $xLen) |
| 1175 | 1173 | { |
@@ -1405,7 +1403,6 @@ discard block |
||
| 1405 | 1403 | * |
| 1406 | 1404 | * @access private |
| 1407 | 1405 | * @param string $mgfSeed |
| 1408 | - * @param int $mgfLen |
|
| 1409 | 1406 | * @return string |
| 1410 | 1407 | */ |
| 1411 | 1408 | function _mgf1($mgfSeed, $maskLen) |
@@ -1494,7 +1491,7 @@ discard block |
||
| 1494 | 1491 | * @access private |
| 1495 | 1492 | * @param string $c |
| 1496 | 1493 | * @param string $l |
| 1497 | - * @return bool|string |
|
| 1494 | + * @return false|string |
|
| 1498 | 1495 | */ |
| 1499 | 1496 | function _rsaes_oaep_decrypt($c, $l = '') |
| 1500 | 1497 | { |
@@ -1548,7 +1545,7 @@ discard block |
||
| 1548 | 1545 | * |
| 1549 | 1546 | * @access private |
| 1550 | 1547 | * @param string $m |
| 1551 | - * @return bool|string |
|
| 1548 | + * @return false|string |
|
| 1552 | 1549 | * @throws \OutOfBoundsException if strlen($m) > $this->k |
| 1553 | 1550 | */ |
| 1554 | 1551 | function _raw_encrypt($m) |
@@ -1571,7 +1568,7 @@ discard block |
||
| 1571 | 1568 | * @param string $m |
| 1572 | 1569 | * @param bool $pkcs15_compat optional |
| 1573 | 1570 | * @throws \OutOfBoundsException if strlen($m) > $this->k - 11 |
| 1574 | - * @return bool|string |
|
| 1571 | + * @return false|string |
|
| 1575 | 1572 | */ |
| 1576 | 1573 | function _rsaes_pkcs1_v1_5_encrypt($m, $pkcs15_compat = false) |
| 1577 | 1574 | { |
@@ -1629,7 +1626,7 @@ discard block |
||
| 1629 | 1626 | * |
| 1630 | 1627 | * @access private |
| 1631 | 1628 | * @param string $c |
| 1632 | - * @return bool|string |
|
| 1629 | + * @return false|string |
|
| 1633 | 1630 | */ |
| 1634 | 1631 | function _rsaes_pkcs1_v1_5_decrypt($c) |
| 1635 | 1632 | { |
@@ -1711,7 +1708,7 @@ discard block |
||
| 1711 | 1708 | * @param string $m |
| 1712 | 1709 | * @param string $em |
| 1713 | 1710 | * @param int $emBits |
| 1714 | - * @return string |
|
| 1711 | + * @return boolean |
|
| 1715 | 1712 | */ |
| 1716 | 1713 | function _emsa_pss_verify($m, $em, $emBits) |
| 1717 | 1714 | { |
@@ -1756,7 +1753,7 @@ discard block |
||
| 1756 | 1753 | * |
| 1757 | 1754 | * @access private |
| 1758 | 1755 | * @param string $m |
| 1759 | - * @return bool|string |
|
| 1756 | + * @return false|string |
|
| 1760 | 1757 | */ |
| 1761 | 1758 | function _rsassa_pss_sign($m) |
| 1762 | 1759 | { |
@@ -1876,7 +1873,7 @@ discard block |
||
| 1876 | 1873 | * @access private |
| 1877 | 1874 | * @param string $m |
| 1878 | 1875 | * @throws \LengthException if the RSA modulus is too short |
| 1879 | - * @return bool|string |
|
| 1876 | + * @return false|string |
|
| 1880 | 1877 | */ |
| 1881 | 1878 | function _rsassa_pkcs1_v1_5_sign($m) |
| 1882 | 1879 | { |
@@ -2058,7 +2055,7 @@ discard block |
||
| 2058 | 2055 | * @access public |
| 2059 | 2056 | * @param string $plaintext |
| 2060 | 2057 | * @param int $padding optional |
| 2061 | - * @return bool|string |
|
| 2058 | + * @return false|string |
|
| 2062 | 2059 | * @throws \LengthException if the RSA modulus is too short |
| 2063 | 2060 | */ |
| 2064 | 2061 | function encrypt($plaintext, $padding = self::PADDING_OAEP) |
@@ -2080,9 +2077,8 @@ discard block |
||
| 2080 | 2077 | * |
| 2081 | 2078 | * @see self::encrypt() |
| 2082 | 2079 | * @access public |
| 2083 | - * @param string $plaintext |
|
| 2084 | 2080 | * @param int $padding optional |
| 2085 | - * @return bool|string |
|
| 2081 | + * @return false|string |
|
| 2086 | 2082 | */ |
| 2087 | 2083 | function decrypt($ciphertext, $padding = self::PADDING_OAEP) |
| 2088 | 2084 | { |
@@ -2130,7 +2126,7 @@ discard block |
||
| 2130 | 2126 | * @param string $message |
| 2131 | 2127 | * @param string $signature |
| 2132 | 2128 | * @param int $padding optional |
| 2133 | - * @return bool |
|
| 2129 | + * @return boolean|string |
|
| 2134 | 2130 | */ |
| 2135 | 2131 | function verify($message, $signature, $padding = self::PADDING_PSS) |
| 2136 | 2132 | { |
@@ -55,7 +55,6 @@ |
||
| 55 | 55 | * |
| 56 | 56 | * @access public |
| 57 | 57 | * @param string $password |
| 58 | - * @param string $iv |
|
| 59 | 58 | * @param int $length |
| 60 | 59 | * @return string |
| 61 | 60 | */ |
@@ -289,9 +289,9 @@ |
||
| 289 | 289 | $n |
| 290 | 290 | ); |
| 291 | 291 | $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" . |
| 292 | - 'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n"; |
|
| 293 | - chunk_split(Base64::encode($key), 64) . |
|
| 294 | - '---- END SSH2 PUBLIC KEY ----'; |
|
| 292 | + 'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n"; |
|
| 293 | + chunk_split(Base64::encode($key), 64) . |
|
| 294 | + '---- END SSH2 PUBLIC KEY ----'; |
|
| 295 | 295 | |
| 296 | 296 | return $key; |
| 297 | 297 | } |
@@ -203,9 +203,8 @@ |
||
| 203 | 203 | /** |
| 204 | 204 | * Set the number of lines that should be logged past the terminal height |
| 205 | 205 | * |
| 206 | - * @param int $x |
|
| 207 | - * @param int $y |
|
| 208 | 206 | * @access public |
| 207 | + * @param integer $history |
|
| 209 | 208 | */ |
| 210 | 209 | function setHistory($history) |
| 211 | 210 | { |