translation update

This commit is contained in:
Roland Gruber 2011-07-13 18:30:14 +00:00
parent b286da56ce
commit d9df016a53
20 changed files with 264 additions and 518 deletions

File diff suppressed because it is too large Load Diff

View File

@ -61,8 +61,7 @@ if (count($ldap['attrs']['need']) > 0) {
$request['page']->drawSubTitle(); $request['page']->drawSubTitle();
echo '<div style="text-align: center">'; echo '<div style="text-align: center">';
printf('<small><b>%s: </b>%s <b>%s</b> %s %s</small>', printf('<small>%s <b>%s</b> %s %s</small>',
_('Instructions'),
_('In order to add these objectClass(es) to this entry, you must specify'), _('In order to add these objectClass(es) to this entry, you must specify'),
count($ldap['attrs']['need']),_('new attributes'), count($ldap['attrs']['need']),_('new attributes'),
_('that this objectClass requires.')); _('that this objectClass requires.'));
@ -82,7 +81,7 @@ if (count($ldap['attrs']['need']) > 0) {
echo '</div>'; echo '</div>';
echo '<table class="entry" cellspacing="0" border="0" style="margin-left: auto; margin-right: auto;">'; echo '<table class="entry" cellspacing="0" border="0" style="margin-left: auto; margin-right: auto;">';
printf('<tr><th colspan="2">%s</th></tr>',_('New Required Attributes')); printf('<tr><th colspan="2">%s</th></tr>',_('New required attributes'));
$counter = 0; $counter = 0;
echo '<tr><td colspan="2">'; echo '<tr><td colspan="2">';

View File

@ -62,8 +62,8 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST'
$request['count'] = $request['attribute']->getValueCount(); $request['count'] = $request['attribute']->getValueCount();
if ($request['count']) { if ($request['count']) {
printf('<td class="top">%s <b>%s</b> %s <b>%s</b>:</td>', printf('<td class="top">' . _('Current list of <b>%s</b> values for attribute <b>%s</b>:') . '</td>',
_('Current list of'),$request['count'],_('values for attribute'),$request['attribute']->getFriendlyName()); $request['count'],$request['attribute']->getFriendlyName());
echo '<td>'; echo '<td>';
@ -80,8 +80,8 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST'
echo '</td>'; echo '</td>';
} else { } else {
printf('<td>%s <b>%s</b>.</td>', printf('<td>' . _('No current value for attribute <b>%s</b>.') . '</td>',
_('No current value for attribute'),$request['attribute']->getFriendlyName()); $request['attribute']->getFriendlyName());
echo '<td><br /><br /></td>'; echo '<td><br /><br /></td>';
} }
@ -142,8 +142,8 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST'
printf('<small><b>%s:</b> %s</small><br />',_('Syntax'),$sattr->getType()); printf('<small><b>%s:</b> %s</small><br />',_('Syntax'),$sattr->getType());
if ($sattr->getMaxLength()) if ($sattr->getMaxLength())
printf('<small><b>%s:</b> %s %s</small><br />', printf('<small>' . _('<b>Maximum length:</b> %s characters') . '</small><br />',
_('Maximum Length'),number_format($sattr->getMaxLength()),_('characters')); number_format($sattr->getMaxLength()));
echo '<br />'; echo '<br />';
printf('<input type="submit" id="save_button" name="submit" value="%s" />',_('Add value')); printf('<input type="submit" id="save_button" name="submit" value="%s" />',_('Add value'));

View File

@ -145,7 +145,7 @@ function r_copy_dn($serverSRC,$serverDST,$snapshottree,$dnSRC,$dnDST,$remove) {
$delete_result = $serverSRC->delete($dnSRC); $delete_result = $serverSRC->delete($dnSRC);
if ($delete_result) if ($delete_result)
array_push($copy_message,sprintf('%s %s: <b>%s</b> %s',_('Delete successful'),_('DN'),$dnDST,_('has been deleted.'))); array_push($copy_message,sprintf(_('Delete successful: %s'),$dnSRC));
} }
} else { } else {

View File

@ -94,7 +94,7 @@ if ($add_result) {
echo '<br />'; echo '<br />';
echo '<center>'; echo '<center>';
printf('<a href="cmd.php?%s&amp;dn=%s">%s</a>.', printf('<a href="cmd.php?%s&amp;dn=%s">%s</a>.',
htmlspecialchars($href),rawurlencode($request['template']->getDN()),_('Display the new created entry')); htmlspecialchars($href),rawurlencode($request['template']->getDN()),_('Display the created entry'));
echo '<br />'; echo '<br />';
printf('<a href="cmd.php?%s&amp;container=%s">%s</a>.', printf('<a href="cmd.php?%s&amp;container=%s">%s</a>.',
htmlspecialchars($href),rawurlencode($request['template']->getContainer()),_('Create another entry')); htmlspecialchars($href),rawurlencode($request['template']->getContainer()),_('Create another entry'));

View File

@ -78,7 +78,7 @@ if (count($request['template']->getLDAPadd(true))) {
echo "\n"; echo "\n";
printf('<tr class="heading"><td>%s</td><td>%s</td><td>%s</td></tr>', printf('<tr class="heading"><td>%s</td><td>%s</td><td>%s</td></tr>',
_('Attribute'),_('New Value'),_('Skip')); _('Attribute'),_('New value'),_('Skip'));
echo "\n\n"; echo "\n\n";
$counter = 0; $counter = 0;

View File

@ -61,15 +61,6 @@ if (count($request['children'])) {
echo '<tr><td colspan="2">&nbsp;</td></tr>'; echo '<tr><td colspan="2">&nbsp;</td></tr>';
printf('<tr><td colspan="2">%s</td></tr>',
sprintf(_('phpLDAPadmin can recursively delete this entry and all %s of its children. See below for a list of all the entries that this action will delete. Do you want to do this?'),count($request['search'])));
echo '<tr><td colspan="2">&nbsp;</td></tr>';
printf('<tr><td colspan="2"><small>%s</small></td></tr>',
_('Note: this is potentially very dangerous and you do this at your own risk. This operation cannot be undone. Take into consideration aliases, referrals, and other things that may cause problems.'));
echo "\n";
echo '<tr>'; echo '<tr>';
echo '<td style="width: 50%; text-align: center;">'; echo '<td style="width: 50%; text-align: center;">';
echo '<form action="cmd.php" method="post" id="delete_form">'; echo '<form action="cmd.php" method="post" id="delete_form">';

View File

@ -20,7 +20,7 @@ $request['element'] = get_request('element','GET');
$request['rdn'] = get_request('rdn','GET'); $request['rdn'] = get_request('rdn','GET');
echo '<div class="popup">'; echo '<div class="popup">';
printf('<h3 class="subtitle">%s</h3>',_('Entry Chooser')); printf('<h3 class="subtitle">%s</h3>',_('Choose entry'));
echo '<script type="text/javascript">'; echo '<script type="text/javascript">';
echo ' function returnDN(dn) {'; echo ' function returnDN(dn) {';
@ -32,8 +32,7 @@ echo '</script>';
echo '<table class="forminput" width="100%" border="0">'; echo '<table class="forminput" width="100%" border="0">';
if ($request['container']) { if ($request['container']) {
printf('<tr><td class="heading" colspan="3">%s:</td><td>%s</td></tr>',_('Server'),$app['server']->getName()); printf('<tr><td class="heading" colspan="3">%s:</td><td>%s</td></tr>',_('Parent DN'),$request['container']);
printf('<tr><td class="heading" colspan="3">%s:</td><td>%s</td></tr>',_('Looking in'),$request['container']);
echo '<tr><td class="blank" colspan="4">&nbsp;</td></tr>'; echo '<tr><td class="blank" colspan="4">&nbsp;</td></tr>';
} }
@ -87,7 +86,6 @@ if (isset($app['server']) && ! is_null($request['container'])) {
} else { } else {
foreach ($_SESSION[APPCONFIG]->getServerList() as $index => $server) { foreach ($_SESSION[APPCONFIG]->getServerList() as $index => $server) {
if ($server->isLoggedIn(null)) { if ($server->isLoggedIn(null)) {
printf('<tr><td class="heading" colspan="3">%s:</td><td class="heading">%s</td></tr>',_('Server'),$server->getName());
foreach ($server->getBaseDN() as $dn) { foreach ($server->getBaseDN() as $dn) {
if (! $dn) { if (! $dn) {
printf('<tr><td class="blank">&nbsp;</td><td colspan="3">(%s)</td></tr>',('Could not determine base DN')); printf('<tr><td class="blank">&nbsp;</td><td colspan="3">(%s)</td></tr>',('Could not determine base DN'));

View File

@ -68,7 +68,7 @@ while (! $request['import']->eof()) {
$errormsg .= ldap_error_msg($app['server']->getErrorMessage(null),$app['server']->getErrorNum(null)); $errormsg .= ldap_error_msg($app['server']->getErrorMessage(null),$app['server']->getErrorNum(null));
system_message(array( system_message(array(
'title'=>_('LDIF text import'), 'title'=>_('LDIF import'),
'body'=>$errormsg, 'body'=>$errormsg,
'type'=>'warn')); 'type'=>'warn'));
} }

View File

@ -17,7 +17,7 @@ $request['dn'] = get_request('dn','REQUEST');
if (! $request['dn']) if (! $request['dn'])
system_message(array( system_message(array(
'title'=>_('No entry selected'), 'title'=>_('No entry was selected to delete'),
'body'=>_('No entry was selected to delete'), 'body'=>_('No entry was selected to delete'),
'type'=>'warn'),'index.php'); 'type'=>'warn'),'index.php');
@ -41,8 +41,7 @@ foreach ($request['dn'] as $dn) {
} }
} }
printf('<h3 class="title">%s</h3>',_('Mass Delete')); printf('<h3 class="title">%s</h3>',_('Mass delete'));
printf('<h3 class="subtitle">%s: <b>%s</b></h3>',_('Server'),$app['server']->getName());
echo "\n"; echo "\n";
echo '<center>'; echo '<center>';

View File

@ -58,7 +58,7 @@ if (count($request['update'])) {
if ($result) if ($result)
printf('%s: <b>%s</b><br>',$template->getDN(),_('Modification successful!')); printf('%s: <b>%s</b><br>',$template->getDN(),_('Modification successful!'));
else else
printf('%s: <b>%s</b><br>',$template->getDN(),_('Modification NOT successful!')); printf('%s: <b>%s</b><br>',$template->getDN(),_('Modification not successful!'));
} }
} else { } else {

View File

@ -52,7 +52,7 @@ if (count($request['template']->getLDAPmodify(true))) {
echo "\n"; echo "\n";
printf('<tr class="heading"><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', printf('<tr class="heading"><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
_('Attribute'),_('Old Value'),_('New Value'),_('Skip')); _('Attribute'),_('Old value'),_('New value'),_('Skip'));
echo "\n\n"; echo "\n\n";
# If we skip objectclass changes, but there are new must/may attrs provided by the new objectclass, they need to be skip. # If we skip objectclass changes, but there are new must/may attrs provided by the new objectclass, they need to be skip.

View File

@ -230,7 +230,7 @@ class HTMLTree extends Tree {
return ''; return '';
$menu['cmd'] = 'query_engine'; $menu['cmd'] = 'query_engine';
$menu['ajax'] = _('Loading Search'); $menu['ajax'] = _('Loading search');
$menu['div'] = 'BODY'; $menu['div'] = 'BODY';
$menu['title'] = _('Search'); $menu['title'] = _('Search');
$menu['img'] = 'search-big.png'; $menu['img'] = 'search-big.png';
@ -287,7 +287,7 @@ class HTMLTree extends Tree {
return ''; return '';
$menu['cmd'] = 'import_form'; $menu['cmd'] = 'import_form';
$menu['ajax'] = _('Loading Import'); $menu['ajax'] = _('Loading import');
$menu['div'] = 'BODY'; $menu['div'] = 'BODY';
$menu['title'] = _('Import'); $menu['title'] = _('Import');
$menu['img'] = 'import-big.png'; $menu['img'] = 'import-big.png';
@ -300,7 +300,7 @@ class HTMLTree extends Tree {
return ''; return '';
$menu['cmd'] = 'export_form'; $menu['cmd'] = 'export_form';
$menu['ajax'] = _('Loading Export'); $menu['ajax'] = _('Loading export');
$menu['div'] = 'BODY'; $menu['div'] = 'BODY';
$menu['title'] = _('Export'); $menu['title'] = _('Export');
$menu['img'] = 'export-big.png'; $menu['img'] = 'export-big.png';
@ -502,8 +502,8 @@ class HTMLTree extends Tree {
echo '<tr>'; echo '<tr>';
printf('<td class="spacer" colspan="%s"></td>',$level+3); printf('<td class="spacer" colspan="%s"></td>',$level+3);
printf('<td class="icon"><a href="%s"><img src="%s/create.png" alt="%s" /></a></td>',$href,IMGDIR,_('new')); printf('<td class="icon"><a href="%s"><img src="%s/create.png" alt="%s" /></a></td>',$href,IMGDIR,_('new'));
printf('<td class="link" colspan="%s"><a href="%s" title="%s %s">%s</a></td>', printf('<td class="link" colspan="%s"><a href="%s" title="%s">%s</a></td>',
$this->getDepth()+3-$level,$href,_('Create a new entry in'),$rdn,_('Create new entry here')); $this->getDepth()+3-$level,$href,_('Create new entry here'),_('Create new entry here'));
echo '</tr>'; echo '</tr>';
} }

View File

@ -91,26 +91,8 @@ class QueryRender extends PageRender {
$templates = $this->getTemplates(); $templates = $this->getTemplates();
if (count($templates->getTemplates())) {
echo '<tr>'; echo '<tr>';
printf('<td><acronym title="%s">%s</acronym></td>',_('Run a predefined query'),_('Predefined Query')); printf('<td><acronym title="%s">%s</acronym></td>',_('The format to show the query results'),_('Display format'));
echo '<td>';
echo '<select name="query">';
if ($this->haveDefaultTemplate())
printf('<option value="%s" %s>%s</option>','none','',_('Custom Query'));
foreach ($templates->getTemplates() as $template)
printf('<option value="%s" %s>%s</option>',
$template->getID(),
($this->template_id == $template->getID() ? 'selected="selected"' : ''),
$template->getDescription());
echo '</select>';
echo '</td>';
echo '</tr>';
}
echo '<tr>';
printf('<td><acronym title="%s">%s</acronym></td>',_('The format to show the query results'),_('Display Format'));
echo '<td>'; echo '<td>';
echo '<select name="format" style="width: 200px">'; echo '<select name="format" style="width: 200px">';
@ -124,7 +106,7 @@ class QueryRender extends PageRender {
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
printf('<td><acronym title="%s"></acronym></td>',_('Entries to show per page')); echo '<td></td>';
echo '<td>'; echo '<td>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -134,8 +116,6 @@ class QueryRender extends PageRender {
echo '<td colspan="2">'; echo '<td colspan="2">';
printf('<div id="customquery" style="display: %s">','block'); printf('<div id="customquery" style="display: %s">','block');
echo '<br/>'; echo '<br/>';
echo '<fieldset>';
printf('<legend>%s</legend>',_('Custom Query'));
echo '<table border="0"><tr>'; echo '<table border="0"><tr>';
printf('<td>%s</td>',_('Base DN')); printf('<td>%s</td>',_('Base DN'));
@ -193,7 +173,6 @@ class QueryRender extends PageRender {
echo '</tr>'; echo '</tr>';
echo '</table>'; echo '</table>';
echo '</fieldset>';
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -517,7 +496,7 @@ class QueryRender extends PageRender {
if (isAjaxEnabled()) if (isAjaxEnabled())
printf('<a href="cmd.php?%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>', printf('<a href="cmd.php?%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>',
$query_string,$query_string,_('Loading Search'),_($f)); $query_string,$query_string,_('Loading search'),_($f));
else else
printf('<a href="cmd.php?%s">%s</a>',$query_string,_($f)); printf('<a href="cmd.php?%s">%s</a>',$query_string,_($f));
} }

View File

@ -555,8 +555,8 @@ class Template extends xmlTemplate {
else { else {
system_message(array( system_message(array(
'title'=>_('No RDN attribute'), 'title'=>_('No RDN attribute was selected.'),
'body'=>_('No RDN attribute was selected'), 'body'=>_('No RDN attribute was selected.'),
'type'=>'warn'),'index.php'); 'type'=>'warn'),'index.php');
die(); die();

View File

@ -680,7 +680,7 @@ class TemplateRender extends PageRender {
# Title # Title
$this->drawTitle(); $this->drawTitle();
if (get_request('create_base')) if (get_request('create_base'))
$this->drawSubTitle(sprintf('<b>%s</b>: %s',_('Creating Base DN'),$this->template->getDN())); $this->drawSubTitle(sprintf('<b>%s</b>: %s',('Creating Base DN'),$this->template->getDN()));
else else
$this->drawSubTitle(); $this->drawSubTitle();
echo "\n"; echo "\n";
@ -1339,7 +1339,7 @@ class TemplateRender extends PageRender {
if ($_SESSION[APPCONFIG]->getValue('appearance','show_hints')) { if ($_SESSION[APPCONFIG]->getValue('appearance','show_hints')) {
printf('<tr><td>&nbsp;</td><td><small><img src="%s/light.png" alt="Hint" /><span class="hint">',IMGDIR); printf('<tr><td>&nbsp;</td><td><small><img src="%s/light.png" alt="Hint" /><span class="hint">',IMGDIR);
echo _('Hint: You must choose exactly one structural objectClass (shown in bold above)'); echo _('Hint: You must choose exactly one structural object class (shown in bold above)');
echo '</span></small><br /></td></tr>'; echo '</span></small><br /></td></tr>';
} }
} }
@ -1863,13 +1863,13 @@ function fillRec(id,value) {
printf('<a href="cmd.php?cmd=template_engine&amp;server_id=%s&amp;dn=%s" title="%s %s"><img src="%s/ldap-alias.png" alt="Go" /></a>&nbsp;', printf('<a href="cmd.php?cmd=template_engine&amp;server_id=%s&amp;dn=%s" title="%s %s"><img src="%s/ldap-alias.png" alt="Go" /></a>&nbsp;',
$this->getServerID(),rawurlencode($val),_('Go to'),$val,IMGDIR); $this->getServerID(),rawurlencode($val),_('Go to'),$val,IMGDIR);
else else
printf('<a title="%s %s"><img src="%s/nogo.png" alt="Go" /></a>&nbsp;',_('DN not available'),$val,IMGDIR); printf('<a title="%s %s"><img src="%s/nogo.png" alt="Go" /></a>&nbsp;',_('DN does not exist'),$val,IMGDIR);
} }
protected function drawMailValueIconAttribute($attribute,$val) { protected function drawMailValueIconAttribute($attribute,$val) {
if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__); if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
$img = sprintf('<img src="%s/mail.png" alt="%s" style="float: right;" />',IMGDIR,_('Mail')); $img = sprintf('<img src="%s/mail.png" alt="%s" style="float: right;" />',IMGDIR,_('Email'));
if (strlen($val) <= 0) if (strlen($val) <= 0)
echo $img; echo $img;
else else
@ -2105,13 +2105,13 @@ function fillRec(id,value) {
$this->getServerID(),$this->template->getDNEncode(),rawurlencode($attribute->getName())); $this->getServerID(),$this->template->getDNEncode(),rawurlencode($attribute->getName()));
if (isAjaxEnabled()) if (isAjaxEnabled())
return sprintf('(<a href="cmd.php?%s" title="%s: %s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>)', return sprintf('(<a href="cmd.php?%s" onclick="return ajDISPLAY(\'BODY\',\'%s\',\'%s\');">%s</a>)',
htmlspecialchars($href),_('Modify members for'),$this->template->getDN(), htmlspecialchars($href),
htmlspecialchars($href),str_replace('\'','\\\'',_('Modify group membership')), htmlspecialchars($href),str_replace('\'','\\\'',_('Modify group members')),
_('modify group members')); _('Modify group members'));
else else
return sprintf('(<a href="cmd.php?%s" title="%s: %s">%s</a>)', return sprintf('(<a href="cmd.php?%s">%s</a>)',
htmlspecialchars($href),_('Modify members for'),$this->template->getDN(),_('modify group members')); htmlspecialchars($href),_('Modify group members'));
} }
protected function getRenameMenuItemAttribute($attribute) { protected function getRenameMenuItemAttribute($attribute) {

View File

@ -345,8 +345,8 @@ class myldap extends DS {
if (is_array($query['base'])) { if (is_array($query['base'])) {
system_message(array( system_message(array(
'title'=>_('Invalid BASE for query'), 'title'=>('Invalid BASE for query'),
'body'=>_('The query was cancelled because of an invalid base.'), 'body'=>('The query was cancelled because of an invalid base.'),
'type'=>'error')); 'type'=>'error'));
return array(); return array();

View File

@ -298,14 +298,6 @@ function check_config($config_file) {
$config->setServers($servers); $config->setServers($servers);
# Check the memory limit parameter.
if ((ini_get('memory_limit') > -1) && ini_get('memory_limit') < $config->getValue('session','memorylimit'))
system_message(array(
'title'=>_('Memory Limit low.'),
'body'=>sprintf('Your php memory limit is low - currently %s, you should increase it to atleast %s. This is normally controlled in /etc/php.ini.',
ini_get('memory_limit'),$config->getValue('session','memorylimit')),
'type'=>'error'));
return $config; return $config;
} }
@ -347,31 +339,31 @@ function cmd_control_pane($type) {
case 'top' : case 'top' :
return array( return array(
'forum'=>array( 'forum'=>array(
'title'=>_('Forum'), 'title'=>('Forum'),
'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true, 'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true,
'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('forum'),('Forum')), 'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('forum'),('Forum')),
'image'=>sprintf('<img src="%s/forum-big.png" alt="%s" />',IMGDIR,('Forum'))), 'image'=>sprintf('<img src="%s/forum-big.png" alt="%s" />',IMGDIR,('Forum'))),
'feature'=>array( 'feature'=>array(
'title'=>_('Request feature'), 'title'=>('Request feature'),
'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true, 'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true,
'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('add_rfe'),('Request feature')), 'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('add_rfe'),('Request feature')),
'image'=>sprintf('<img src="%s/request-feature-big.png" alt="%s" />',IMGDIR,('Request feature'))), 'image'=>sprintf('<img src="%s/request-feature-big.png" alt="%s" />',IMGDIR,('Request feature'))),
'bug'=>array( 'bug'=>array(
'title'=>_('Report a bug'), 'title'=>('Report a bug'),
'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true, 'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true,
'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('add_bug'),('Report a bug')), 'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('add_bug'),('Report a bug')),
'image'=>sprintf('<img src="%s/bug-big.png" alt="%s" />',IMGDIR,('Report a bug'))), 'image'=>sprintf('<img src="%s/bug-big.png" alt="%s" />',IMGDIR,('Report a bug'))),
'donation'=>array( 'donation'=>array(
'title'=>_('Donate'), 'title'=>('Donate'),
'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true, 'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true,
'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('donate'),('Donate')), 'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('donate'),('Donate')),
'image'=>sprintf('<img src="%s/smile-big.png" alt="%s" />',IMGDIR,('Donate'))), 'image'=>sprintf('<img src="%s/smile-big.png" alt="%s" />',IMGDIR,('Donate'))),
'help'=>array( 'help'=>array(
'title'=>_('Help'), 'title'=>('Help'),
'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true, 'enable'=>isset($_SESSION[APPCONFIG]) ? $_SESSION[APPCONFIG]->isCommandAvailable('cmd','oslinks') : true,
'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('documentation'),('Help')), 'link'=>sprintf('href="%s" title="%s" onclick="target=\'_blank\';"',get_href('documentation'),('Help')),
'image'=>sprintf('<img src="%s/help-big.png" alt="%s" />',IMGDIR,('Help'))) 'image'=>sprintf('<img src="%s/help-big.png" alt="%s" />',IMGDIR,('Help')))
@ -2021,12 +2013,6 @@ function draw_jpeg_photo($server,$dn,$attr_name='jpegphoto',$index,$draw_delete_
'body'=>sprintf(('Please check jpeg,tmpdir is a writable directory in the phpLDAPadmin config.php'),$jpeg_temp_dir), 'body'=>sprintf(('Please check jpeg,tmpdir is a writable directory in the phpLDAPadmin config.php'),$jpeg_temp_dir),
'type'=>'warn')); 'type'=>'warn'));
} elseif ($outjpeg < 6) {
system_message(array(
'title'=>sprintf('%s %s',$attr_name,_('contains errors')),
'body'=>_('It appears that the jpeg image may not be a jpeg image'),
'type'=>'warn'));
} else { } else {
$jpeg_dimensions = getimagesize($jpeg_filename); $jpeg_dimensions = getimagesize($jpeg_filename);
$width = $jpeg_dimensions[0]; $width = $jpeg_dimensions[0];

View File

@ -151,7 +151,7 @@ class ImportLDIF extends Import {
public $error = array(); public $error = array();
static public function getType() { static public function getType() {
return array('type'=>'LDIF','description' => _('LDIF Import'),'extension'=>'ldif'); return array('type'=>'LDIF','description' => _('LDIF import'),'extension'=>'ldif');
} }
protected function getTemplate() { protected function getTemplate() {