Merge remote-tracking branch 'origin/develop' into 6_2_1
Conflicts: lam-packaging/debian/changelog lam/HISTORY lam/VERSIONpull/45/head
Roland Gruber
6 years ago
commit
f0b68d2b1a
@ -1,22 +1,24 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
files=`ls templates/lib/*.js`
|
||||
for file in $files; do
|
||||
closure-compiler --charset UTF-8 --js $file --js_output_file ${file}-MIN
|
||||
rm $file
|
||||
mv ${file}-MIN $file
|
||||
outFile=templates/lib/100_lam.${SOURCE_DATE_EPOCH}.min.js
|
||||
if [ ! -e $outFile ]; then
|
||||
files=`ls templates/lib/*.js`
|
||||
jsFiles=""
|
||||
for file in $files; do
|
||||
jsFiles="$jsFiles --js $file"
|
||||
done
|
||||
closure-compiler --charset UTF-8 $jsFiles --js_output_file $outFile
|
||||
rm $files
|
||||
# add final new line to supress Debian warnings
|
||||
echo "" >> $file
|
||||
done
|
||||
echo "" >> $outFile
|
||||
fi
|
||||
|
||||
files=`ls style/*.css`
|
||||
for file in $files; do
|
||||
cleancss -o ${file}-MIN $file
|
||||
rm $file
|
||||
mv ${file}-MIN $file
|
||||
outFile=style/100_lam.${SOURCE_DATE_EPOCH}.min.css
|
||||
if [ ! -e $outFile ]; then
|
||||
cat $files | cleancss -o ${outFile}
|
||||
rm $files
|
||||
# add final new line to supress Debian warnings
|
||||
echo "" >> $file
|
||||
done
|
||||
|
||||
echo "" >> $outFile
|
||||
fi
|
||||
|
||||
@ -1 +1 @@
|
||||
6.2.1
|
||||
6.3.DEV
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
<pdf type="bind" filename="printLogo.jpg" headline="Custom entry" foldingmarks="no">
|
||||
<section name="_main_dn">
|
||||
</section>
|
||||
</pdf>
|
||||
@ -0,0 +1 @@
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 815 B After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
@ -0,0 +1,35 @@
|
||||
<?php
|
||||
namespace LAM\FOOTER;
|
||||
/*
|
||||
|
||||
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
|
||||
Copyright (C) 2018 Roland Gruber
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*/
|
||||
|
||||
/**
|
||||
* Footer part of page which closes the tab content area etc.
|
||||
*
|
||||
* @package main
|
||||
* @author Roland Gruber
|
||||
*/
|
||||
?>
|
||||
|
||||
</div>
|
||||
<br>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,206 @@
|
||||
<?php
|
||||
namespace LAM\HEADER;
|
||||
/*
|
||||
|
||||
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
|
||||
Copyright (C) 2018 Roland Gruber
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*/
|
||||
|
||||
/**
|
||||
* Head part of page which includes links to lists etc.
|
||||
*
|
||||
* @package main
|
||||
* @author Roland Gruber
|
||||
*/
|
||||
|
||||
$headerPrefix = "";
|
||||
if (is_file("login.php")) {
|
||||
$headerPrefix = "..";
|
||||
}
|
||||
elseif (is_file("../../templates/login.php")) {
|
||||
$headerPrefix = "../..";
|
||||
}
|
||||
elseif (is_file("../../../templates/login.php")) {
|
||||
$headerPrefix = "../../..";
|
||||
}
|
||||
|
||||
/** tool definitions */
|
||||
include_once($headerPrefix . "/lib/tools.inc");
|
||||
|
||||
$pro = '';
|
||||
if (isLAMProVersion()) {
|
||||
$pro = ' Pro';
|
||||
}
|
||||
|
||||
// HTML header and title
|
||||
echo $_SESSION['header'];
|
||||
$title = "LDAP Account Manager" . $pro . " (" . str_replace(array('ldap://', 'ldaps://'), array('', ''), $_SESSION['config']->get_ServerURL()) . ")";
|
||||
printHeaderContents($title, $headerPrefix);
|
||||
echo "</head><body class=\"admin\">\n";
|
||||
|
||||
// include all JavaScript files
|
||||
printJsIncludes($headerPrefix);
|
||||
|
||||
// get tool list
|
||||
$availableTools = getTools();
|
||||
$toolSettings = $_SESSION['config']->getToolSettings();
|
||||
// sort tools
|
||||
$toSort = array();
|
||||
foreach ($availableTools as $toolClass) {
|
||||
$myTool = new $toolClass();
|
||||
if ($myTool->getRequiresWriteAccess() && !checkIfWriteAccessIsAllowed()) {
|
||||
continue;
|
||||
}
|
||||
if ($myTool->getRequiresPasswordChangeRights() && !checkIfPasswordChangeIsAllowed()) {
|
||||
continue;
|
||||
}
|
||||
// check visibility
|
||||
if (!$myTool->isVisible()) {
|
||||
continue;
|
||||
}
|
||||
// check if hidden by config
|
||||
$toolName = substr($toolClass, strrpos($toolClass, '\\') + 1);
|
||||
if (isset($toolSettings['tool_hide_' . $toolName]) && ($toolSettings['tool_hide_' . $toolName] == 'true')) {
|
||||
continue;
|
||||
}
|
||||
$toSort[$toolClass] = $myTool->getPosition();
|
||||
}
|
||||
asort($toSort);
|
||||
$tools = array();
|
||||
foreach ($toSort as $key => $value) {
|
||||
$tools[] = new $key();
|
||||
}
|
||||
?>
|
||||
|
||||
<table border=0 width="100%" class="lamHeader ui-corner-all">
|
||||
<tr>
|
||||
<td align="left" height="30" class="nowrap">
|
||||
<a class="lamLogo" href="https://www.ldap-account-manager.org/" target="new_window">
|
||||
<span class="hide-on-tablet"> </span>
|
||||
<span class="hide-on-mobile">
|
||||
LDAP Account Manager
|
||||
<?php
|
||||
echo $pro . " - " . LAMVersion();
|
||||
?>
|
||||
</span>
|
||||
</a>
|
||||
</td>
|
||||
<td align="left" height="30" class="nowrap">
|
||||
<span class="hide-on-mobile">
|
||||
<?php
|
||||
$userData = $_SESSION['ldap']->decrypt_login();
|
||||
echo ' <small title="' . $userData[0] . '">';
|
||||
printf('(' . _('Logged in as: %s') . ')', extractRDNValue($userData[0]));
|
||||
$userData = null;
|
||||
echo '</small>';
|
||||
?>
|
||||
</span>
|
||||
</td>
|
||||
<td align="right" height=30 width="100%">
|
||||
<ul id="dropmenu" class="dropmenu">
|
||||
<li><a href="<?php echo $headerPrefix; ?>/templates/logout.php" target="_top"><img class="align-middle" height="16" width="16" alt="logout" src="<?php echo $headerPrefix; ?>/graphics/exit.png"><span class="hide-on-mobile padding0"> <?php echo _("Logout") ?></span></a></li>
|
||||
<?php
|
||||
if (is_dir(dirname(__FILE__) . '/../docs/manual')) {
|
||||
?>
|
||||
<li>
|
||||
<a target="_blank" href="<?php echo $headerPrefix; ?>/docs/manual/index.html"><img class="align-middle" width="16" height="16" alt="help" src="<?php echo $headerPrefix; ?>/graphics/help.png"><span class="hide-on-mobile padding0"> <?php echo _("Help") ?> </span></a>
|
||||
</li>
|
||||
<?php
|
||||
}
|
||||
if (sizeof($tools) > 0) {
|
||||
?>
|
||||
<li>
|
||||
<a href="<?php echo $headerPrefix; ?>/templates/tools.php"><img class="align-middle" height="16" width="16" alt="tools" src="<?php echo $headerPrefix; ?>/graphics/tools.png"><span class="hide-on-mobile padding0"> <?php echo _("Tools") ?></span></a>
|
||||
<ul>
|
||||
<?php
|
||||
foreach ($tools as $tool) {
|
||||
$subTools = $tool->getSubTools();
|
||||
echo '<li title="' . $tool->getDescription() . '">';
|
||||
$link = $headerPrefix . '/templates/' . $tool->getLink();
|
||||
echo '<a href="' . $link . "\">\n";
|
||||
echo '<img class="max16" height="16px" width="16px" alt="" src="' . $headerPrefix . '/graphics/' . $tool->getImageLink() . '"> ' . $tool->getName();
|
||||
echo "</a>\n";
|
||||
if (sizeof($subTools) > 0) {
|
||||
echo "<ul>\n";
|
||||
foreach ($subTools as $subTool) {
|
||||
echo "<li title=\"" . $subTool->description . "\">\n";
|
||||
echo "<a href=\"" . $headerPrefix . '/templates/' . $subTool->link . "\">\n";
|
||||
echo '<img class="max16" width="16px" height="16px" alt="" src="' . $headerPrefix . '/graphics/' . $subTool->image . '"> ' . $subTool->name;
|
||||
echo "</a>\n";
|
||||
echo "</li>\n";
|
||||
}
|
||||
echo "</ul>\n";
|
||||
}
|
||||
echo "</li>\n";
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</li>
|
||||
<?php
|
||||
}
|
||||
if ($_SESSION['config']->get_Suffix('tree') != "") {
|
||||
?>
|
||||
<li>
|
||||
<a href="<?php echo $headerPrefix; ?>/templates/tree/treeViewContainer.php"><img class="align-middle" height="16" width="16" alt="tree" src="<?php echo $headerPrefix; ?>/graphics/process.png"><span class="hide-on-mobile padding0"> <?php echo _("Tree view") ?></span></a>
|
||||
</li>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<script type="text/javascript">
|
||||
jQuery(document).ready(function() {
|
||||
jQuery('#dropmenu').dropmenu({
|
||||
effect : 'slide',
|
||||
nbsp : true,
|
||||
timeout : 350,
|
||||
speed : 'fast'
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<br>
|
||||
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
|
||||
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
|
||||
<?php
|
||||
printTypeTabs($headerPrefix);
|
||||
?>
|
||||
</ul>
|
||||
|
||||
<?php
|
||||
|
||||
function printTypeTabs($headerPrefix) {
|
||||
$typeManager = new \LAM\TYPES\TypeManager();
|
||||
$types = $typeManager->getConfiguredTypes();
|
||||
foreach ($types as $type) {
|
||||
if ($type->isHidden()) {
|
||||
continue;
|
||||
}
|
||||
$link = '<a href="' . $headerPrefix . '/templates/lists/list.php?type=' . $type->getId() .
|
||||
'" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">' .
|
||||
'<img height="16" width="16" alt="' . $type->getId() . '" src="' . $headerPrefix . '/graphics/' . $type->getIcon() . '"> ' .
|
||||
$type->getAlias() . '</a>';
|
||||
echo '<li id="tab_' . $type->getId() . '" class="ui-state-default ui-corner-top">';
|
||||
echo $link;
|
||||
echo "</li>\n";
|
||||
}
|
||||
}
|
||||
|
||||