Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 719 → Rev 720

/trunk/plugins/viathinksoft/adminPages/111_systeminfo/OIDplusPageAdminSysteminfo.class.php
141,10 → 141,14
// On Linux:
// get_current_user() will get the owner of the PHP script, not the process owner!
// We want the process owner, so we use posix_geteuid().
if (function_exists('posix_geteuid') && function_exists('posix_getpwuid')) {
$uid = posix_geteuid();
$current_user = posix_getpwuid($uid); // receive username (required read access to /etc/passwd )
} else {
$uid = -1;
}
if ($current_user == '') $current_user = get_current_user();
if ($current_user == '') $current_user = '#'.$uid;
if (($current_user == '') && ($uid >= 0)) $current_user = '#'.$uid;
}
}
$out['text'] .= ' <td>'.($current_user == '' ? '<i>'._L('unknown').'</i>' : htmlentities($current_user)).'</td>';
/trunk/plugins/viathinksoft/publicPages/095_attachments/OIDplusPagePublicAttachments.class.php
50,7 → 50,7
$file_owner_a = -1;
$file_owner_a_name = '???';
} else {
$tmp = posix_getpwuid($file_owner_a);
$tmp = function_exists('posix_getpwuid') ? posix_getpwuid($file_owner_a) : false;
$file_owner_a_name = $tmp !== false ? $tmp['name'] : 'UID '.$file_owner_a;
}
 
59,7 → 59,7
$file_owner_b = -1;
$file_owner_b_name = '???';
} else {
$tmp = posix_getpwuid($file_owner_b);
$tmp = function_exists('posix_getpwuid') ? posix_getpwuid($file_owner_b) : false;
$file_owner_b_name = $tmp !== false ? $tmp['name'] : 'UID '.$file_owner_b;
}
 
/trunk/vendor/composer/InstalledVersions.php
82,7 → 82,7
array (
0 => '9999999-dev',
),
'reference' => '861975efb89d07ed67953884e1ba5bf4b8677d80',
'reference' => 'eb0b3f8ba434d9ee5bc933e83fca2cf25b92bd4b',
),
'danielmarschall/uuid_mac_utils' =>
array (
92,7 → 92,7
array (
0 => '9999999-dev',
),
'reference' => '7b292091da6fd9ab93b06be767754ee668ff457c',
'reference' => '2f646245865273217be08873a9c158f81f753797',
),
'danielmarschall/vnag' =>
array (
/trunk/vendor/composer/installed.json
192,18 → 192,18
"source": {
"type": "git",
"url": "https://github.com/danielmarschall/php_utils.git",
"reference": "861975efb89d07ed67953884e1ba5bf4b8677d80"
"reference": "eb0b3f8ba434d9ee5bc933e83fca2cf25b92bd4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielmarschall/php_utils/zipball/861975efb89d07ed67953884e1ba5bf4b8677d80",
"reference": "861975efb89d07ed67953884e1ba5bf4b8677d80",
"url": "https://api.github.com/repos/danielmarschall/php_utils/zipball/eb0b3f8ba434d9ee5bc933e83fca2cf25b92bd4b",
"reference": "eb0b3f8ba434d9ee5bc933e83fca2cf25b92bd4b",
"shasum": ""
},
"require": {
"php": ">=7.0"
},
"time": "2021-12-15T15:45:59+00:00",
"time": "2022-01-06T20:55:14+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
233,18 → 233,18
"source": {
"type": "git",
"url": "https://github.com/danielmarschall/uuid_mac_utils.git",
"reference": "7b292091da6fd9ab93b06be767754ee668ff457c"
"reference": "2f646245865273217be08873a9c158f81f753797"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/7b292091da6fd9ab93b06be767754ee668ff457c",
"reference": "7b292091da6fd9ab93b06be767754ee668ff457c",
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/2f646245865273217be08873a9c158f81f753797",
"reference": "2f646245865273217be08873a9c158f81f753797",
"shasum": ""
},
"require": {
"php": ">=7.0"
},
"time": "2021-06-10T22:08:19+00:00",
"time": "2021-12-28T23:40:13+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
/trunk/vendor/composer/installed.php
56,7 → 56,7
array (
0 => '9999999-dev',
),
'reference' => '861975efb89d07ed67953884e1ba5bf4b8677d80',
'reference' => 'eb0b3f8ba434d9ee5bc933e83fca2cf25b92bd4b',
),
'danielmarschall/uuid_mac_utils' =>
array (
66,7 → 66,7
array (
0 => '9999999-dev',
),
'reference' => '7b292091da6fd9ab93b06be767754ee668ff457c',
'reference' => '2f646245865273217be08873a9c158f81f753797',
),
'danielmarschall/vnag' =>
array (
/trunk/vendor/danielmarschall/php_utils/oid_utils.inc.php
2,8 → 2,8
 
/*
* OID-Utilities for PHP
* Copyright 2011-2021 Daniel Marschall, ViaThinkSoft
* Version 2021-09-23
* Copyright 2011-2022 Daniel Marschall, ViaThinkSoft
* Version 2022-01-06
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
362,7 → 362,7
continue;
}
 
if (!ctype_digit($a)) return false; // does contain something other than digits
if (!preg_match('@^(\\d+)$@', $a, $m)) return false; // does contain something other than digits
 
// strike leading zeroes
$a = preg_replace("@^0+@", '', $a);
/trunk/vendor/danielmarschall/php_utils/x_509_utils.inc.php
3,7 → 3,7
/*
* X.509 Utilities for PHP
* Copyright 2011-2021 Daniel Marschall, ViaThinkSoft
* Version 2021-06-29
* Version 2021-12-29
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/trunk/vendor/danielmarschall/uuid_mac_utils/includes/uuid_utils.inc.php
3,7 → 3,7
/*
* UUID utils for PHP
* Copyright 2011 - 2021 Daniel Marschall, ViaThinkSoft
* Version 2021-05-29
* Version 2021-12-29
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
313,7 → 313,7
}
 
function is_uuid_oid($oid, $only_allow_root=false) {
if (substr($oid,0,1) == '.') $oid = substr($oid, 1); // remove leading dot
if (substr(oid,0,1) == '.') $oid = substr($oid, 1); // remove leading dot
 
$ary = explode('.', $oid);
 
486,7 → 486,7
} else {
// Linux
$addresses = @glob('/sys/class/net/'.'*'.'/address');
if ($addresses) foreach ($addresses as $x) {
foreach ($addresses as $x) {
if (!strstr($x,'/lo/')) {
$detected_mac = trim(file_get_contents($x));
return $detected_mac;
/trunk/vendor/licenses
7,8 → 7,8
components/jquery 3.6.0 MIT
components/jqueryui 1.12.1 MIT
danielmarschall/fileformats dev-master acfeaf4 Apache-2.0
danielmarschall/php_utils dev-master 861975e Apache-2.0
danielmarschall/uuid_mac_utils dev-master 7b29209 Apache-2.0
danielmarschall/php_utils dev-master eb0b3f8 Apache-2.0
danielmarschall/uuid_mac_utils dev-master 2f64624 Apache-2.0
danielmarschall/vnag dev-master 8bf513c Apache-2.0
dcodeio/bcrypt.js master master BSD-3-Clause, MIT
emn178/js-sha3 master master MIT