new PLA release
This commit is contained in:
parent
dda8f4ad5b
commit
24f9db8b7d
|
@ -17,7 +17,6 @@ if (! ini_get('file_uploads'))
|
||||||
|
|
||||||
$request['page'] = new PageRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
|
$request['page'] = new PageRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
|
||||||
$request['page']->drawTitle(sprintf('<b>%s</b>',_('Import')));
|
$request['page']->drawTitle(sprintf('<b>%s</b>',_('Import')));
|
||||||
$request['page']->drawSubTitle(sprintf('%s: <b>%s</b>',_('Server'),$app['server']->getName()));
|
|
||||||
|
|
||||||
echo '<form action="cmd.php" method="post" class="new_value" enctype="multipart/form-data">';
|
echo '<form action="cmd.php" method="post" class="new_value" enctype="multipart/form-data">';
|
||||||
echo '<div>';
|
echo '<div>';
|
||||||
|
|
|
@ -61,7 +61,6 @@ if (! count($request['page']))
|
||||||
|
|
||||||
# We'll render this forms Title with the first DN's object.
|
# We'll render this forms Title with the first DN's object.
|
||||||
$request['page'][0]->drawTitle(_('Bulk edit the following DNs'));
|
$request['page'][0]->drawTitle(_('Bulk edit the following DNs'));
|
||||||
$request['page'][0]->drawSubTitle(sprintf('%s: <b>%s</b>',_('Server'),$app['server']->getName()));
|
|
||||||
|
|
||||||
echo '<form action="cmd.php" method="post">';
|
echo '<form action="cmd.php" method="post">';
|
||||||
echo '<div>';
|
echo '<div>';
|
||||||
|
|
|
@ -46,7 +46,6 @@ foreach ($request['dn'] as $index => $dn) {
|
||||||
|
|
||||||
# We can use the $render to give us a title
|
# We can use the $render to give us a title
|
||||||
$render->drawTitle(_('Bulk update the following DNs'));
|
$render->drawTitle(_('Bulk update the following DNs'));
|
||||||
$render->drawSubTitle(sprintf('%s: <b>%s</b>',_('Server'),$app['server']->getName()));
|
|
||||||
|
|
||||||
if (count($request['update'])) {
|
if (count($request['update'])) {
|
||||||
if (get_request('confirm','REQUEST')) {
|
if (get_request('confirm','REQUEST')) {
|
||||||
|
|
|
@ -432,20 +432,7 @@ class QueryRender extends PageRender {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function drawSubTitle($subtitle=null) {
|
public function drawSubTitle($subtitle=null) {
|
||||||
if (is_null($subtitle)) {
|
return;
|
||||||
$server = $this->getServer();
|
|
||||||
|
|
||||||
$subtitle = sprintf('%s: <b>%s</b>',_('Server'),$server->getName());
|
|
||||||
|
|
||||||
if ($this->template) {
|
|
||||||
$subtitle .= '<br />';
|
|
||||||
$subtitle .= sprintf('%s: <b>%s</b>',('Query'),$this->template->getID() != 'none' ? $this->template->getTitle() : _('Default'));
|
|
||||||
if ($this->template->getName())
|
|
||||||
$subtitle .= sprintf(' (<b>%s</b>)',$this->template->getName(false));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
parent::drawSubTitle($subtitle);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getAFattrs() {
|
private function getAFattrs() {
|
||||||
|
|
|
@ -188,7 +188,7 @@ function app_error_handler($errno,$errstr,$file,$lineno) {
|
||||||
* Returns the application name.
|
* Returns the application name.
|
||||||
*/
|
*/
|
||||||
function app_name() {
|
function app_name() {
|
||||||
return 'phpLDAPadmin';
|
return 'LDAP Account Manager';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -198,33 +198,7 @@ function app_name() {
|
||||||
* @return string The current version as read from the VERSION file.
|
* @return string The current version as read from the VERSION file.
|
||||||
*/
|
*/
|
||||||
function app_version() {
|
function app_version() {
|
||||||
static $CACHE = null;
|
return LAMVersion();
|
||||||
|
|
||||||
if ($CACHE)
|
|
||||||
return $CACHE;
|
|
||||||
|
|
||||||
$version_file = realpath(LIBDIR.'../VERSION');
|
|
||||||
if (! file_exists($version_file))
|
|
||||||
$CACHE = 'UNKNOWN';
|
|
||||||
|
|
||||||
else {
|
|
||||||
$version = rtrim(file_get_contents($version_file));
|
|
||||||
|
|
||||||
$CACHE = preg_replace('/^RELEASE-([0-9\.]+(-.*)*)$/','$1',$version);
|
|
||||||
|
|
||||||
# Check if we are a CVS copy.
|
|
||||||
if (preg_match('/^(DEVEL)?$/',$CACHE))
|
|
||||||
$CACHE = 'DEVEL';
|
|
||||||
|
|
||||||
# Check if we are special DEVEL version
|
|
||||||
elseif (preg_match('/^DEVEL-([0-9\.]+)+$/',$CACHE)) {}
|
|
||||||
|
|
||||||
# If return is still the same as version, then the tag is not one we expect.
|
|
||||||
elseif ($CACHE == $version)
|
|
||||||
$CACHE = 'UNKNOWN';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $CACHE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue