Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1142 → Rev 1143

/trunk/.idea/workspace.xml
8,21 → 8,35
</component>
<component name="ChangeListManager">
<list default="true" id="df2a484b-bed2-4376-a9d2-11f38408a62e" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/copyright" afterDir="true" />
<change afterPath="$PROJECT_DIR$/.idea/copyright/Apache_2.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dev/translation/message_regenerate.phps" beforeDir="false" afterPath="$PROJECT_DIR$/dev/translation/message_regenerate.phps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/includes/classes/OIDplus.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/includes/classes/OIDplus.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/includes/classes/OIDplusLogger.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/includes/classes/OIDplusLogger.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/oidplus.min.css.php" beforeDir="false" afterPath="$PROJECT_DIR$/oidplus.min.css.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TODO" beforeDir="false" afterPath="$PROJECT_DIR$/TODO" afterDir="false" />
<change beforePath="$PROJECT_DIR$/includes/classes/OIDplusPluginManifest.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/includes/classes/OIDplusPluginManifest.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/phpstan.neon.dist" beforeDir="false" afterPath="$PROJECT_DIR$/phpstan.neon.dist" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/050_oobe/oobe.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/050_oobe/oobe.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/110_system_config/OIDplusPageAdminSystemConfig.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/110_system_config/OIDplusPageAdminSystemConfig.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/130_create_ra/OIDplusPageAdminCreateRa.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/130_create_ra/OIDplusPageAdminCreateRa.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/400_oidinfo_export/OIDplusPageAdminOIDInfoExport.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/400_oidinfo_export/OIDplusPageAdminOIDInfoExport.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/700_colors/OIDplusPageAdminColors.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/700_colors/OIDplusPageAdminColors.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/900_software_update/OIDplusPageAdminSoftwareUpdate.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/900_software_update/OIDplusPageAdminSoftwareUpdate.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/901_vnag_version_check/vnag.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/901_vnag_version_check/vnag.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/910_automated_ajax_calls/OIDplusPageAdminAutomatedAJAXCalls.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/910_automated_ajax_calls/OIDplusPageAdminAutomatedAJAXCalls.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/language/dede/messages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/language/dede/messages.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/001_ra_base/OIDplusPagePublicRaBaseUtils.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/001_ra_base/OIDplusPagePublicRaBaseUtils.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/090_login/OIDplusPagePublicLogin.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/090_login/OIDplusPagePublicLogin.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/091_forgot_password/OIDplusPagePublicForgotPassword.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/091_forgot_password/OIDplusPagePublicForgotPassword.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/095_attachments/OIDplusPagePublicAttachments.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/095_attachments/OIDplusPagePublicAttachments.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/100_whois/whois/json/security.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/100_whois/whois/json/security.inc.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/200_viathinksoft_freeoid/OIDplusPagePublicFreeOID.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/200_viathinksoft_freeoid/OIDplusPagePublicFreeOID.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/999_antispam_filter/OIDplusPagePublicAntiSpamFilter.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/999_antispam_filter/OIDplusPagePublicAntiSpamFilter.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/500_resources/OIDplusPagePublicResources.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/500_resources/OIDplusPagePublicResources.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/800_login_ldap/OIDplusPagePublicLoginLDAP.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/800_login_ldap/OIDplusPagePublicLoginLDAP.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/raPages/092_invite/OIDplusPageRaInvite.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/raPages/092_invite/OIDplusPageRaInvite.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/raPages/100_edit_contact_data/OIDplusPageRaEditContactData.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/raPages/100_edit_contact_data/OIDplusPageRaEditContactData.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/raPages/101_change_password/OIDplusPageRaChangePassword.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/raPages/101_change_password/OIDplusPageRaChangePassword.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/raPages/102_change_email/OIDplusPageRaChangeEMail.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/raPages/102_change_email/OIDplusPageRaChangeEMail.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/raPages/910_automated_ajax_calls/OIDplusPageRaAutomatedAJAXCalls.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/raPages/910_automated_ajax_calls/OIDplusPageRaAutomatedAJAXCalls.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/polyfill.min.js.php" beforeDir="false" afterPath="$PROJECT_DIR$/polyfill.min.js.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/setup/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/setup/index.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
79,28 → 93,28
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "D:/SVN/OIDplus/trunk/setup/sql/wellknown_other_access.sql",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"run.code.analysis.last.selected.profile": "pProject Default",
"settings.editor.selected.configurable": "reference.settings.ide.settings.new.ui",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/SVN/OIDplus/trunk/setup/sql/wellknown_other_access.sql&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.ide.settings.new.ui&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
},
"keyToStringList": {
"com.intellij.ide.scratch.LRUPopupBuilder$1/SQL Dialect": [
"Oracle",
"TSQL"
&quot;keyToStringList&quot;: {
&quot;com.intellij.ide.scratch.LRUPopupBuilder$1/SQL Dialect&quot;: [
&quot;Oracle&quot;,
&quot;TSQL&quot;
]
}
}]]></component>
}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\SVN\OIDplus\trunk\plugins\viathinksoft\raPages\010_notifications" />
174,6 → 188,9
<workItem from="1679864406091" duration="718000" />
<workItem from="1679865137427" duration="853000" />
<workItem from="1679866104125" duration="985000" />
<workItem from="1679949005588" duration="2250000" />
<workItem from="1680034549644" duration="3650000" />
<workItem from="1680038296463" duration="499000" />
</task>
<servers />
</component>
/trunk/TODO
2,7 → 2,12
Type safety:
- PhpStorm warnings
- Re-Check "mixed"
- Nullable params passed to non-nullable methods => find using PHPStan level 7
 
