Verified Commit 5d4d0936 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

🚑 fix(code) Style and spacing fixes from php-cs-fixer

issue #5925
parent f337c6d2
......@@ -77,5 +77,3 @@ class mailAliasDistribution extends simplePlugin
);
}
}
?>
......@@ -75,5 +75,3 @@ class mailAliasRedirection extends simplePlugin
);
}
}
?>
......@@ -49,4 +49,3 @@ class aliasConfig extends simplePlugin
);
}
}
?>
......@@ -127,4 +127,3 @@ class application extends simplePlugin
}
}
}
?>
......@@ -78,4 +78,3 @@ class webApplication extends simplePlugin
);
}
}
?>
......@@ -68,4 +68,3 @@ class applicationRights extends simplePlugin
);
}
}
?>
......@@ -60,4 +60,3 @@ class applicationsPluginConfig extends simplePlugin
);
}
}
?>
......@@ -193,4 +193,3 @@ class argonautAction extends simplePlugin
return $ret;
}
}
?>
......@@ -190,4 +190,3 @@ class argonautImportFile extends simplePlugin
$this->attributesAccess['events']->setPostValue($events);
}
}
?>
......@@ -113,7 +113,7 @@ class argonautQueue extends simpleManagement
if ($this->acl_is_removeable($task['TARGETDN'])) {
/* Only remove WAITING or ERROR entries */
if (in_array($task['STATUS'], array('waiting','error','processed')) ||
($task['STATUS'] == 'processing' && !preg_match('/install/', $task['HEADERTAG'])) ) {
($task['STATUS'] == 'processing' && !preg_match('/install/', $task['HEADERTAG']))) {
$this->dns[] = $dn;
} else {
$nodelete[] = $j_name;
......@@ -332,7 +332,7 @@ class argonautQueue extends simpleManagement
}
}
if ($progress) {
$str .= " (".htmlentities($progress, ENT_COMPAT, 'UTF-8')."%)";
$str .= " (".htmlentities($progress, ENT_COMPAT, 'UTF-8')."%)";
}
return $str;
}
......@@ -378,11 +378,10 @@ class argonautQueue extends simpleManagement
STATUS == "processing" && PROGRESS == NUMERIC
*/
if ($status == 'processing' && $substatus) {
$status = $substatus;
$status = $substatus;
} elseif ($status == 'processing') {
$status = preg_replace('/ /', ' ', _('in progress'));
$status = preg_replace('/ /', ' ', _('in progress'));
}
return $status;
}
}
?>
......@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
class filterArgonautEvents extends filterLDAP
class filterArgonautEvents extends filterLDAP
{
static function query ($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
{
......@@ -105,7 +105,7 @@ class filterArgonautEvents extends filterLDAP
/* If WAITING or ERROR add remove action
*/
if ( $acl_is_removeable && in_array($entry['STATUS'], array("waiting","error","processed"))) {
if ($acl_is_removeable && in_array($entry['STATUS'], array("waiting","error","processed"))) {
$entry['objectClass'][] = "FAKE_OC__remove";
}
if ($acl_is_writeable && in_array($entry['STATUS'], array("processing")) && !preg_match("/install/", $entry['HEADERTAG'])) {
......@@ -133,4 +133,3 @@ class filterArgonautEvents extends filterLDAP
return $data;
}
}
?>
......@@ -19,4 +19,3 @@
*/
simpleManagement::mainInc('argonautQueue');
?>
......@@ -214,5 +214,3 @@ class argonautClient extends simplePlugin
);
}
}
?>
......@@ -68,5 +68,3 @@ class deploymentTimeframe extends simplePlugin
);
}
}
?>
......@@ -203,4 +203,3 @@ class argonautFuseConfig extends simpleService
return parent::remove($fulldelete);
}
}
?>
......@@ -104,4 +104,3 @@ class argonautMirrorConfig extends simpleService
);
}
}
?>
......@@ -158,4 +158,3 @@ class argonautServer extends simpleService
return $fields;
}
}
?>
......@@ -48,4 +48,3 @@ $res = $o->get_entries_by_mac(explode(",", $_GET['mac']));
foreach ($res as $entry) {
echo $entry['MACADDRESS']."|".$entry['PROGRESS']."\n";
}
?>
......@@ -516,7 +516,6 @@ class supportDaemon
foreach ($evts as $evt) {
if (($evt['STATUS'] == "processing") &&
in_array($evt['HEADERTAG'], array("reinstall","update"))) {
return TRUE;
}
}
......@@ -607,7 +606,7 @@ class supportDaemon
$ret = array();
foreach ($dates as $date) {
if ($date == "." || $date == "..") {
continue;
continue;
}
$ret[$date]['DATE_STR'] = $date;
$ret[$date]['REAL_DATE'] = strtotime(preg_replace("/[^0-9]*/", "", $date));
......@@ -825,5 +824,3 @@ class supportDaemon
}
}
}
?>
......@@ -49,7 +49,8 @@ class jsonRPCClientBadArgsException extends jsonRPCClientException
*
* \author sergio <jsonrpcphp@inservibile.org>
*/
class jsonRPCClient {
class jsonRPCClient
{
/*!
* \brief Debug state
......@@ -245,10 +246,8 @@ class jsonRPCClient {
}
return $response['result'];
} else {
return TRUE;
}
}
}
?>
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