Subversion Repositories oidplus

Compare Revisions

No changes between revisions

Regard whitespace Rev 1271 → Rev 1272

/trunk/.idea/workspace.xml
8,34 → 8,18
</component>
<component name="ChangeListManager">
<list default="true" id="df2a484b-bed2-4376-a9d2-11f38408a62e" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/dev/logger/verify_maskcodes.phps" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dev/test_logmasks" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/doc/developer_notes/logger_maskcodes.md" beforeDir="false" afterPath="$PROJECT_DIR$/doc/developer_notes/logger_maskcodes.md" 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/OIDplusAuthUtils.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/includes/classes/OIDplusAuthUtils.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$/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/120_registration/OIDplusPageAdminRegistration.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/120_registration/OIDplusPageAdminRegistration.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$/includes/classes/OIDplusObject.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/includes/classes/OIDplusObject.class.php" 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$/plugins/viathinksoft/adminPages/911_rest_api/OIDplusPageAdminRestApi.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/adminPages/911_rest_api/OIDplusPageAdminRestApi.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/objectTypes/fourcc/OIDplusFourCC.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/objectTypes/fourcc/OIDplusFourCC.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/objectTypes/guid/OIDplusGuid.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/objectTypes/guid/OIDplusGuid.class.php" 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/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/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/publicPages/810_login_google/oauth.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/810_login_google/oauth.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/820_login_facebook/oauth.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/820_login_facebook/oauth.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/publicPages/000_objects/OIDplusPagePublicObjects.js" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/002_rest_api/OIDplusPagePublicRestApi.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/publicPages/002_rest_api/OIDplusPagePublicRestApi.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/plugins/viathinksoft/raPages/911_rest_api/OIDplusPageRaRestApi.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/plugins/viathinksoft/raPages/911_rest_api/OIDplusPageRaRestApi.class.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
110,28 → 94,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/dev/logger/verify_maskcodes.phps",
"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": "SQL Dialects",
"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/dev/logger/verify_maskcodes.phps&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;SQL Dialects&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" />
287,6 → 271,8
<workItem from="1683935571903" duration="1954000" />
<workItem from="1683999584980" duration="2824000" />
<workItem from="1684007063012" duration="17463000" />
<workItem from="1684055187110" duration="1320000" />
<workItem from="1684091114321" duration="12534000" />
</task>
<servers />
</component>
/trunk/includes/classes/OIDplusPluginManifest.class.php
133,6 → 133,7
* @return string
*/
public function getName(): string {
// TODO: Find a way to translate plugin names
return $this->name;
}
 