April 2023 planned:
- Don't send information object OIDs to oid-info.com anymore
- https://github.com/danielmarschall/oidplus/issues/5 => "Offline mode" (do not contact internet, e.g. gs1-barcodes, polyfill, oidinfo, ...)
 
Admin Auth:
- implement argon2 as alternative to bcrypt?
- idea: could RA-auth-plugins also be used to create the admin-hash? problem: setup/ generates hash with javascript, not via PHP!!!
/trunk/includes/classes/OIDplusPluginManifest.class.php
161,7 → 161,7
return 'built-in';
} else {
//return _L('Part of OIDplus, version %1', $sysver);
return $sysver;
return $sysver ? $sysver : 'unknown';
}
} else {
return $this->version;
/trunk/plugins/viathinksoft/adminPages/050_oobe/oobe.php
201,6 → 201,7
echo '</html>';
 
$cont = ob_get_contents();
if (!$cont) $cont = '';
ob_end_clean();
 
if ($do_edits && !$errors_happened) {
/trunk/plugins/viathinksoft/adminPages/110_system_config/OIDplusPageAdminSystemConfig.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/adminPages/130_create_ra/OIDplusPageAdminCreateRa.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/adminPages/400_oidinfo_export/OIDplusPageAdminOIDInfoExport.class.php
40,7 → 40,7
/**
* @param string $actionID
* @param array $params
* @return array|int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/adminPages/700_colors/OIDplusPageAdminColors.class.php
67,7 → 67,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/adminPages/900_software_update/OIDplusPageAdminSoftwareUpdate.class.php
489,6 → 489,9
} else {
$out_msg = _L('OIDplus could not determine the latest version.').' '._L('Probably the ViaThinkSoft server could not be reached.');
}
} else if (!$local_installation) {
$out_stat = 'WARN';
$out_msg = _L('OIDplus could not determine its version. Please update your system manually by downloading the latest archive file from oidplus.com.');
} else if (version_compare($local_installation, $newest_version) >= 0) {
$out_stat = 'INFO';
$out_msg = _L('You are using the latest version of OIDplus (%1 local / %2 remote)', $local_installation, $newest_version);
/trunk/plugins/viathinksoft/adminPages/901_vnag_version_check/vnag.php
97,6 → 97,9
if (!$newest_version) {
$out_stat = VNag::STATUS_UNKNOWN;
$out_msg = 'OIDplus could not determine the latest version. Probably the ViaThinkSoft server could not be reached.'; // do not translate
} else if (!$local_installation) {
$out_stat = 'WARN';
$out_msg = 'OIDplus could not determine its version. Please update your system manually by downloading the latest archive file from oidplus.com.'; // do not translate
} else if (version_compare($local_installation, $newest_version) >= 0) {
$out_stat = VNag::STATUS_OK;
$out_msg = 'You are using the latest version of OIDplus (' . $local_installation . ' local / ' . $newest_version . ' remote)'; // do not translate
/trunk/plugins/viathinksoft/adminPages/910_automated_ajax_calls/OIDplusPageAdminAutomatedAJAXCalls.class.php
31,7 → 31,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/language/dede/messages.xml
4390,6 → 4390,14
</message>
<message>
<source><![CDATA[
OIDplus could not determine its version. Please update your system manually by downloading the latest archive file from oidplus.com.
]]></source>
<target><![CDATA[
Die OIDplus-Version konnte nicht ermittelt werden. Bitte aktualisieren Sie OIDplus durch das erneute Herunterladen des Archivs von oidplus.com.
]]></target>
</message>
<message>
<source><![CDATA[
OIDplus could not determine the latest version.
]]></source>
<target><![CDATA[
/trunk/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.class.php
60,7 → 60,7
/**
* @param string $actionID
* @param array $params
* @return array|int[]
* @return array
* @throws OIDplusConfigInitializationException
* @throws OIDplusException
*/
584,11 → 584,13
$cont = '';
}
 
if ($cont) {
list($html, $js, $css) = extractHtmlContents($cont);
$cont = '';
if (!empty($js)) $cont .= "<script>\n$js\n</script>";
if (!empty($css)) $cont .= "<style>\n$css\n</style>";
$cont .= stripHtmlComments($html);
}
 
$out['text'] = $cont;
 
/trunk/plugins/viathinksoft/publicPages/001_ra_base/OIDplusPagePublicRaBaseUtils.class.php
29,7 → 29,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/publicPages/090_login/OIDplusPagePublicLogin.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/publicPages/091_forgot_password/OIDplusPagePublicForgotPassword.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
/trunk/plugins/viathinksoft/publicPages/095_attachments/OIDplusPagePublicAttachments.class.php
206,7 → 206,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/publicPages/100_whois/whois/json/security.inc.php
65,7 → 65,7
* @param string $json_content
* @param string $privkey
* @param string $pubkey
* @return false|string
* @return string
* @throws Exception
*/
function oidplus_json_sign(string $json_content, string $privkey, string $pubkey) {
101,6 → 101,7
 
// Self-test and output
$json_signed = json_encode($output);
if (!$json_signed) throw new Exception("JSON Encoding failed");
oidplus_json_verify($json_signed, $pubkey);
return $json_signed;
}
/trunk/plugins/viathinksoft/publicPages/200_viathinksoft_freeoid/OIDplusPagePublicFreeOID.class.php
56,7 → 56,7
/**
* @param string $actionID
* @param array $params
* @return array|int[]
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
375,7 → 375,7
$arc = substr_count(self::getFreeRootOid(false), '.')+1;
$highest_id = explode('.',$row['id'])[$arc];
}
return $highest_id;
return (int)$highest_id;
}
 
/**
/trunk/plugins/viathinksoft/publicPages/500_resources/OIDplusPagePublicResources.class.php
63,6 → 63,7
if (file_exists($file2)) $file = $file2;
 
$cont = file_get_contents($file);
if (!$cont) return '';
 
list($html, $js, $css) = extractHtmlContents($cont);
$cont = '';
/trunk/plugins/viathinksoft/publicPages/800_login_ldap/OIDplusPagePublicLoginLDAP.class.php
119,7 → 119,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusConfigInitializationException
* @throws OIDplusException
*/
/trunk/plugins/viathinksoft/raPages/092_invite/OIDplusPageRaInvite.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
/trunk/plugins/viathinksoft/raPages/100_edit_contact_data/OIDplusPageRaEditContactData.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/raPages/101_change_password/OIDplusPageRaChangePassword.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/plugins/viathinksoft/raPages/102_change_email/OIDplusPageRaChangeEMail.class.php
28,7 → 28,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
/trunk/plugins/viathinksoft/raPages/910_automated_ajax_calls/OIDplusPageRaAutomatedAJAXCalls.class.php
31,7 → 31,7
/**
* @param string $actionID
* @param array $params
* @return int[]
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
/trunk/polyfill.min.js.php
100,4 → 100,5
 
# ---
 
if (!$out) $out = '';
httpOutWithETag($out, 'application/javascript', 'polyfill'.(MINIFY_POLYFILL ? '.min' : '').'.js');
/trunk/setup/index.php
238,6 → 238,7
$page_title_2 = _L('Configuration File Generator');
$static_icon = 'img/main_icon.png';
$static_content = ob_get_contents();
if (!$static_content) $static_content = '';
$extra_head_tags = array();
$extra_head_tags[] = '<meta name="robots" content="noindex">';
$extra_head_tags[] = '<link rel="stylesheet" href="setup.min.css.php">';