Commit 09523944 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Cleaning minor sonar code compliance


Move this trailing comment on the previous empty line
Add one whitespace between the colon and the value.
Move the opening curly brace to the previous line.
Signed-off-by: default avatarBenoit Mortier <benoit.mortier@opensides.be>
parent 62a7bd5a
......@@ -3,17 +3,17 @@
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2010 Antoine Gallavardin
Copyright (C) 2012-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -2,17 +2,17 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2013-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -73,17 +73,17 @@
<actionmenu>
<action>
<name>import</name>
<type>entry</type>
<image>geticon.php?context=actions&amp;icon=document-import&amp;size=16</image>
<label>Import</label>
<name>import</name>
<type>entry</type>
<image>geticon.php?context=actions&amp;icon=document-import&amp;size=16</image>
<label>Import</label>
</action>
<action>
<name>remove</name>
<type>entry</type>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
<name>remove</name>
<type>entry</type>
<image>geticon.php?context=actions&amp;icon=edit-delete&amp;size=16</image>
<label>Remove</label>
</action>
<action>
......
......@@ -634,7 +634,7 @@ class supportDaemon
} catch (jsonRPCClient_RequestErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
/* connection is OK */
$this->new_state(TRUE);
$this->new_state(TRUE);
return FALSE;
} catch (jsonRPCClient_NetworkErrorException $e) {
$this->set_error(nl2br($e->getMessage()));
......@@ -694,7 +694,8 @@ class supportDaemon
}
if (in_array("SECTION", $attrs)) {
foreach ($packages as &$package) {
$package['SECTION'] = $section; // FIXME : do we want to do this? It will replace "contrib/misc by contrib, for instance
/* FIXME : do we want to do this? It will replace "contrib/misc by contrib, for instance */
$package['SECTION'] = $section;
}
unset($package);
}
......
......@@ -495,15 +495,13 @@ class mailMethodCyrus extends mailMethod
{
mailMethod::saveSieveSettings();
/* Map attribute from parent class
*/
/* Map attribute from parent class */
$mail = $this->parent->mail;
$gosaMailDeliveryMode = $this->parent->gosaMailDeliveryMode;
$gosaMailAlternateAddress = $this->parent->gosaMailAlternateAddress;
$gosaVacationMessage = $this->parent->gosaVacationMessage;
/* Try to login into sieve
*/
/* Try to login into sieve */
$cfg = $this->ServerList[$this->parent->gosaMailServer];
$sieve = new sieve($cfg["sieve_server"], $cfg["sieve_port"], $this->getUAttribValue(),
$cfg["password"], $cfg["admin"], $cfg["sieve_option"]);
......@@ -563,7 +561,7 @@ class mailMethodCyrus extends mailMethod
if (is_integer(strpos($gosaMailDeliveryMode, "C")) ||
is_integer(strpos($gosaMailDeliveryMode, "I")) ||
is_integer(strpos($gosaMailDeliveryMode, "V"))) {
/* Add vacation information */
$smarty->assign('vacation', is_integer(strpos($gosaMailDeliveryMode, "V")));
if (is_integer(strpos($gosaMailDeliveryMode, "V"))) {
......
......@@ -2,17 +2,17 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2013-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -2,17 +2,17 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2013-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -2,17 +2,17 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2014-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -2,17 +2,17 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2014-2016 FusionDirectory
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
......
......@@ -178,10 +178,8 @@ class serviceRepository extends simpleService
_('Repositories this server hosts'),
'FAIrepository'
),
/* no order */
FALSE,
array(),
/* edit button */
TRUE
)
)
......
......@@ -4,17 +4,17 @@
Copyright (C) 2003-2009 GONICUS GmbH
Copyright (C) 2012 WILLIAME Jeremy
Copyright (C) 2011-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -84,7 +84,7 @@ class freeradiusAccount extends simplePlugin {
_('FreeRadius Group'),
'radiusGroupName',
FALSE,
array("")
array("")
)
),
),
......
<?php
# Collect inventory and store them in the LDAP
# Usage :
# fusioninventory-agent --server http://server/fusiondirectory/collect.php
/* Collect inventory and store them in the LDAP
Usage : fusioninventory-agent --server http://server/fusiondirectory/collect.php */
require_once('../include/php_setup.inc');
require_once('functions.inc');
require_once('variables.inc');
##########################################################################
$http_raw_post_data = file_get_contents('php://input');
if (!$http_raw_post_data) {
......@@ -19,14 +17,14 @@ if (strpos($http_raw_post_data, "<?xml") === 0) {
} elseif ($xml = @gzuncompress($http_raw_post_data)) {
$compressmode = "gzcompress";
} elseif ($xml = @gzinflate ("\x1f\x8b\x08\x00\x00\x00\x00\x00".$http_raw_post_data)) {
// ** OCS agent 2.0 Compatibility, but return in gzcompress
/* OCS agent 2.0 Compatibility, but return in gzcompress */
$compressmode = "gzdeflate";
if (strstr($xml, "<QUERY>PROLOG</QUERY>")
AND !strstr($xml, "<TOKEN>")) {
$compressmode = "gzcompress";
}
} elseif ($xml = @gzinflate (substr($http_raw_post_data, 2))) {
// ** OCS agent 2.0 Compatibility, but return in gzcompress
/* OCS agent 2.0 Compatibility, but return in gzcompress */
$compressmode = "gzdeflate";
if (strstr($xml, "<QUERY>PROLOG</QUERY>")
AND !strstr($xml, "<TOKEN>")) {
......
ul.inventory
{
margin:0;
padding:0;
ul.inventory {
margin: 0;
padding: 0;
}
ul.inventory li
{
list-style-type:none;
ul.inventory li {
list-style-type: none;
}
html.ltr ul.inventory li div
{
margin-left:20px;
html.ltr ul.inventory li div {
margin-left: 20px;
}
html.rtl ul.inventory li div
{
margin-right:20px;
html.rtl ul.inventory li div {
margin-right: 20px;
}
html.ltr ul.inventory li table.list th
{
text-align:left;
padding-right:10px;
html.ltr ul.inventory li table.list th {
text-align: left;
padding-right: 10px;
}
html.rtl ul.inventory li table.list th
{
text-align:right;
padding-left:10px;
html.rtl ul.inventory li table.list th {
text-align: right;
padding-left: 10px;
}
ul.inventory li table.table
{
border-collapse:collapse;
ul.inventory li table.table {
border-collapse: collapse;
}
ul.inventory li table.table, ul.inventory li table.table td, ul.inventory li table.table th
{
border:1px solid black;
ul.inventory li table.table, ul.inventory li table.table td, ul.inventory li table.table th {
border: 1px solid black;
}
......@@ -2,17 +2,17 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2011-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
......
......@@ -32,7 +32,7 @@ class mailMethod
protected $mailEqualsCN = FALSE;
/* the attribute used to create accounts */
protected $uattrib = "mail"; // Naming attribute for accounts, e.g. imap.
protected $uattrib = "mail";
/* The account prefixes, keep the '.' here! See FAQ cyrusUseSlashes */
protected $user_prefix = "user.";
......
......@@ -2,20 +2,20 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2011 Alejandro Escanero Blanco (aescanero@gmail.com)
Copyright (C) 2011-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
......
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2013-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
......@@ -21,7 +21,7 @@
class netgroupManagement extends simpleManagement
{
// Tab definition
/* Tab definition */
protected $objectTypes = array('netgroup');
protected $departmentBrowser = TRUE;
......
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2013-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
......
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2013-2016 FusionDirectory
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment