diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index a248d8673d83bc5797fc25d2f5bf998d10a322b4..8673e63e8266ca7f6a2c82d1de4aad3d32aecad1 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -386,7 +386,7 @@ class passwordRecovery extends standAlonePage {
$this->loginAttribute = $config->get_cfg_value('passwordRecoveryLoginAttribute', 'uid');
- @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $config->get_cfg_value ('passwordRecoveryActivated'), "passwordRecoveryActivated");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $config->get_cfg_value('passwordRecoveryActivated'), "passwordRecoveryActivated");
return ($config->get_cfg_value('passwordRecoveryActivated') == "TRUE");
}
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index ad3b80be0378bba01d29de553a9dfa14e1d6ef80..742dccb6709952d5eb160494f6a6ac0fcbe8d644 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -75,7 +75,7 @@ class CopyPasteHandler
*/
function add_to_queue ($dn, $action, $type)
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'add_to_queue');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'add_to_queue');
if (!in_array($action, ['cut','copy'])) {
trigger_error(sprintf('Specified action "%s" does not exists for copy & paste.', $action));
@@ -139,7 +139,7 @@ class CopyPasteHandler
*/
protected function load_entry_from_ldap ($entry, $base)
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $entry['dn'], 'load_entry_from_ldap');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $entry['dn'], 'load_entry_from_ldap');
if (!isset($entry['tab_class']) && !isset($entry['type'])) {
return [];
}
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 5372cda7be749e43468aced24c2475b25851a756..f47e4b0e14b83601649cc9ef5b2810e08340d223 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -68,7 +68,7 @@ class IconThemeDir
public function MatchesSize ($size)
{
- switch ($this->Type) {
+ switch($this->Type) {
case 'Fixed':
return ($this->Size == $size);
default:
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 2e7c45f16fcd5b3bbffdf62471738941f73cbf53..cd1570bb3e92a07b1f088e7a08316e6359775550 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -60,7 +60,7 @@ class Language
bindtextdomain($domain, LOCALE_DIR);
textdomain($domain);
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, 'Setting language to');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, 'Setting language to');
}
$ret = FALSE;
@@ -70,7 +70,7 @@ class Language
$ret = TRUE;
if (session::is_set('plist')) {
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
- @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::get ('lang'), 'Plist already loaded with language');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::get('lang'), 'Plist already loaded with language');
}
session::un_set('plist');
session::set('lang', $lang);
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index b248486ffff75dab399ce9176c882fa8a0f04325..066cdc1df978691b30499c8bd9ac5b396eeca1f0 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -218,7 +218,7 @@ class SnapshotHandler
{
global $config;
if (!$this->enabled()) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot are disabled but tried to create snapshot');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot are disabled but tried to create snapshot');
return;
}
@@ -233,7 +233,7 @@ class SnapshotHandler
/* check if the dn exists */
if (!$ldap->dn_exists($dn)) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Tried to snapshot non-existing dn');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Tried to snapshot non-existing dn');
return;
}
@@ -241,7 +241,7 @@ class SnapshotHandler
list($usec, $sec) = explode(" ", microtime());
/* Collect some infos */
- $base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
+ $base_of_object = preg_replace('/^[^,]+,/i', '', $dn);
$new_base = $this->snapshot_dn($base_of_object);
/* Create object */
$data = '';
@@ -393,7 +393,7 @@ class SnapshotHandler
{
global $config;
if (!$this->enabled()) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot are disabled but tried to restore snapshot');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot are disabled but tried to restore snapshot');
return [];
}
diff --git a/include/class_config.inc b/include/class_config.inc
index 961de1a9214d86a093ff41fcb3e1247de3994765..f372174600ccebd15104fe6c6b31e8fad3398544 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -812,7 +812,7 @@ class config
if (($tabclass == 'GROUPTABS') && class_available('mixedGroup')) {
$tabclass = 'OGROUP-USERTABS';
}
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $tabclass, "Adding $class to tab list");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $tabclass, "Adding $class to tab list");
if (!isset($this->data['TABS'][$tabclass])) {
$this->data['TABS'][$tabclass] = [];
}
@@ -852,7 +852,7 @@ class config
$value['tabClass'] = 'simpleTabs';
}
$this->data['OBJECTS'][strtoupper($key)] = $value;
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $tabclass, "Adding $class as main tab of");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $tabclass, "Adding $class as main tab of");
if (!isset($this->data['TABS'][$tabclass])) {
$this->data['TABS'][$tabclass] = [];
}
@@ -860,7 +860,7 @@ class config
}
}
} elseif (class_available($class) && is_subclass_of($class, 'simpleService')) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class, "Adding service");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class, "Adding service");
if (!isset($this->data['TABS']['SERVERSERVICE'])) {
$this->data['TABS']['SERVERSERVICE'] = [];
}
@@ -902,7 +902,7 @@ class config
];
/* Extract categories definitions from object types */
foreach ($this->data['OBJECTS'] as $key => $infos) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $infos['aclCategory'], "ObjectType $key category");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $infos['aclCategory'], "ObjectType $key category");
if (strtoupper($infos['aclCategory']) == $key) {
$cat = $infos['aclCategory'];
if (!isset($this->data['CATEGORIES'][$cat])) {
@@ -980,7 +980,7 @@ class config
}
}
}
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, join (',', array_unique($acl)), "Class $class categories");
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, join(',', array_unique($acl)), "Class $class categories");
/* Feed menu */
if (isset($plInfo['plSection'])) {
$section = $plInfo['plSection'];
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 7c923956aea652767de8fc84642c53649ca2c528..59ce8ad07c917bcfb2bd2b955399055caee92e80 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1235,7 +1235,7 @@ class LDAP
/* Get list of objectclasses and fill array */
$nb = $attr[0]['subschemasubentry'][0];
$objectclasses = [];
- $sr = ldap_read ($this->cid, $nb, 'objectClass=*', ['objectclasses']);
+ $sr = ldap_read($this->cid, $nb, 'objectClass=*', ['objectclasses']);
$attrs = ldap_get_entries($this->cid, $sr);
if (!isset($attrs[0])) {
return [];
diff --git a/include/class_objects.inc b/include/class_objects.inc
index 9c8d7e055a2499d9fcdcab36db18e6feb9f0ac4e..8ec16c24d2e563968a7178879473d72a8681550a 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -278,7 +278,7 @@ class objects
$tabObject = new $tabClass($type, $dn);
$tabObject->set_acl_base();
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, "Openned as $type object");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, "Openned as $type object");
return $tabObject;
}
diff --git a/include/functions.inc b/include/functions.inc
index f3f4973e3909ebe0d0e7de3dfe7e349889a72280..9cbe4ffc4f6ef26999ea3a698930a93635158503 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -43,7 +43,7 @@ define ('DEBUG_CONFIG', 64); /*! Debug level for CONFIG information */
define ('DEBUG_ACL', 128); /*! Debug level for ACL infos */
define ('DEBUG_SI', 256); /*! Debug level for communication with Argonaut */
define ('DEBUG_MAIL', 512); /*! Debug level for all about mail (mailAccounts, imap, sieve etc.) */
-define ('DEBUG_FAI', 1024); /* FAI(incomplete) */
+define('DEBUG_FAI', 1024); /* FAI(incomplete) */
/* Define shadow states */
define('POSIX_ACCOUNT_EXPIRED', 1);
@@ -106,7 +106,7 @@ function fusiondirectory_autoload ($class_name)
if (isset($class_mapping["$class_name"])) {
require_once($BASE_DIR.'/'.$class_mapping["$class_name"]);
} else {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class_name, 'Could not load');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class_name, 'Could not load');
if (isset($config) && is_object($config) &&
$config->get_cfg_value('displayerrors') == 'TRUE') {
list($trace,) = html_trace();
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index dac4b7482aad39fbd2128898610ddc42e75baa2e..edf64a0a920625207784dbd843f6e77a3896b5db 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -251,7 +251,7 @@ class DialogAttribute extends SetAttribute
'submit', 'add'.$id,
['value' => '{msgPool type=addButton}']
);
- $dialogButtonValue = _('Add (dialog)');
+ $dialogButtonValue = _('Add(dialog)');
}
$buttons .= $this->renderInputField(
'submit', 'add'.$id.'_dialog',
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index df03add14bf2a895bc3b7064d6521878b6df4fd0..2d11f86220a703d8dc4b8d27e102ddbe85735cad 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -692,7 +692,7 @@ class simpleManagement
// Open object
$this->openTabObject(objects::open($this->dn, $type), $this->headpage->getBase());
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Create new entry initiated!");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Create new entry initiated!");
}
function newEntryTemplate ($action, array $target, array $all)
@@ -766,7 +766,7 @@ class simpleManagement
return;
} else {
if (!$cancel) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Template applied!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Template applied!');
}
del_lock($this->dn);
if (empty($this->dns)) {
@@ -800,7 +800,7 @@ class simpleManagement
msg_dialog::displayChecks($msgs);
return;
} else {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
$this->remove_lock();
$this->closeDialogs();
}
@@ -812,7 +812,7 @@ class simpleManagement
return;
} else {
$this->dialogObject->save();
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
$this->remove_lock();
$this->closeDialogs();
}
@@ -893,7 +893,7 @@ class simpleManagement
// Open object
$this->openTabObject(objects::open($this->dn, $type), $this->dn);
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Edit entry initiated!");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Edit entry initiated!");
if (isset($all['subaction'])) {
if ($this->handleSubAction($all) == FALSE) {
trigger_error('Was not able to handle subaction: '.$all['subaction']);
@@ -1018,7 +1018,7 @@ class simpleManagement
$disallowed = [];
$this->dns = [];
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal requested!");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal requested!");
// Check permissons for each target
foreach ($target as $dn) {
@@ -1082,7 +1082,7 @@ class simpleManagement
function removeEntryConfirmed ($action, array $target, array $all)
{
global $ui;
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal confirmed!");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal confirmed!");
foreach ($this->dns as $dn) {
$type = $this->getType($dn);
@@ -1124,7 +1124,7 @@ class simpleManagement
function createSnapshotDialog ($action, array $target)
{
global $config, $ui;
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, 'Snaptshot creation initiated!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, 'Snaptshot creation initiated!');
if (count($target) == 1) {
$this->dn = array_pop($target);
@@ -1180,7 +1180,7 @@ class simpleManagement
}
if ($ui->allow_snapshot_restore($this->dn, $aclCategory, !count($target))) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Snaptshot restoring initiated!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Snaptshot restoring initiated!');
$this->snapHandler->setSnapshotBases($bases);
$this->dialogObject = new SnapshotRestoreDialog($this->dn, $this, !count($target), $aclCategory);
$this->dialogObject->set_acl_base($this->dn);
@@ -1219,11 +1219,11 @@ class simpleManagement
if (($action == 'copy') && $ui->is_copyable($dn, $infos['aclCategory'])) {
$this->cpHandler->add_to_queue($dn, 'copy', $type);
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Entry copied!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Entry copied!');
}
if (($action == 'cut') && $ui->is_cutable($dn, $infos['aclCategory'], $infos['mainTab'])) {
$this->cpHandler->add_to_queue($dn, 'cut', $type);
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Entry cut!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Entry cut!');
}
}
}
@@ -1263,7 +1263,7 @@ class simpleManagement
}
if (!empty($dn) && $ui->allow_snapshot_create($dn, $this->dialogObject->aclCategory)) {
$this->snapHandler->createSnapshot($dn, $description);
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot created!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot created!');
} else {
msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $dn),
ERROR_DIALOG);
@@ -1280,7 +1280,7 @@ class simpleManagement
global $ui;
if (!empty($dn) && $ui->allow_snapshot_restore($dn, $this->dialogObject->aclCategory, $this->dialogObject->global)) {
$this->snapHandler->restoreSnapshot($dn);
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot restored');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot restored');
$this->closeDialogs();
} else {
msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $dn),
@@ -1325,7 +1325,7 @@ class simpleManagement
global $ui;
if (!empty($dn) && $ui->allow_snapshot_delete($dn, $this->dialogObject->aclCategory)) {
$this->snapHandler->removeSnapshot($dn);
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot deleted');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot deleted');
} else {
msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to delete a snapshot for %s.'), $dn),
ERROR_DIALOG);
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index e7e778a807cd8afe633ff01b1ccdb9d21b1f5afc..f3cb20b2dd8114e52f661a435017819e97418caf 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -243,7 +243,7 @@ class simplePlugin
/* Set the template flag according to the existence of objectClass fdTemplate */
if (isset($this->attrs['objectClass'])) {
if (in_array_ics ('fdTemplate', $this->attrs['objectClass'])) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Template check');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Template check');
$this->setTemplate(TRUE);
$this->templateLoadAttrs($this->attrs);
}
@@ -252,7 +252,7 @@ class simplePlugin
/* Is Account? */
if ($this->is_this_account($this->attrs)) {
$this->is_account = TRUE;
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Object check');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Object check');
}
}
@@ -655,7 +655,7 @@ class simplePlugin
*/
function execute ()
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "execute");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "execute");
/* Reset Lock message POST/GET check array, to prevent preg_match errors */
session::set('LOCK_VARS_TO_USE', []);
@@ -1077,7 +1077,7 @@ class simplePlugin
*/
function save_object ()
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'save_object');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'save_object');
if ($this->displayHeader && isset($_POST[get_class($this).'_modify_state'])) {
if ($this->is_account && $this->acl_is_removeable()) {
$this->is_account = FALSE;
@@ -1200,7 +1200,7 @@ class simplePlugin
*/
function save ()
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "save");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "save");
$errors = $this->prepare_save();
if (!empty($errors)) {
return $errors;
@@ -1493,7 +1493,7 @@ class simplePlugin
*/
function check ()
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'check');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'check');
$messages = [];
foreach ($this->attributesInfo as $sectionInfo) {
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index a74cd121b4c158705741f4ade12b50efbba781fd..5dd21b4d60600b1026cf9a5b81c38d05fd78312c 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -162,7 +162,7 @@ class simpleTabs
{
$baseobject = $this->getBaseObject();
if (isset($baseobject->base)) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixing base');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixing base');
if (session::is_set('CurrentMainBase')) {
$baseobject->base = dn2base('cn=dummy,'.session::get('CurrentMainBase'));
} else {
@@ -172,9 +172,9 @@ class simpleTabs
/* For some plugins not yet migrated to simple plugin. */
$baseobject->baseSelector->setBase($baseobject->base);
}
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixed base');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixed base');
} else {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, '', 'no base');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, '', 'no base');
}
}
@@ -232,7 +232,7 @@ class simpleTabs
/* Save last tab */
if ($this->last != "") {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->last, "Saving");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->last, "Saving");
$this->by_object[$this->last]->save_object();
}
@@ -355,7 +355,7 @@ class simpleTabs
foreach ($this->by_object as $key => $obj) {
$this->plNotify[$key] = FALSE;
if (($obj->is_account || $obj->ignore_account) && (!$obj->is_template)) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Checking");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Checking");
$msg = $obj->check();
@@ -390,7 +390,7 @@ class simpleTabs
$old_dn = $this->dn;
try {
$new_dn = $baseobject->compute_dn();
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $new_dn, 'Saving');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $new_dn, 'Saving');
} catch (FusionDirectoryException $e) {
return [
sprintf(_('Failed to compute DN for object: %s'), $e->getMessage())
@@ -419,7 +419,7 @@ class simpleTabs
/* Save all plugins */
$first = TRUE;
foreach ($this->by_object as $key => $obj) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Saving');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Saving');
$obj->dn = $this->dn;
@@ -470,7 +470,7 @@ class simpleTabs
function adapt_from_template ($attrs, $skip = [])
{
foreach ($this->by_object as $key => &$obj) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Adapting");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Adapting");
$obj->parent = &$this;
$obj->adapt_from_template($attrs, $skip);
}
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index eb012c93ce3bba86469fa9edff1a3af9cecaa186..00c725dc5bd3e7f31c3e84fde787b40b86778620 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -198,7 +198,7 @@ class aclManagement extends simpleManagement
set_object_info($this->dn);
$this->openTabObject($tabObject, $this->headpage->getBase());
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Creating new ACLÂ assignment');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Creating new ACLÂ assignment');
}
static function filterLabel ($row, $dn, $pid = 0, $base = '')
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 1ae261449f5efde2b23ac04246ea9750de0ba611..ef9c1dede15138189155a67a17df9cb356722b48 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -195,12 +195,12 @@ class groupManagement extends simpleManagement
msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
} else {
if (is_array($res) && count($res) > 1) {
- msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (results were "%s")'), implode(', ', $res)), INFO_DIALOG);
+ msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error(results were "%s")'), implode(', ', $res)), INFO_DIALOG);
} else {
if (is_array($res)) {
$res = $res[0];
}
- msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
+ msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error(result was "%s")'), $res), INFO_DIALOG);
}
}
$this->closeDialogs();
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 238ff6ed921fc75676c5ef51425feaafb921629b..3fa4fffe2dabaea1db5cddbdf991a2b36aeda48d 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -52,7 +52,7 @@ class ObjectsAttribute extends GenericDialogAttribute
break;
}
} catch (NonExistingObjectTypeException $e) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $e->getMessage (), "Objecttype");
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $e->getMessage(), "Objecttype");
unset(ogroup::$objectTypes[$code]);
}
}
diff --git a/plugins/admin/groups/tabs_ogroups.inc b/plugins/admin/groups/tabs_ogroups.inc
index 406631973d323ee51587a7dc7632341dbea30f57..0a827898eaac2d7512b2ba031d24608d41721cda 100644
--- a/plugins/admin/groups/tabs_ogroups.inc
+++ b/plugins/admin/groups/tabs_ogroups.inc
@@ -108,7 +108,7 @@ class ogrouptabs extends simpleTabs_noSpecial
function addTab ($class)
{
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class, 'Adding tab ');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class, 'Adding tab ');
$plInfos = pluglist::pluginInfos($class);
$this->by_name[$class] = $plInfos['plShortName'];
$this->plNotify[$class] = FALSE;
@@ -161,7 +161,7 @@ class ogrouptabs extends simpleTabs_noSpecial
if (isset($this->by_object[$key])) {
continue;
}
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Removing');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Removing');
$obj->dn = $this->dn;
$tabErrors = $obj->remove(FALSE);
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 69de796ec905ee5b2c9ad621a0a586aa77d5efc4..922cc71c1d3df5b29107c3030ba8715852ac1894 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -106,7 +106,7 @@ class userManagement extends simpleManagement
$this->filter->elements['FUNCTIONAL']['set'] = ' (objectClass=*)';
} else {
/* The FUNCTIONAL filter must not use inexisting classes */
- $this->filter->elements['FUNCTIONAL']['set'] = ' (! (| (objectClass='.implode (') (objectClass=', $classes).')))';
+ $this->filter->elements['FUNCTIONAL']['set'] = ' (! (| (objectClass='.implode(') (objectClass=', $classes).')))';
}
}
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 3fd56b2ca9b3dc46fafe5843e1aa93335d9f8f68..27ef1ed18e0d1167e14f748ac00780777a312fd0 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -61,7 +61,7 @@ class recoveryConfig extends simplePlugin
TRUE,
0, FALSE, 10
),
- new StringAttribute (
+ new StringAttribute(
_('Salt for tokens'),
_('Just a security measure, you can put anything in there, even random characters'),
'fdPasswordRecoverySalt',
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 834c3f7e189f8c0fc8c12836c5ebd4db1532b142..c7a920df336283f20866713e6f30b351764d1244 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -31,7 +31,7 @@ class UserPasswordAttribute extends CompositeAttribute
/* Create password methods array */
$pwd_methods = [];
$this->needPassword = [];
- foreach($temp['name'] as $id => $name) {
+ foreach ($temp['name'] as $id => $name) {
$this->needPassword[$name] = $temp[$id]['object']->need_password();
$pwd_methods[$name] = $name;
if (!empty($temp[$id]['desc'])) {
@@ -91,7 +91,7 @@ class UserPasswordAttribute extends CompositeAttribute
if ($this->linearRendering) {
parent::renderAttribute($attributes, $readOnly);
} else {
- foreach($this->attributes as $key => &$attribute) {
+ foreach ($this->attributes as $key => &$attribute) {
if (is_object($this->plugin) && $this->plugin->is_template && ($key == 2)) {
/* Do not display confirmation field in template mode */
continue;
@@ -514,7 +514,7 @@ class user extends simplePlugin
{
$fields = templateHandling::listFields($pattern);
$attrs = [];
- foreach($fields as $field) {
+ foreach ($fields as $field) {
if (in_array($field, $this->attributes)) {
$attrs[$field] = $this->$field;
continue;