diff --git a/contrib/smarty/plugins/block.render.php b/contrib/smarty/plugins/block.render.php
index 6e99145627a1cc8a34a75b94077f2aa00b1f5f0d..04d5b3c5ffcc109d9e7566a2086e5a6575333e37 100644
--- a/contrib/smarty/plugins/block.render.php
+++ b/contrib/smarty/plugins/block.render.php
@@ -33,7 +33,7 @@ function smarty_block_render ($params, $text)
}
/* Debug output */
- if (session::is_set('DEBUGLEVEL') && session::get('DEBUGLEVEL') & DEBUG_ACL ) {
+ if (session::is_set('DEBUGLEVEL') && session::get('DEBUGLEVEL') & DEBUG_ACL) {
echo '<div style="color:blue;">'.$acl.(isset($params['aclName']) ? ' ['.$params['aclName'].']' : '').'</div>';
}
@@ -75,4 +75,3 @@ function smarty_block_render ($params, $text)
return preg_replace($from, $to, $text);
}
-?>
diff --git a/contrib/smarty/plugins/function.filePath.php b/contrib/smarty/plugins/function.filePath.php
index 856c3e92d428b61ec99d043a23bc8f46bd59753e..977349e4bb4da451c7fd73e90d0c7282c6bda4c9 100644
--- a/contrib/smarty/plugins/function.filePath.php
+++ b/contrib/smarty/plugins/function.filePath.php
@@ -55,4 +55,3 @@ function smarty_function_filePath ($params, Smarty_Internal_Template $smarty)
}
return $filename;
}
-?>
diff --git a/contrib/smarty/plugins/function.iconPath.php b/contrib/smarty/plugins/function.iconPath.php
index 3866f0eb7b5f4b55ab4a453fee2a688da3f7f9ac..d87335bea805dc8acd91788e02bf8be8e151db59 100644
--- a/contrib/smarty/plugins/function.iconPath.php
+++ b/contrib/smarty/plugins/function.iconPath.php
@@ -29,4 +29,3 @@ function smarty_function_iconPath ($params)
return IconTheme::findThemeIcon($theme, $params['context'], $params['icon'], $params['size']);
}
-?>
diff --git a/contrib/smarty/plugins/function.msgPool.php b/contrib/smarty/plugins/function.msgPool.php
index 2b7baaf85783e74eaecb9dc827da6790a33e248b..cb3e4ccacc6d7582e0ab12bb945b14b5b3218f33 100644
--- a/contrib/smarty/plugins/function.msgPool.php
+++ b/contrib/smarty/plugins/function.msgPool.php
@@ -36,4 +36,3 @@ function smarty_function_msgPool ($params)
trigger_error('Unknown class msgPool.');
}
}
-?>
diff --git a/html/autocomplete.php b/html/autocomplete.php
index b34dd291c708ff6d3325d5667d4de7185c758587..87f6778384849d2fd8a5f2cb34d7dd3100df6b23 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -68,9 +68,7 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
echo "<ul>$res</ul>";
}
}
-
} else {
-
$ui = session::global_get('ui');
$config = session::global_get('config');
@@ -80,5 +78,3 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
$filter->processAutocomplete();
}
}
-
-?>
diff --git a/html/geticon.php b/html/geticon.php
index dbd9cf1016e2c4cd8c7a0d6875adecc00045605b..5807d6078498ef57d2b35d45fcdc04736fb152d2 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -50,4 +50,3 @@ if (isset($_GET['disabled']) && $_GET['disabled']) {
} else {
readfile($src);
}
-?>
diff --git a/html/main.php b/html/main.php
index 3af25bf2fe5d164aa65ff557a663b840b3f36016..2fea060b69d7044f683d4ea9fdd7b8d5f13d207e 100644
--- a/html/main.php
+++ b/html/main.php
@@ -167,7 +167,7 @@ if (!empty($old_plugin_index) && ($old_plugin_index != $plugin_index)) {
$ui->getSizeLimitHandler()->update();
/* Check for memory */
-if (memory_get_usage() > (to_byte(ini_get('memory_limit')) - 2048000 )) {
+if (memory_get_usage() > (to_byte(ini_get('memory_limit')) - 2048000)) {
msg_dialog::display(_("Configuration error"), _("Running out of memory!"), WARNING_DIALOG);
}
diff --git a/html/progress.php b/html/progress.php
index 7b9aa68f8d96ef077fd5bba7f64cd90f53cfb497..8b247b80b9fc8a58e9c7bd5962b5735b241630db 100644
--- a/html/progress.php
+++ b/html/progress.php
@@ -55,7 +55,6 @@ if (!function_exists("imagecreate")) {
echo "Please install the php5-gd library, FusionDirectory can't create images without it.";
exit();
} else {
-
$x_matches = FALSE;
$y_matches = FALSE;
foreach (array(7,6,5,4,3,2,1,0) as $font) {
diff --git a/html/setup.php b/html/setup.php
index 8e814b09499535125f5eebc003cfe1908c6ee729..50112ffc63f36b02e9eef0ac3dc0b2b750aaa5d3 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -130,5 +130,3 @@ if ($error_collector != "") {
$smarty->assign("version", FD_VERSION);
echo $header.$smarty->fetch("$BASE_DIR/setup/setup_frame.tpl");
-
-?>
diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index ebd6fa580649a6015b2748acbe1710e9f36c8468..4bfa810618724beafbc19d1a168a7b46e58a33d8 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -165,7 +165,7 @@ function al2gt ($gettextlangs)
}
// if lang scores are equals we compare char scores
- if (($lang_score > $max_l_score)
+ if (($lang_score > $max_l_score)
|| (($lang_score == $max_l_score) && ($char_score > $max_c_score))) {
$max_l_score = $lang_score;
$max_c_score = $char_score;
@@ -179,4 +179,3 @@ function al2gt ($gettextlangs)
return $max_lang;
}
-?>
diff --git a/include/class_CSRFProtection.inc b/include/class_CSRFProtection.inc
index bcca73bbc233ec6b7088a4a2ccee8f859a0610cd..695f93cad7086a0573d6eb1820836869ad258856 100644
--- a/include/class_CSRFProtection.inc
+++ b/include/class_CSRFProtection.inc
@@ -58,8 +58,7 @@ class CSRFProtection
if (!empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
/* Only take the first value, there may be several separated by commas */
list($target) = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST'], 2);
- } else
- if (!empty($_SERVER['HTTP_HOST'])) {
+ } elseif (!empty($_SERVER['HTTP_HOST'])) {
$target = $_SERVER['HTTP_HOST'];
}
if ($target && !hash_equals($origin, $target)) {
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index e84e649c9ac9558fdf1e0cd08fbe44ba50a1cfba..9aaf90b87c4c80e77bd377ea29eae63a61905f06 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -187,7 +187,7 @@ class CopyPasteHandler
$cut_acl = $ui->is_cutable($entry['dn'], $entry['aclCategory'], $entry['mainTab']);
/* Check permissions */
- if ( (($entry['method'] == 'copy') && !$copy_acl)
+ if ((($entry['method'] == 'copy') && !$copy_acl)
|| (($entry['method'] == 'cut') && !$cut_acl)) {
$this->disallowed_objects[$key] = $entry;
} else {
@@ -328,4 +328,3 @@ class CopyPasteHandler
return $Copy_Paste;
}
}
-?>
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 2829381d422e08cb9d599670d01bb07c19006e8d..e44ecbb3d617d3969d67f3614025806a58e3ffbc 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -401,5 +401,3 @@ class IconTheme
),
);
}
-
-?>
diff --git a/include/class_SnapshotDialogs.inc b/include/class_SnapshotDialogs.inc
index 4f61316f83615dd50d404457d3c947b09c1d97a4..4aae53235b2ad48c87c7ab64d1cda7d79d606d78 100644
--- a/include/class_SnapshotDialogs.inc
+++ b/include/class_SnapshotDialogs.inc
@@ -408,4 +408,3 @@ class SnapshotRestoreDialog extends simplePlugin
{
}
}
-?>
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index 700ce6dc4b32f99b9678d9752bb9578e46d57b26..a6723a0a290834f1691b741c2ed1bf00c78b63e1 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -402,4 +402,3 @@ class SnapshotHandler
}
}
}
-?>
diff --git a/include/class_acl.inc b/include/class_acl.inc
index e2312aa13c8bec9cec1787498e92347b829a6072..d3e63aebf74c6f4121e8c49e765144a86d2896bb 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -99,11 +99,11 @@ class acl
{
$list = explode(':', $acl);
if (count($list) == 5) {
- list($index, $type,$role,$members,$filter) = $list;
+ list($index, $type, $role, $members, $filter) = $list;
$filter = base64_decode($filter);
} else {
$filter = "";
- list($index, $type,$role,$members) = $list;
+ list($index, $type, $role, $members) = $list;
}
$a = array( $index => array(
@@ -214,11 +214,9 @@ class acl
list($field, $facl) = explode(';', $ssacl);
$a[$gobject][$field] = $facl;
}
-
}
}
return $a;
}
}
-?>
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 139e207921ea64f4ba1f627dbf43ebd3b4a4eb0e..63ceaa13e140421225e6f5727b6b311f33af59ca 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -320,4 +320,3 @@ class baseSelector
return $this->pathMapping;
}
}
-?>
diff --git a/include/class_config.inc b/include/class_config.inc
index 1ef33e8f7b23144f4b999324c214f13e0ba75a51..352aa207de0fbf2755e0ef6c200e075715fe42f8 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -101,7 +101,6 @@ class config
session::global_set('class_location.inc:timestamp', $tmp['mtime']);
if (($this->filename != '') && ((filemtime($this->filename) != $this->last_modified) || $force)) {
-
$this->config_found = FALSE;
$this->tags = array();
$this->level = 0;
@@ -447,7 +446,6 @@ class config
);
}
}
-
}
/* Check that configuration is in LDAP, check that no plugin got installed since last configuration update */
@@ -1126,4 +1124,3 @@ class config
);
}
}
-?>
diff --git a/include/class_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index 37c4f5dd08b545d4e15d6292d0b6544b25e65efe..feea924d02517603fd5cac80e3c6ab3a79a2e5c3 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -27,7 +27,8 @@
/*!
* \brief This class contains all the function needed to sort department
*/
-class departmentSortIterator extends listingSortIterator {
+class departmentSortIterator extends listingSortIterator
+{
/*!
* \brief departmentSortIterator constructor
*
@@ -40,4 +41,3 @@ class departmentSortIterator extends listingSortIterator {
parent::__construct($data, $direction, 'sort-attribute', 'department');
}
}
-?>
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index d06e4dc1584dda20cdd0220296a4cfcf6d8e8b38..affc4718a841d3ae37a14cfd9114029a39a7aaaf 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -217,4 +217,3 @@ class divSelectBox
return $s_return;
}
}
-?>
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 99e8c7fbc70a7c68f7d5a12661057cba048c3999..cd46381be205af7a4cf46dbe9ae9c20ebb0e0830 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -163,7 +163,7 @@ class filter
"new Ajax.Autocompleter('$tag', 'autocomplete$tag', 'autocomplete.php', { minChars: $characters, frequency: $frequency });".
"</script>";
- $this->autocompleters[$tag] = $element['autocomplete'];
+ $this->autocompleters[$tag] = $element['autocomplete'];
}
return $result;
}
@@ -265,13 +265,13 @@ class filter
}
}
- /*!
- * \brief Set a converter
- *
- * \param string $field
- *
- * \param string $hook
- */
+ /*!
+ * \brief Set a converter
+ *
+ * \param string $field
+ *
+ * \param string $hook
+ */
function setConverter ($field, $hook)
{
$this->converter[$field] = $hook;
@@ -520,7 +520,6 @@ class filter
$this->scope = (isset($_POST['SCOPE']) ? 'sub' : 'one');
}
}
-
}
/*!
@@ -626,5 +625,3 @@ function strlenSort ($a, $b)
}
return (strlen($a['tag']) < strlen($b['tag']) ? -1 : 1);
}
-
-?>
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index de08a9fc73001fa8a6dd3a7249a378a0884c8ed7..4aeb0f4844b660557be7fbdff2b410655e121583 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -172,4 +172,3 @@ class filterLDAP
return $result;
}
}
-?>
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index d36c4a4485d88a51a0156f4ec6696fd3d3970530..431723505dfe81abdb35d2b35893c34f99c17e77 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -855,7 +855,6 @@ class LDAP
msg_dialog::display(_('Internal error'), sprintf(_('Cannot automatically create subtrees with RDN "%s": not supported'), $type), FATAL_ERROR_DIALOG);
exit();
}
-
}
$this->cd($cdn);
$this->add($na);
@@ -981,16 +980,16 @@ class LDAP
{
// Ensure that limit is numeric if not skip here.
if (!empty($limit) && !is_numeric($limit)) {
- trigger_error(sprintf("Invalid parameter for limit '%s', a numeric value is required."), $limit);
- return NULL;
+ trigger_error(sprintf("Invalid parameter for limit '%s', a numeric value is required."), $limit);
+ return NULL;
}
$limit = (!$limit) ? '' : ' -z '.$limit;
// Check scope values
$scope = trim($scope);
if (!empty($scope) && !in_array($scope, array('base', 'one', 'sub', 'children'))) {
- trigger_error(sprintf("Invalid parameter for scope '%s', please use 'base', 'one', 'sub' or 'children'."), $scope);
- return NULL;
+ trigger_error(sprintf("Invalid parameter for scope '%s', please use 'base', 'one', 'sub' or 'children'."), $scope);
+ return NULL;
}
$scope = (!empty($scope)) ? ' -s '.$scope : '';
@@ -1305,7 +1304,6 @@ class LDAP
default: $value .= $chunk.' ';
}
}
-
}
if (class_available('session')) {
session::global_set('LDAP_CACHE::get_objectclasses', $objectclasses);
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index 633fa40bbb3b2a08967f1333fce97eceb4ce0637..2b3dd8ccc3e90604c59294232fb64c135c954eef 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -28,7 +28,8 @@
/*!
* \brief This class contains all function to manage ldap multiplexer
*/
-class ldapMultiplexer {
+class ldapMultiplexer
+{
/* Internal stuff */
protected $object;
@@ -76,7 +77,4 @@ class ldapMultiplexer {
{
return $this->object->$memberName;
}
-
}
-
-?>
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 53ec6a14dd9198fbd8d8a08dc556215538b43191..1e4913c8b7540e113ef72f5856857c2aaa501cb3 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -424,11 +424,11 @@ class listing
foreach ($entryIterator as $row => $entry) {
// Apply custom class to row?
if (preg_match("/<rowClass:([a-z0-9_-]*)\/>/i", $entry['_rendered'], $matches)) {
- $result .= "<tr class='".$matches[1]."'>\n";
- $result .= preg_replace("/<rowClass[^>]+>/", '', $entry['_rendered']);
+ $result .= "<tr class='".$matches[1]."'>\n";
+ $result .= preg_replace("/<rowClass[^>]+>/", '', $entry['_rendered']);
} else {
- $result .= "<tr>\n";
- $result .= $entry['_rendered'];
+ $result .= "<tr>\n";
+ $result .= $entry['_rendered'];
}
$result .= "</tr>\n";
@@ -510,7 +510,7 @@ class listing
$this->baseSelector->update();
// Check if a wrong base was supplied
if (!$this->baseSelector->checkLastBaseUpdate()) {
- msg_dialog::display(_("Error"), msgPool::check_base(), ERROR_DIALOG);
+ msg_dialog::display(_("Error"), msgPool::check_base(), ERROR_DIALOG);
}
}
@@ -1820,7 +1820,4 @@ class listing
}
return NULL;
}
-
}
-
-?>
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index 571ff2c4bc6f484a1910911d1c3bd42120329eaf..1c9a77e9df30fe37d3380b84546a9fae855660e6 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -28,7 +28,8 @@
* \brief This class contains all the function needed to sort list
* go up, go down , back , next. etc...
*/
-class listingSortIterator implements Iterator {
+class listingSortIterator implements Iterator
+{
protected $data;
/*!
@@ -172,4 +173,3 @@ class listingSortIterator implements Iterator {
return (key($this->data) !== NULL);
}
}
-?>
diff --git a/include/class_logging.inc b/include/class_logging.inc
index 80f375773e65b4df09c6806ad5718b4a0ec9f32c..6df3e766cfc4a5345855d657d3a59f4df5ab3dbc 100644
--- a/include/class_logging.inc
+++ b/include/class_logging.inc
@@ -33,7 +33,8 @@
* \version 2.6
* \date 11.04.2007
*/
-class logging {
+class logging
+{
static $validActions = array('modify','create','remove','copy','snapshot','view','security','debug');
/*!
@@ -157,4 +158,3 @@ class logging {
}
}
}
-?>
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index 4f20d3cc0def0c567419b742fda16c72f256754b..6bc4a08106f1836c4d6f234471167333a8dc7587 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -35,8 +35,8 @@ define("LDAP_AUTH", 6);
/*!
* \brief This class contains all the messages for the various actions
*/
-class msgPool {
-
+class msgPool
+{
public static function selectToView ($type, $o_type = "")
{
if ($o_type == "") {
@@ -50,7 +50,6 @@ class msgPool {
} elseif ($o_type == "subsearch_small") {
return _("Search in subtrees");
}
-
}
/*!
@@ -225,15 +224,15 @@ class msgPool {
return sprintf(_("Cannot connect to %s database!"), $name).$error;
}
- /*!
- * \brief Display informations about database select
- *
- * \param string $name Name of the database
- *
- * \param string $error Error messsage to display
- *
- * \param string $dbinfo Database information
- */
+ /*!
+ * \brief Display informations about database select
+ *
+ * \param string $name Name of the database
+ *
+ * \param string $error Error messsage to display
+ *
+ * \param string $dbinfo Database information
+ */
public static function dbselect ($name, $error = "", $dbinfo = "")
{
if ($error != "") {
@@ -255,15 +254,15 @@ class msgPool {
return sprintf(_("No %s server defined!"), $name);
}
- /*!
- * \brief Display informations about database query
- *
- * \param string $name Name of the database
- *
- * \param string $error Error messsage to display
- *
- * \param string $dbinfo Database information
- */
+ /*!
+ * \brief Display informations about database query
+ *
+ * \param string $name Name of the database
+ *
+ * \param string $error Error messsage to display
+ *
+ * \param string $dbinfo Database information
+ */
public static function dbquery ($name, $error = "", $dbinfo = "")
{
if ($error != "") {
@@ -856,4 +855,3 @@ class msgPool {
return _("The supplied base is not valid and has been reset to the previous value!");
}
}
-?>
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index 061b17cd1eeb9a425d3a7e1b4baa85c978a45b54..fa1fc86d716466375b8f0b02197947307b55081b 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -162,7 +162,7 @@ class msg_dialog
</head><body>';
if (isset($config) && is_object($config) &&
$config->get_cfg_value('displayerrors') == 'TRUE') {
- list($trace,) = html_trace();
+ list($trace, ) = html_trace();
$display .= $trace;
}
$display .=
@@ -180,7 +180,6 @@ class msg_dialog
</table></body></html>';
return $display;
} else {
-
$smarty = get_smarty();
$smarty->assign('s_Trace', print_a($this->a_Trace, TRUE));
$smarty->assign('i_TraceCnt', count($this->a_Trace));
@@ -240,4 +239,3 @@ class msg_dialog
return $return;
}
}
-?>
diff --git a/include/class_objects.inc b/include/class_objects.inc
index 1528f454c830d5f86cfa254c989f6f3d3f2f6453..d9586b4fc7bae720532d0816ec1badbcb68d0fce 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -488,5 +488,3 @@ class objects
return $templates;
}
}
-
-?>
diff --git a/include/class_passwordRecovery.inc b/include/class_passwordRecovery.inc
index a76a2d32ffe6e97b741017501d78545a47c08a8d..4feb6489a0923ec83f3410306e6362a165fa55e1 100644
--- a/include/class_passwordRecovery.inc
+++ b/include/class_passwordRecovery.inc
@@ -425,5 +425,3 @@ class passwordRecovery extends standAlonePage
}
}
}
-
-?>
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index aaeec46bf05e12ff23831a7a0f0fdb352751b492..806fb5f785ca886a88c620f1a4a29da66d574a99 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -31,7 +31,8 @@
*
* \see class_plugin
*/
-class pluglist {
+class pluglist
+{
var $menu = "";
var $iconmenu = "";
var $current = "";
diff --git a/include/class_session.inc b/include/class_session.inc
index f18d6d99595a4ff88124d85288772dc7b6836f22..1b7863f791689bb58b5de9850d678de7fa91afe9 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -27,7 +27,8 @@
/*!
* \brief This class contains all the function needed to manage sessions
*/
-class session {
+class session
+{
/*!
* \brief Check if the name of the session is set
*
@@ -257,4 +258,3 @@ class session {
@session_destroy();
}
}
-?>
diff --git a/include/class_standAlonePage.inc b/include/class_standAlonePage.inc
index 08277998979083382b39648db541d9cd18e0ab96..42939609d6dd48d26c57120e11bfb92e5df9b565 100644
--- a/include/class_standAlonePage.inc
+++ b/include/class_standAlonePage.inc
@@ -20,7 +20,8 @@
*/
/* base class for passwordRecovery and such classes handling requests on their own */
-class standAlonePage {
+class standAlonePage
+{
protected $directories;
protected $directory;
protected $activated;
diff --git a/include/class_templateHandling.inc b/include/class_templateHandling.inc
index 127767c7f51cbe1a6d390c7b1868d2994b408cc8..c2cf79ed92d3e455a83634531e977b7de1e692ae 100644
--- a/include/class_templateHandling.inc
+++ b/include/class_templateHandling.inc
@@ -435,7 +435,8 @@ class templateHandling
if (count($args) < 3) {
$args[] = 1;
}
- $numberGenerator = function ($mandatory, $start, $step) {
+ $numberGenerator = function ($mandatory, $start, $step)
+ {
if (!$mandatory) {
yield '';
}
@@ -609,7 +610,7 @@ class templateHandling
$depends = array();
foreach ($attrs as $key => $values) {
$depends[$key] = array();
- if (!is_array($values)) {
+ if (!is_array($values)) {
$values = array($values);
}
unset ($values['count']);
@@ -638,7 +639,8 @@ class templateHandling
/*! \brief Sort attrs depending of dependencies */
protected static function sortAttributes (array $attrs, array $flatdepends)
{
- uksort($attrs, function ($k1, $k2) use ($flatdepends) {
+ uksort($attrs, function ($k1, $k2) use ($flatdepends)
+ {
if (in_array($k1, $flatdepends[$k2])) {
return -1;
} elseif (in_array($k2, $flatdepends[$k1])) {
@@ -648,7 +650,7 @@ class templateHandling
$c1 = count($flatdepends[$k1]);
$c2 = count($flatdepends[$k2]);
if ($c1 == $c2) {
- return 0;
+ return 0;
}
return (($c1 < $c2) ? -1 : 1);
}
diff --git a/include/class_timezone.inc b/include/class_timezone.inc
index 3f481bb37664b1c07ce3c55a0bf0b96e1c4c6a9d..495151cdcc7a6bb40fff416247756d49fd5c39fb 100644
--- a/include/class_timezone.inc
+++ b/include/class_timezone.inc
@@ -109,4 +109,3 @@ class timezone
return $utc;
}
}
-?>
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 2d1a469d1fc1a5aeacb3efc6122c4916cb90a426..549873179c1801886cc4f8ea6d2f10369097fb24 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -652,7 +652,7 @@ class userinfo
*
* \return array Return all accessible departments
*/
- function get_module_departments ($module, $skip_self_acls = FALSE )
+ function get_module_departments ($module, $skip_self_acls = FALSE)
{
global $config;
/* If we are forced to skip ACLs checks for the current user
diff --git a/include/class_xml.inc b/include/class_xml.inc
index 3dcb117c1e1f2b025e1e7b39deeda1451514894c..8a2c8acd0dfd270ed4f086acb17b1fdda6a56ddc 100644
--- a/include/class_xml.inc
+++ b/include/class_xml.inc
@@ -28,7 +28,8 @@
* \brief This class contains all the function needed to manage xml
* files
*/
-class xml {
+class xml
+{
/*!
* \brief Transform a xml document to an array
*
@@ -110,7 +111,6 @@ class xml {
$repeated_tag_index[$tag.'_'.$level] = 1;
$current = &$current[$tag];
-
} else { //There was another element with the same tag name
if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
@@ -128,7 +128,6 @@ class xml {
$last_item_index = $repeated_tag_index[$tag.'_'.$level] - 1;
$current = &$current[$tag][$last_item_index];
}
-
} elseif ($type == "complete") { //Tags that ends in 1 line '<tag />'
//See if the key is already taken.
if (!isset($current[$tag])) { //New Key
@@ -143,10 +142,9 @@ class xml {
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
if ($priority == 'tag' and $get_attributes and $attributes_data) {
- $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
+ $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
}
$repeated_tag_index[$tag.'_'.$level]++;
-
} else { //If it is not an array...
$current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
$repeated_tag_index[$tag.'_'.$level] = 1;
@@ -170,5 +168,4 @@ class xml {
return $xml_array;
}
-
}
diff --git a/include/exporter/class_PDF.php b/include/exporter/class_PDF.php
index 9b85ed242d338a788f57beb84bbe791b88ffdcde..68945f38f23cbbf90f342ed8d989442679074366 100644
--- a/include/exporter/class_PDF.php
+++ b/include/exporter/class_PDF.php
@@ -61,5 +61,3 @@ class PDF extends FPDF
$this->Cell(0, 10, _("Page")." ".$this->PageNo().'/{nb}', 0, 0, 'C');
}
}
-
-?>
diff --git a/include/exporter/class_csvExporter.inc b/include/exporter/class_csvExporter.inc
index f4a6a1191e39b67ad884c906c1a456d24442f7e9..0389bbb32d94f2323afa0fe6790e4ac8f3eb0a5f 100644
--- a/include/exporter/class_csvExporter.inc
+++ b/include/exporter/class_csvExporter.inc
@@ -117,7 +117,4 @@ class csvExporter
{
return array("exportCSV" => array( "label" => _("CSV"), "image" => "geticon.php?context=mimetypes&icon=text-csv&size=16", "class" => "csvExporter", "mime" => "text/x-csv", "filename" => "export.csv" ));
}
-
}
-
-?>
diff --git a/include/exporter/class_pdfExporter.inc b/include/exporter/class_pdfExporter.inc
index a4f41878202338c478f5736b852416c5396696ae..6fa8732951d80d6faea1e28c56b2a9365999f881 100644
--- a/include/exporter/class_pdfExporter.inc
+++ b/include/exporter/class_pdfExporter.inc
@@ -106,7 +106,6 @@ class pdfExporter
}
foreach ($columns as $order => $index) {
-
if (isset($row["_sort$index"])) {
$this->result->Cell($width[$order], 6, utf8_decode($row["_sort$index"]), 'LR', 0, 'L', $fill);
} else {
@@ -222,7 +221,7 @@ class pdfExporter
*/
function query ()
{
- return $this->result->Output("", "S");
+ return $this->result->Output("", "S");
}
static function export (managementListing $listing)
@@ -310,7 +309,4 @@ class pdfExporter
return NULL;
}
}
-
}
-
-?>
diff --git a/include/functions.inc b/include/functions.inc
index 061fb70336e0481637a79293f32196ce6ae64344..4a1df7444940aea2ccde658db1141863d993bcb1 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -90,7 +90,7 @@ function __fusiondirectory_autoload ($class_name)
if ($class_mapping === NULL) {
if (isset($config) && is_object($config) &&
$config->get_cfg_value('displayerrors') == 'TRUE') {
- list($trace,) = html_trace();
+ list($trace, ) = html_trace();
echo $trace;
echo "<br/>\n";
}
@@ -109,7 +109,7 @@ function __fusiondirectory_autoload ($class_name)
@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();
+ list($trace, ) = html_trace();
echo $trace;
echo "<br/>\n";
}
@@ -1026,15 +1026,13 @@ function gen_locked_message (array $locks, $dn, $allow_readonly = FALSE)
$remove = FALSE;
/* Save variables from LOCK_VARS_TO_USE in session - for further editing */
- if ( session::is_set('LOCK_VARS_TO_USE') && count(session::get('LOCK_VARS_TO_USE'))) {
-
+ if (session::is_set('LOCK_VARS_TO_USE') && count(session::get('LOCK_VARS_TO_USE'))) {
$LOCK_VARS_USED_GET = array();
$LOCK_VARS_USED_POST = array();
$LOCK_VARS_USED_REQUEST = array();
$LOCK_VARS_TO_USE = session::get('LOCK_VARS_TO_USE');
foreach ($LOCK_VARS_TO_USE as $name) {
-
if (empty($name)) {
continue;
}
@@ -1309,7 +1307,6 @@ function to_byte ($value)
$value = strtolower(trim($value));
if (!is_numeric(substr($value, -1))) {
-
switch (substr($value, -1)) {
case 'g':
$mult = 1073741824;
@@ -2057,13 +2054,13 @@ function set_object_info ($str = "")
*/
function isIpInNet ($ip, $net, $mask)
{
- // Move to long ints
- $ip = ip2long($ip);
- $net = ip2long($net);
- $mask = ip2long($mask);
+ // Move to long ints
+ $ip = ip2long($ip);
+ $net = ip2long($net);
+ $mask = ip2long($mask);
- // Mask given IP with mask. If it returns "net", we're in...
- return (($ip & $mask) == $net);
+ // Mask given IP with mask. If it returns "net", we're in...
+ return (($ip & $mask) == $net);
}
/*!
diff --git a/include/functions_debug.inc b/include/functions_debug.inc
index 7df84694d6f97290eb2778bfd1ce878d6e19da82..f88b121b3f5d0de0c6f356b7a785241faa922d00 100644
--- a/include/functions_debug.inc
+++ b/include/functions_debug.inc
@@ -59,7 +59,8 @@
* based on the print_a() function from
* Stephan Pirson (Saibot)
*/
-class printAClass {
+class printAClass
+{
// this can be changed to FALSE if you don't like the fancy string formatting
var $look_for_leading_tabs = TRUE;
@@ -117,14 +118,14 @@ class printAClass {
}
if (!$iteration && isset($this->export_flag)) {
- $this->output .= '<form id="pa_form_'.$this->export_hash.'" action="'.$this->export_dumper_path.'?mode='.$this->export_flag.'" method="post" target="_blank"><input name="array" type="hidden" value="'.htmlspecialchars( serialize( $array ) ).'"></form>';
+ $this->output .= '<form id="pa_form_'.$this->export_hash.'" action="'.$this->export_dumper_path.'?mode='.$this->export_flag.'" method="post" target="_blank"><input name="array" type="hidden" value="'.htmlspecialchars(serialize($array)).'"></form>';
}
// lighten up the background color for the key td's =)
if ($iteration) {
for ($i = 0; $i < 6; $i += 2) {
- $c = substr( $key_bg_color, $i, 2 );
- $c = hexdec( $c );
+ $c = substr($key_bg_color, $i, 2);
+ $c = hexdec($c);
$c += 15;
if ($c > 255) {
$c = 255;
@@ -132,15 +133,14 @@ class printAClass {
if (!isset($tmp_key_bg_color)) {
$tmp_key_bg_color = '';
}
- $tmp_key_bg_color .= sprintf( "%02X", $c );
+ $tmp_key_bg_color .= sprintf("%02X", $c);
}
$key_bg_color = $tmp_key_bg_color;
}
// build a single table ... may be nested
- $this->output .= '<table style="border:none;" '.( !$iteration && $this->export_flag ? 'onClick="document.getElementById(\'pa_form_'.$this->export_hash.'\').submit();" )' : '' ).'>';
+ $this->output .= '<table style="border:none;" '.(!$iteration && $this->export_flag ? 'onClick="document.getElementById(\'pa_form_'.$this->export_hash.'\').submit();" )' : '').'>';
foreach ($array as $key => $value) {
-
$value_style = 'color:black;';
$key_style = 'color:white;';
@@ -171,7 +171,7 @@ class printAClass {
if ($this->look_for_leading_tabs && preg_match('/^\t/m', $value)) {
$search = array('/\t/', "/\n/");
$replace = array(' ','<br />');
- $value = preg_replace( $search, $replace, htmlspecialchars($value));
+ $value = preg_replace($search, $replace, htmlspecialchars($value));
$value_style = 'color:black;border:1px gray dotted;';
} else {
$value_style = 'color:black;';
@@ -186,7 +186,7 @@ class printAClass {
}
$this->output .= '<tr>';
- $this->output .= '<td nowrap align="'.$this->keyalign.'" style="background-color:#'.$key_bg_color.';'.$key_style.';font:bold '.$this->fontsize.' '.$this->fontfamily.';" title="'.gettype( $key ).'['.$type.']">';
+ $this->output .= '<td nowrap align="'.$this->keyalign.'" style="background-color:#'.$key_bg_color.';'.$key_style.';font:bold '.$this->fontsize.' '.$this->fontfamily.';" title="'.gettype($key).'['.$type.']">';
$this->output .= $key;
$this->output .= '</td>';
$this->output .= '<td nowrap="nowrap" style="background-color:#'.$this->value_bg_color.';font: '.$this->fontsize.' '.$this->fontfamily.'; color:black;">';
@@ -194,13 +194,13 @@ class printAClass {
// value output
if ($type == 'array') {
if (count($value)) {
- $this->print_a( $value, TRUE, $key_bg_color );
+ $this->print_a($value, TRUE, $key_bg_color);
} else {
$this->output .= '<div style="color:blue;">Array (empty)</div>';
}
} elseif ($type == 'object') {
if ($this->show_object_vars) {
- $this->print_a( get_object_vars( $value ), TRUE, $key_bg_color );
+ $this->print_a(get_object_vars($value), TRUE, $key_bg_color);
} else {
$this->output .= '<div style="'.$value_style.'">OBJECT - '.get_class($value).'</div>';
}
@@ -226,7 +226,7 @@ class printAClass {
*
* \param boolean $export_flag false
*/
-function print_a ($array, $return_mode = FALSE, $show_object_vars = FALSE, $export_flag = FALSE )
+function print_a ($array, $return_mode = FALSE, $show_object_vars = FALSE, $export_flag = FALSE)
{
$e = error_reporting(0);
if (is_array($array) || is_object($array)) {
@@ -242,7 +242,7 @@ function print_a ($array, $return_mode = FALSE, $show_object_vars = FALSE, $expo
$output = &$pa->output;
} else {
- $output = '<span style="color:red;font-size:small;">print_a( '.gettype( $array ).' )</span>';
+ $output = '<span style="color:red;font-size:small;">print_a( '.gettype($array).' )</span>';
}
error_reporting($e);
@@ -338,10 +338,9 @@ function show_vars ($show_all_vars = FALSE, $show_object_vars = FALSE)
}
if ($$vars_name) {
print '<div class="vars-container" style="background-color:'.$vars_data[1].';"><span class="varsname">'.$vars_data[0].'</span><br />';
- print_a($$vars_name, FALSE, $show_object_vars, FALSE );
+ print_a($$vars_name, FALSE, $show_object_vars, FALSE);
print '</div>';
}
}
print '</div>';
}
-?>
diff --git a/include/login/class_LoginPost.inc b/include/login/class_LoginPost.inc
index 7d89777c7bd7b740fbfbabed5081b7af10d40678..cb68c5ebad7a3f34dc1f4034e5d0aeaae6e4c76f 100644
--- a/include/login/class_LoginPost.inc
+++ b/include/login/class_LoginPost.inc
@@ -39,7 +39,6 @@ class LoginPost extends LoginMethod
$smarty->assign('focusfield', 'username');
if (($_SERVER['REQUEST_METHOD'] == 'POST') && isset($_POST['login']) && isset($_POST['username']) && isset($_POST['password'])) {
-
static::$username = $_POST['username'];
static::$password = $_POST['password'];
diff --git a/include/management/class_ManagementConfigurationDialog.inc b/include/management/class_ManagementConfigurationDialog.inc
index 102cdfd3c6d21323c393d5e850244c928c614cc9..88d6277979294b36c00ae69adad1c9c7bd4bb07c 100644
--- a/include/management/class_ManagementConfigurationDialog.inc
+++ b/include/management/class_ManagementConfigurationDialog.inc
@@ -20,7 +20,6 @@
class ManagementColumnAttribute extends CompositeAttribute
{
-
function __construct ($label, $description, $ldapName, $attributes, $acl = "")
{
parent::__construct($description, $ldapName, $attributes, FALSE, FALSE, $acl, $label);
diff --git a/include/management/class_managementListing.inc b/include/management/class_managementListing.inc
index 37e39246f964a2fb53147e85a63636d84d21b435..ddbecec6fc46ca24bef5329a042cf24894823d61 100644
--- a/include/management/class_managementListing.inc
+++ b/include/management/class_managementListing.inc
@@ -227,7 +227,7 @@ class managementListing
// Check if a wrong base was supplied
if (!$this->baseSelector->checkLastBaseUpdate()) {
- msg_dialog::display(_('Error'), msgPool::check_base(), ERROR_DIALOG);
+ msg_dialog::display(_('Error'), msgPool::check_base(), ERROR_DIALOG);
}
// Save base
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_password-methods-clear.inc
index 9a877f77b2f3123f529ff97c0ea56b38c9f0390e..cdfecd172db771253ca1a351863dcab935dfbda1 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_password-methods-clear.inc
@@ -69,6 +69,4 @@ class passwordMethodClear extends passwordMethod
{
return "clear";
}
-
}
-?>
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index 87984b1d385ab8c7de53d096c0d939ba2d9bcad8..12ba6f6bd0293b946b57d08810d3b9f083abe958 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -59,21 +59,21 @@ class passwordMethodCrypt extends passwordMethod
if ($this->hash == "crypt/standard-des") {
$salt = "";
for ($i = 0; $i < 2; $i++) {
- $salt .= get_random_char();
+ $salt .= get_random_char();
}
}
if ($this->hash == "crypt/enhanced-des") {
$salt = "_";
for ($i = 0; $i < 8; $i++) {
- $salt .= get_random_char();
+ $salt .= get_random_char();
}
}
if ($this->hash == "crypt/md5") {
$salt = "\$1\$";
for ($i = 0; $i < 8; $i++) {
- $salt .= get_random_char();
+ $salt .= get_random_char();
}
$salt .= "\$";
}
@@ -81,7 +81,7 @@ class passwordMethodCrypt extends passwordMethod
if ($this->hash == "crypt/blowfish") {
$salt = "\$2a\$07\$";
for ($i = 0; $i < CRYPT_SALT_LENGTH; $i++) {
- $salt .= get_random_char();
+ $salt .= get_random_char();
}
$salt .= "\$";
}
@@ -89,7 +89,7 @@ class passwordMethodCrypt extends passwordMethod
if ($this->hash == "crypt/sha-256") {
$salt = "\$5\$";
for ($i = 0; $i < 16; $i++) {
- $salt .= get_random_char();
+ $salt .= get_random_char();
}
$salt .= "\$";
}
@@ -97,7 +97,7 @@ class passwordMethodCrypt extends passwordMethod
if ($this->hash == "crypt/sha-512") {
$salt = "\$6\$";
for ($i = 0; $i < 16; $i++) {
- $salt .= get_random_char();
+ $salt .= get_random_char();
}
$salt .= "\$";
}
@@ -186,4 +186,3 @@ class passwordMethodCrypt extends passwordMethod
return "";
}
}
-?>
diff --git a/include/password-methods/class_password-methods-empty.inc b/include/password-methods/class_password-methods-empty.inc
index 24c5c468a0127bb73d051c8807ba9805aabcbd69..bc75c17d0a67616e4f45e3fbd686f277353ec9a4 100644
--- a/include/password-methods/class_password-methods-empty.inc
+++ b/include/password-methods/class_password-methods-empty.inc
@@ -90,4 +90,3 @@ class passwordMethodEmpty extends passwordMethod
return '';
}
}
-?>
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index 7637e354bf5db54db5b432b44ef0b78a4b9c731b..bb910db53ac91116890b27abbfafc65802b7a7cb 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -56,7 +56,7 @@ class passwordMethodMd5 extends passwordMethod
*/
function generate_hash ($pwd, $locked = FALSE)
{
- return '{MD5}'.($locked ? '!' : '').base64_encode( pack('H*', md5($pwd)));
+ return '{MD5}'.($locked ? '!' : '').base64_encode(pack('H*', md5($pwd)));
}
/*!
@@ -67,4 +67,3 @@ class passwordMethodMd5 extends passwordMethod
return 'md5';
}
}
-?>
diff --git a/include/password-methods/class_password-methods-sasl.inc b/include/password-methods/class_password-methods-sasl.inc
index d0a2e898c1b97ad9852efc7cf360e2bc0cb9507e..dcae829c1d76ad51053176c3866ef3c92efd437c 100644
--- a/include/password-methods/class_password-methods-sasl.inc
+++ b/include/password-methods/class_password-methods-sasl.inc
@@ -123,4 +123,3 @@ class passwordMethodsasl extends passwordMethod
return ($config->get_cfg_value('forceSaslPasswordAsk', 'FALSE') == 'TRUE');
}
}
-?>
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_password-methods-sha.inc
index af5acbc7d781f2bddb6966e877d8bc08e708cb04..f088026942245f78b0bb582b9675f55ac7f27cf2 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -75,4 +75,3 @@ class passwordMethodsha extends passwordMethod
return 'sha';
}
}
-?>
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index 9f3ab5b75c2a0b785441507a7729867cfd70a5f4..f367d8a21a6d30d4dbb4b2418912e496cf46a02b 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -77,4 +77,3 @@ class passwordMethodsmd5 extends passwordMethod
return 'smd5';
}
}
-?>
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index f31f53b887450664f72a9f36b0fe92aa121662cf..0bf55370c4f15235ef458ede8f45e8a54a311889 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -93,4 +93,3 @@ class passwordMethodssha extends passwordMethod
return 'ssha';
}
}
-?>
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index 7a822dcae41777e8c43323f35444bf569cbeb20a..e7b0917c0babce611f6ed918cf171f8d57b22917 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -390,4 +390,3 @@ class passwordMethod
return TRUE;
}
}
-?>
diff --git a/include/php_setup.inc b/include/php_setup.inc
index da665fd580eaa43f6c1896ca2af44566220119c2..a091892ea1bb41c4d61323c7ff975c523d6fc025 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -94,7 +94,8 @@ function html_trace ($errstr = "")
} else {
$hideArgsIndexes = array();
}
- $f = function ($index, $arg) use(&$f, $hideArgsIndexes) {
+ $f = function ($index, $arg) use (&$f, $hideArgsIndexes)
+ {
static $i = 0;
if (($i == 0) && in_array($index, $hideArgsIndexes)) {
return '***';
@@ -354,4 +355,3 @@ $ssl = '';
if (!sslOn()) {
$ssl = sslUrl();
}
-?>
diff --git a/include/select/class_filterLDAPBlacklist.inc b/include/select/class_filterLDAPBlacklist.inc
index a6a5a0368672a074314eae7cc78d3a08e13412ee..e2dbb0b180c828707461fc2e39d0cdd6e99cdff2 100644
--- a/include/select/class_filterLDAPBlacklist.inc
+++ b/include/select/class_filterLDAPBlacklist.inc
@@ -23,8 +23,8 @@
/*!
* \brief filterLDAP backend with blacklist/whitelist handling
*/
-class filterLDAPBlacklist {
-
+class filterLDAPBlacklist
+{
static function query ($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
{
$result = filterLDAP::query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage);
@@ -70,4 +70,3 @@ class filterLDAPBlacklist {
return array_values($entries);
}
}
-?>
diff --git a/include/select/groupSelect/class_groupSelect.inc b/include/select/groupSelect/class_groupSelect.inc
index 9e9784b8882a7cbd529352a98af6abfce808171a..fa94786eb7c5a06507240c70c079224c26d5efe6 100644
--- a/include/select/groupSelect/class_groupSelect.inc
+++ b/include/select/groupSelect/class_groupSelect.inc
@@ -33,4 +33,3 @@ class groupSelect extends simpleSelectManagement
parent::__construct();
}
}
-?>
diff --git a/include/select/systemSelect/class_systemSelect.inc b/include/select/systemSelect/class_systemSelect.inc
index 1ee23b44a708a4d7a989b4ef45558ba23c9034cf..c8d1a7faa8db0f28a1ec5bce4c7f04bad6af8116 100644
--- a/include/select/systemSelect/class_systemSelect.inc
+++ b/include/select/systemSelect/class_systemSelect.inc
@@ -28,4 +28,3 @@ class systemSelect extends simpleSelectManagement
'terminal', 'workstation', 'server'
);
}
-?>
diff --git a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index c8581d3fde55c9f08291b2c4b7c90cb855a83f34..ea27f0e5e9088f6dbdac91e3130f134adf3a5d8e 100644
--- a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
+++ b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
@@ -121,7 +121,7 @@ class BaseSelectorAttribute extends Attribute
function checkValue ($value)
{
- if (!is_string($value) && (!is_object($value) || !method_exists($value, '__toString' ))) {
+ if (!is_string($value) && (!is_object($value) || !method_exists($value, '__toString'))) {
throw new InvalidValueException(_('Base field value should always be a string'));
}
}
diff --git a/include/simpleplugin/attributes/class_BooleanAttribute.inc b/include/simpleplugin/attributes/class_BooleanAttribute.inc
index 1fd7838ee186477fe5afe212dfdc299f5328b209..f355a9d9bc4980ba859c6f2f783683b24c73b7bb 100644
--- a/include/simpleplugin/attributes/class_BooleanAttribute.inc
+++ b/include/simpleplugin/attributes/class_BooleanAttribute.inc
@@ -209,4 +209,3 @@ class ObjectClassBooleanAttribute extends BooleanAttribute
}
}
}
-
diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index 42e69c7198bbeb0c95e2d825f3d9c32e39107777..3459b2c8915e310c66e8d775f45c141e8e82abec 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -197,7 +197,7 @@ class SetAttribute extends Attribute
}
$attribute = $this->attribute;
return array_map(
- function ($value) use($attribute)
+ function ($value) use ($attribute)
{
return $attribute->displayValue($value);
},
diff --git a/include/simpleplugin/attributes/class_StringAttribute.inc b/include/simpleplugin/attributes/class_StringAttribute.inc
index 81ecde381ff23e063c37703aa5f40f2f3285e1c1..bb8570447695678ec9efcd5ad64431a4c2487e4f 100644
--- a/include/simpleplugin/attributes/class_StringAttribute.inc
+++ b/include/simpleplugin/attributes/class_StringAttribute.inc
@@ -77,7 +77,7 @@ class StringAttribute extends Attribute
$attributes['onChange'] = 'javascript:'.htmlentities($js, ENT_COMPAT, 'UTF-8');
}
if ($this->autocomplete !== NULL) {
- $attributes['autocomplete'] = ($this->autocomplete ? 'on' : 'off' );
+ $attributes['autocomplete'] = ($this->autocomplete ? 'on' : 'off');
}
if ($this->html5pattern !== NULL) {
$attributes['pattern'] = '{literal}'.htmlentities($this->html5pattern, ENT_COMPAT, 'UTF-8').'{/literal}';
@@ -98,7 +98,7 @@ class StringAttribute extends Attribute
'value' => '{literal}'.htmlentities($this->getValue(), ENT_COMPAT, 'UTF-8').'{/literal}'
);
if ($this->autocomplete !== NULL) {
- $attributes['autocomplete'] = ($this->autocomplete ? 'on' : 'off' );
+ $attributes['autocomplete'] = ($this->autocomplete ? 'on' : 'off');
}
if ($this->isSubAttribute) {
$attributes['class'] = 'subattribute';
@@ -144,7 +144,7 @@ class StringAttribute extends Attribute
function checkValue ($value)
{
- if (!is_scalar($value) && (!is_object($value) || !method_exists($value, '__toString' ))) {
+ if (!is_scalar($value) && (!is_object($value) || !method_exists($value, '__toString'))) {
throw new InvalidValueException(sprintf(_('StringAttribute "%s" was set to a non-compatible value'), $this->getLabel()));
}
}
diff --git a/include/simpleplugin/class_Attribute.inc b/include/simpleplugin/class_Attribute.inc
index 88c2b5bf2d605ec4fad7692d4e4b092e31616797..6b2318fa6128c971c4720d17428206698722a991 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -700,7 +700,8 @@ class Attribute
protected function changeStateJS ()
{
return join(array_map(
- function ($id) {
+ function ($id)
+ {
return 'changeState('.json_encode($id).');';
},
$this->htmlIds()
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index 5b4ba78175b3b7960cae33c3ddc4dd6b99ca993e..789b0e8161d62835dff5062f48f84093926e4a13 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -998,4 +998,3 @@ class GenericSimplePluginDialog extends GenericDialog
return FALSE;
}
}
-?>
diff --git a/include/simpleplugin/class_helpersAttribute.inc b/include/simpleplugin/class_helpersAttribute.inc
index 81b63b777e695c986070a60fe2125b53d014d4b1..d283642992f2309006fb35cb0948b43e4754d4ec 100644
--- a/include/simpleplugin/class_helpersAttribute.inc
+++ b/include/simpleplugin/class_helpersAttribute.inc
@@ -284,5 +284,3 @@ class TimeAttribute extends UnitIntAttribute
parent::__construct($label, $description, $ldapName, $required, $units, $min, $max, $defaultValue, $acl);
}
}
-
-?>
diff --git a/include/simpleplugin/class_multiPlugin.inc b/include/simpleplugin/class_multiPlugin.inc
index 2a88b02fc281bc7af4edbab19344186f7cfa838b..b501ec98d3dc96184a487c8726e652afa5391792 100644
--- a/include/simpleplugin/class_multiPlugin.inc
+++ b/include/simpleplugin/class_multiPlugin.inc
@@ -206,5 +206,3 @@ class multiPlugin extends simplePlugin
unset($plug);
}
}
-
-?>
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 1a57bda72c3903c60082bf47e4ce0bce42dbc2b2..55e05b89982657b8e9a92d04d3306766b9c25e1d 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -1353,4 +1353,3 @@ class simpleManagement
}
}
}
-?>
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 6eaf819cf8ffaa0b1c2211c4257f8d176b0a18a6..03e0cd804e3b115875ae987919d79cb2ce5867c4 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -789,9 +789,9 @@ class simplePlugin
function show_header (string $button_text, string $text, bool $plugin_enabled, bool $button_disabled = FALSE, string $name = 'modify_state'): string
{
if ($button_disabled || ((!$this->acl_is_createable() && !$plugin_enabled) || (!$this->acl_is_removeable() && $plugin_enabled))) {
- $state = 'disabled="disabled"';
+ $state = 'disabled="disabled"';
} else {
- $state = '';
+ $state = '';
}
$display = '<div width="100%"><p><b>'.$text.'</b><br/>'."\n";
$display .= '<input type="submit" formnovalidate="formnovalidate" value="'.$button_text.'" name="'.$name.'" '.$state.'></p></div><hr class="separator"/>';
diff --git a/include/simpleplugin/class_simpleSelectManagement.inc b/include/simpleplugin/class_simpleSelectManagement.inc
index dc51592212ff9addd124f33e16adc2a166cae8b6..fb03870ed40040ace71e5e2b9fc3f36835e57066 100644
--- a/include/simpleplugin/class_simpleSelectManagement.inc
+++ b/include/simpleplugin/class_simpleSelectManagement.inc
@@ -86,4 +86,3 @@ class simpleSelectManagement extends simpleManagement
return '';
}
}
-?>
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index 5d8bc7268fd61652418a2cfda0caef6607c4f4f5..0f6692d8d529defae8e6687878b0bb60d7ed393f 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -567,4 +567,3 @@ class simpleTabs_noSpecial extends simpleTabs
{
protected $specialTabs = FALSE;
}
-?>
diff --git a/include/variables.inc b/include/variables.inc
index 95dd6230d831b0b8aef10b00afcf8154e2a918ed..0385a59e76203ee6d09598a36ed31179d5ac4b75 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -83,5 +83,3 @@ define("SUPANN_DIR", "/etc/fusiondirectory/supann/"); /* FusionDirectory supann
* \brief name of the class.cache file
*/
define("CLASS_CACHE", "class.cache"); /* name of the class cache */
-
-?>
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 6187c6ed21604ffe116767c0785ffe9146a5cc81..ad2547b512da10b512d5892d2fcce4842b9a38ec 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -79,5 +79,3 @@ define('PHP_MIN_VERSION', '5.6.0');
* \brief Toggle crashing on PHP error, used for test suites
*/
define('PHP_ERROR_FATAL', 'FALSE');
-
-?>
diff --git a/plugins/addons/dashboard/class_dashboardPasswords.inc b/plugins/addons/dashboard/class_dashboardPasswords.inc
index bd283470a80aab9b6be6e0df4670acf264fd9439..de27439d5e218466058bc9b934feb9695063fa0c 100644
--- a/plugins/addons/dashboard/class_dashboardPasswords.inc
+++ b/plugins/addons/dashboard/class_dashboardPasswords.inc
@@ -106,4 +106,3 @@ class dashboardPassword extends simplePlugin
);
}
}
-?>
diff --git a/plugins/addons/dashboard/class_dashboardUsers.inc b/plugins/addons/dashboard/class_dashboardUsers.inc
index 5ab8831f82d0d3697794c7a9c59c78ff0cd782aa..a6d8500a02caf411012d5059b19baadb4689affc 100644
--- a/plugins/addons/dashboard/class_dashboardUsers.inc
+++ b/plugins/addons/dashboard/class_dashboardUsers.inc
@@ -274,4 +274,3 @@ class dashboardUsers extends simplePlugin
}
}
}
-?>
diff --git a/plugins/addons/dashboard/tabs_dashBoard.inc b/plugins/addons/dashboard/tabs_dashBoard.inc
index 0d0d350b1cbe7bf3ad617fc5d5ff83342588390a..a0b64a2c5334f52f5534ffcfc45eea3f67e3fe85 100644
--- a/plugins/addons/dashboard/tabs_dashBoard.inc
+++ b/plugins/addons/dashboard/tabs_dashBoard.inc
@@ -33,5 +33,3 @@ class tabs_dashboard extends simpleTabs_noSpecial
{
}
}
-
-?>
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index f4e4918b1aeadc84db46d81718e0e8bbaa2c66dd..a724f1370e28f828e1ee04557d03c433b988383c 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -168,7 +168,6 @@ class ACLEditionDialog extends GenericDialog
foreach ($infos['classes'] as $oc) {
if (isset($this->aclContents[$oc]) && count($this->aclContents[$oc]) && isset($this->aclContents[$oc][0]) &&
$this->aclContents[$oc][0] != '') {
-
$summary[] = $oc;
continue;
}
diff --git a/plugins/admin/aclrole/class_aclRole.inc b/plugins/admin/aclrole/class_aclRole.inc
index 4d1070af6d607bbd2a609e00c367f318e06ff0f7..995e5d6c80502f87159293e605ed85346b2eb048 100644
--- a/plugins/admin/aclrole/class_aclRole.inc
+++ b/plugins/admin/aclrole/class_aclRole.inc
@@ -117,4 +117,3 @@ class aclRole extends simplePlugin
);
}
}
-?>
diff --git a/plugins/admin/departments/class_country.inc b/plugins/admin/departments/class_country.inc
index 9a68dd0323738cf0073aa301dafc7de8159c096e..73dd6fd632fb2d00f8db7f04189d3c97c8174ed1 100644
--- a/plugins/admin/departments/class_country.inc
+++ b/plugins/admin/departments/class_country.inc
@@ -63,4 +63,3 @@ class country extends department
return $attributesInfo;
}
}
-?>
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/admin/departments/class_dcObject.inc
index 0439d84ed9f8f2919a28680557c1e92f1fc576fc..f3a3e56c9e31015c6d0903f316ba265606276a50 100644
--- a/plugins/admin/departments/class_dcObject.inc
+++ b/plugins/admin/departments/class_dcObject.inc
@@ -54,4 +54,3 @@ class dcObject extends department
return $attributesInfo;
}
}
-?>
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 1c1c9db1016838f273b79861f20ca62ca0ae840b..146633878d014d0d8dcf0e4a5138d012f5bdd83d 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -197,4 +197,3 @@ class department extends simplePlugin
return parent::prepare_save();
}
}
-?>
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/admin/departments/class_domain.inc
index a46d0b6a3c4ed19297fcd1b0ec4b076b9c3b2385..589b4193244b3c3cc3164637980b209ee52d7399 100644
--- a/plugins/admin/departments/class_domain.inc
+++ b/plugins/admin/departments/class_domain.inc
@@ -54,4 +54,3 @@ class domain extends department
return $attributesInfo;
}
}
-?>
diff --git a/plugins/admin/departments/class_locality.inc b/plugins/admin/departments/class_locality.inc
index e3cc9173b52906c11dedf4cbef7bc2419b98f1f6..5c7ffcee6e233d5650196719a853f50e6e774e0f 100644
--- a/plugins/admin/departments/class_locality.inc
+++ b/plugins/admin/departments/class_locality.inc
@@ -55,4 +55,3 @@ class locality extends department
return $attributesInfo;
}
}
-?>
diff --git a/plugins/admin/departments/class_organization.inc b/plugins/admin/departments/class_organization.inc
index 6babd9ded4692a7dbd99e05ea4dee449c9e7d45d..b6fd7641a5470d5174718db259b71fe0952d2f04 100644
--- a/plugins/admin/departments/class_organization.inc
+++ b/plugins/admin/departments/class_organization.inc
@@ -52,4 +52,3 @@ class organization extends department
return parent::getDepartmentAttributesInfo(_('organization'));
}
}
-?>
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 9ce8d88ff1138ca5bd86ad1b4b8ac97ae9242090..148557902456d9adf9dad9fa50c24cf12c431598 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -33,4 +33,3 @@ class deptabs extends simpleTabs
return $errors;
}
}
-?>
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 7fd5daf76cc07cd7ad8e9042d871ed8b03d994b8..1f6de1c0f8e3bd94334592b2fd00ba07b41cdbf6 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -393,4 +393,3 @@ class ogroup extends simplePlugin
return $this->gosaGroupObjects;
}
}
-?>
diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/admin/groups/class_roleGeneric.inc
index 95d0a2d30418a78f08576d0bf7444fc7dc66dbc6..1e7f835ef0e468715185a386ed4af93ae3929e4c 100644
--- a/plugins/admin/groups/class_roleGeneric.inc
+++ b/plugins/admin/groups/class_roleGeneric.inc
@@ -72,9 +72,9 @@ class roleGeneric extends simplePlugin
);
}
- /*!
- * \brief The main function : information about attributes
- */
+ /*!
+ * \brief The main function : information about attributes
+ */
static function getAttributesInfo (): array
{
return array(
@@ -142,4 +142,3 @@ class roleGeneric extends simplePlugin
return parent::ldap_save();
}
}
-?>
diff --git a/plugins/admin/groups/tabs_ogroups.inc b/plugins/admin/groups/tabs_ogroups.inc
index d9ff1015f744e2346ee04106421f69ebaaa76128..ba30d7ed553fd5b43e38632756fe3cc9269f6f4c 100644
--- a/plugins/admin/groups/tabs_ogroups.inc
+++ b/plugins/admin/groups/tabs_ogroups.inc
@@ -195,4 +195,3 @@ class ogrouptabs extends simpleTabs_noSpecial
}
}
}
-?>
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 671688a9690b704fe268a57864cc40153804d67d..f5f0faa3ef148e9ac8ae7d21bab9ebb7bd1c4aec 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -616,4 +616,3 @@ class configInLdap extends simplePlugin
parent::mainInc($classname, $entry_dn, $tabs, $edit_mode, $objectType);
}
}
-?>
diff --git a/plugins/config/class_dashBoardConfig.inc b/plugins/config/class_dashBoardConfig.inc
index 77d90c5d3aea89ef1bfd51fee0c179ca6f7f1397..d724bec69f305ff469c14ca869ff70061d104cd7 100644
--- a/plugins/config/class_dashBoardConfig.inc
+++ b/plugins/config/class_dashBoardConfig.inc
@@ -66,4 +66,3 @@ class dashboardConfig extends simplePlugin
);
}
}
-?>
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/config/class_mainPluginsConfig.inc
index ac7415e155cb8508078caffc2ad80e95e67a88f9..8619cb1accb27c740d92ecbd7e2ab67c6393f2d8 100644
--- a/plugins/config/class_mainPluginsConfig.inc
+++ b/plugins/config/class_mainPluginsConfig.inc
@@ -59,4 +59,3 @@ class mainPluginsConfig extends simplePlugin
);
}
}
-?>
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index c32fe6eb2f3e434332a3ce14b4f2d7f9060d5145..c7e3bde5e8b43f1c513082b8102eed4b26877b75 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -156,4 +156,3 @@ class recoveryConfig extends simplePlugin
);
}
}
-?>
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index 19fdffc54575a1613a42caa365cf8338abf6e2bd..9cae38b9abfa2e908acd68163e71f430e1275c0e 100644
--- a/plugins/config/tabs_configInLdap.inc
+++ b/plugins/config/tabs_configInLdap.inc
@@ -34,4 +34,3 @@ class tabs_configInLdap extends simpleTabs_noSpecial
return $errors;
}
}
-?>
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 6c5877e5dec9718aa955bcd5454ade4e7680765a..eab0ac7d446130f4060a04c01b54d0e8cfeae54d 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -486,4 +486,3 @@ class user extends simplePlugin
return FALSE;
}
}
-?>
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index cbf0fe72cda106a12642922fb04236cc871ffd8a..69041d34f2d79f37f031b12e9a6d5beab7447fe3 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -163,7 +163,6 @@ class setup
{
$str = '<ul class="menu"><li><a>FusionDirectory Setup</a><ul>';
foreach ($this->o_steps as $key => $step) {
-
$step->update_strings();
$s_short_name = $step->get_short_name();
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 1f323af32e6e4440db408e9a73ca4a99fe8bb213..7f0ebea2d2ada9232989e5c0a6c4b8995ec198bd 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -112,4 +112,3 @@ class setupStep extends simplePlugin
}
}
}
-?>
diff --git a/setup/class_setupStepChecks.inc b/setup/class_setupStepChecks.inc
index 15ddbf3d623dd253dd84860bf74117161ccaf8bb..84cc9cdfc5b2b69a15fd1606641eccd588f803c8 100644
--- a/setup/class_setupStepChecks.inc
+++ b/setup/class_setupStepChecks.inc
@@ -240,8 +240,8 @@ class setupStepChecks extends setupStep
function save_object ()
{
parent::save_object();
- /* If everything is fine, set this step to completed
- * and allow switching to next setup step */
+ /* If everything is fine, set this step to completed
+ * and allow switching to next setup step */
$failed = FALSE;
foreach (array('basic_checks','config_checks') as $type) {
foreach ($this->$type as $obj) {
@@ -254,5 +254,3 @@ class setupStepChecks extends setupStep
$this->is_completed = !$failed;
}
}
-
-?>
diff --git a/setup/class_setupStepFinish.inc b/setup/class_setupStepFinish.inc
index d32c5ba40ae3fe9232cd103fa9a11dff6ab46922..2c5ba31e89a63ddc6cba2e287c35c3f697dfc6de 100644
--- a/setup/class_setupStepFinish.inc
+++ b/setup/class_setupStepFinish.inc
@@ -128,4 +128,3 @@ class setupStepFinish extends setupStep
return (bool) decbin($p & 4);
}
}
-?>
diff --git a/setup/class_setupStepLdap.inc b/setup/class_setupStepLdap.inc
index 95848affba21035ec28e2cb9e91316b26935c3be..33dd780160ee20686c29e49a7ec6f822035a141f 100644
--- a/setup/class_setupStepLdap.inc
+++ b/setup/class_setupStepLdap.inc
@@ -221,4 +221,3 @@ class setupStepLdap extends setupStep
}
}
}
-?>
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 91ca88627ed860c89735c9d2a2d79e38f8d44a3c..00d47979386d3cb639552ae6d8630eb630c7aee7 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -1127,7 +1127,7 @@ class setupStepMigrate extends setupStep
/* Check if entry is not an addressbook only user
* and verify that he is in a valid department
*/
- if ( !preg_match('/'.preg_quote('dc=addressbook,', '/').'/', $group_db_base) &&
+ if (!preg_match('/'.preg_quote('dc=addressbook,', '/').'/', $group_db_base) &&
!in_array($group_db_base, $config->departments)
) {
$attrs['checked'] = FALSE;
@@ -1376,4 +1376,3 @@ class setupStepMigrate extends setupStep
}
}
}
-?>
diff --git a/setup/class_setupStepWelcome.inc b/setup/class_setupStepWelcome.inc
index ca74c45408be1cbbbb1a4f848a6a063a727fce18..178309c2eaffc577bd9bc6d4ed784e364c37c751 100644
--- a/setup/class_setupStepWelcome.inc
+++ b/setup/class_setupStepWelcome.inc
@@ -80,5 +80,3 @@ class setupStepWelcome extends setupStep
}
}
}
-
-?>