Oracle database support

This commit is contained in:
Roland Gruber 2014-02-09 14:47:35 +00:00
parent 0ac34b07a4
commit 543c9322ea
7 changed files with 24 additions and 6 deletions

View File

@ -9,6 +9,7 @@ March 2014 4.5
-> Bind DLZ: support TXT/SRV records -> Bind DLZ: support TXT/SRV records
-> Self Service: added language selection -> Self Service: added language selection
-> Custom fields: support help texts -> Custom fields: support help texts
-> Support for Oracle databases (orclNetService) (RFE 104)
- fixed bugs: - fixed bugs:
-> PDF export for multiple entries does not work -> PDF export for multiple entries does not work
-> Personal: fixed photo upload if Imagick is not installed -> Personal: fixed photo upload if Imagick is not installed

View File

@ -0,0 +1,6 @@
<pdf type="oracleContextType" filename="printLogo.jpg" headline="Database information">
<section name="_oracleService_cn">
<entry name="oracleService_orclNetDescString" />
<entry name="oracleService_description" />
</section>
</pdf>

View File

@ -0,0 +1 @@

View File

@ -676,7 +676,11 @@ class lamList {
echo "<div class=\"ui-tabs-nav " . $this->type . "-bright\">"; echo "<div class=\"ui-tabs-nav " . $this->type . "-bright\">";
echo "<div class=\"smallPaddingContent\">\n"; echo "<div class=\"smallPaddingContent\">\n";
echo "<form action=\"list.php?type=" . $this->type . "&amp;norefresh=true\" method=\"post\">\n"; $refresh = '&amp;norefresh=true';
if (isset($_GET['refresh']) && ($_GET['refresh'] == 'true')) {
$refresh = '&amp;refresh=true';
}
echo "<form action=\"list.php?type=" . $this->type . $refresh . "\" method=\"post\">\n";
$container = new htmlTable(); $container = new htmlTable();
$container->addElement(new htmlSubTitle(_('Create PDF file')), true); $container->addElement(new htmlSubTitle(_('Create PDF file')), true);

View File

@ -839,7 +839,7 @@ class accountContainer {
} }
// create PDF file // create PDF file
if (isset($_POST['accountContainerCreatePDF'])) { if (isset($_POST['accountContainerCreatePDF'])) {
metaRefresh('../lists/list.php?printPDF=1&amp;type=' . $this->type . "&amp;PDFSessionID=" . $this->base); metaRefresh('../lists/list.php?printPDF=1&amp;type=' . $this->type . "&amp;refresh=true&amp;PDFSessionID=" . $this->base);
exit; exit;
} }
// module actions // module actions

View File

@ -578,3 +578,7 @@ h4.schema_oclass_sub {
.kolabSharedFolderType-bright { background:#b6eeff !important; } .kolabSharedFolderType-bright { background:#b6eeff !important; }
.kolabSharedFolderType-dark { background-color:#80e0e1 !important; } .kolabSharedFolderType-dark { background-color:#80e0e1 !important; }
.oracleContextType-border { border-color:#32768b; }
.oracleContextType-bright { background:#b6eeff !important; }
.oracleContextType-dark { background-color:#80e0e1 !important; }

View File

@ -187,17 +187,19 @@ function profileShowDeleteDialog(title, okText, cancelText, scope, selectFieldNa
} }
/** /**
* Shows the dialog to create an automount map. * Shows a simple dialog.
* *
* @param title dialog title * @param title dialog title
* @param okText text for Ok button * @param okText text for Ok button
* @param cancelText text for Cancel button * @param cancelText text for Cancel button
* @param formID form ID
* @param dialogDivID ID of div that contains dialog content
*/ */
function automountShowNewMapDialog(title, okText, cancelText) { function showSimpleDialog(title, okText, cancelText, formID, dialogDivID) {
var buttonList = {}; var buttonList = {};
buttonList[okText] = function() { document.forms["newAutomountMapDialogForm"].submit(); }; buttonList[okText] = function() { document.forms[formID].submit(); };
buttonList[cancelText] = function() { jQuery(this).dialog("close"); }; buttonList[cancelText] = function() { jQuery(this).dialog("close"); };
jQuery('#newAutomountMapDialog').dialog({ jQuery('#' + dialogDivID).dialog({
modal: true, modal: true,
title: title, title: title,
dialogClass: 'defaultBackground', dialogClass: 'defaultBackground',