WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new config file structuring

This commit is contained in:
Roland Gruber 2012-10-28 15:03:36 +00:00
parent 86e0ad60de
commit 79f9243e1e
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lam/lib/upgrade.inc
View File

@ -174,8 +174,10 @@ function recursiveCopy($src, $dst, $profiles, $fileFilter = null, $overwrite = t
recursiveCopy($src . '/' . $file, $dst . '/' . $file, $profiles, $fileFilter, $overwrite);
}
elseif ((isset($fileFilter) && (strpos($file, $fileFilter) === 0 || $file == '.htaccess'))
|| (!isset($fileFilter)))
{
|| (!isset($fileFilter))) {
if (!is_file($src . '/' . $file)) {
continue;
}
if ($overwrite || !file_exists($dst . '/' . $file)) {
$tmpState = @copy($src . '/' . $file, $dst . '/' . $file);
if ($tmpState === false) {

2
lam/templates/pdfedit/pdfmain.php
View File

@ -197,7 +197,6 @@ include '../main_header.php';
$deleteLink->setOnClick("profileShowDeleteDialog('" . _('Delete') . "', '" . _('Ok') . "', '" . _('Cancel') . "', '" . $templateClasses[$i]['scope'] . "', '" . 'template_' . $templateClasses[$i]['scope'] . "');");
$existingContainer->addElement($deleteLink);
if (count($configProfiles) > 1) {
$importLink = new htmlLink(null, '#', '../../graphics/import.png');
$importLink->setTitle(_('Import PDF structures'));
$importLink->setOnClick("showDistributionDialog('" . _("Import PDF structures") . "', '" .
@ -209,7 +208,6 @@ include '../main_header.php';
$exportLink->setOnClick("showDistributionDialog('" . _("Export PDF structure") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', '" . $templateClasses[$i]['scope'] . "', 'export', '" . 'template_' . $templateClasses[$i]['scope'] . "', '" . $_SESSION['config']->getName() . "');");
$existingContainer->addElement($exportLink);
}
$existingContainer->addNewLine();
}
$container->addElement($existingContainer, true);

2
lam/templates/profedit/profilemain.php
View File

@ -195,7 +195,6 @@ for ($i = 0; $i < sizeof($profileClasses); $i++) {
$deleteLink->setTitle(_('Delete'));
$deleteLink->setOnClick("profileShowDeleteDialog('" . _('Delete') . "', '" . _('Ok') . "', '" . _('Cancel') . "', '" . $profileClasses[$i]['scope'] . "', '" . 'profile_' . $profileClasses[$i]['scope'] . "');");
$existingContainer->addElement($deleteLink);
if (count($configProfiles) > 1) {
$importLink = new htmlLink(null, '#', '../../graphics/import.png');
$importLink->setTitle(_('Import profiles'));
$importLink->setOnClick("showDistributionDialog('" . _("Import profiles") . "', '" .
@ -207,7 +206,6 @@ for ($i = 0; $i < sizeof($profileClasses); $i++) {
$exportLink->setOnClick("showDistributionDialog('" . _("Export profile") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', '" . $profileClasses[$i]['scope'] . "', 'export', '" . 'profile_' . $profileClasses[$i]['scope'] . "', '" . $_SESSION['config']->getName() . "');");
$existingContainer->addElement($exportLink);
}
$existingContainer->addNewLine();
}
$container->addElement($existingContainer);