/trunk/plugins/viathinksoft/adminPages/911_rest_api/OIDplusPageAdminRestApi.class.php
63,8 → 63,21
* @throws OIDplusException
*/
public function gui(string $id, array &$out, bool &$handled) {
if ($id === 'oidplus:rest_api_information_admin') {
$tmp = explode('$',$id);
$classname = $tmp[1] ?? '';
 
$parts = explode('.',$tmp[0],2);
if ($parts[0] != 'oidplus:rest_api_information_admin') return;
$handled = true;
 
if (str_starts_with($classname, 'endpoints:')) {
$plugin = OIDplus::getPluginByOid(explode(':',$classname)[1]);
if (!$plugin || !($plugin instanceof INTF_OID_1_3_6_1_4_1_37476_2_5_2_3_9)) throw new OIDplusException(_L("No endpoints for this plugin found"), null, 404);
$out['title'] = _L('REST API').' - '.$plugin->getManifest()->getName() . ' ' . _L('Endpoints');
$out['icon'] = file_exists(__DIR__.'/img/endpoints_icon.png') ? OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'img/main_icon.png' : '';
$out['text'] = '<p><a '.OIDplus::gui()->link('oidplus:rest_api_information_admin').'><img src="img/arrow_back.png" width="16" alt="'._L('Go back').'"> '._L('Go back').'</a></p>';
$out['text'] .= $plugin->restApiInfo('html');
} else {
$out['title'] = _L('REST API');
$out['icon'] = file_exists(__DIR__.'/img/main_icon.png') ? OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'img/main_icon.png' : '';
 
93,12 → 106,13
$endpoints = '';
foreach (OIDplus::getAllPlugins() as $plugin) {
if ($plugin instanceof INTF_OID_1_3_6_1_4_1_37476_2_5_2_3_9) {
$endpoints .= $plugin->restApiInfo('html');
$link = 'oidplus:rest_api_information_admin$endpoints:'.$plugin->getManifest()->getOid();
$endpoints .= '<li><a '.OIDplus::gui()->link($link).'>'.htmlentities($plugin->getManifest()->getName()).'</a></li>';
}
}
if ($endpoints) {
$out['text'] .= '<p>'._L('The following endpoints are registered by the plugins in this system:').'</p>';
$out['text'] .= '<p>'.$endpoints.'</p>';
$out['text'] .= '<p>'._L('The following installed plugins are offering REST endpoints:').'</p>';
$out['text'] .= '<p><ul>'.$endpoints.'</ul></p>';
} else {
$out['text'] .= '<p>'._L('No installed plugin offers a REST functionality').'</p>';
}
139,14 → 153,30
$tree_icon = null; // default icon (folder)
}
 
if (file_exists(__DIR__.'/img/endpoints_icon16.png')) {
$tree_icon_endpoints = OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'img/endpoints_icon16.png';
} else {
$tree_icon_endpoints = null; // default icon (folder)
}
 
$submenu = array();
foreach (OIDplus::getAllPlugins() as $plugin) {
if ($plugin instanceof INTF_OID_1_3_6_1_4_1_37476_2_5_2_3_9) {
$submenu[] = [
'id' => 'oidplus:rest_api_information_admin$endpoints:'.$plugin->getManifest()->getOid(),
'icon' => $tree_icon_endpoints,
'text' => $plugin->getManifest()->getName() . ' ' . _L('Endpoints')
];
}
}
 
$json[] = array(
'id' => 'oidplus:rest_api_information_admin',
'icon' => $tree_icon,
'text' => _L('REST API')
'text' => _L('REST API'),
'children' => $submenu
);
 
// TODO: Make "Endpoints" (with all installed plugins) and "Authentication" as menu entries!
 
return true;
}
 
/trunk/plugins/viathinksoft/adminPages/911_rest_api/img/endpoints_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/trunk/plugins/viathinksoft/adminPages/911_rest_api/img/endpoints_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/trunk/plugins/viathinksoft/language/dede/messages.xml
4254,6 → 4254,14
</message>
<message>
<source><![CDATA[
No endpoints for this plugin found
]]></source>
<target><![CDATA[
Keine Endpunkte für dieses Plugin gefunden
]]></target>
</message>
<message>
<source><![CDATA[
No extra OIDs found
]]></source>
<target><![CDATA[
7326,10 → 7334,10
</message>
<message>
<source><![CDATA[
The following endpoints are registered by the plugins in this system:
The following installed plugins are offering REST endpoints:
]]></source>
<target><![CDATA[
Die folgenden Endpunkte werden durch Plugins in diesem System zur Verfügung gestellt:
Die folgenden installierten Plugins bieten REST Endpunkte an:
]]></target>
</message>
<message>
/trunk/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.class.php
181,7 → 181,6
public function restApiInfo(string $kind='html'): string {
if ($kind === 'html') {
$struct = [
"Objects API" => [
'('._L('Receive').') GET objects/<abbr title="'._L('e.g. %1', 'oid:2.999').'">[id]</abbr>' => [
_L('Input parameters') => [
'<i>'._L('None').'</i>'
249,7 → 248,6
'status|error'
]
]
]
];
return self::array_to_html_ul_li($struct);
} else {
/trunk/plugins/viathinksoft/raPages/911_rest_api/OIDplusPageRaRestApi.class.php
66,9 → 66,21
* @throws OIDplusException
*/
public function gui(string $id, array &$out, bool &$handled) {
if (explode('$',$id)[0] == 'oidplus:rest_api_information_ra') {
$tmp = explode('$',$id);
$classname = $tmp[1] ?? '';
 
$parts = explode('.',$tmp[0],2);
if ($parts[0] != 'oidplus:rest_api_information_ra') return;
$handled = true;
 
if (str_starts_with($classname, 'endpoints:')) {
$plugin = OIDplus::getPluginByOid(explode(':',$classname)[1]);
if (!$plugin || !($plugin instanceof INTF_OID_1_3_6_1_4_1_37476_2_5_2_3_9)) throw new OIDplusException(_L("No endpoints for this plugin found"), null, 404);
$out['title'] = _L('REST API').' - '.$plugin->getManifest()->getName() . ' ' . _L('Endpoints');
$out['icon'] = file_exists(__DIR__.'/img/endpoints_icon.png') ? OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'img/main_icon.png' : '';
$out['text'] = '<p><a '.OIDplus::gui()->link('oidplus:rest_api_information_ra').'><img src="img/arrow_back.png" width="16" alt="'._L('Go back').'"> '._L('Go back').'</a></p>';
$out['text'] .= $plugin->restApiInfo('html');
} else {
$ra_email = explode('$',$id)[1];
 
$out['title'] = _L('REST API');
99,12 → 111,13
$endpoints = '';
foreach (OIDplus::getAllPlugins() as $plugin) {
if ($plugin instanceof INTF_OID_1_3_6_1_4_1_37476_2_5_2_3_9) {
$endpoints .= $plugin->restApiInfo('html');
$link = 'oidplus:rest_api_information_ra$endpoints:'.$plugin->getManifest()->getOid();
$endpoints .= '<li><a '.OIDplus::gui()->link($link).'>'.htmlentities($plugin->getManifest()->getName()).'</a></li>';
}
}
if ($endpoints) {
$out['text'] .= '<p>'._L('The following endpoints are registered by the plugins in this system:').'</p>';
$out['text'] .= '<p>'.$endpoints.'</p>';
$out['text'] .= '<p>'._L('The following installed plugins are offering REST endpoints:').'</p>';
$out['text'] .= '<p><ul>'.$endpoints.'</ul></p>';
} else {
$out['text'] .= '<p>'._L('No installed plugin offers a REST functionality').'</p>';
}
146,14 → 159,30
$tree_icon = null; // default icon (folder)
}
 
if (file_exists(__DIR__.'/img/endpoints_icon16.png')) {
$tree_icon_endpoints = OIDplus::webpath(__DIR__,OIDplus::PATH_RELATIVE).'img/endpoints_icon16.png';
} else {
$tree_icon_endpoints = null; // default icon (folder)
}
 
$submenu = array();
foreach (OIDplus::getAllPlugins() as $plugin) {
if ($plugin instanceof INTF_OID_1_3_6_1_4_1_37476_2_5_2_3_9) {
$submenu[] = [
'id' => 'oidplus:rest_api_information_ra$endpoints:'.$plugin->getManifest()->getOid(),
'icon' => $tree_icon_endpoints,
'text' => $plugin->getManifest()->getName() . ' ' . _L('Endpoints')
];
}
}
 
$json[] = array(
'id' => 'oidplus:rest_api_information_ra$'.$ra_email,
'id' => 'oidplus:rest_api_information_ra',
'icon' => $tree_icon,
'text' => _L('REST API')
'text' => _L('REST API'),
'children' => $submenu
);
 
// TODO: Make "Endpoints" (with all installed plugins) and "Authentication" as menu entries!
 
return true;
}
 
/trunk/plugins/viathinksoft/raPages/911_rest_api/img/endpoints_icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/trunk/plugins/viathinksoft/raPages/911_rest_api/img/endpoints_icon16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property