[debian-edu-commits] debian-edu/upstream/ 02/03: pre-release white-space cleanup
Mike Gabriel
sunweaver at debian.org
Wed Aug 26 23:18:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa-plugin-mailaddress.
commit cbc1f9ba661adb8f9f464dfaa2e40b9055c57e21
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Aug 27 01:16:50 2015 +0200
pre-release white-space cleanup
---
admin/groups/mailaddress/class_groupMail.inc | 28 +++++++++++-----------
admin/groups/mailaddress/mailaddress.tpl | 4 ++--
admin/groups/mailaddress/paste_mailaddress.tpl | 4 ++--
contrib/update-locale | 2 +-
personal/mailaddress/class_mailAccount.inc | 32 +++++++++++++-------------
personal/mailaddress/generic.tpl | 2 +-
6 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/admin/groups/mailaddress/class_groupMail.inc b/admin/groups/mailaddress/class_groupMail.inc
index 99bae2c..9f30f7c 100644
--- a/admin/groups/mailaddress/class_groupMail.inc
+++ b/admin/groups/mailaddress/class_groupMail.inc
@@ -3,10 +3,10 @@
class mailgroup extends plugin
{
/* Multiple edit */
- var $gosaMailForwardingAddress_Some = array(); // Used in multiple edit
+ var $gosaMailForwardingAddress_Some = array(); // Used in multiple edit
/* Default values */
- var $mail = ""; // Default mail address
+ var $mail = ""; // Default mail address
var $gosaMailAlternateAddress = array(); // Set default Alternate Mail Adresses to empty array
var $gosaMailForwardingAddress = array(); // Forwarding also empty
/* Internal */
@@ -16,7 +16,7 @@ class mailgroup extends plugin
* required due to gosaMailAccount objectclass requirements.
*/
var $gosaMailServer = "NULL";
- var $gosaMailDeliveryMode = "[ ]"; //
+ var $gosaMailDeliveryMode = "[ ]"; //
/* attribute list for save action */
var $attributes= array( "mail", "gosaMailServer", "gosaMailDeliveryMode",
@@ -221,7 +221,7 @@ class mailgroup extends plugin
/******
- Multi edit support
+ Multi edit support
******/
foreach($this->attributes as $attr){
if(in_array_strict($attr,$this->multi_boxes)){
@@ -257,7 +257,7 @@ class mailgroup extends plugin
$this->cleanup();
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
if (!$ldap->success()){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
}
@@ -314,7 +314,7 @@ class mailgroup extends plugin
/* Save data to LDAP */
$ldap->cd($this->dn);
$this->cleanup();
- $ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
if (!$ldap->success()){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
}
@@ -322,7 +322,7 @@ class mailgroup extends plugin
if($this->initially_was_account){
new log("modify","groups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
}else{
- new log("create","groups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+ new log("create","groups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
}
/* Optionally execute a command after we''re done */
@@ -449,7 +449,7 @@ class mailgroup extends plugin
{
if(!$this->is_account) return;
- /* Perform ADD / REMOVE ... for mail alternate / mail forwarding addresses
+ /* Perform ADD / REMOVE ... for mail alternate / mail forwarding addresses
*/
$this->execute();
if(isset($_POST['mail'])){
@@ -477,7 +477,7 @@ class mailgroup extends plugin
"plDepends" => array(),
"plPriority" => 10,
"plSection" => array("administration"),
- "plCategory" => array("groups"),
+ "plCategory" => array("groups"),
"plProvidedAcls"=> array(
"mail" => _("Mail address"),
"gosaMailAlternateAddress" => _("Alternate addresses"),
@@ -541,8 +541,8 @@ class mailgroup extends plugin
function get_multi_edit_values()
{
$ret = plugin::get_multi_edit_values();
- $ret['Forward_some'] = $this->gosaMailForwardingAddress_Some;
- $ret['Forward_all'] = $this->gosaMailForwardingAddress;
+ $ret['Forward_some'] = $this->gosaMailForwardingAddress_Some;
+ $ret['Forward_all'] = $this->gosaMailForwardingAddress;
$ret['mail'] = $this->mail;
return($ret);
}
@@ -597,7 +597,7 @@ class mailgroup extends plugin
/* Update multiple edit values too */
if($this->multiple_support_active){
- $this->gosaMailForwardingAddress_Some=
+ $this->gosaMailForwardingAddress_Some=
array_remove_entries (array($address),$this->gosaMailForwardingAddress_Some);
}
@@ -607,7 +607,7 @@ class mailgroup extends plugin
}
- /*! \brief Removes the given mail address from the forwarders
+ /*! \brief Removes the given mail address from the forwarders
*/
function delForwarder($addresses)
{
@@ -660,7 +660,7 @@ class mailgroup extends plugin
}
- /*! \brief Removes the given mail address from the alternate addresses
+ /*! \brief Removes the given mail address from the alternate addresses
*/
function delAlternate($addresses)
{
diff --git a/admin/groups/mailaddress/mailaddress.tpl b/admin/groups/mailaddress/mailaddress.tpl
index 2561f65..a91ae79 100644
--- a/admin/groups/mailaddress/mailaddress.tpl
+++ b/admin/groups/mailaddress/mailaddress.tpl
@@ -43,7 +43,7 @@
</h3>
{render acl=$gosaMailAlternateAddressACL}
- <select style="width:100%;" name="alternates_list[]" size=10 multiple
+ <select style="width:100%;" name="alternates_list[]" size=10 multiple
title="{t}List of alternative mail addresses{/t}">
{html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
<option disabled> </option>
@@ -70,7 +70,7 @@
<hr>
-<h3>{t}Advanced mail options{/t}</h3>
+<h3>{t}Advanced mail options{/t}</h3>
<table style='width:100%; ' summary="{t}Advanced mail options{/t}">
<tr>
diff --git a/admin/groups/mailaddress/paste_mailaddress.tpl b/admin/groups/mailaddress/paste_mailaddress.tpl
index 83179ed..c7a8385 100644
--- a/admin/groups/mailaddress/paste_mailaddress.tpl
+++ b/admin/groups/mailaddress/paste_mailaddress.tpl
@@ -2,14 +2,14 @@
<table style='width:100%; ' summary="{t}Paste mail settings{/t}">
<tr>
- <td colspan=2>
+ <td colspan=2>
<table summary="{t}Mail address settings{/t}">
<tr>
<td>
<LABEL for="mail">{t}Mail address{/t}</LABEL>{$must}
</td>
<td>
- <input id="mail" name="mail" size="25" maxlength="65" type='text'
+ <input id="mail" name="mail" size="25" maxlength="65" type='text'
value="{$mail}" title="{t}Mail address for this group{/t}">
</td>
</tr>
diff --git a/contrib/update-locale b/contrib/update-locale
index 1be2aa5..25242da 100755
--- a/contrib/update-locale
+++ b/contrib/update-locale
@@ -132,7 +132,7 @@ cat <<-EOF
---------------------------------------------------------------------
Now edit all files that have been replaced above (i.e. using kbabel
-or gtranslator) and mail the changes to gosa at oss.gonicus.de to be
+or gtranslator) and mail the changes to gosa at oss.gonicus.de to be
included in the next release.
To see the changes you've made in GOsa, run "msgfmt messages.po" on
diff --git a/personal/mailaddress/class_mailAccount.inc b/personal/mailaddress/class_mailAccount.inc
index c883d76..77bcda0 100644
--- a/personal/mailaddress/class_mailAccount.inc
+++ b/personal/mailaddress/class_mailAccount.inc
@@ -1,5 +1,5 @@
<?php
-/*!
+/*!
\brief mail plugin
\author Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
\version 0.99.3
@@ -9,7 +9,7 @@
has been derived from gosa-plugin-mail, but it is not used to
actually control mailservers. It is only used for allowing
mail information to be stored in LDAP.
-
+
This plugin actually breaks gosa-mail-account and is intended to be a
drop-in replacement for it in situations where it is only necessary
to store information in inetOrgPerson''s mail LDAP attribute description.
@@ -66,9 +66,9 @@ class mailAccount extends plugin
*/
function __construct (&$config, $dn= NULL)
{
- plugin::plugin($config,$dn);
+ plugin::plugin($config,$dn);
- /* Get attributes from parent object
+ /* Get attributes from parent object
*/
foreach(array("uid","cn") as $attr){
if(isset($this->parent->by_object['group']) && isset($this->parent->by_object['group']->$attr)){
@@ -116,7 +116,7 @@ class mailAccount extends plugin
return ($display);
}
if ($this->parent !== NULL){
- if ($this->is_account){
+ if ($this->is_account){
$display= $this->show_disable_header(msgPool::removeFeaturesButton(_("Mail")),msgPool::featuresEnabled(_("Mail")));
} else {
$display= $this->show_enable_header(msgPool::addFeaturesButton(_("Mail")),msgPool::featuresDisabled(_("Mail")));
@@ -132,7 +132,7 @@ class mailAccount extends plugin
}
*/
/****************
- SMARTY- Assign smarty variables
+ SMARTY- Assign smarty variables
****************/
$smarty = get_smarty();
@@ -177,8 +177,8 @@ class mailAccount extends plugin
}
- /*! \brief Removes the mailAccount extension from ldap
- */
+ /*! \brief Removes the mailAccount extension from ldap
+ */
function remove_from_parent()
{
/* Cancel if there's nothing to do here */
@@ -262,7 +262,7 @@ class mailAccount extends plugin
}
- /*! \brief Check given values
+ /*! \brief Check given values
*/
function check()
{
@@ -317,7 +317,7 @@ class mailAccount extends plugin
}
- /*! \brief Adapt from template, using 'dn'
+ /*! \brief Adapt from template, using 'dn'
*/
function adapt_from_template($dn, $skip= array())
{
@@ -334,8 +334,8 @@ class mailAccount extends plugin
}
- /*! \brief Creates the mail part for the copy & paste dialog
- */
+ /*! \brief Creates the mail part for the copy & paste dialog
+ */
function getCopyDialog()
{
if(!$this->is_account) return("");
@@ -351,8 +351,8 @@ class mailAccount extends plugin
}
- /*! \brief save_object for copy&paste vars
- */
+ /*! \brief save_object for copy&paste vars
+ */
function saveCopyDialog()
{
if(!$this->is_account) return;
@@ -424,7 +424,7 @@ class mailAccount extends plugin
}
- /*! \brief ACL settings
+ /*! \brief ACL settings
*/
static function plInfo()
{
@@ -441,7 +441,7 @@ class mailAccount extends plugin
"plRequirements"=> array(
'onFailureDisablePlugin' => array(get_class())
),
-
+
"plProvidedAcls" => array(
"mail" => _("Mail address"),
),
diff --git a/personal/mailaddress/generic.tpl b/personal/mailaddress/generic.tpl
index a6d1611..925533a 100644
--- a/personal/mailaddress/generic.tpl
+++ b/personal/mailaddress/generic.tpl
@@ -1,6 +1,6 @@
<table summary="{t}Mail Address Settings{/t}" style='width:100%;'>
<tr>
- <td style='width:50%; '>
+ <td style='width:50%; '>
{if !$multiple_support}
<h3>{t}User Mail Address{/t}</h3>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/gosa-plugin-mailaddress.git
More information about the debian-edu-commits
mailing list