diff --git a/contrib/smarty/plugins/block.render.php b/contrib/smarty/plugins/block.render.php
index cbb2a2321a44128b44e531830700d26b5e9dc572..6e99145627a1cc8a34a75b94077f2aa00b1f5f0d 100644
--- a/contrib/smarty/plugins/block.render.php
+++ b/contrib/smarty/plugins/block.render.php
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-function smarty_block_render($params, $text)
+function smarty_block_render ($params, $text)
{
/* Skip closing tag </render> */
if (empty($text)) {
diff --git a/contrib/smarty/plugins/function.filePath.php b/contrib/smarty/plugins/function.filePath.php
index 315e00a29e87c4ab8f4d992db3af5e47d5e260dc..856c3e92d428b61ec99d043a23bc8f46bd59753e 100644
--- a/contrib/smarty/plugins/function.filePath.php
+++ b/contrib/smarty/plugins/function.filePath.php
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-function smarty_function_filePath($params, Smarty_Internal_Template $smarty)
+function smarty_function_filePath ($params, Smarty_Internal_Template $smarty)
{
$config = session::global_get('config');
$default_theme = 'breezy';
diff --git a/contrib/smarty/plugins/function.iconPath.php b/contrib/smarty/plugins/function.iconPath.php
index 53a648b8f246958b6ecf83245ec9124f59bd18a8..3866f0eb7b5f4b55ab4a453fee2a688da3f7f9ac 100644
--- a/contrib/smarty/plugins/function.iconPath.php
+++ b/contrib/smarty/plugins/function.iconPath.php
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-function smarty_function_iconPath($params)
+function smarty_function_iconPath ($params)
{
$config = session::global_get('config');
diff --git a/contrib/smarty/plugins/function.msgPool.php b/contrib/smarty/plugins/function.msgPool.php
index e179c605ce3162f6b451371aab4d6e18f790877b..2b7baaf85783e74eaecb9dc827da6790a33e248b 100644
--- a/contrib/smarty/plugins/function.msgPool.php
+++ b/contrib/smarty/plugins/function.msgPool.php
@@ -18,7 +18,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-function smarty_function_msgPool($params)
+function smarty_function_msgPool ($params)
{
if (class_available('msgPool') && isset($params['type'])) {
$parameter = array();
diff --git a/html/autocomplete.php b/html/autocomplete.php
index 0a400bb6b3dfe15fa90ddd5b1802e3490163e115..b34dd291c708ff6d3325d5667d4de7185c758587 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -31,7 +31,7 @@ reset_errors();
/* Logged in? Simple security check */
if (!session::global_is_set('ui')) {
logging::log('security', 'unknown', '', array(), 'Error: autocomplete.php called without session');
- header ('Location: index.php');
+ header('Location: index.php');
exit;
}
diff --git a/html/getbin.php b/html/getbin.php
index 631e0560b20e4639f38667c4d0e35dc955da8d2b..eabf89b32e057e66582c7c02eb70408776cf689b 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -24,7 +24,7 @@
@require_once('functions.inc');
@require_once('variables.inc');
-error_reporting (0);
+error_reporting(0);
session_cache_limiter('private');
session::start();
reset_errors();
@@ -32,7 +32,7 @@ reset_errors();
/* Logged in? Simple security check */
if (!session::global_is_set('ui')) {
logging::log('security', 'unknown', '', array(), 'Error: getbin.php called without session');
- header ('Location: index.php');
+ header('Location: index.php');
exit;
}
@@ -54,5 +54,4 @@ if (session::is_set($key.'file')) {
}
echo session::get($key);
-error_reporting (E_ALL | E_STRICT);
-?>
+error_reporting(E_ALL | E_STRICT);
diff --git a/html/index.php b/html/index.php
index 3af61a05fe4241f90ee189caa18a21684585d235..5f36aaff300550c4458add4aec0f58fb74ad11ba 100644
--- a/html/index.php
+++ b/html/index.php
@@ -89,7 +89,7 @@ if (!is_readable(CONFIG_DIR.'/'.CONFIG_FILE)) {
$config = new config(CONFIG_DIR.'/'.CONFIG_FILE, $BASE_DIR);
session::global_set('config', $config);
session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
-@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, 'config');
+@DEBUG(DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, 'config');
/* Set template compile directory */
$smarty->compile_dir = $config->get_cfg_value('templateCompileDirectory', SPOOL_DIR);
@@ -129,7 +129,7 @@ if (
/* If SSL is forced, just forward to the SSL enabled site */
if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
- header ("Location: $ssl");
+ header("Location: $ssl");
exit;
}
@@ -150,4 +150,3 @@ if (isset($_REQUEST['message'])) {
}
LoginMethod::loginProcess();
-?>
diff --git a/html/main.php b/html/main.php
index daef0db78bb2ad1d5f34586f9a54c24706acec73..3af25bf2fe5d164aa65ff557a663b840b3f36016 100644
--- a/html/main.php
+++ b/html/main.php
@@ -40,14 +40,14 @@ session::start();
reset_errors();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- @DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, '_POST');
+ @DEBUG(DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, '_POST');
}
-@DEBUG (DEBUG_SESSION, __LINE__, __FUNCTION__, __FILE__, $_SESSION, '_SESSION');
+@DEBUG(DEBUG_SESSION, __LINE__, __FUNCTION__, __FILE__, $_SESSION, '_SESSION');
/* Logged in? Simple security check */
if (!session::global_is_set('connected')) {
logging::log('security', 'login', '', array(), 'main.php called without session - logging out');
- header ('Location: index.php?message=nosession');
+ header('Location: index.php?message=nosession');
exit;
}
@@ -58,7 +58,7 @@ $config = session::global_get('config');
/* If SSL is forced, just forward to the SSL enabled site */
if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
- header ("Location: $ssl");
+ header("Location: $ssl");
exit;
}
@@ -79,7 +79,7 @@ if (session::global_get('_LAST_PAGE_REQUEST') != '') {
if ($request_time > $max_life) {
session::destroy();
logging::log('security', 'login', '', array(), 'main.php called with expired session - logging out');
- header ('Location: index.php?signout=1&message=expired');
+ header('Location: index.php?signout=1&message=expired');
exit;
}
}
@@ -87,7 +87,7 @@ if (session::global_get('_LAST_PAGE_REQUEST') != '') {
session::global_set('_LAST_PAGE_REQUEST', time());
-@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
+@DEBUG(DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
/* Set template compile directory */
$smarty->compile_dir = $config->get_cfg_value("templateCompileDirectory", SPOOL_DIR);
@@ -111,14 +111,14 @@ $smarty->assign("hideMenus", FALSE);
if ($config->get_cfg_value("handleExpiredAccounts") == "TRUE") {
$expired = $ui->expired_status();
if (($expired == POSIX_WARN_ABOUT_EXPIRATION) && !session::is_set('POSIX_WARN_ABOUT_EXPIRATION__DONE')) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $expired, 'This user account ('.$ui->uid.') is about to expire');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $expired, 'This user account ('.$ui->uid.') is about to expire');
// The users password is about to xpire soon, display a warning message.
logging::log('security', 'fusiondirectory', '', array(), 'password for user "'.$ui->uid.'" is about to expire');
msg_dialog::display(_('Password change'), _('Your password is about to expire, please change your password!'), INFO_DIALOG);
session::set('POSIX_WARN_ABOUT_EXPIRATION__DONE', TRUE);
} elseif ($expired == POSIX_FORCE_PASSWORD_CHANGE) {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $expired, "This user account expired");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $expired, "This user account expired");
// The password is expired, we are now going to enforce a new one from the user.
@@ -178,11 +178,11 @@ if (isset($_GET['reset'])) {
}
/* show web frontend */
-$smarty->assign ("date", date("l, dS F Y H:i:s O"));
+$smarty->assign("date", date("l, dS F Y H:i:s O"));
$lang = session::global_get('lang');
-$smarty->assign ('lang', preg_replace('/_.*$/', '', $lang));
-$smarty->assign ('rtl', Language::isRTL($lang));
-$smarty->assign ('must', '<span class="must">*</span>');
+$smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
+$smarty->assign('rtl', Language::isRTL($lang));
+$smarty->assign('must', '<span class="must">*</span>');
if (isset($plugin_index)) {
$plug = "?plug=$plugin_index";
} else {
@@ -190,12 +190,12 @@ if (isset($plugin_index)) {
}
if ($ui->ignore_acl_for_current_user()) {
- $smarty->assign ('username', '<div style="color:#FF0000;">'._('User ACL checks disabled').'</div> '.$ui->uid);
+ $smarty->assign('username', '<div style="color:#FF0000;">'._('User ACL checks disabled').'</div> '.$ui->uid);
} else {
- $smarty->assign ('username', $ui->uid);
+ $smarty->assign('username', $ui->uid);
}
-$smarty->assign ("menu", $plist->menu);
-$smarty->assign ("plug", "$plug");
+$smarty->assign("menu", $plist->menu);
+$smarty->assign("plug", "$plug");
$smarty->assign("usePrototype", "false");
diff --git a/html/progress.php b/html/progress.php
index c133b48b49912f3efe9514cf39cc1e6750ebbcf6..7b9aa68f8d96ef077fd5bba7f64cd90f53cfb497 100644
--- a/html/progress.php
+++ b/html/progress.php
@@ -40,7 +40,7 @@ if ($p < 0) {
} elseif ($p > 100) {
$p = 100;
}
-$p = intval ($p);
+$p = intval($p);
/* Check dimensions */
if ($x < 3 || $x > 1000) {
@@ -75,7 +75,7 @@ if (!function_exists("imagecreate")) {
}
/* Draw image in GD image stream */
- $im = imagecreate ($x, $y);
+ $im = imagecreate($x, $y);
if (!$im) {
die ('Cannot Initialize new GD image stream');
}
@@ -87,18 +87,16 @@ if (!function_exists("imagecreate")) {
$tx_color = imagecolorallocate($im, 240, 10, 90);
/* Draw progress bar */
- imagerectangle ($im, 0, 0, $x - 1, $y - 1, $br_color);
- imagefilledrectangle ($im, 1, 1, (($x - 2) * $p / 100),
- $y - 2, $fi_color);
+ imagerectangle($im, 0, 0, $x - 1, $y - 1, $br_color);
+ imagefilledrectangle($im, 1, 1, (($x - 2) * $p / 100), $y - 2, $fi_color);
/* Is font to big for progress bar? */
if ($font != 0) {
- imagestring ($im, $font, ($x - $fx) / 2, ($y - $fy) / 2, "$p%", $tx_color);
+ imagestring($im, $font, ($x - $fx) / 2, ($y - $fy) / 2, "$p%", $tx_color);
}
/* Finally draw the image and remove context */
- header ("Content-type: image/png");
- imagepng ($im);
- imagedestroy ($im);
+ header("Content-type: image/png");
+ imagepng($im);
+ imagedestroy($im);
}
-?>
diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index 3f2a3b23d64857758cac9c1357c564588464d3ea..ebd6fa580649a6015b2748acbe1710e9f36c8468 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -115,7 +115,7 @@ function parse_gettext_lang ($str)
}
}
-function al2gt($gettextlangs)
+function al2gt ($gettextlangs)
{
/* Check if ACCEPT_LANGUAGE isset */
if (empty($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
diff --git a/include/class_CSRFProtection.inc b/include/class_CSRFProtection.inc
index 9c80b84e54f2f25744d6c43c68832708f9fd3860..bcca73bbc233ec6b7088a4a2ccee8f859a0610cd 100644
--- a/include/class_CSRFProtection.inc
+++ b/include/class_CSRFProtection.inc
@@ -20,7 +20,7 @@
class CSRFProtection
{
- public static function check()
+ public static function check ()
{
if (empty($_POST)) {
return;
@@ -36,7 +36,7 @@ class CSRFProtection
}
}
- public static function getToken()
+ public static function getToken ()
{
if (!session::is_set('CSRFtoken')) {
session::set('CSRFtoken', standAlonePage::generateRandomHash());
@@ -44,7 +44,7 @@ class CSRFProtection
return session::get('CSRFtoken');
}
- public static function checkHeaders()
+ public static function checkHeaders ()
{
$origin = FALSE;
if (!empty($_SERVER['HTTP_ORIGIN'])) {
diff --git a/include/class_Combinations.inc b/include/class_Combinations.inc
index 2821f6df5717e39ad4d3ff69feb0ae1f30de5da4..fef0220eefee41e3cc738ed4112aa965a24ba6be 100644
--- a/include/class_Combinations.inc
+++ b/include/class_Combinations.inc
@@ -28,7 +28,7 @@ class Combinations implements Iterator
protected $size = 0;
protected $pos = 0;
- function __construct(array $input, $size)
+ function __construct (array $input, $size)
{
$this->input = array_values($input);
$this->n = count($this->input);
@@ -36,12 +36,12 @@ class Combinations implements Iterator
$this->rewind();
}
- function key()
+ function key ()
{
return $this->pos;
}
- function current()
+ function current ()
{
$r = array();
for ($i = 0; $i < $this->size; $i++) {
@@ -50,7 +50,7 @@ class Combinations implements Iterator
return $r;
}
- function next()
+ function next ()
{
if ($this->_next()) {
$this->pos++;
@@ -59,18 +59,18 @@ class Combinations implements Iterator
}
}
- function rewind()
+ function rewind ()
{
$this->current = range(0, $this->size);
$this->pos = 0;
}
- function valid()
+ function valid ()
{
return ($this->pos >= 0);
}
- protected function _next()
+ protected function _next ()
{
$i = $this->size - 1;
while (($i >= 0) && ($this->current[$i] == $this->n - $this->size + $i)) {
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 890c40f193dd4ddfec87d08e12ed8dc7dc7bf7e9..e84e649c9ac9558fdf1e0cd08fbe44ba50a1cfba 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -53,7 +53,7 @@ class CopyPasteHandler
/*!
* \brief Create CP handler
*/
- function __construct()
+ function __construct ()
{
}
@@ -70,9 +70,9 @@ class CopyPasteHandler
*
* \param String $type the type of the object
*/
- function add_to_queue($dn, $action, $type)
+ 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, array('cut','copy'))) {
trigger_error(sprintf('Specified action "%s" does not exists for copy & paste.', $action));
@@ -105,7 +105,7 @@ class CopyPasteHandler
* Remove hdd dumps of current entries too.
* Remove entries older than 24 hours.
*/
- function cleanup_queue()
+ function cleanup_queue ()
{
$this->current = FALSE;
$this->require_update = TRUE;
@@ -116,7 +116,7 @@ class CopyPasteHandler
/*!
* \brief This resets the queue to allow pasting again.
*/
- function resetPaste()
+ function resetPaste ()
{
$this->current = FALSE;
$this->require_update = TRUE;
@@ -126,7 +126,7 @@ class CopyPasteHandler
/*!
* \brief Check if there are still entries the object queue
*/
- function entries_queued()
+ function entries_queued ()
{
return ((count($this->queue) > 0) || ($this->current !== FALSE));
}
@@ -134,9 +134,9 @@ class CopyPasteHandler
/*!
* \brief Paste one entry from LDAP
*/
- protected function load_entry_from_ldap($entry, $base)
+ 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 array();
}
@@ -161,7 +161,7 @@ class CopyPasteHandler
* \brief Displays a dialog which allows the user to fix all dependencies of this object.
* Create unique names, ids, or what ever
*/
- function execute($base)
+ function execute ($base)
{
$ui = get_userinfo();
@@ -266,7 +266,7 @@ class CopyPasteHandler
return '';
}
- private function current_saved()
+ private function current_saved ()
{
$this->lastdn = $this->current['object']->dn;
$this->handleReferences();
@@ -278,7 +278,7 @@ class CopyPasteHandler
*
* \return the dn of the last edited entry
*/
- function last_entry()
+ function last_entry ()
{
return $this->lastdn;
}
@@ -287,7 +287,7 @@ class CopyPasteHandler
/*!
* \brief Save new values posted by copy & paste dialog
*/
- function save_object()
+ function save_object ()
{
if (isset($_POST['abort_current_cut-copy_operation'])) {
$this->current = FALSE;
@@ -299,7 +299,7 @@ class CopyPasteHandler
}
}
- function handleReferences()
+ function handleReferences ()
{
$dst_dn = $this->current['object']->dn;
$src_dn = $this->current['dn'];
@@ -316,7 +316,7 @@ class CopyPasteHandler
*
* \return the paste icon for headpages
*/
- function generatePasteIcon()
+ function generatePasteIcon ()
{
$Copy_Paste = " <img class='center' src='images/lists/seperator.png' alt='' height='16' width='1'> ";
if ($this->entries_queued()) {
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 5fdb279f7568c0b7612c33135d4f5ddc2c4f1269..2829381d422e08cb9d599670d01bb07c19006e8d 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -49,7 +49,7 @@ class IconThemeDir
* Defaults to 2 if not present. */
private $Threshold = 2;
- function __construct($infos)
+ function __construct ($infos)
{
$this->Size = $infos['Size'];
$this->MinSize = $infos['Size'];
@@ -66,7 +66,7 @@ class IconThemeDir
}
}
- function MatchesSize($size)
+ function MatchesSize ($size)
{
switch ($this->Type) {
case 'Fixed':
@@ -78,7 +78,7 @@ class IconThemeDir
}
}
- function SizeDistance($size)
+ function SizeDistance ($size)
{
switch ($this->Type) {
case 'Fixed':
@@ -106,7 +106,7 @@ class IconTheme
private $path;
private $parent;
- function __construct($folder, $default_parent)
+ function __construct ($folder, $default_parent)
{
$this->path = $folder;
$datas = @parse_ini_file($folder.'/index.theme', TRUE, INI_SCANNER_RAW);
@@ -127,13 +127,13 @@ class IconTheme
}
}
- function FindIcon($context, $icon, $size)
+ function FindIcon ($context, $icon, $size)
{
$context = strtolower($context);
return $this->FindIconHelper($context, $icon, $size);
}
- function FindIconHelper($context, $icon, $size)
+ function FindIconHelper ($context, $icon, $size)
{
$filename = $this->LookupIcon($context, $icon, $size);
if ($filename != NULL) {
@@ -159,7 +159,7 @@ class IconTheme
return NULL;
}
- function LookupIcon($context, $iconname, $size)
+ function LookupIcon ($context, $iconname, $size)
{
if (!isset($this->subdirs[$context])) {
return NULL;
@@ -203,7 +203,7 @@ class IconTheme
/* We store themes in the session. To do otherwise, override these methods. */
static public $session_var = 'IconThemes';
- static public function loadThemes($path)
+ static public function loadThemes ($path)
{
$themes = array();
if ($dir = opendir("$path")) {
@@ -224,7 +224,7 @@ class IconTheme
$_SESSION[static::$session_var] = $themes;
}
- static public function findThemeIcon($theme, $context, $icon, $size)
+ static public function findThemeIcon ($theme, $context, $icon, $size)
{
if (!isset($_SESSION[static::$session_var])) {
die('Error: no theme found in session');
@@ -235,7 +235,7 @@ class IconTheme
return $_SESSION[static::$session_var][static::$default_theme]->FindIcon($context, $icon, $size);
}
- public function findTheme($theme)
+ public function findTheme ($theme)
{
if (isset($_SESSION[static::$session_var][$theme])) {
return $_SESSION[static::$session_var][$theme];
diff --git a/include/class_Language.inc b/include/class_Language.inc
index d47a11cb5445551ae9b397aba6598aa29b6016ba..2d75417fbcad5139613b1652218d1e28c7567b34 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -34,7 +34,7 @@ class Language
*
* \param string $lang Language locale to use, defaults to self::detect()
*/
- public static function init($lang = NULL)
+ public static function init ($lang = NULL)
{
global $BASE_DIR;
@@ -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::global_is_set('plist')) {
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language');
}
session::global_un_set('plist');
session::global_set('lang', $lang);
@@ -95,7 +95,7 @@ class Language
*
* \return string gettext locale string
*/
- public static function detect()
+ public static function detect ()
{
global $config;
@@ -132,7 +132,7 @@ class Language
*
* \param boolean $ownLanguage Should language names be stated in their own language as well
*/
- public static function getList($ownLanguage = FALSE)
+ public static function getList ($ownLanguage = FALSE)
{
/* locales in english */
$tmp_english = array(
@@ -224,7 +224,7 @@ class Language
return preg_match('/^(fa_|ar_)/', $lang);
}
- public static function setHeaders($language, $mime)
+ public static function setHeaders ($language, $mime)
{
list ($lang, $country, $char) = parse_gettext_lang($language);
diff --git a/include/class_SnapshotDialogs.inc b/include/class_SnapshotDialogs.inc
index b5862888c7752920268d264e1aa04cd72f33e3b9..5af36fdd873376ba2106d14938ac57b7241ee46d 100644
--- a/include/class_SnapshotDialogs.inc
+++ b/include/class_SnapshotDialogs.inc
@@ -71,7 +71,7 @@ class SnapshotCreateDialog extends simplePlugin
*
* \param mixed $attr Attribute object or name (in this case it will be fetched from attributesAccess)
*/
- function attrIsWriteable($attr): bool
+ function attrIsWriteable ($attr): bool
{
global $ui;
@@ -85,7 +85,7 @@ class SnapshotCreateDialog extends simplePlugin
}
}
- function renderAttributes($readOnly = FALSE)
+ function renderAttributes ($readOnly = FALSE)
{
global $ui;
$smarty = get_smarty();
@@ -162,7 +162,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
}
}
- protected function handleEdit($key)
+ protected function handleEdit ($key)
{
}
@@ -170,7 +170,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
{
}
- function addValue($value)
+ function addValue ($value)
{
$this->value[] = $value;
$this->reIndexValues();
@@ -181,7 +181,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
return '';
}
- protected function getAttributeArrayValue($key, $value)
+ protected function getAttributeArrayValue ($key, $value)
{
$values = array(
date(_('Y-m-d, H:i:s'), preg_replace('/\-.*$/', '', $value['gosaSnapshotTimestamp'][0])),
@@ -193,7 +193,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
return $values;
}
- protected function genRowIcons($key, $value)
+ protected function genRowIcons ($key, $value)
{
$id = $this->getHtmlId();
list ($img, $nbicons) = parent::genRowIcons($key, $value);
@@ -211,7 +211,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
return array ($img, $nbicons);
}
- protected function handlePostValueActions($id, $postValue)
+ protected function handlePostValueActions ($id, $postValue)
{
if (parent::handlePostValueActions($id, $postValue)) {
return TRUE;
@@ -349,7 +349,7 @@ class SnapshotRestoreDialog extends simplePlugin
return $str;
}
- function attrIsWriteable($attr): bool
+ function attrIsWriteable ($attr): bool
{
global $ui;
@@ -363,13 +363,13 @@ class SnapshotRestoreDialog extends simplePlugin
}
}
- function triggerRestore($dn)
+ function triggerRestore ($dn)
{
$this->dialog = 'restore';
$this->snapDn = $dn;
}
- function triggerDelete($dn)
+ function triggerDelete ($dn)
{
$this->dialog = 'delete';
$this->snapDn = $dn;
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index 4795beeab67d99328473b2dbee5b618e54048b27..700ce6dc4b32f99b9678d9752bb9578e46d57b26 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -32,7 +32,7 @@ class SnapshotHandler
{
protected $enabled;
- static function plInfo()
+ static function plInfo ()
{
return array(
'plShortName' => _('Snapshot'),
@@ -50,7 +50,7 @@ class SnapshotHandler
/*!
* \brief Create handler
*/
- function __construct()
+ function __construct ()
{
global $config;
$this->enabled = $config->snapshotEnabled();
@@ -71,14 +71,14 @@ class SnapshotHandler
*
* \return boolean TRUE if is enable, return FALSE otherwise
*/
- function enabled()
+ function enabled ()
{
return $this->enabled;
}
/* \brief Get the snapshot dn of an object dn
*/
- protected function snapshot_dn($dn)
+ protected function snapshot_dn ($dn)
{
global $config;
return preg_replace("/".preg_quote($config->current['BASE'], '/')."$/", "", $dn)
@@ -88,7 +88,7 @@ class SnapshotHandler
/*!
* \brief Check if there are deleted snapshots
*/
- function hasDeletedSnapshots($bases)
+ function hasDeletedSnapshots ($bases)
{
foreach ($bases as $base) {
if (count($this->getAllDeletedSnapshots($base)) > 0) {
@@ -101,7 +101,7 @@ class SnapshotHandler
/*!
* \brief Cache Snapshot information for all objects in $base
*/
- function initSnapshotCache($base)
+ function initSnapshotCache ($base)
{
global $config;
if (!$this->enabled()) {
@@ -129,7 +129,7 @@ class SnapshotHandler
*
* \return the numbers of snapshots
*/
- function hasSnapshots($dn)
+ function hasSnapshots ($dn)
{
return isset($this->snapshotsCache[$dn]);
}
@@ -141,7 +141,7 @@ class SnapshotHandler
*
* \param string $raw FALSE
*/
- function getSnapshots($dn, $raw = FALSE)
+ function getSnapshots ($dn, $raw = FALSE)
{
global $config;
if (!$this->enabled()) {
@@ -192,11 +192,11 @@ class SnapshotHandler
*
* \param array $description Snapshot description
*/
- function createSnapshot($dn, $description = array())
+ function createSnapshot ($dn, $description = array())
{
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;
}
@@ -211,7 +211,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;
}
@@ -219,7 +219,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 = '';
@@ -265,7 +265,7 @@ class SnapshotHandler
*
* \param string $dn The DN
*/
- function removeSnapshot($dn)
+ function removeSnapshot ($dn)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -281,7 +281,7 @@ class SnapshotHandler
*
* \return available snapshots for the given base
*/
- function getAvailableSnapsShots($dn)
+ function getAvailableSnapsShots ($dn)
{
global $config;
if (!$this->enabled()) {
@@ -291,7 +291,7 @@ class SnapshotHandler
$ldap = $config->get_ldap_link();
/* Prepare bases and some other infos */
- $base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
+ $base_of_object = preg_replace('/^[^,]+,/i', '', $dn);
$new_base = $this->snapshot_dn($base_of_object);
$tmp = array();
@@ -319,7 +319,7 @@ class SnapshotHandler
*
* \param string $base_of_object
*/
- function getAllDeletedSnapshots($base_of_object)
+ function getAllDeletedSnapshots ($base_of_object)
{
global $config;
if (!$this->enabled()) {
@@ -367,11 +367,11 @@ class SnapshotHandler
*
* \param string $dn The DN
*/
- function restoreSnapshot($dn)
+ function restoreSnapshot ($dn)
{
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 array();
}
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 94b1aa3a19171c67502cee0dd44d002573d7e1ac..e2312aa13c8bec9cec1787498e92347b829a6072 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -51,7 +51,7 @@ class acl
*
* \param Array $list Array to be sorted
*/
- static function sort_by_priority($list)
+ static function sort_by_priority ($list)
{
uksort($list,
function ($a, $b)
@@ -75,7 +75,7 @@ class acl
*
* \param string $role ACL role to be exploded
*/
- static function explodeRole($role)
+ static function explodeRole ($role)
{
if (!is_array($role)) {
$role = array($role);
@@ -95,7 +95,7 @@ class acl
*
* \param string $acl ACL to be exploded
*/
- static function explodeACL($acl)
+ static function explodeACL ($acl)
{
$list = explode(':', $acl);
if (count($list) == 5) {
@@ -128,7 +128,7 @@ class acl
*
* \return an array with members
*/
- static function extractMembers($ms)
+ static function extractMembers ($ms)
{
global $config;
$a = array();
@@ -182,7 +182,7 @@ class acl
*
* \param string $acl The acl to be extracted
*/
- static function extractACL($acl)
+ static function extractACL ($acl)
{
/* Rip acl off the string, seperate by ',' and place it in an array */
$as = preg_replace('/^[^:]+:[^:]+:[^:]*:([^:]*).*$/', '\1', $acl);
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 7bb765bad71f78571501de08e221603e900118da..139e207921ea64f4ba1f627dbf43ebd3b4a4eb0e 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -45,7 +45,7 @@ class baseSelector
*
* \param String $base Empty string
*/
- function __construct($bases, $base = "")
+ function __construct ($bases, $base = "")
{
// Initialize pid
$this->pid = preg_replace("/[^0-9]/", "", microtime(TRUE));
@@ -58,7 +58,7 @@ class baseSelector
/*!
* \brief Returns id of the html field
*/
- function getInputHtmlId()
+ function getInputHtmlId ()
{
return 'bs_input_'.$this->pid;
}
@@ -68,7 +68,7 @@ class baseSelector
*
* \param Boolean $flag Flag for the submit button
*/
- function setSubmitButton($flag)
+ function setSubmitButton ($flag)
{
$this->submitButton = $flag;
}
@@ -78,7 +78,7 @@ class baseSelector
*
* \param Integer $value The new value of the height
*/
- function setHeight($value)
+ function setHeight ($value)
{
$this->height = $value;
}
@@ -88,7 +88,7 @@ class baseSelector
*
* \param String $base The new value of the base
*/
- function setBase($base)
+ function setBase ($base)
{
if (isset($this->pathMapping[$base])) {
$this->base = $base;
@@ -105,7 +105,7 @@ class baseSelector
*
* \return Boolean the last state of the object
*/
- function checkLastBaseUpdate()
+ function checkLastBaseUpdate ()
{
return $this->lastState;
}
@@ -115,7 +115,7 @@ class baseSelector
*
* \param Array $bases The new value of the bases
*/
- function setBases($bases)
+ function setBases ($bases)
{
global $config;
@@ -138,7 +138,7 @@ class baseSelector
*
* \param Boolean $force FALSE
*/
- function update($force = FALSE)
+ function update ($force = FALSE)
{
if (!isset($this->base) || ($this->base == '')) {
$this->lastState = FALSE;
@@ -187,7 +187,7 @@ class baseSelector
return TRUE;
}
- protected function renderTree()
+ protected function renderTree ()
{
global $config;
$link = "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($config->current['BASE'])."'; $('submit_tree_base_".$this->pid."').click();\"";
@@ -285,7 +285,7 @@ class baseSelector
*
* \param String $string The string which his space will be replaced
*/
- function escape($string)
+ function escape ($string)
{
return str_replace(' ', ' ', htmlentities($string, ENT_COMPAT, 'UTF-8'));
}
@@ -295,7 +295,7 @@ class baseSelector
*
* \return members tree of the ACL class
*/
- function render()
+ function render ()
{
return $this->tree;
}
@@ -305,7 +305,7 @@ class baseSelector
*
* \return String containts the base of the object
*/
- function getBase()
+ function getBase ()
{
return $this->base;
}
@@ -315,7 +315,7 @@ class baseSelector
*
* \return Array containts the bases and their display text
*/
- function getBases()
+ function getBases ()
{
return $this->pathMapping;
}
diff --git a/include/class_config.inc b/include/class_config.inc
index c0b77230207064c28110e31b202b12bfb9cee3b8..1ef33e8f7b23144f4b999324c214f13e0ba75a51 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -72,7 +72,7 @@ class config
*
* \param string $basedir base directory
*/
- function __construct($filename, $basedir = '')
+ function __construct ($filename, $basedir = '')
{
$this->basedir = $basedir;
@@ -89,7 +89,7 @@ class config
* read the last time and reloads it. It uses the file mtime to check
* weither the file changed or not.
*/
- function check_and_reload($force = FALSE)
+ function check_and_reload ($force = FALSE)
{
/* Check if class_location.inc has changed, this is the case
if we have installed or removed plugins. */
@@ -120,7 +120,7 @@ class config
*
* \param string $filename The filename of the configuration file.
*/
- function parse($filename)
+ function parse ($filename)
{
$this->last_modified = filemtime($filename);
$this->filename = $filename;
@@ -161,7 +161,7 @@ class config
*
* \param string $attrs
*/
- function tag_open($parser, $tag, $attrs)
+ function tag_open ($parser, $tag, $attrs)
{
/* Save last and current tag for reference */
$this->tags[$this->level] = $tag;
@@ -227,7 +227,7 @@ class config
/* Load main parameters */
case 'MAIN':
- $this->data['MAIN'] = array_merge ($this->data['MAIN'], $attrs);
+ $this->data['MAIN'] = array_merge($this->data['MAIN'], $attrs);
break;
/* Ignore other tags */
@@ -243,7 +243,7 @@ class config
*
* \param string $tag
*/
- function tag_close($parser, $tag)
+ function tag_close ($parser, $tag)
{
/* Close config section */
if ($tag == 'CONF') {
@@ -262,7 +262,7 @@ class config
*
* \return string the password corresponding to the keyword
*/
- function get_credentials($creds)
+ function get_credentials ($creds)
{
if (isset($_SERVER['HTTP_FDKEY'])) {
if (!session::global_is_set('HTTP_FDKEY_CACHE')) {
@@ -306,13 +306,13 @@ class config
*
* \return ldapMultiplexer object
*/
- function get_ldap_link($sizelimit = FALSE)
+ function get_ldap_link ($sizelimit = FALSE)
{
global $ui;
if ($this->ldapLink === NULL || !is_resource($this->ldapLink->cid)) {
/* Build new connection */
- $this->ldapLink = ldap_init ($this->current['SERVER'], $this->current['BASE'],
+ $this->ldapLink = ldap_init($this->current['SERVER'], $this->current['BASE'],
$this->current['ADMINDN'], $this->get_credentials($this->current['ADMINPASSWORD']));
/* Check for connection */
@@ -343,7 +343,7 @@ class config
*
* \param string $name the name of the location
*/
- function set_current($name)
+ function set_current ($name)
{
global $ui;
@@ -472,7 +472,7 @@ class config
del_lock($dn);
}
- function load_inldap_config()
+ function load_inldap_config ()
{
$ldap = $this->get_ldap_link();
$ldap->cat(CONFIGRDN.$this->current['BASE']);
@@ -510,7 +510,7 @@ class config
/*!
* \brief Loads the management classes config to index them by class
*/
- private function loadManagementConfig()
+ private function loadManagementConfig ()
{
if (isset($this->current['MANAGEMENTCONFIG'])) {
if (!is_array($this->current['MANAGEMENTCONFIG'])) {
@@ -528,7 +528,7 @@ class config
/*!
* \brief Update the management config in the LDAP and the cache
*/
- public function updateManagementConfig($managementClass, $managementConfig)
+ public function updateManagementConfig ($managementClass, $managementConfig)
{
$managementConfig = json_encode($managementConfig);
$changes = array();
@@ -562,7 +562,7 @@ class config
/*!
* \brief Returns the config for a management class, or NULL
*/
- public function getManagementConfig($managementClass)
+ public function getManagementConfig ($managementClass)
{
if (isset($this->current['MANAGEMENTCONFIG'][$managementClass])) {
return json_decode($this->current['MANAGEMENTCONFIG'][$managementClass], TRUE);
@@ -574,7 +574,7 @@ class config
/*!
* \brief Store the departments from ldap in $this->departments
*/
- function get_departments()
+ function get_departments ()
{
/* Initialize result hash */
$result = array();
@@ -601,8 +601,8 @@ class config
/* Get list of department objects */
$ldap = $this->get_ldap_link();
- $ldap->cd ($this->current['BASE']);
- $ldap->search ($filter, $ldap_values);
+ $ldap->cd($this->current['BASE']);
+ $ldap->search($filter, $ldap_values);
while ($attrs = $ldap->fetch()) {
/* Detect department type */
@@ -637,7 +637,7 @@ class config
$this->departments = $result;
}
- function make_idepartments($max_size = 28)
+ function make_idepartments ($max_size = 28)
{
$base = $this->current['BASE'];
$qbase = preg_quote($base, '/');
@@ -694,7 +694,7 @@ class config
*
* \param int $max_size initialized at 256
*/
- function generateDepartmentArray($arr, $depth = -1, $max_size = 256)
+ function generateDepartmentArray ($arr, $depth = -1, $max_size = 256)
{
$ret = array();
$depth++;
@@ -749,7 +749,7 @@ class config
*
* \return array of hook commands or empty array
*/
- function searchHooks($class, $value)
+ function searchHooks ($class, $value)
{
$class = strtoupper($class);
$value = strtoupper($value);
@@ -773,7 +773,7 @@ class config
*
* \return string the configuration value if found or the default value
*/
- function get_cfg_value($name, $default = '')
+ function get_cfg_value ($name, $default = '')
{
$name = strtoupper($name);
$res = $default;
@@ -806,7 +806,7 @@ class config
* or not. If SESSIONLIFETIME is not configured in FusionDirectory it always returns
* TRUE.
*/
- function check_session_lifetime()
+ function check_session_lifetime ()
{
$cfg_lifetime = $this->get_cfg_value('SESSIONLIFETIME', 0);
if ($cfg_lifetime > 0) {
@@ -823,7 +823,7 @@ class config
*
* \return boolean TRUE if snapshot are enabled, FALSE otherwise
*/
- function snapshotEnabled()
+ function snapshotEnabled ()
{
if ($this->get_cfg_value('enableSnapshots') != 'TRUE') {
return FALSE;
@@ -874,7 +874,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] = array();
}
@@ -916,7 +916,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] = array();
}
@@ -924,7 +924,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'] = array();
}
@@ -966,7 +966,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])) {
@@ -1044,7 +1044,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_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index f749e2e68a8a34a1eb6d8ede9ea61b0048d750d9..37c4f5dd08b545d4e15d6292d0b6544b25e65efe 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -35,7 +35,7 @@ class departmentSortIterator extends listingSortIterator {
*
* \param $direction Direction
*/
- public function __construct($data, $direction)
+ public function __construct ($data, $direction)
{
parent::__construct($data, $direction, 'sort-attribute', 'department');
}
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index 31d7073d1f25eaf19afdfe8af103058037065108..d06e4dc1584dda20cdd0220296a4cfcf6d8e8b38 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -42,7 +42,7 @@ class divSelectBox
/*!
* \brief Default divSelectBox constructor
*/
- function __construct($id)
+ function __construct ($id)
{
$this->s_summary = '';
$this->a_entries = array();
@@ -55,7 +55,7 @@ class divSelectBox
*
* \param integer $h Height
*/
- function setHeight($h)
+ function setHeight ($h)
{
if (is_numeric($h)) {
$this->height = $h.'px';
@@ -69,7 +69,7 @@ class divSelectBox
*
* \param array $a_entriedata
*/
- function addEntry($a_entriedata)
+ function addEntry ($a_entriedata)
{
$this->a_entries[] = $a_entriedata;
}
@@ -79,7 +79,7 @@ class divSelectBox
*
* \param array $headers
*/
- function setHeaders($headers)
+ function setHeaders ($headers)
{
$this->headers = $headers;
}
@@ -87,7 +87,7 @@ class divSelectBox
/*!
* \brief Draw the list
*/
- function drawList()
+ function drawList ()
{
$s_return = '';
$s_return .= '<div style="border:1px solid rgb(170,170,170);padding-right:1px;height:'.$this->height.';width:100%">'."\n";
@@ -117,7 +117,7 @@ class divSelectBox
*
* \param string $msg
*/
- function setSummary($msg)
+ function setSummary ($msg)
{
$this->s_summary = $msg;
}
@@ -125,7 +125,7 @@ class divSelectBox
/*!
* \brief Generate the page
*/
- protected function generatePage()
+ protected function generatePage ()
{
$display = '';
if ($this->headers !== FALSE) {
@@ -144,7 +144,7 @@ class divSelectBox
/*!
* \brief Generate the body
*/
- protected function generateBody()
+ protected function generateBody ()
{
/* If divselectbox is empty, append a single white entry */
if (count($this->a_entries) == 0) {
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 6f7d92eb7b5a20d0d3fa393d1a2f9c33f3b20621..99e8c7fbc70a7c68f7d5a12661057cba048c3999 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -49,7 +49,7 @@ class filter
*
* \param string $filename
*/
- function __construct($filename)
+ function __construct ($filename)
{
// Load eventually passed filename
if (!$this->load($filename)) {
@@ -64,7 +64,7 @@ class filter
*
* \param string $filename
*/
- function load($filename)
+ function load ($filename)
{
$contents = file_get_contents($filename);
$this->xmlData = xml::xml2array($contents, 1);
@@ -137,7 +137,7 @@ class filter
*
* \param array $element
*/
- function getTextfield($element)
+ function getTextfield ($element)
{
$tag = $element['tag'];
$size = 30;
@@ -174,7 +174,7 @@ class filter
*
* \param array $element
*/
- function getCheckbox($element)
+ function getCheckbox ($element)
{
$tag = $element['tag'];
$checked = '';
@@ -190,7 +190,7 @@ class filter
*
* \param array $element
*/
- function getCombobox($element)
+ function getCombobox ($element)
{
$result = "<select name='".$element['tag']."' size='1' onChange='document.mainform.submit();'>";
@@ -228,7 +228,7 @@ class filter
*
* \param array $element
*/
- function getDatePicker($element)
+ function getDatePicker ($element)
{
global $lang;
$tag = $element['tag'];
@@ -255,7 +255,7 @@ class filter
*
* \param array $options
*/
- function setComboBoxOptions($tag, $options)
+ function setComboBoxOptions ($tag, $options)
{
if (isset($this->elements[$tag]) && ($this->elements[$tag]['type'] == "combobox")) {
$this->elements[$tag]['value'] = array();
@@ -272,7 +272,7 @@ class filter
*
* \param string $hook
*/
- function setConverter($field, $hook)
+ function setConverter ($field, $hook)
{
$this->converter[$field] = $hook;
}
@@ -282,7 +282,7 @@ class filter
*
* \param string $storage
*/
- function setObjectStorage($storage)
+ function setObjectStorage ($storage)
{
$this->objectStorage = $storage;
}
@@ -293,7 +293,7 @@ class filter
*
* \param string $base
*/
- function setBase($base)
+ function setBase ($base)
{
$this->base = $base;
}
@@ -303,7 +303,7 @@ class filter
*
* \param string $scope
*/
- function setCurrentScope($scope)
+ function setCurrentScope ($scope)
{
$this->scope = $scope;
}
@@ -313,7 +313,7 @@ class filter
*
* \return string
*/
- function renderApply()
+ function renderApply ()
{
return "<input type='submit' name='apply' value='"._("Apply filter")."'>";
}
@@ -323,7 +323,7 @@ class filter
*
* \return string
*/
- function renderScope()
+ function renderScope ()
{
$checked = ($this->scope == 'sub' ? ' checked' : '');
return "<LABEL for='SCOPE'><input type='checkbox' id='SCOPE' name='SCOPE' value='1' onClick='document.mainform.submit();'$checked> "._("Search in subtrees")."</LABEL>";
@@ -332,7 +332,7 @@ class filter
/*!
* \brief Render
*/
- function render()
+ function render ()
{
/* If template is not filled, we display nothing */
if (!isset ($this->xmlData['definition']['template'])) {
@@ -365,7 +365,7 @@ class filter
break;
default:
- throw new FusionDirectoryException ('Unknown element type specified: '.$element['type'].'!');
+ throw new FusionDirectoryException('Unknown element type specified: '.$element['type'].'!');
}
$smarty->assign("$tag", $htmlCode);
}
@@ -385,7 +385,7 @@ class filter
/*!
* \brief Query
*/
- function query()
+ function query ()
{
global $class_mapping;
$result = array();
@@ -479,7 +479,7 @@ class filter
*
* \return TRUE if is valid, FALSE otherwise
*/
- function isValid()
+ function isValid ()
{
foreach ($this->elements as $tag => $element) {
if (isset($element->regex)
@@ -493,7 +493,7 @@ class filter
/*!
* \brief Update
*/
- function update()
+ function update ()
{
if (isset($_POST['FILTER_PID']) && $_POST['FILTER_PID'] == $this->pid) {
// Load post values and adapt filter, base and scope accordingly - but
@@ -532,7 +532,7 @@ class filter
*
* \param string $value
*/
- function getCompletitionList($cfg, $tag, $value = "*")
+ function getCompletitionList ($cfg, $tag, $value = "*")
{
global $class_mapping;
$res = array();
@@ -585,7 +585,7 @@ class filter
/*!
* \brief Auto complete
*/
- function processAutocomplete()
+ function processAutocomplete ()
{
$result = array();
@@ -619,7 +619,7 @@ class filter
*
* \param array $b
*/
-function strlenSort($a, $b)
+function strlenSort ($a, $b)
{
if (strlen($a['tag']) == strlen($b['tag'])) {
return 0;
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index e94d0446bac5c86921cab0fd306df78e4e39fcc0..de08a9fc73001fa8a6dd3a7249a378a0884c8ed7 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -48,7 +48,7 @@ class filterLDAP
*
* \param array $objectStorage
*/
- static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = array(""))
+ static function query ($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = array(""))
{
return static::get_list($parent, $base, $filter, $attributes, $category, $objectStorage, (($scope == 'sub') ? 'subtree' : 'one'), TRUE);
}
@@ -74,7 +74,7 @@ class filterLDAP
*
* \param boolean $skipAcl
*/
- static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $scope, $sizelimit = TRUE, $skipAcl = FALSE)
+ static function get_list ($parent, $base, $filter, $attributes, $category, $objectStorage, $scope, $sizelimit = TRUE, $skipAcl = FALSE)
{
global $config, $ui;
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 36b9c7b935680ed372f2f9a4c68c79b5fe566124..d36c4a4485d88a51a0156f4ec6696fd3d3970530 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -79,7 +79,7 @@ class LDAP
*
* \param boolean $tls FALSE
*/
- function __construct($binddn, $bindpw, $hostname, $follow_referral = FALSE, $tls = FALSE)
+ function __construct ($binddn, $bindpw, $hostname, $follow_referral = FALSE, $tls = FALSE)
{
global $config;
$this->follow_referral = $follow_referral;
@@ -102,7 +102,7 @@ class LDAP
*
* \return increase srp
*/
- function getSearchResource()
+ function getSearchResource ()
{
$this->sr[$this->srp] = NULL;
$this->start[$this->srp] = 0;
@@ -115,7 +115,7 @@ class LDAP
*
* \param string $dn The DN
*/
- static function prepare4filter($dn)
+ static function prepare4filter ($dn)
{
trigger_error('deprecated, use ldap_escape_f instead');
return ldap_escape_f($dn);
@@ -126,7 +126,7 @@ class LDAP
*
* The string $error containts result of the connection
*/
- function connect()
+ function connect ()
{
$this->hascon = FALSE;
$this->reconnect = FALSE;
@@ -161,7 +161,7 @@ class LDAP
/*!
* \brief Rebind
*/
- function rebind($ldap, $referral)
+ function rebind ($ldap, $referral)
{
$credentials = $this->get_credentials($referral);
if (@ldap_bind($ldap, $credentials['ADMINDN'], $credentials['ADMINPASSWORD'])) {
@@ -178,7 +178,7 @@ class LDAP
/*!
* \brief Reconnect to LDAP server
*/
- function reconnect()
+ function reconnect ()
{
if ($this->reconnect) {
$this->unbind();
@@ -188,7 +188,7 @@ class LDAP
/*!
* \brief Unbind to LDAP server
*/
- function unbind()
+ function unbind ()
{
@ldap_unbind($this->cid);
$this->cid = NULL;
@@ -197,7 +197,7 @@ class LDAP
/*!
* \brief Disconnect to LDAP server
*/
- function disconnect()
+ function disconnect ()
{
if ($this->hascon) {
@ldap_close($this->cid);
@@ -210,7 +210,7 @@ class LDAP
*
* \param string $dir The new directory
*/
- function cd($dir)
+ function cd ($dir)
{
if ($dir == '..') {
$this->basedn = $this->getParentDir();
@@ -226,7 +226,7 @@ class LDAP
*
* \return String, the parent directory
*/
- function getParentDir($basedn = '')
+ function getParentDir ($basedn = '')
{
if ($basedn == '') {
$basedn = $this->basedn;
@@ -245,7 +245,7 @@ class LDAP
*
* \param string $scope Scope of the search: subtree/base/one
*/
- function search($srp, $filter, $attrs = array(), $scope = 'subtree')
+ function search ($srp, $filter, $attrs = array(), $scope = 'subtree')
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -295,7 +295,7 @@ class LDAP
*
* \param array $attrs
*/
- function ls($srp, $filter = "(objectclass=*)", $basedn = "", $attrs = array("*"))
+ function ls ($srp, $filter = "(objectclass=*)", $basedn = "", $attrs = array("*"))
{
trigger_error('deprecated');
$this->cd($basedn);
@@ -313,7 +313,7 @@ class LDAP
*
* \param string $filter Initialized at "(objectclass=*)"
*/
- function cat($srp, $dn, $attrs = array("*"), $filter = "(objectclass=*)")
+ function cat ($srp, $dn, $attrs = array("*"), $filter = "(objectclass=*)")
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -339,7 +339,7 @@ class LDAP
*
* \param string $filter The filter of the research
*/
- function object_match_filter($dn, $filter)
+ function object_match_filter ($dn, $filter)
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -358,7 +358,7 @@ class LDAP
*
* \param $size The limit
*/
- function set_size_limit($size)
+ function set_size_limit ($size)
{
/* Ignore zero settings */
if ($size == 0) {
@@ -376,7 +376,7 @@ class LDAP
*
* \param integer $srp
*/
- function fetch($srp)
+ function fetch ($srp)
{
$att = array();
if ($this->hascon) {
@@ -415,7 +415,7 @@ class LDAP
*
* \param integer $srp Value to be reset
*/
- function resetResult($srp)
+ function resetResult ($srp)
{
$this->start[$srp] = 0;
}
@@ -425,7 +425,7 @@ class LDAP
*
* \param integer $srp The result to clear
*/
- function clearResult($srp)
+ function clearResult ($srp)
{
if ($this->hasres[$srp]) {
$this->hasres[$srp] = FALSE;
@@ -438,7 +438,7 @@ class LDAP
*
* \param $srp srp
*/
- function getDN($srp)
+ function getDN ($srp)
{
if ($this->hascon) {
if ($this->hasres[$srp]) {
@@ -465,7 +465,7 @@ class LDAP
*
* \param $srp srp
*/
- function count($srp)
+ function count ($srp)
{
if ($this->hascon) {
if ($this->hasres[$srp]) {
@@ -490,7 +490,7 @@ class LDAP
*
* \param string $dn Empty string
*/
- function rm($attrs = "", $dn = "")
+ function rm ($attrs = "", $dn = "")
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -509,7 +509,7 @@ class LDAP
}
}
- function mod_add($attrs = "", $dn = "")
+ function mod_add ($attrs = "", $dn = "")
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -533,7 +533,7 @@ class LDAP
*
* \param string $deletedn The DN to be deleted
*/
- function rmdir($deletedn)
+ function rmdir ($deletedn)
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -558,7 +558,7 @@ class LDAP
*
* \return Boolean TRUE on success else FALSE.
*/
- function rename_dn($source, $dest)
+ function rename_dn ($source, $dest)
{
/* Check if source and destination are the same entry */
if (strtolower($source) == strtolower($dest)) {
@@ -612,7 +612,7 @@ class LDAP
*
* \return TRUE on sucessfull , 0 in error, and "" when we don't get a ldap conection
*/
- function rmdir_recursive($srp, $deletedn)
+ function rmdir_recursive ($srp, $deletedn)
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -644,7 +644,7 @@ class LDAP
}
}
- function makeReadableErrors($error, $attrs)
+ function makeReadableErrors ($error, $attrs)
{
if ($this->success()) {
return "";
@@ -675,7 +675,7 @@ class LDAP
*
* \param array $attrs The new entry
*/
- function modify(array $attrs)
+ function modify (array $attrs)
{
if (count($attrs) == 0) {
return 0;
@@ -701,7 +701,7 @@ class LDAP
*
* \param array $changes The changes
*/
- function modify_batch(array $changes)
+ function modify_batch (array $changes)
{
if (count($changes) == 0) {
return TRUE;
@@ -724,7 +724,7 @@ class LDAP
*
* \param string $attrs The entry to add
*/
- function add($attrs)
+ function add ($attrs)
{
if ($this->hascon) {
if ($this->reconnect) {
@@ -747,7 +747,7 @@ class LDAP
*
* Creates missing trees, in our example ou=orga,dc=base will get created if not existing, same thing for ou=example,ou=orga,dc=base
* */
- function create_missing_trees($srp, $target, $ignoreReferralBases = TRUE)
+ function create_missing_trees ($srp, $target, $ignoreReferralBases = TRUE)
{
$real_path = substr($target, 0, strlen($target) - strlen($this->basedn) - 1);
@@ -781,7 +781,7 @@ class LDAP
}
}
- $this->cat ($srp, $cdn);
+ $this->cat($srp, $cdn);
$attrs = $this->fetch($srp);
/* Create missing entry? */
@@ -880,10 +880,10 @@ class LDAP
*
* \return string containts LDAP_OPT_ERROR_STRING
*/
- function get_additional_error()
+ function get_additional_error ()
{
$additional_error = '';
- @ldap_get_option ($this->cid, LDAP_OPT_ERROR_STRING, $additional_error);
+ @ldap_get_option($this->cid, LDAP_OPT_ERROR_STRING, $additional_error);
return $additional_error;
}
@@ -892,7 +892,7 @@ class LDAP
*
* \return boolean TRUE if Success is found in $error, else return FALSE
*/
- function success()
+ function success ()
{
return preg_match('/Success/i', $this->error);
}
@@ -900,7 +900,7 @@ class LDAP
/*!
* \brief Get the error
*/
- function get_error()
+ function get_error ()
{
if ($this->error == 'Success') {
return $this->error;
@@ -925,7 +925,7 @@ class LDAP
*
* Must be run right after the ldap request
*/
- function get_errno()
+ function get_errno ()
{
if ($this->error == 'Success') {
return 0;
@@ -939,13 +939,13 @@ class LDAP
*
* Must be run right after the search
*/
- function hitSizeLimit()
+ function hitSizeLimit ()
{
/* LDAP_SIZELIMIT_EXCEEDED 0x04 */
return ($this->get_errno() == 0x04);
}
- function get_credentials($url, $referrals = NULL)
+ function get_credentials ($url, $referrals = NULL)
{
$ret = array();
$url = preg_replace('!\?\?.*$!', '', $url);
@@ -1033,7 +1033,7 @@ class LDAP
return $res;
}
- function dn_exists($dn)
+ function dn_exists ($dn)
{
return @ldap_read($this->cid, $dn, "(objectClass=*)", array("objectClass"));
}
@@ -1053,7 +1053,7 @@ class LDAP
*
* \param boolean $DeleteOldEntries
*/
- function import_complete_ldif($srp, $str_attr, $JustModify, $DeleteOldEntries)
+ function import_complete_ldif ($srp, $str_attr, $JustModify, $DeleteOldEntries)
{
if ($this->reconnect) {
$this->connect();
@@ -1156,7 +1156,7 @@ class LDAP
*
* \param boolean $delete
*/
- protected function import_single_entry($srp, $data, $modify, $delete)
+ protected function import_single_entry ($srp, $data, $modify, $delete)
{
global $config;
@@ -1233,7 +1233,7 @@ class LDAP
*
* \param boolean $force_reload FALSE
*/
- function get_objectclasses($force_reload = FALSE)
+ function get_objectclasses ($force_reload = FALSE)
{
/* Return the cached results. */
if (class_available('session') && session::global_is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
@@ -1250,7 +1250,7 @@ class LDAP
/* Get list of objectclasses and fill array */
$nb = $attrs[0]['subschemasubentry'][0];
$objectclasses = array();
- $res = ldap_read ($this->cid, $nb, 'objectClass=*', array('objectclasses'));
+ $res = ldap_read($this->cid, $nb, 'objectClass=*', array('objectclasses'));
$attrs = ldap_get_entries($this->cid, $res);
if (!isset($attrs[0])) {
return array();
@@ -1315,7 +1315,7 @@ class LDAP
}
- function value2container($value)
+ function value2container ($value)
{
/* Set emtpy values to "TRUE" only */
if (preg_match('/^\s*$/', $value)) {
@@ -1341,12 +1341,12 @@ class LDAP
*
* \param string $string
*/
- function log($string)
+ function log ($string)
{
if (session::global_is_set('config')) {
$cfg = session::global_get('config');
if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])) {
- syslog (LOG_INFO, $string);
+ syslog(LOG_INFO, $string);
}
}
}
@@ -1358,7 +1358,7 @@ class LDAP
*
* \param $dn The DN
*/
- function getCn($dn)
+ function getCn ($dn)
{
$simple = explode(",", $dn);
@@ -1371,21 +1371,20 @@ class LDAP
}
}
- function get_naming_contexts($server, $admin = '', $password = '')
+ function get_naming_contexts ($server, $admin = '', $password = '')
{
/* Build LDAP connection */
- $ds = ldap_connect ($server);
+ $ds = ldap_connect($server);
if (!$ds) {
die ('Can\'t bind to LDAP. No check possible!');
}
ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
- ldap_bind ($ds, $admin, $password);
+ ldap_bind($ds, $admin, $password);
/* Get base to look for naming contexts */
- $res = @ldap_read ($ds, '', 'objectClass=*', array('namingContexts'));
+ $res = @ldap_read($ds, '', 'objectClass=*', array('namingContexts'));
$attrs = @ldap_get_entries($ds, $res);
return $attrs[0]['namingcontexts'];
}
}
-?>
diff --git a/include/class_ldapFilter.inc b/include/class_ldapFilter.inc
index 3376cb5b585e887e5adb2734f5eca3c0c4cdb0c0..a76b27ce95592409f9ba6a6836a7702fbee71921 100644
--- a/include/class_ldapFilter.inc
+++ b/include/class_ldapFilter.inc
@@ -41,18 +41,18 @@ class ldapFilter
protected $operator;
protected $subparts;
- function __construct($operator, $subparts)
+ function __construct ($operator, $subparts)
{
$this->operator = $operator;
$this->subparts = $subparts;
}
- function __toString()
+ function __toString ()
{
return '('.$this->operator.join($this->subparts).')';
}
- function __invoke($array)
+ function __invoke ($array)
{
$stopValue = FALSE;
switch ($this->operator) {
@@ -72,17 +72,17 @@ class ldapFilter
}
}
- function getOperator()
+ function getOperator ()
{
return $this->operator;
}
- function getSubparts()
+ function getSubparts ()
{
return $this->subparts;
}
- function listUsedAttributes(&$result = array())
+ function listUsedAttributes (&$result = array())
{
foreach ($this->subparts as $subpart) {
$subpart->listUsedAttributes($result);
@@ -90,7 +90,7 @@ class ldapFilter
return $result;
}
- static function parse($filter)
+ static function parse ($filter)
{
// Remove starting and ending parenthesis
$filter = preg_replace(array('/^\\s*\\(/', '/\\)\\s*$/'), '', $filter);
@@ -140,7 +140,7 @@ class ldapFilterLeaf extends ldapFilter
protected $pattern;
protected $dnFilter = FALSE;
- function __construct($left, $operator, $right)
+ function __construct ($left, $operator, $right)
{
if (@strrpos($left, ':dn:', -4) !== FALSE) {
$this->dnFilter = TRUE;
@@ -167,17 +167,17 @@ class ldapFilterLeaf extends ldapFilter
}
}
- function isDnFilter()
+ function isDnFilter ()
{
return $this->dnFilter;
}
- function __toString()
+ function __toString ()
{
return '('.$this->subparts[0].($this->dnFilter ? ':dn:' : '').$this->operator.$this->subparts[1].')';
}
- function __invoke($array)
+ function __invoke ($array)
{
if ($this->dnFilter) {
switch ($this->operator) {
@@ -221,7 +221,7 @@ class ldapFilterLeaf extends ldapFilter
return FALSE;
}
- function listUsedAttributes(&$result = array())
+ function listUsedAttributes (&$result = array())
{
if ($this->dnFilter) {
$result['dn'] = 'dn';
@@ -232,7 +232,7 @@ class ldapFilterLeaf extends ldapFilter
}
}
-function fdTemplateFilter($filter)
+function fdTemplateFilter ($filter)
{
if ($filter instanceof ldapFilterLeaf) {
if ($filter->isDnFilter()) {
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index add456b28bb7dd8c4b5637c687e5f9bb8355c970..633fa40bbb3b2a08967f1333fce97eceb4ce0637 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -41,7 +41,7 @@ class ldapMultiplexer {
*
* \param $object Object LDAP
*/
- public function __construct(&$object)
+ public function __construct (&$object)
{
/* Store object */
$this->object = $object;
@@ -57,7 +57,7 @@ class ldapMultiplexer {
*
* \param $parameters Parameters for the method
*/
- public function __call($methodName, $parameters)
+ public function __call ($methodName, $parameters)
{
/* Add resource pointer if the mentioned methods are used */
if (in_array($methodName, array('search','ls','cat','fetch','clearResult','resetResult','count','getDN','rmdir_recursive','create_missing_trees','import_single_entry','import_complete_ldif'))) {
@@ -72,7 +72,7 @@ class ldapMultiplexer {
*
* \param string $memberName
*/
- public function __get($memberName)
+ public function __get ($memberName)
{
return $this->object->$memberName;
}
diff --git a/include/class_ldapSizeLimit.inc b/include/class_ldapSizeLimit.inc
index 69d5e35ca090de6b4a0489d678da6e93fec6c8df..198bc409dca44050ff37951910f368ac83700de7 100644
--- a/include/class_ldapSizeLimit.inc
+++ b/include/class_ldapSizeLimit.inc
@@ -39,7 +39,7 @@ class ldapSizeLimit
/*! \brief Limit was exceeded */
protected $limitExceeded;
- function __construct()
+ function __construct ()
{
global $config;
@@ -47,17 +47,17 @@ class ldapSizeLimit
$this->ignore = preg_match('/true/i', $config->get_cfg_value('LDAPSIZEIGNORE', 'TRUE'));
}
- function getSizeLimit()
+ function getSizeLimit ()
{
return $this->sizeLimit;
}
- function setSizeLimit($limit)
+ function setSizeLimit ($limit)
{
$this->sizeLimit = $limit;
}
- function setLimitExceeded($exceeded = TRUE)
+ function setLimitExceeded ($exceeded = TRUE)
{
$this->limitExceeded = $exceeded;
}
@@ -65,7 +65,7 @@ class ldapSizeLimit
/*!
* \brief Handle sizelimit dialog related posts
*/
- function update()
+ function update ()
{
if (isset($_POST['set_size_action']) && isset($_POST['action'])) {
switch ($_POST['action']) {
@@ -99,7 +99,7 @@ class ldapSizeLimit
* Show sizelimit configuration dialog when number
* of entries exceeded the sizelimit
*/
- function check()
+ function check ()
{
global $config;
@@ -125,7 +125,7 @@ class ldapSizeLimit
* Print a sizelimit warning when number
* of entries exceeded the sizelimit
*/
- function renderWarning()
+ function renderWarning ()
{
if (($this->sizeLimit >= 10000000) || $this->limitExceeded) {
$config = '<input type="submit" name="edit_sizelimit" value="'._('Configure').'" formnovalidate="formnovalidate"/>';
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 732d987681afb6a73b204c17ea6f0db5f638c0f2..53ec6a14dd9198fbd8d8a08dc556215538b43191 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -69,7 +69,7 @@ class listing
*
* \param string $data either a filename or an array representation of the XML
*/
- function __construct($data)
+ function __construct ($data)
{
global $config, $class_mapping, $ui;
@@ -117,7 +117,7 @@ class listing
$this->baseSelector = new baseSelector($this->bases, $this->base);
}
- function setParent($parent)
+ function setParent ($parent)
{
$this->parent = $parent;
}
@@ -129,7 +129,7 @@ class listing
*
* \see CopyPasteHandler
*/
- function setCopyPasteHandler($handler)
+ function setCopyPasteHandler ($handler)
{
$this->copyPasteHandler = $handler;
}
@@ -141,7 +141,7 @@ class listing
*
* \see SnapshotHandler
*/
- function setSnapshotHandler($handler)
+ function setSnapshotHandler ($handler)
{
if ($handler->enabled()) {
$this->snapshotHandler = $handler;
@@ -157,7 +157,7 @@ class listing
*
* \see filter
*/
- function setFilter($filter)
+ function setFilter ($filter)
{
$this->filter = $filter;
$filter->headpage = $this;
@@ -174,7 +174,7 @@ class listing
*
* \param string $call
*/
- function registerElementFilter($name, $call)
+ function registerElementFilter ($name, $call)
{
if (!isset($this->filters[$name])) {
$this->filters[$name] = $call;
@@ -189,7 +189,7 @@ class listing
*
* \param string $data either a filename or an array representation of the XML
*/
- function load($data)
+ function load ($data)
{
if (is_array($data)) {
$this->xmlData = $data;
@@ -270,7 +270,7 @@ class listing
}
- function renderHeader()
+ function renderHeader ()
{
$this->header = array();
$this->plainHeader = array();
@@ -327,7 +327,7 @@ class listing
/*!
* \brief Render
*/
- function render()
+ function render ()
{
global $ui;
@@ -501,7 +501,7 @@ class listing
/*!
* \brief Update a listing
*/
- function update()
+ function update ()
{
$ui = get_userinfo();
@@ -626,7 +626,7 @@ class listing
*
* \param string $base
*/
- function setBase($base)
+ function setBase ($base)
{
global $ui;
$this->base = $base;
@@ -636,7 +636,7 @@ class listing
}
}
- function tryAndSetBase($base)
+ function tryAndSetBase ($base)
{
$ui = get_userinfo();
$deps = $ui->get_module_departments($this->categories);
@@ -650,7 +650,7 @@ class listing
*
* \return the base
*/
- function getBase()
+ function getBase ()
{
return $this->base;
}
@@ -660,7 +660,7 @@ class listing
*
* \param string $layout
*/
- function parseLayout($layout)
+ function parseLayout ($layout)
{
$result = array();
$layout = preg_replace("/^\|/", "", $layout);
@@ -716,7 +716,7 @@ class listing
}
- function renderCell($table, $index, $data, $cfg, $row)
+ function renderCell ($table, $index, $data, $cfg, $row)
{
// Replace flat attributes in data string
$offset = 0;
@@ -739,7 +739,7 @@ class listing
}
- function renderBase()
+ function renderBase ()
{
if (!$this->baseMode) {
return;
@@ -749,7 +749,7 @@ class listing
}
- function processElementFilter($type, $index, $data, $cfg, $row)
+ function processElementFilter ($type, $index, $data, $cfg, $row)
{
if (isset($this->filterCache[$type.$index])) {
$filtersData = $this->filterCache[$type.$index];
@@ -837,7 +837,7 @@ class listing
* \param string $dn dn of the object
* \param string $attrs LDAP attributes of the object
*/
- function getObjectType($dn, $attrs)
+ function getObjectType ($dn, $attrs)
{
return $this->genericGetType($dn, $attrs, $this->objectTypes);
}
@@ -848,7 +848,7 @@ class listing
* \param string $dn dn of the object
* \param string $attrs LDAP attributes of the object
*/
- function getDepartmentType($dn, $attrs)
+ function getDepartmentType ($dn, $attrs)
{
return $this->genericGetType($dn, $attrs, $this->departmentTypes);
}
@@ -856,7 +856,7 @@ class listing
/*!
* \brief Get the object or department type
*/
- protected function genericGetType($dn, $attrs, $types)
+ protected function genericGetType ($dn, $attrs, $types)
{
if (isset($this->objectDnMapping[$dn])) {
return $this->objectDnMapping[$dn];
@@ -900,7 +900,7 @@ class listing
return NULL;
}
- function getObjectTypeInfos($dn, $attrs)
+ function getObjectTypeInfos ($dn, $attrs)
{
$type = $this->getObjectType($dn, $attrs);
if ($type === NULL) {
@@ -916,7 +916,7 @@ class listing
*
* \param string $dn The DN
*/
- function filterObjectType($row, $dn)
+ function filterObjectType ($row, $dn)
{
return $this->filterGenericType($dn, $this->objectTypes, $this->getObjectType($dn, $this->entries[$row]));
}
@@ -924,7 +924,7 @@ class listing
/*!
* \brief Generic method for department and objects once type is known
*/
- protected function filterGenericType($dn, $types, $type)
+ protected function filterGenericType ($dn, $types, $type)
{
$result = " ";
@@ -946,7 +946,7 @@ class listing
*
* \param string $dn The DN
*/
- function filterDepartmentType($row, $dn)
+ function filterDepartmentType ($row, $dn)
{
return $this->filterGenericType($dn, $this->departmentTypes, $this->getDepartmentType($dn, $this->departments[$row]));
}
@@ -960,7 +960,7 @@ class listing
*
* \param string $classes
*/
- function filterActions($dn, $row, $classes)
+ function filterActions ($dn, $row, $classes)
{
// Do nothing if there's no menu defined
if (!isset($this->xmlData['actiontriggers']['action'])) {
@@ -1059,7 +1059,7 @@ class listing
*
* \param array $description
*/
- function filterDepartmentLink($row, $dn, $description)
+ function filterDepartmentLink ($row, $dn, $description)
{
$attr = $this->departments[$row]['sort-attribute'];
$name = $this->departments[$row][$attr];
@@ -1073,7 +1073,7 @@ class listing
/*!
* \brief Filter link with object name
*/
- function filterNameLink($row, $dn)
+ function filterNameLink ($row, $dn)
{
$infos = $this->getObjectTypeInfos($dn, $this->entries[$row]);
$value = $this->entries[$row][$infos['nameAttr']];
@@ -1086,7 +1086,7 @@ class listing
/*!
* \brief Filter link
*/
- function filterLink($row, $dn, $mask, ...$vals)
+ function filterLink ($row, $dn, $mask, ...$vals)
{
$params = array($mask);
@@ -1120,7 +1120,7 @@ class listing
}
- function renderNavigation()
+ function renderNavigation ()
{
$result = array();
$enableBack = TRUE;
@@ -1176,7 +1176,7 @@ class listing
/*!
* \brief Get action
*/
- function getAction()
+ function getAction ()
{
global $config, $ui;
@@ -1295,7 +1295,7 @@ class listing
}
- function renderActionMenu()
+ function renderActionMenu ()
{
// Don't send anything if the menu is not defined
if (!isset($this->xmlData['actionmenu']['action'])) {
@@ -1319,7 +1319,7 @@ class listing
return '<div id="pulldown">'.$result.'</li></ul></div>';
}
- function renderActionMenuActionLink($separator, $action, $name, $icon)
+ function renderActionMenuActionLink ($separator, $action, $name, $icon)
{
return '<li'.$separator.' id="actionmenu_'.$action.'">'
.'<a href="#" onClick="'
@@ -1329,7 +1329,7 @@ class listing
.'</li>';
}
- function recurseActions(&$actions)
+ function recurseActions (&$actions)
{
global $class_mapping;
static $level = 2;
@@ -1426,7 +1426,7 @@ class listing
* \param string $row
*
*/
- function hasActionPermission(&$action, $dn, $row = NULL)
+ function hasActionPermission (&$action, $dn, $row = NULL)
{
global $ui;
@@ -1519,7 +1519,7 @@ class listing
/*!
* \brief Refresh the bases list
*/
- function refreshBasesList()
+ function refreshBasesList ()
{
global $config;
$ui = get_userinfo();
@@ -1546,7 +1546,7 @@ class listing
}
/*! \brief Cache the departments */
- function refreshDepartmentsCache()
+ function refreshDepartmentsCache ()
{
$ui = get_userinfo();
@@ -1600,7 +1600,7 @@ class listing
}
- function renderCopyPasteMenu($separator, $copy = TRUE, $cut = TRUE)
+ function renderCopyPasteMenu ($separator, $copy = TRUE, $cut = TRUE)
{
// We can only provide information if we've got a copypaste handler
// instance
@@ -1648,7 +1648,7 @@ class listing
}
- function renderCopyPasteActions($row, $dn, $category, $class, $copy = TRUE, $cut = TRUE)
+ function renderCopyPasteActions ($row, $dn, $category, $class, $copy = TRUE, $cut = TRUE)
{
// We can only provide information if we've got a copypaste handler
// instance
@@ -1688,7 +1688,7 @@ class listing
}
- function renderSnapshotMenu($separator)
+ function renderSnapshotMenu ($separator)
{
// We can only provide information if we've got a snapshot handler instance
if (!is_object($this->snapshotHandler)) {
@@ -1712,7 +1712,7 @@ class listing
}
- function renderExporterMenu($separator)
+ function renderExporterMenu ($separator)
{
// Presets
$result = "";
@@ -1732,7 +1732,7 @@ class listing
}
- function renderSnapshotActions($row, $dn, $category)
+ function renderSnapshotActions ($row, $dn, $category)
{
/* We can only provide information if we've got a snapshot handler instance */
if (!is_object($this->snapshotHandler)) {
@@ -1773,7 +1773,7 @@ class listing
}
- function renderDaemonMenu($separator)
+ function renderDaemonMenu ($separator)
{
$result = "";
@@ -1792,7 +1792,7 @@ class listing
}
- function getEntry($dn)
+ function getEntry ($dn)
{
if (isset($this->dnToRow[$dn])) {
return $this->entries[$this->dnToRow[$dn]];
@@ -1803,7 +1803,7 @@ class listing
/*!
* \brief Get listing entries
*/
- function getEntries()
+ function getEntries ()
{
return $this->entries;
}
@@ -1813,7 +1813,7 @@ class listing
*
* \param string $dn The DN
*/
- function getType($dn)
+ function getType ($dn)
{
if (isset($this->objectDnMapping[$dn])) {
return $this->objectDnMapping[$dn];
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index f4b666d65095f01ef8f81326de59f3293cb76dd5..571ff2c4bc6f484a1910911d1c3bd42120329eaf 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -42,7 +42,7 @@ class listingSortIterator implements Iterator {
*
* \param string $type
*/
- public function __construct($data, $direction, $attribute, $type = 'string')
+ public function __construct ($data, $direction, $attribute, $type = 'string')
{
// Sort for attribute
if ($attribute != '') {
@@ -127,7 +127,7 @@ class listingSortIterator implements Iterator {
*
* \return the first element of the array
*/
- function rewind()
+ function rewind ()
{
return reset($this->data);
}
@@ -137,7 +137,7 @@ class listingSortIterator implements Iterator {
*
* \return The current element pointed by array pointer
*/
- function current()
+ function current ()
{
return current($this->data);
}
@@ -147,7 +147,7 @@ class listingSortIterator implements Iterator {
*
* \return the key element of the array
*/
- function key()
+ function key ()
{
return key($this->data);
}
@@ -157,7 +157,7 @@ class listingSortIterator implements Iterator {
*
* \return The next element pointed by array pointer
*/
- function next()
+ function next ()
{
return next($this->data);
}
@@ -167,7 +167,7 @@ class listingSortIterator implements Iterator {
*
* \return TRUE if the array is valid, return FALSE otherwise
*/
- function valid()
+ function valid ()
{
return (key($this->data) !== NULL);
}
diff --git a/include/class_logging.inc b/include/class_logging.inc
index 9b971bda9ba52a7f1518b409a70a2d617328b2cc..80f375773e65b4df09c6806ad5718b4a0ec9f32c 100644
--- a/include/class_logging.inc
+++ b/include/class_logging.inc
@@ -95,7 +95,7 @@ class logging {
*
* \param Array $entry to be checked
*/
- static protected function check($entry = array())
+ static protected function check ($entry = array())
{
$msgs = array();
@@ -115,7 +115,7 @@ class logging {
*
* \param Array $entry Entry to be loged
*/
- static protected function log_into_syslog($entry)
+ static protected function log_into_syslog ($entry)
{
$str = '';
if (empty($entry['object']) && empty($entry['changes'])) {
@@ -131,7 +131,7 @@ class logging {
*
* \param Array $entry Entry to be loged
*/
- static protected function log_into_ldap($entry)
+ static protected function log_into_ldap ($entry)
{
global $config;
if ($entry['objecttype'] == 'plugin/auditEvent') {
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index 75b56b8ab18f4a049d8df1b21983668fefd1778e..4f20d3cc0def0c567419b742fda16c72f256754b 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -25,19 +25,19 @@
* Source code for class msgPool
*/
-define ("LDAP_READ", 1);
-define ("LDAP_ADD", 2);
-define ("LDAP_MOD", 3);
-define ("LDAP_DEL", 4);
-define ("LDAP_SEARCH", 5);
-define ("LDAP_AUTH", 6);
+define("LDAP_READ", 1);
+define("LDAP_ADD", 2);
+define("LDAP_MOD", 3);
+define("LDAP_DEL", 4);
+define("LDAP_SEARCH", 5);
+define("LDAP_AUTH", 6);
/*!
* \brief This class contains all the messages for the various actions
*/
class msgPool {
- public static function selectToView($type, $o_type = "")
+ public static function selectToView ($type, $o_type = "")
{
if ($o_type == "") {
return sprintf(_("Select to list objects of type '%s'."), $type);
@@ -60,7 +60,7 @@ class msgPool {
*
* \param string $type Type of the object which will be deleted
*/
- public static function deleteInfo($name = "", $type = "")
+ public static function deleteInfo ($name = "", $type = "")
{
if ($name == "") {
if ($type == "") {
@@ -95,7 +95,7 @@ class msgPool {
*
* \param string $name Name of the object which will be deleted
*/
- public static function permDelete($name = "")
+ public static function permDelete ($name = "")
{
if ($name == "") {
return _("You have no permission to delete this object!");
@@ -117,7 +117,7 @@ class msgPool {
*
* \param string $name Name of the object which will be created
*/
- public static function permCreate($name = "")
+ public static function permCreate ($name = "")
{
if ($name == "") {
return _("You have no permission to create this object!");
@@ -140,7 +140,7 @@ class msgPool {
* \param string $name Name of the object which cannot be modified (or array of objects names)
* \param string $field Name of the field of the object which cannot be modified
*/
- public static function permModify($name = '', $field = '')
+ public static function permModify ($name = '', $field = '')
{
if ($name == '') {
return _('You have no permission to modify this object!');
@@ -166,7 +166,7 @@ class msgPool {
*
* \param string $name Name of the object which will be viewed
*/
- public static function permView($name = "")
+ public static function permView ($name = "")
{
if ($name == "") {
return _("You have no permission to view this object!");
@@ -188,7 +188,7 @@ class msgPool {
*
* \param string $name Name of the object which will be moved
*/
- public static function permMove($name = "")
+ public static function permMove ($name = "")
{
if ($name == "") {
return _("You have no permission to move this object!");
@@ -214,7 +214,7 @@ class msgPool {
*
* \param string $dbinfo Database information
*/
- public static function dbconnect($name, $error = "", $dbinfo = "")
+ public static function dbconnect ($name, $error = "", $dbinfo = "")
{
if ($error != "") {
$error = "<br><br><i>"._("Error").":</i> ".$error;
@@ -234,7 +234,7 @@ class msgPool {
*
* \param string $dbinfo Database information
*/
- public static function dbselect($name, $error = "", $dbinfo = "")
+ public static function dbselect ($name, $error = "", $dbinfo = "")
{
if ($error != "") {
$error = "<br><br><i>"._("Error").":</i> ".$error;
@@ -250,7 +250,7 @@ class msgPool {
*
* \param string $name Name of the server
*/
- public static function noserver($name)
+ public static function noserver ($name)
{
return sprintf(_("No %s server defined!"), $name);
}
@@ -264,7 +264,7 @@ class msgPool {
*
* \param string $dbinfo Database information
*/
- public static function dbquery($name, $error = "", $dbinfo = "")
+ public static function dbquery ($name, $error = "", $dbinfo = "")
{
if ($error != "") {
$error = "<br><br><i>"._("Error").":</i> ".$error;
@@ -280,7 +280,7 @@ class msgPool {
*
* \param string $name The field which contains reserved keyword
*/
- public static function reserved($name)
+ public static function reserved ($name)
{
return sprintf(_("The field '%s' contains a reserved keyword!"), $name);
}
@@ -292,7 +292,7 @@ class msgPool {
*
* \param string $plugin Name of the plugin
*/
- public static function cmdnotfound($type, $plugin)
+ public static function cmdnotfound ($type, $plugin)
{
return sprintf(_("Command specified as %s hook for plugin '%s' does not exist!"), $type, $plugin);
}
@@ -306,7 +306,7 @@ class msgPool {
*
* \param string $plugin Name of the plugin
*/
- public static function cmdinvalid($type, $command = "", $plugin = "")
+ public static function cmdinvalid ($type, $command = "", $plugin = "")
{
if ($command == "") {
if ($plugin == "") {
@@ -332,7 +332,7 @@ class msgPool {
*
* \param string $plugin Name of the plugin
*/
- public static function cmdexecfailed($type, $command = "", $plugin = "")
+ public static function cmdexecfailed ($type, $command = "", $plugin = "")
{
if ($command == "") {
if ($plugin == "") {
@@ -356,7 +356,7 @@ class msgPool {
*
* \param string $min The largest value
*/
- public static function toobig($name, $min = "")
+ public static function toobig ($name, $min = "")
{
if ($min == "") {
return sprintf(_("Value for '%s' is too large!"), $name);
@@ -372,7 +372,7 @@ class msgPool {
*
* \param string $min The smallest value
*/
- public static function toosmall($name, $min = "")
+ public static function toosmall ($name, $min = "")
{
if ($min == "") {
return sprintf(_("Value for '%s' is too small!"), $name);
@@ -388,7 +388,7 @@ class msgPool {
*
* \param string $name2 Second object
*/
- public static function depends($name1, $name2)
+ public static function depends ($name1, $name2)
{
return sprintf(_("'%s' depends on '%s' - please provide both values!"), $name1, $name2);
}
@@ -399,7 +399,7 @@ class msgPool {
* \param string $name The attribute name
* \param string $dn The existing entry dn
*/
- public static function duplicated($name, $dn = NULL)
+ public static function duplicated ($name, $dn = NULL)
{
if ($dn == NULL) {
return sprintf(_("There is already an entry with this '%s' attribute in the system!"), $name);
@@ -413,7 +413,7 @@ class msgPool {
*
* \param string $name Name of the field
*/
- public static function required($name)
+ public static function required ($name)
{
return sprintf(_("The required field '%s' is empty!"), $name);
}
@@ -429,7 +429,7 @@ class msgPool {
*
* \param string $example Example of a right submited data
*/
- public static function invalid($name, $data = "", $regex = "", $example = "")
+ public static function invalid ($name, $data = "", $regex = "", $example = "")
{
/* Stylize example */
if ($example != "") {
@@ -466,7 +466,7 @@ class msgPool {
*
* \param string $name The name of the extension
*/
- public static function missingext($name)
+ public static function missingext ($name)
{
return sprintf(_("Missing %s PHP extension!"), $name);
}
@@ -474,7 +474,7 @@ class msgPool {
/*!
* \brief Text for a cancel button
*/
- public static function cancelButton()
+ public static function cancelButton ()
{
return _("Cancel");
}
@@ -482,7 +482,7 @@ class msgPool {
/*!
* \brief Text for a ok button
*/
- public static function okButton()
+ public static function okButton ()
{
return _("Ok");
}
@@ -490,7 +490,7 @@ class msgPool {
/*!
* \brief Text for an apply button
*/
- public static function applyButton()
+ public static function applyButton ()
{
return _("Apply");
}
@@ -498,7 +498,7 @@ class msgPool {
/*!
* \brief Text for a save button
*/
- public static function saveButton()
+ public static function saveButton ()
{
return _("Save");
}
@@ -508,7 +508,7 @@ class msgPool {
*
* \param string $what Text for the button
*/
- public static function addButton($what = '')
+ public static function addButton ($what = '')
{
return (($what == '') ? sprintf(_('Add')) : sprintf(_('Add %s'), $what));
}
@@ -518,7 +518,7 @@ class msgPool {
*
* \param string $what Text for the button
*/
- public static function delButton($what = '')
+ public static function delButton ($what = '')
{
return (($what == '') ? sprintf(_('Delete')) : sprintf(_('Delete %s'), $what));
}
@@ -528,7 +528,7 @@ class msgPool {
*
* \param string $what Text for the button
*/
- public static function editButton($what = '')
+ public static function editButton ($what = '')
{
return (($what == '') ? sprintf(_('Edit...')) : sprintf(_('Edit %s...'), $what));
}
@@ -536,7 +536,7 @@ class msgPool {
/*!
* \brief Text for a back button
*/
- public static function backButton()
+ public static function backButton ()
{
return _('Back');
}
@@ -546,7 +546,7 @@ class msgPool {
*
* \param array $data Array with the elements of the list
*/
- public static function buildList($data)
+ public static function buildList ($data)
{
$objects = "<ul>";
foreach ($data as $key => $value) {
@@ -565,7 +565,7 @@ class msgPool {
*
* \param string $name Name of the extension
*/
- public static function noValidExtension($name)
+ public static function noValidExtension ($name)
{
return sprintf(_("This account has no valid %s extensions!"), $name);
}
@@ -577,7 +577,7 @@ class msgPool {
*
* \param array $depends Contains all the settings enabled
*/
- public static function featuresEnabled($name, $depends = '')
+ public static function featuresEnabled ($name, $depends = '')
{
if (($depends == "") || (is_array($depends) && (count($depends) == 0))) {
return sprintf(_("This account has %s settings enabled. You can disable them by clicking below."), $name);
@@ -598,7 +598,7 @@ class msgPool {
*
* \param array $conflicts Tabs this tab conflicts with
*/
- public static function featuresDisabled($name, array $depends = array(), array $conflicts = array())
+ public static function featuresDisabled ($name, array $depends = array(), array $conflicts = array())
{
if (empty($depends) && empty($conflicts)) {
return sprintf(_('This account has %s settings disabled. You can enable them by clicking below.'), $name);
@@ -614,7 +614,7 @@ class msgPool {
*
* \param string $name Name of the feature
*/
- public static function addFeaturesButton($name)
+ public static function addFeaturesButton ($name)
{
return sprintf(_("Add %s settings"), $name);
}
@@ -625,7 +625,7 @@ class msgPool {
* \param string $name Name of the feature
*/
- public static function removeFeaturesButton($name)
+ public static function removeFeaturesButton ($name)
{
return sprintf(_("Remove %s settings"), $name);
}
@@ -633,7 +633,7 @@ class msgPool {
/*!
* \brief Display : Click the 'Edit' button below to change information in this dialog
*/
- public static function clickEditToChange()
+ public static function clickEditToChange ()
{
return _("Click the 'Edit' button below to change information in this dialog");
}
@@ -641,7 +641,7 @@ class msgPool {
/*!
* \brief Build an array with the months
*/
- public static function months()
+ public static function months ()
{
return array(_("January"), _("February"), _("March"), _("April"),
_("May"), _("June"), _("July"), _("August"), _("September"),
@@ -652,7 +652,7 @@ class msgPool {
* \brief Build an array with the days of a week.
* Start by Sunday
*/
- public static function weekdays()
+ public static function weekdays ()
{
return array( _("Sunday"), _("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"));
}
@@ -668,7 +668,7 @@ class msgPool {
*
* \param string $plugin
*/
- public static function ldaperror($error, $dn = '', $type = 0, $plugin = '')
+ public static function ldaperror ($error, $dn = '', $type = 0, $plugin = '')
{
/* Assign headline depending on type */
$typemap = array(1 => _('read operation'), _('add operation'), _('modify operation'),
@@ -695,7 +695,7 @@ class msgPool {
*
* \param string $reason The reason of the upload failed
*/
- public static function incorrectUpload($reason = "")
+ public static function incorrectUpload ($reason = "")
{
if ($reason == "") {
return _("Upload failed!");
@@ -709,7 +709,7 @@ class msgPool {
*
* \param string $error The error of the communication failure
*/
- public static function siError($error = "")
+ public static function siError ($error = "")
{
if ($error == "") {
return _("Communication failure with the infrastructure service!");
@@ -724,7 +724,7 @@ class msgPool {
*
* \param array $objects
*/
- public static function stillInUse($type, $objects = array())
+ public static function stillInUse ($type, $objects = array())
{
if (!is_array($objects)) {
return sprintf(_("This '%s' is still in use by this object: %s"), $type, "<br><br>".$objects);
@@ -743,7 +743,7 @@ class msgPool {
*
* \param string $file Name of the file not found
*/
- public static function fileDoesNotExist($file)
+ public static function fileDoesNotExist ($file)
{
return sprintf(_("File '%s' does not exist!"), $file);
}
@@ -753,7 +753,7 @@ class msgPool {
*
* \param string $file Name of the file not readable
*/
- public static function cannotReadFile($file)
+ public static function cannotReadFile ($file)
{
return sprintf(_("Cannot open file '%s' for reading!"), $file);
}
@@ -763,7 +763,7 @@ class msgPool {
*
* \param string $file Name of the file not writable
*/
- public static function cannotWriteFile($file)
+ public static function cannotWriteFile ($file)
{
return sprintf(_("Cannot open file '%s' for writing!"), $file);
}
@@ -773,7 +773,7 @@ class msgPool {
*
* \param string $attr Name of the invalide attribute
*/
- public static function invalidConfigurationAttribute($attr)
+ public static function invalidConfigurationAttribute ($attr)
{
return sprintf(_("The value for '%s' is currently unconfigured or invalid, please check your configuration file!"), $attr);
}
@@ -783,7 +783,7 @@ class msgPool {
*
* \param string $file Filename which can't be deleted
*/
- public static function cannotDeleteFile($file)
+ public static function cannotDeleteFile ($file)
{
return sprintf(_("Cannot delete file '%s'!"), $file);
}
@@ -793,7 +793,7 @@ class msgPool {
*
* \param string $path Name of folder which can't be created
*/
- public static function cannotCreateFolder($path)
+ public static function cannotCreateFolder ($path)
{
return sprintf(_("Cannot create folder '%s'!"), $path);
}
@@ -803,7 +803,7 @@ class msgPool {
*
* \param string $path Name of folder which can't be deleted
*/
- public static function cannotDeleteFolder($path)
+ public static function cannotDeleteFolder ($path)
{
return sprintf(_("Cannot delete folder '%s'!"), $path);
}
@@ -813,7 +813,7 @@ class msgPool {
*
* \param string $what Name of the support
*/
- public static function checkingFor($what)
+ public static function checkingFor ($what)
{
return sprintf(_("Checking for %s support"), $what);
}
@@ -823,7 +823,7 @@ class msgPool {
*
* \param string $what Name of the module
*/
- public static function installPhpModule($what)
+ public static function installPhpModule ($what)
{
return sprintf(_("Install and activate the %s PHP module."), $what);
}
@@ -833,7 +833,7 @@ class msgPool {
*
* \param string $what Name of the module
*/
- public static function installPearModule($what)
+ public static function installPearModule ($what)
{
return sprintf(_("Install and activate the %s Pear module."), $what);
}
@@ -843,7 +843,7 @@ class msgPool {
*
* \param string $plugin Name of the class which can'b be initialized
*/
- public static function class_not_found($plugin)
+ public static function class_not_found ($plugin)
{
return sprintf(_("Cannot initialize class '%s'! Maybe there is a plugin missing in your FusionDirectory setup?"), $plugin);
}
@@ -851,7 +851,7 @@ class msgPool {
/*!
* \brief Display error when checking the base
*/
- public static function check_base()
+ public static function check_base ()
{
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 911606ffb10a2110be7d4b50f481a3a69c21f6e0..061b17cd1eeb9a425d3a7e1b4baa85c978a45b54 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -52,7 +52,7 @@ class msg_dialog
*
* \param string $i_type The type of the message dialog, by default = INFO_DIALOG
*/
- public function __construct($s_title, $s_message, $i_type)
+ public function __construct ($s_title, $s_message, $i_type)
{
if (!in_array($i_type, array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG))) {
trigger_error('Invalid msg_dialog type.');
@@ -65,7 +65,7 @@ class msg_dialog
$this->i_Type = $i_type;
}
- protected function show()
+ protected function show ()
{
global $config;
@@ -119,7 +119,7 @@ class msg_dialog
*
* \param string $i_type The type of the message dialog, by default = INFO_DIALOG
*/
- public static function display($s_title, $s_message, $i_type = INFO_DIALOG)
+ public static function display ($s_title, $s_message, $i_type = INFO_DIALOG)
{
$dialog = new msg_dialog($s_title, $s_message, $i_type);
$dialog->show();
@@ -130,7 +130,7 @@ class msg_dialog
*
* \param array $messages Contains messages
*/
- public static function displayChecks($messages)
+ public static function displayChecks ($messages)
{
foreach ($messages as $error) {
static::display(_('Error'), $error, ERROR_DIALOG);
@@ -142,7 +142,7 @@ class msg_dialog
*
* \return The identifier of the message dialog
*/
- public function get_ID()
+ public function get_ID ()
{
return $this->i_ID;
}
@@ -150,7 +150,7 @@ class msg_dialog
/*!
* \brief Run the message dialog
*/
- public function execute()
+ public function execute ()
{
global $config;
if ($this->i_Type == FATAL_ERROR_DIALOG) {
@@ -199,7 +199,7 @@ class msg_dialog
*
* \return True if is confirmed, else return false
*/
- public function is_confirmed()
+ public function is_confirmed ()
{
return isset($_POST['MSG_OK'.$this->i_ID]);
}
@@ -207,7 +207,7 @@ class msg_dialog
/*!
* \brief Accessor of the message dialog
*/
- public static function get_dialogs()
+ public static function get_dialogs ()
{
$return = "";
$dialog_ids = "";
diff --git a/include/class_objects.inc b/include/class_objects.inc
index 112aad6ff72ce767fb3af345fffd752ad6349241..1528f454c830d5f86cfa254c989f6f3d3f2f6453 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -310,7 +310,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/class_passwordRecovery.inc b/include/class_passwordRecovery.inc
index ad05389e153bc8f273fe62ad6cbf8718a9ac2201..a76a2d32ffe6e97b741017501d78545a47c08a8d 100644
--- a/include/class_passwordRecovery.inc
+++ b/include/class_passwordRecovery.inc
@@ -45,7 +45,7 @@ class passwordRecovery extends standAlonePage
protected $usealternates;
- function init()
+ function init ()
{
parent::init();
@@ -68,7 +68,7 @@ class passwordRecovery extends standAlonePage
}
}
- function save_object()
+ function save_object ()
{
if (!$this->activated) {
return;
@@ -100,7 +100,7 @@ class passwordRecovery extends standAlonePage
}
}
- function execute()
+ function execute ()
{
$this->save_object();
@@ -132,7 +132,7 @@ class passwordRecovery extends standAlonePage
/* Check that password recovery is activated, read config in ldap
* Returns a boolean saying if password recovery is activated
*/
- function readLdapConfig()
+ function readLdapConfig ()
{
global $config;
$this->salt = $config->get_cfg_value('passwordRecoverySalt');
@@ -153,7 +153,7 @@ class passwordRecovery extends standAlonePage
return ($config->get_cfg_value('passwordRecoveryActivated') == "TRUE");
}
- function storeToken($temp_password)
+ function storeToken ($temp_password)
{
global $config;
/* Store it in ldap with the salt */
@@ -167,7 +167,7 @@ class passwordRecovery extends standAlonePage
$ldap->cat($token, array('dn'));
if (!$ldap->count()) {
/* It's not, let's create it */
- $ldap->cd ($config->current['BASE']);
+ $ldap->cd($config->current['BASE']);
$ldap->create_missing_trees($token);
if (!$ldap->success()) {
return msgPool::ldaperror($ldap->get_error(),
@@ -202,7 +202,7 @@ class passwordRecovery extends standAlonePage
return '';
}
- function checkToken($token)
+ function checkToken ($token)
{
global $config;
$salt_token = $this->salt.$token.$this->salt;
@@ -224,7 +224,7 @@ class passwordRecovery extends standAlonePage
($ldap_token == $sha1_token);
}
- function getUserDn()
+ function getUserDn ()
{
global $config;
/* Retrieve dn from the ldap */
@@ -255,7 +255,7 @@ class passwordRecovery extends standAlonePage
}
/* Find the login of for the given email address */
- function step2()
+ function step2 ()
{
global $config;
@@ -307,7 +307,7 @@ class passwordRecovery extends standAlonePage
return $attrs['dn'];
}
- function generateAndStoreToken()
+ function generateAndStoreToken ()
{
$activatecode = static::generateRandomHash();
@@ -322,7 +322,7 @@ class passwordRecovery extends standAlonePage
}
/* generate a token and send it by email */
- function step3()
+ function step3 ()
{
/* Send a mail, save information in session and create a very random unique id */
$token = $this->generateAndStoreToken();
@@ -352,7 +352,7 @@ class passwordRecovery extends standAlonePage
}
/* check if the given token is the good one */
- function step4()
+ function step4 ()
{
$uniq_id_from_mail = validate($_GET['uniq']);
@@ -375,7 +375,7 @@ class passwordRecovery extends standAlonePage
}
}
- function changeUserPassword($new_password, $new_password_repeated)
+ function changeUserPassword ($new_password, $new_password_repeated)
{
$dn = $this->getUserDn();
if (!$dn) {
@@ -406,7 +406,7 @@ class passwordRecovery extends standAlonePage
}
/* change the password and send confirmation email */
- function step5()
+ function step5 ()
{
$success = $this->changeUserPassword($_POST['new_password'], $_POST['new_password_repeated']);
if (!$success) {
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index a8514afe8a68a2c4dc34887bf68ca7210866e5a3..aaeec46bf05e12ff23831a7a0f0fdb352751b492 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -61,7 +61,7 @@ class pluglist {
/*!
* \brief List the plugins
*/
- function __construct()
+ function __construct ()
{
global $class_mapping;
@@ -237,7 +237,7 @@ class pluglist {
*
* \return Boolean TRUE on success FALSE otherwise
*/
- function check_access($infos)
+ function check_access ($infos)
{
global $ui;
@@ -301,7 +301,7 @@ class pluglist {
/*!
* \brief Get headline, description and icon of a plugin
*/
- function get_infos($cname)
+ function get_infos ($cname)
{
$plHeadline = FALSE;
$plIcon = FALSE;
@@ -345,7 +345,7 @@ class pluglist {
/*!
* \brief Generate menu
*/
- function gen_menu()
+ function gen_menu ()
{
global $config;
if ($this->menu == "") {
@@ -408,7 +408,7 @@ class pluglist {
/*!
* \brief Show the menu icon
*/
- function show_iconmenu()
+ function show_iconmenu ()
{
global $class_mapping, $config;
if ($this->iconmenu == "") {
@@ -465,7 +465,7 @@ class pluglist {
*
* \param string $index The index which we want the path
*/
- function get_path($index)
+ function get_path ($index)
{
if (!isset($this->dirlist[$index])) {
return "";
@@ -478,7 +478,7 @@ class pluglist {
*
* \param string $class The name of the class
*/
- function get_index($class)
+ function get_index ($class)
{
/* Search for plugin index (id), identify entry by class */
if (isset($this->info[$class])) {
@@ -496,12 +496,12 @@ class pluglist {
*
* \return Boolean TRUE if we are allowed to view the plugin else FALSE
*/
- function plugin_access_allowed($plug_id)
+ function plugin_access_allowed ($plug_id)
{
return isset($this->allowed_plugins[$plug_id]);
}
- static function pluginInfos($cname)
+ static function pluginInfos ($cname)
{
$plist = session::global_get('plist');
if ($plist) {
@@ -517,7 +517,7 @@ class pluglist {
/*!
* \brief Loads plist and load it in config object
*/
- static function load($ldap_available = TRUE)
+ static function load ($ldap_available = TRUE)
{
global $config, $plist;
if (!session::global_is_set('plist')) {
@@ -538,7 +538,7 @@ class pluglist {
return $plist;
}
- static function runMainInc($index, $forceCleanup = FALSE)
+ static function runMainInc ($index, $forceCleanup = FALSE)
{
global $BASE_DIR, $config, $plist, $ui, $smarty, $display, $remove_lock, $cleanup, $plug;
diff --git a/include/class_session.inc b/include/class_session.inc
index 28f052c1266396e01a4acb059d2f212b6fba8190..f18d6d99595a4ff88124d85288772dc7b6836f22 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -33,7 +33,7 @@ class session {
*
* \param string $name The name of the session
*/
- public static function is_set($name)
+ public static function is_set ($name)
{
$channel = "";
if (isset($_POST['_channel_'])) {
@@ -60,7 +60,7 @@ class session {
*
* \param string $name Name of the session
*/
- public static function global_is_set($name)
+ public static function global_is_set ($name)
{
return isset($_SESSION[$name]);
}
@@ -72,7 +72,7 @@ class session {
*
* \param $value The new value
*/
- public static function set($name, $value)
+ public static function set ($name, $value)
{
$channel = "";
if (isset($_POST['_channel_'])) {
@@ -99,7 +99,7 @@ class session {
*
* \param $value The new value
*/
- public static function global_set($name, $value)
+ public static function global_set ($name, $value)
{
$_SESSION[$name] = $value;
}
@@ -109,7 +109,7 @@ class session {
*
* \param string $name Name of the session
*/
- public static function &get($name)
+ public static function &get ($name)
{
$channel = "";
if (isset($_POST['_channel_'])) {
@@ -135,7 +135,7 @@ class session {
*
* \param string $name Name of the session var
*/
- public static function global_get($name)
+ public static function global_get ($name)
{
if (isset($_SESSION[$name])) {
return $_SESSION[$name];
@@ -149,7 +149,7 @@ class session {
*
* \param string $name Name of the session var
*/
- public static function &global_get_ref($name)
+ public static function &global_get_ref ($name)
{
return $_SESSION[$name];
}
@@ -159,7 +159,7 @@ class session {
*
* \param string $name Name of the session to delete
*/
- public static function delete($name)
+ public static function delete ($name)
{
$channel = "";
if (isset($_POST['_channel_'])) {
@@ -183,7 +183,7 @@ class session {
*
* \param string $name Name of the session to delete
*/
- public static function global_delete($name)
+ public static function global_delete ($name)
{
if (isset($_SESSION[$name])) {
unset($_SESSION[$name]);
@@ -195,7 +195,7 @@ class session {
*
* \param string $name Name of the session to delete
*/
- public static function un_set($name)
+ public static function un_set ($name)
{
return session::delete($name);
}
@@ -205,7 +205,7 @@ class session {
*
* \param string $name Name of the session to delete
*/
- public static function global_un_set($name)
+ public static function global_un_set ($name)
{
return session::global_delete($name);
}
@@ -213,7 +213,7 @@ class session {
/*!
* \brief Start a session
*/
- public static function start($id = NULL)
+ public static function start ($id = NULL)
{
session_name("FusionDirectory");
/* Set cookie lifetime to one day (The parameter is in seconds ) */
@@ -252,7 +252,7 @@ class session {
/*!
* \brief Destroy a session
*/
- public static function destroy()
+ public static function destroy ()
{
@session_destroy();
}
diff --git a/include/class_standAlonePage.inc b/include/class_standAlonePage.inc
index 1ee6558bb2e5bec9736e9b8adf3f56f6d80608cc..08277998979083382b39648db541d9cd18e0ab96 100644
--- a/include/class_standAlonePage.inc
+++ b/include/class_standAlonePage.inc
@@ -27,7 +27,7 @@ class standAlonePage {
protected $interactive;
/* Constructor */
- function __construct($interactive = TRUE)
+ function __construct ($interactive = TRUE)
{
global $config, $ssl, $ui;
@@ -53,7 +53,7 @@ class standAlonePage {
static::init();
}
- function checkDirectoryChooser()
+ function checkDirectoryChooser ()
{
global $config;
@@ -79,7 +79,7 @@ class standAlonePage {
}
}
- function init()
+ function init ()
{
global $config, $ssl, $ui;
@@ -108,7 +108,7 @@ class standAlonePage {
pluglist::load();
}
- function loadConfig()
+ function loadConfig ()
{
global $BASE_DIR;
@@ -127,7 +127,7 @@ class standAlonePage {
return $config;
}
- function setupSmarty()
+ function setupSmarty ()
{
global $config;
$smarty = get_smarty();
@@ -170,7 +170,7 @@ class standAlonePage {
}
}
- function assignSmartyVars()
+ function assignSmartyVars ()
{
global $error_collector, $error_collector_mailto;
$smarty = get_smarty();
@@ -185,7 +185,7 @@ class standAlonePage {
$smarty->assign('msg_dialogs', msg_dialog::get_dialogs());
}
- function checkForSSL()
+ function checkForSSL ()
{
global $config;
$smarty = get_smarty();
@@ -202,14 +202,14 @@ class standAlonePage {
exit;
} elseif ($config->get_cfg_value('warnssl') == 'TRUE') {
/* Display SSL mode warning? */
- $smarty->assign ('ssl', sprintf(_('Warning: <a href="%s">Session is not encrypted!</a>'), $ssl));
+ $smarty->assign('ssl', sprintf(_('Warning: <a href="%s">Session is not encrypted!</a>'), $ssl));
}
}
return $ssl;
}
- function getPageURL()
+ function getPageURL ()
{
$protocol = 'http';
if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) {
@@ -243,7 +243,7 @@ class standAlonePage {
return $pageURL;
}
- function encodeParams($keys)
+ function encodeParams ($keys)
{
$params = '';
foreach ($keys as $key) {
@@ -252,7 +252,7 @@ class standAlonePage {
return preg_replace('/^&/', '?', $params);
}
- static function run()
+ static function run ()
{
session::start();
@@ -268,14 +268,14 @@ class standAlonePage {
$page->execute();
}
- static function securityHeaders()
+ static function securityHeaders ()
{
header('X-XSS-Protection: 1; mode=block');
header('X-Content-Type-Options: nosniff');
header('X-Frame-Options: deny');
}
- static function generateRandomHash()
+ static function generateRandomHash ()
{
/* Generate a very long random value */
$len = 56;
diff --git a/include/class_template.inc b/include/class_template.inc
index bc1ef52c152ef8740501bf7d7430815a38211166..40085fd3b5d1c6b1d131a84acd82eb9c6c4a469a 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -51,7 +51,7 @@ class template
);
}
- static function getTemplatedTypes()
+ static function getTemplatedTypes ()
{
$result = array();
$types = objects::types();
@@ -68,7 +68,7 @@ class template
return $result;
}
- function __construct($type, $dn, $targetdn = NULL)
+ function __construct ($type, $dn, $targetdn = NULL)
{
$this->type = $type;
$this->dn = $dn;
@@ -105,7 +105,7 @@ class template
}
/*! \brief Used when you need to re-apply the same template with different values */
- function reset()
+ function reset ()
{
list($this->attrs, $depends) = templateHandling::fetch($this->dn);
// This is needed because it removes %askme% values from attrs
@@ -122,12 +122,12 @@ class template
$this->applied = FALSE;
}
- function getDn()
+ function getDn ()
{
return $this->dn;
}
- function getBase()
+ function getBase ()
{
if (is_object($this->tabObject)) {
return $this->tabObject->getBaseObject()->base;
@@ -137,12 +137,12 @@ class template
}
}
- function getNeeded()
+ function getNeeded ()
{
return $this->attributes;
}
- function alterAttributes($mandatories, $readonly, $hidden)
+ function alterAttributes ($mandatories, $readonly, $hidden)
{
foreach ($mandatories as $class => $attrs) {
foreach ($attrs as $attr) {
@@ -171,12 +171,12 @@ class template
}
}
- function getAttribute($tab, $attr)
+ function getAttribute ($tab, $attr)
{
return $this->tabObject->by_object[$tab]->attributesAccess[$attr];
}
- function getAttributeTab($attr)
+ function getAttributeTab ($attr)
{
foreach ($this->tabObject->by_object as $tab => $tabObject) {
if (isset($tabObject->attributesAccess[$attr])) {
@@ -187,7 +187,7 @@ class template
/*! \brief Serialize this template for webservice
*/
- function serialize()
+ function serialize ()
{
$ret = array();
foreach ($this->tabObject->by_object as $class => $plugin) {
@@ -206,7 +206,7 @@ class template
/*! \brief Deserialize values into the template
*/
- function deserialize($values)
+ function deserialize ($values)
{
foreach ($values as $class => $class_values) {
$result = $this->tabObject->by_object[$class]->deserializeValues($class_values);
@@ -221,7 +221,7 @@ class template
*
* this produces a format that you can send to setValues later (after a reset for instance)
*/
- function getValues()
+ function getValues ()
{
$ret = array();
foreach ($this->tabObject->by_object as $class => $plugin) {
@@ -236,7 +236,7 @@ class template
/*! \brief Set values
*/
- function setValues($values, $ldapFormat = FALSE)
+ function setValues ($values, $ldapFormat = FALSE)
{
foreach ($values as $class => $class_values) {
foreach ($class_values as $name => $value) {
@@ -248,7 +248,7 @@ class template
}
}
- function save_object()
+ function save_object ()
{
foreach ($this->tabObject->by_object as $plugin) {
$plugin->save_object();
@@ -260,7 +260,7 @@ class template
return $this->tabObject->dialogOpened();
}
- function execute()
+ function execute ()
{
$smarty = get_smarty();
$sections = array();
@@ -307,7 +307,7 @@ class template
/* Apply template and current values to an object and returns it for saving or edition
* Cannot be called twice! If you need to, call reset between calls */
- function apply($targetdn = NULL)
+ function apply ($targetdn = NULL)
{
if ($this->applied) {
trigger_error('Templates can’t be applied twice without calling reset before');
diff --git a/include/class_templateHandling.inc b/include/class_templateHandling.inc
index 5a21817cdef04fce90f9b9816cd3522b9a27d552..127767c7f51cbe1a6d390c7b1868d2994b408cc8 100644
--- a/include/class_templateHandling.inc
+++ b/include/class_templateHandling.inc
@@ -28,7 +28,7 @@
class templateHandling
{
/*! \brief Fetch a template from LDAP and returns its attributes and dependencies information */
- public static function fetch($dn)
+ public static function fetch ($dn)
{
global $config;
@@ -118,7 +118,7 @@ class templateHandling
}
/*! \brief Parse a mask (without surrounding %) using $attrs attributes, apply modifiers and returns an array containing possible results */
- public static function parseMask($mask, array $attrs)
+ public static function parseMask ($mask, array $attrs)
{
if ($mask == '|') {
return array('%');
@@ -157,7 +157,7 @@ class templateHandling
*
* \return array An array of attributes which are needed by the template
*/
- public static function neededAttrs(array &$attrs, array $flatdepends)
+ public static function neededAttrs (array &$attrs, array $flatdepends)
{
$needed = array();
foreach ($flatdepends as $attr => $depends) {
@@ -184,7 +184,7 @@ class templateHandling
*
* \return array An array with the final values of attributes
*/
- public static function parseArray(array $attrs, array $specialAttrs, $target = NULL)
+ public static function parseArray (array $attrs, array $specialAttrs, $target = NULL)
{
foreach ($attrs as $name => &$attr) {
if (is_array($attr)) {
@@ -211,7 +211,7 @@ class templateHandling
*
* \return string the string with patterns replaced by their values
*/
- public static function parseString($string, array $attrs, $escapeMethod = NULL, $unique = NULL, $target = NULL)
+ public static function parseString ($string, array $attrs, $escapeMethod = NULL, $unique = NULL, $target = NULL)
{
global $config;
@@ -258,7 +258,7 @@ class templateHandling
* \param array $variables The possible values for each mask with its position and length
* \param callable $escapeMethod Method to call to escape mask result
*/
- protected static function iteratePossibleValues($rule, array $variables, $escapeMethod = NULL)
+ protected static function iteratePossibleValues ($rule, array $variables, $escapeMethod = NULL)
{
if (!count($variables)) {
yield $rule;
@@ -284,7 +284,7 @@ class templateHandling
*
* \return array An array with the names of the fields used in the string pattern
*/
- public static function listFields($string)
+ public static function listFields ($string)
{
$fields = array();
$offset = 0;
@@ -302,7 +302,7 @@ class templateHandling
return $fields;
}
- private static function modifierRemoveAccents($str)
+ private static function modifierRemoveAccents ($str)
{
$str = htmlentities($str, ENT_NOQUOTES, 'UTF-8');
@@ -313,7 +313,7 @@ class templateHandling
return array(preg_replace('#&[^;]+;#', '', $str));
}
- private static function modifierTranslit(array $args, $str)
+ private static function modifierTranslit (array $args, $str)
{
$localesaved = setlocale(LC_CTYPE, 0);
$ret = array();
@@ -325,7 +325,7 @@ class templateHandling
return array_unique($ret);
}
- private static function modifierPregReplace(array $args, $str)
+ private static function modifierPregReplace (array $args, $str)
{
$pattern = '/\s/';
$replace = '';
@@ -339,7 +339,7 @@ class templateHandling
return array(preg_replace($pattern.'u', $replace, $str));
}
- private static function modifierSubString(array $args, $str)
+ private static function modifierSubString (array $args, $str)
{
if (count($args) < 1) {
trigger_error("Missing 's' substr modifier parameter");
@@ -358,7 +358,7 @@ class templateHandling
}
}
- private static function modifierRandomString(array $args)
+ private static function modifierRandomString (array $args)
{
$length = 8;
$chars = 'b';
@@ -408,7 +408,7 @@ class templateHandling
return $res;
}
- private static function modifierDate(array $args)
+ private static function modifierDate (array $args)
{
if (count($args) < 1) {
$args[] = 'now';
@@ -424,7 +424,7 @@ class templateHandling
return array($dateObject->format($args[1]));
}
- private static function modifierNumber(array $args)
+ private static function modifierNumber (array $args)
{
if (count($args) < 1) {
$args[] = FALSE;
@@ -457,7 +457,7 @@ class templateHandling
*
* \return array an array of possible values
* */
- protected static function applyModifier($m, array $args, $str)
+ protected static function applyModifier ($m, array $args, $str)
{
mb_internal_encoding('UTF-8');
mb_regex_encoding('UTF-8');
@@ -588,7 +588,7 @@ class templateHandling
);
return array();
}
- $deps = static::flatDepends ($cache, $errors, $depends, $a, $forbidden);
+ $deps = static::flatDepends($cache, $errors, $depends, $a, $forbidden);
if (($askmeKey = array_search('askme', $deps)) !== FALSE) {
/* Do not flat special askme dependency */
unset($deps[$askmeKey]);
@@ -603,7 +603,7 @@ class templateHandling
}
/*! \brief Computes dependencies between attributes: which attributes must be filled in order to compute each attribute value */
- protected static function attributesDependencies(array $attrs)
+ protected static function attributesDependencies (array $attrs)
{
/* Compute dependencies of each attr */
$depends = array();
@@ -636,7 +636,7 @@ class templateHandling
}
/*! \brief Sort attrs depending of dependencies */
- protected static function sortAttributes(array $attrs, array $flatdepends)
+ protected static function sortAttributes (array $attrs, array $flatdepends)
{
uksort($attrs, function ($k1, $k2) use ($flatdepends) {
if (in_array($k1, $flatdepends[$k2])) {
diff --git a/include/class_tests.inc b/include/class_tests.inc
index 93d90912311a82776abe996c6b657a31aa96bb2c..239a1b9cc66bbf5df0fd2548d042d0a4d806e5ec 100644
--- a/include/class_tests.inc
+++ b/include/class_tests.inc
@@ -45,13 +45,13 @@ class tests
*
* \param string $nr The phone number to check
*/
- public static function is_phone_nr($nr)
+ public static function is_phone_nr ($nr)
{
if ($nr == "") {
return TRUE;
}
- return preg_match ("/^[\/0-9 ()+*-]+$/", $nr);
+ return preg_match("/^[\/0-9 ()+*-]+$/", $nr);
}
@@ -60,7 +60,7 @@ class tests
*
* \param string $str The DNS to check
*/
- public static function is_dns_name($str)
+ public static function is_dns_name ($str)
{
return preg_match("/^[a-z0-9\.\-_]*$/i", $str);
}
@@ -71,7 +71,7 @@ class tests
*
* \param string $str The hostname to check
*/
- public static function is_valid_hostname($str)
+ public static function is_valid_hostname ($str)
{
return preg_match("/^[a-z0-9\.\-]*$/i", $str);
}
@@ -82,14 +82,14 @@ class tests
*
* \param string $url The URL to check
*/
- public static function is_url($url)
+ public static function is_url ($url)
{
if ($url == "") {
return TRUE;
}
/* Using @stephenhay regexp from http://mathiasbynens.be/demo/url-regex (removed ftp through) */
- return preg_match ("@^(https?)://[^\s/$.?#].[^\s]*$@i", $url);
+ return preg_match("@^(https?)://[^\s/$.?#].[^\s]*$@i", $url);
}
@@ -98,13 +98,13 @@ class tests
*
* \param string $dn The DN to check
*/
- public static function is_dn($dn)
+ public static function is_dn ($dn)
{
if ($dn == "") {
return TRUE;
}
- return preg_match ("/^[a-z0-9 _-]+$/i", $dn);
+ return preg_match("/^[a-z0-9 _-]+$/i", $dn);
}
@@ -113,7 +113,7 @@ class tests
*
* \param string $uid The UID to check
*/
- public static function is_uid($uid)
+ public static function is_uid ($uid)
{
if ($uid == "") {
return TRUE;
@@ -122,9 +122,9 @@ class tests
/* STRICT adds spaces and case insenstivity to the uid check.
This is dangerous and should not be used. */
if (strict_uid_mode()) {
- return preg_match ("/^[a-z0-9_-]+$/", $uid);
+ return preg_match("/^[a-z0-9_-]+$/", $uid);
} else {
- return preg_match ("/^[a-z0-9 _.-]+$/i", $uid);
+ return preg_match("/^[a-z0-9 _.-]+$/i", $uid);
}
}
@@ -133,7 +133,7 @@ class tests
*
* \param string $ip The IP to check
*/
- public static function is_ip($ip)
+ public static function is_ip ($ip)
{
return filter_var($ip, FILTER_VALIDATE_IP);
}
@@ -143,7 +143,7 @@ class tests
*
* \param string $ip The IPv4 to check
*/
- public static function is_ipv4($ip)
+ public static function is_ipv4 ($ip)
{
return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
}
@@ -153,7 +153,7 @@ class tests
*
* \param string $ip The IPv6 to check
*/
- public static function is_ipv6($ip)
+ public static function is_ipv6 ($ip)
{
return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
}
@@ -164,7 +164,7 @@ class tests
*
* \param string $mac The MAC address to check
*/
- public static function is_mac($mac)
+ public static function is_mac ($mac)
{
return preg_match('/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/', $mac);
}
@@ -176,7 +176,7 @@ class tests
*
* \param string $ip The IP to check
*/
- public static function is_ip_with_subnetmask($ip)
+ public static function is_ip_with_subnetmask ($ip)
{
/* Generate list of valid submasks */
$res = array();
@@ -222,7 +222,7 @@ class tests
*
* \param string $str The domain to check
*/
- public static function is_domain($str)
+ public static function is_domain ($str)
{
return preg_match("/^(([a-z0-9\-]{2,63})\.)*[a-z]{2,63}$/i", $str);
}
@@ -233,13 +233,13 @@ class tests
*
* \param string $id The id to check
*/
- public static function is_id($id)
+ public static function is_id ($id)
{
if ($id == "") {
return FALSE;
}
- return preg_match ("/^[0-9]+$/", $id);
+ return preg_match("/^[0-9]+$/", $id);
}
@@ -248,7 +248,7 @@ class tests
*
* \param string $path The path to check
*/
- public static function is_path($path)
+ public static function is_path ($path)
{
if ($path == "") {
return TRUE;
@@ -257,7 +257,7 @@ class tests
return FALSE;
}
- return preg_match ("/\/.+$/", $path);
+ return preg_match("/\/.+$/", $path);
}
@@ -266,7 +266,7 @@ class tests
*
* \param string $address The email address
*/
- public static function is_email($address)
+ public static function is_email ($address)
{
/* last test is to allow addresses like example@localhost, which are refused by some PHP version */
return (($address == '')
@@ -282,7 +282,7 @@ class tests
*
* \param string $base
*/
- public static function is_department_name_reserved($name)
+ public static function is_department_name_reserved ($name)
{
global $config;
$reservedNames = array();
@@ -305,7 +305,7 @@ class tests
*
* \return TRUE in case of a valid range, FALSE in case of an error.
*/
- public static function is_ip_range($ip1, $ip2)
+ public static function is_ip_range ($ip1, $ip2)
{
if (!tests::is_ipv4($ip1) || !tests::is_ipv4($ip2)) {
return FALSE;
@@ -329,7 +329,7 @@ class tests
*
* \param string $address The IP address
*/
- public static function is_in_network($network, $netmask, $address)
+ public static function is_in_network ($network, $netmask, $address)
{
$nw = explode('.', $network);
$nm = explode('.', $netmask);
@@ -350,7 +350,7 @@ class tests
}
/* \brief Check if the specified IP address $address is inside the given network */
- public static function is_in_ip_range($from, $to, $address)
+ public static function is_in_ip_range ($from, $to, $address)
{
$from = explode('.', $from);
$to = explode('.', $to);
@@ -364,5 +364,3 @@ class tests
return ($ad >= $from && $ad <= $to);
}
}
-
-?>
diff --git a/include/class_timezone.inc b/include/class_timezone.inc
index 5a63aa7fd0852c53390d73c1444fd6e4ffc5d1da..3f481bb37664b1c07ce3c55a0bf0b96e1c4c6a9d 100644
--- a/include/class_timezone.inc
+++ b/include/class_timezone.inc
@@ -36,7 +36,7 @@ class timezone
*
* \return TRUE upon success, FALSEÂ otherwise
*/
- static public function setDefaultTimezoneFromConfig()
+ static public function setDefaultTimezoneFromConfig ()
{
global $config;
@@ -63,7 +63,7 @@ class timezone
* deprecated
* \param $stamp is used to detect summer or winter time.
*/
- static public function get_default_timezone($stamp = NULL)
+ static public function get_default_timezone ($stamp = NULL)
{
global $config;
@@ -88,19 +88,19 @@ class timezone
*
* \return Time zone informations
*/
- static public function _get_tz_zones()
+ static public function _get_tz_zones ()
{
return DateTimeZone::listIdentifiers();
}
/* \brief Return default timezone as a DateTimeZone object */
- static public function getDefaultTimeZone()
+ static public function getDefaultTimeZone ()
{
return new DateTimeZone(date_default_timezone_get());
}
/* \brief Return UTC timezone as a DateTimeZone object */
- static public function utc()
+ static public function utc ()
{
static $utc;
if (!isset($utc)) {
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 1a00838fbc3ca0e9a72cc82df6917a124d90cb45..2d1a469d1fc1a5aeacb3efc6122c4916cb90a426 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -57,7 +57,7 @@ class userinfo
/* get acl's an put them into the userinfo object
attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
- function __construct($userdn)
+ function __construct ($userdn)
{
global $config;
$this->dn = $userdn;
@@ -72,7 +72,7 @@ class userinfo
}
/*! \brief Loads user information from LDAP */
- function loadLDAPInfo()
+ function loadLDAPInfo ()
{
global $config;
$ldap = $config->get_ldap_link();
@@ -107,7 +107,7 @@ class userinfo
/*!
* \brief Reset acl cache
*/
- public function reset_acl_cache()
+ public function reset_acl_cache ()
{
/* Initialize ACL_CACHE */
session::global_set('ACL_CACHE', array());
@@ -116,7 +116,7 @@ class userinfo
/*!
* \brief Load an acl
*/
- function loadACL()
+ function loadACL ()
{
global $config;
$this->ACL = array();
@@ -285,7 +285,7 @@ class userinfo
*
* \return Return the next id or NULL if failed
*/
- function get_acl_target_objects()
+ function get_acl_target_objects ()
{
return array_keys($this->ACLperPath);
}
@@ -299,7 +299,7 @@ class userinfo
*
* \return all the permissions for the dn and category
*/
- function get_category_permissions($dn, $category)
+ function get_category_permissions ($dn, $category)
{
return @$this->get_permissions($dn, $category.'/0', '');
}
@@ -314,7 +314,7 @@ class userinfo
*
* \return boolean TRUE if the given object is copyable else FALSE
*/
- function is_copyable($dn, $object)
+ function is_copyable ($dn, $object)
{
return (strpos($this->get_complete_category_acls($dn, $object), 'r') !== FALSE);
}
@@ -331,7 +331,7 @@ class userinfo
*
* \return boolean TRUE if the given object is cutable else FALSE
*/
- function is_cutable($dn, $object, $class)
+ function is_cutable ($dn, $object, $class)
{
$remove = (strpos($this->get_permissions($dn, $object.'/'.$class), 'd') !== FALSE);
$read = (strpos($this->get_complete_category_acls($dn, $object), 'r') !== FALSE);
@@ -348,7 +348,7 @@ class userinfo
*
* \return Boolean TRUE if we are allowed to paste an object.
*/
- function is_pasteable($dn, $object)
+ function is_pasteable ($dn, $object)
{
return (strpos($this->get_complete_category_acls($dn, $object), 'w') !== FALSE);
}
@@ -365,7 +365,7 @@ class userinfo
*
* \return boolean TRUE if we are allowed to restore a snapshot.
*/
- function allow_snapshot_restore($dn, $categories, $deleted)
+ function allow_snapshot_restore ($dn, $categories, $deleted)
{
$permissions = $this->get_snapshot_permissions($dn, $categories);
return in_array(($deleted ? 'restore_deleted' : 'restore_over'), $permissions);
@@ -381,7 +381,7 @@ class userinfo
*
* \return boolean TRUE if we are allowed to create a snapshot.
*/
- function allow_snapshot_create($dn, $categories)
+ function allow_snapshot_create ($dn, $categories)
{
$permissions = $this->get_snapshot_permissions($dn, $categories);
return in_array('c', $permissions);
@@ -397,13 +397,13 @@ class userinfo
*
* \return boolean TRUE if we are allowed to delete a snapshot.
*/
- function allow_snapshot_delete($dn, $categories)
+ function allow_snapshot_delete ($dn, $categories)
{
$permissions = $this->get_snapshot_permissions($dn, $categories);
return in_array('d', $permissions);
}
- function get_snapshot_permissions($dn, $categories)
+ function get_snapshot_permissions ($dn, $categories)
{
if (!is_array($categories)) {
$categories = array($categories);
@@ -440,7 +440,7 @@ class userinfo
* \param bool $skip_write Remove the write acl for this dn
*
*/
- function get_permissions($dn, $object, $attribute = "", $skip_write = FALSE)
+ function get_permissions ($dn, $object, $attribute = "", $skip_write = FALSE)
{
global $config;
/* If we are forced to skip ACLs checks for the current user
@@ -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
@@ -736,7 +736,7 @@ class userinfo
*
* \param $newACL The new ACL
*/
- function mergeACL($acl, $type, $newACL)
+ function mergeACL ($acl, $type, $newACL)
{
$at = array("subtree" => "s", "one" => "1");
@@ -777,7 +777,7 @@ class userinfo
*
* \param boolean $reset FALSE
*/
- function cleanACL($acl, $reset = FALSE)
+ function cleanACL ($acl, $reset = FALSE)
{
foreach ($acl as $key => $value) {
/* Continue, if value is empty or subtree */
@@ -820,7 +820,7 @@ class userinfo
*
* \return string return acl combined with boolean AND
*/
- function get_complete_category_acls($dn, $category)
+ function get_complete_category_acls ($dn, $category)
{
global $config;
@@ -861,7 +861,7 @@ class userinfo
* \return Returns TRUE if the current user is configured in IGNORE_ACL=".."
* in your fusiondirectory.conf FALSE otherwise
*/
- function ignore_acl_for_current_user()
+ function ignore_acl_for_current_user ()
{
return $this->ignoreACL;
}
@@ -978,7 +978,7 @@ class userinfo
/* \brief Check if a user is a 'user admin'
*/
- function is_user_admin()
+ function is_user_admin ()
{
global $config;
if (empty($this->ACLperPath)) {
@@ -989,7 +989,7 @@ class userinfo
/* \brief Test if a plugin is blacklisted for this user (does not show up in the menu)
*/
- function isBlacklisted($plugin)
+ function isBlacklisted ($plugin)
{
global $config;
$blacklist = $config->get_cfg_value('PluginsMenuBlacklist', array());
@@ -1007,7 +1007,7 @@ class userinfo
*
* \return The ACLÂ category, or FALSE if not found, or TRUE if acl check should be bypassed
*/
- function getAttributeCategory($type, $attribute)
+ function getAttributeCategory ($type, $attribute)
{
global $config;
@@ -1040,21 +1040,21 @@ class userinfo
return FALSE;
}
- function getSizeLimitHandler()
+ function getSizeLimitHandler ()
{
return $this->sizeLimitHandler;
}
/* \brief Returns the base this user is stored in
*/
- function getBase()
+ function getBase ()
{
return get_base_from_people($this->dn);
}
/* \brief Returns the current base the user went to in management classes
*/
- function getCurrentBase()
+ function getCurrentBase ()
{
if (!empty($this->currentBase)) {
return $this->currentBase;
@@ -1065,14 +1065,14 @@ class userinfo
/* \brief Sets the current base the user went to in management classes
*/
- function setCurrentBase($base)
+ function setCurrentBase ($base)
{
$this->currentBase = $base;
}
/* \brief Get ACL name or HTML id from attribute name
*/
- public static function sanitizeAttributeName($name)
+ public static function sanitizeAttributeName ($name)
{
return preg_replace('/[\/\-,.#:;]/', '_', $name);
}
diff --git a/include/class_userinfoNoAuth.inc b/include/class_userinfoNoAuth.inc
index 8a5a692246bed46f5ea01763c0e7032d6391b9e2..d93747df75ce121dbb0b8c707bdef4813d187908 100644
--- a/include/class_userinfoNoAuth.inc
+++ b/include/class_userinfoNoAuth.inc
@@ -29,7 +29,7 @@
*/
class userinfoNoAuth extends userinfo
{
- function __construct($context = 'fake')
+ function __construct ($context = 'fake')
{
parent::__construct($context);
@@ -37,13 +37,13 @@ class userinfoNoAuth extends userinfo
$this->ignoreACL = TRUE;
}
- function loadLDAPInfo()
+ function loadLDAPInfo ()
{
$this->cn = $this->dn;
$this->uid = $this->dn;
}
- function getBase()
+ function getBase ()
{
global $config;
diff --git a/include/class_xml.inc b/include/class_xml.inc
index 1efd43cc8ac7f22ed8178e5693d6f19f6251209c..3dcb117c1e1f2b025e1e7b39deeda1451514894c 100644
--- a/include/class_xml.inc
+++ b/include/class_xml.inc
@@ -38,7 +38,7 @@ class xml {
*
* \param string $priority Initialized at 'tag'
*/
- static function xml2array($contents, $get_attributes = 1, $priority = 'tag')
+ static function xml2array ($contents, $get_attributes = 1, $priority = 'tag')
{
if (!$contents) {
return array();
diff --git a/include/exporter/class_PDF.php b/include/exporter/class_PDF.php
index 02137e40e5d3b8a5e67887c6c6d034d7aadd6585..9b85ed242d338a788f57beb84bbe791b88ffdcde 100644
--- a/include/exporter/class_PDF.php
+++ b/include/exporter/class_PDF.php
@@ -36,7 +36,7 @@ class PDF extends FPDF
*
* \param string $headline
*/
- function setHeadline($headline)
+ function setHeadline ($headline)
{
$this->headline = $headline;
}
@@ -44,7 +44,7 @@ class PDF extends FPDF
/*!
* \brief Set font and cell for the header page
*/
- function Header()
+ function Header ()
{
$this->SetFont('Helvetica', 'B', 10);
$this->Cell(0, 0, $this->headline, 0, 0, 'L');
@@ -54,7 +54,7 @@ class PDF extends FPDF
/*!
* \brief Set position from the bottom and the number of the page
*/
- function Footer()
+ function Footer ()
{
$this->SetY(-15);
$this->SetFont('Helvetica', 'I', 8);
diff --git a/include/exporter/class_csvExporter.inc b/include/exporter/class_csvExporter.inc
index 948b719d6c50ef8d5fb0af660f8ecda507c62f77..f4a6a1191e39b67ad884c906c1a456d24442f7e9 100644
--- a/include/exporter/class_csvExporter.inc
+++ b/include/exporter/class_csvExporter.inc
@@ -42,7 +42,7 @@ class csvExporter
*
* \param array $columns
*/
- function __construct($headline, $header, $entries, $columns = array())
+ function __construct ($headline, $header, $entries, $columns = array())
{
// If no preset, render all columns
if (!count($columns)) {
@@ -78,12 +78,12 @@ class csvExporter
/*!
* \brief Get the result
*/
- function query()
+ function query ()
{
return $this->result;
}
- static function export(managementListing $listing)
+ static function export (managementListing $listing)
{
$columns = $listing->getColumns();
$iterator = $listing->getIterator();
@@ -113,7 +113,7 @@ class csvExporter
/*!
* \brief Get Informations
*/
- static function getInfo()
+ static function getInfo ()
{
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 c8eb8dc74975638868d3e2a57a9075badb2c19ff..a4f41878202338c478f5736b852416c5396696ae 100644
--- a/include/exporter/class_pdfExporter.inc
+++ b/include/exporter/class_pdfExporter.inc
@@ -51,7 +51,7 @@ class pdfExporter
*
* \param array $columns
*/
- function __construct($headline, $header, $entries, $columns = array())
+ function __construct ($headline, $header, $entries, $columns = array())
{
// Bail out if no FPDF available
if (!class_exists('FPDF')) {
@@ -139,7 +139,7 @@ class pdfExporter
*
* \param array $columns
*/
- function calcWidth($header, $entries, $columns)
+ function calcWidth ($header, $entries, $columns)
{
$width = array();
@@ -180,7 +180,7 @@ class pdfExporter
/*!
* \brief Calculate the width page
*/
- static function calcColumnsWidth($result, $columns, $iterator)
+ static function calcColumnsWidth ($result, $columns, $iterator)
{
$width = array();
@@ -220,12 +220,12 @@ class pdfExporter
/*!
* \brief Get the result
*/
- function query()
+ function query ()
{
return $this->result->Output("", "S");
}
- static function export(managementListing $listing)
+ static function export (managementListing $listing)
{
global $ui;
@@ -300,7 +300,7 @@ class pdfExporter
/*!
* \brief Get informations
*/
- static function getInfo()
+ static function getInfo ()
{
// Check if class defined
$classes = get_declared_classes();
diff --git a/include/functions.inc b/include/functions.inc
index 757762ae60e8c03d872d3072eaa5168c756d4c67..061fb70336e0481637a79293f32196ce6ae64344 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -33,23 +33,23 @@ require_once ('functions_debug.inc');
require_once ('accept-to-gettext.inc');
/* Define constants for debugging */
-define ('DEBUG_TRACE', 1); /*! Debug level for tracing of common actions (save, check, etc.) */
-define ('DEBUG_LDAP', 2); /*! Debug level for LDAP queries */
-define ('DEBUG_DB', 4); /*! Debug level for database operations */
-define ('DEBUG_SHELL', 8); /*! Debug level for shell commands */
-define ('DEBUG_POST', 16); /*! Debug level for POST content */
-define ('DEBUG_SESSION', 32); /*! Debug level for SESSION content */
-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_TRACE', 1); /*! Debug level for tracing of common actions (save, check, etc.) */
+define('DEBUG_LDAP', 2); /*! Debug level for LDAP queries */
+define('DEBUG_DB', 4); /*! Debug level for database operations */
+define('DEBUG_SHELL', 8); /*! Debug level for shell commands */
+define('DEBUG_POST', 16); /*! Debug level for POST content */
+define('DEBUG_SESSION', 32); /*! Debug level for SESSION content */
+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 shadow states */
-define ('POSIX_ACCOUNT_EXPIRED', 1);
-define ('POSIX_WARN_ABOUT_EXPIRATION', 2);
-define ('POSIX_FORCE_PASSWORD_CHANGE', 4);
-define ('POSIX_DISALLOW_PASSWORD_CHANGE', 8);
+define('POSIX_ACCOUNT_EXPIRED', 1);
+define('POSIX_WARN_ABOUT_EXPIRATION', 2);
+define('POSIX_FORCE_PASSWORD_CHANGE', 4);
+define('POSIX_DISALLOW_PASSWORD_CHANGE', 8);
/* Rewrite german 'umlauts' and spanish 'accents'
to get better results */
@@ -83,7 +83,7 @@ $REWRITE = array( "ä" => "ae",
* \param array $class_name list of class name
*/
-function __fusiondirectory_autoload($class_name)
+function __fusiondirectory_autoload ($class_name)
{
global $class_mapping, $BASE_DIR, $config;
@@ -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();
@@ -127,7 +127,7 @@ spl_autoload_register('__fusiondirectory_autoload');
*
* \return boolean Return TRUE if successfull FALSE otherwise
*/
-function class_available($name)
+function class_available ($name)
{
global $class_mapping;
return isset($class_mapping[$name]);
@@ -143,7 +143,7 @@ function class_available($name)
*
* \return boolean Return TRUE if successfull FALSE otherwise
*/
-function plugin_available($plugin)
+function plugin_available ($plugin)
{
global $class_mapping, $BASE_DIR;
@@ -176,7 +176,7 @@ function plugin_available($plugin)
*
* \param string $info Optional: Additional information
*/
-function DEBUG($level, $line, $function, $file, $data, $info = '')
+function DEBUG ($level, $line, $function, $file, $data, $info = '')
{
static $first = TRUE;
if (($_SERVER['REQUEST_METHOD'] == 'POST') && preg_match('/index.php$/', $_SERVER['REQUEST_URI'])) {
@@ -228,7 +228,7 @@ function DEBUG($level, $line, $function, $file, $data, $info = '')
*
* \return string Full path to the template file
*/
-function get_template_path($filename = '', $plugin = FALSE, $path = '')
+function get_template_path ($filename = '', $plugin = FALSE, $path = '')
{
global $config, $BASE_DIR;
$default_theme = 'breezy';
@@ -291,7 +291,7 @@ function get_template_path($filename = '', $plugin = FALSE, $path = '')
*
* \param array $haystack original array to remove the entries from
*/
-function array_remove_entries(array $needles, array $haystack)
+function array_remove_entries (array $needles, array $haystack)
{
return array_values(array_diff($haystack, $needles));
}
@@ -307,7 +307,7 @@ function array_remove_entries(array $needles, array $haystack)
*
* \param array $haystack original array to remove the entries from
*/
-function array_remove_entries_ics(array $needles, array $haystack)
+function array_remove_entries_ics (array $needles, array $haystack)
{
// strcasecmp will work, because we only compare ASCII values here
return array_values(array_udiff($haystack, $needles, 'strcasecmp'));
@@ -325,7 +325,7 @@ function array_remove_entries_ics(array $needles, array $haystack)
*
* \return array
*/
-function array_merge_unique(array $ar1, array $ar2)
+function array_merge_unique (array $ar1, array $ar2)
{
return array_values(array_unique(array_merge($ar1, $ar2)));
}
@@ -377,7 +377,7 @@ function ldap_init ($server, $base, $binddn = '', $pass = '')
{
global $config;
- $ldap = new LDAP ($binddn, $pass, $server,
+ $ldap = new LDAP($binddn, $pass, $server,
isset($config->current['LDAPFOLLOWREFERRALS']) && $config->current['LDAPFOLLOWREFERRALS'] == 'TRUE',
isset($config->current['LDAPTLS']) && $config->current['LDAPTLS'] == 'TRUE');
@@ -390,7 +390,7 @@ function ldap_init ($server, $base, $binddn = '', $pass = '')
}
/* Preset connection base to $base and return to caller */
- $ldap->cd ($base);
+ $ldap->cd($base);
return $ldap;
}
@@ -528,7 +528,7 @@ function ldap_login_user ($username, $password)
*
* \param string $user The user who shall own the lock
*/
-function add_lock($object, $user)
+function add_lock ($object, $user)
{
global $config;
@@ -647,7 +647,7 @@ function del_lock ($object)
*
* \param string $userdn the subject whose locks shall be deleted
*/
-function del_user_locks($userdn)
+function del_user_locks ($userdn)
{
global $config;
@@ -673,7 +673,7 @@ function del_user_locks($userdn)
* \return string Returns the dn of the user who owns the lock or '' if no lock is found
* or FALSE if an error occured.
*/
-function get_lock($object)
+function get_lock ($object)
{
/* Sanity check */
if ($object == '') {
@@ -710,7 +710,7 @@ function get_lock($object)
* \return A numbered array containing all found locks as an array with key 'object'
* and key 'user', or FALSE if an error occured.
*/
-function get_locks($objects, $allow_readonly = FALSE)
+function get_locks ($objects, $allow_readonly = FALSE)
{
global $config;
@@ -773,7 +773,7 @@ function get_locks($objects, $allow_readonly = FALSE)
*
* \return return the current userinfo object
*/
-function &get_userinfo()
+function &get_userinfo ()
{
global $ui;
@@ -785,7 +785,7 @@ function &get_userinfo()
*
* \return return the global smarty object
*/
-function &get_smarty()
+function &get_smarty ()
{
global $smarty;
@@ -810,7 +810,7 @@ function &get_smarty()
*
* \return a string in the form as described above
*/
-function convert_department_dn($dn, $base = NULL)
+function convert_department_dn ($dn, $base = NULL)
{
global $config;
@@ -852,7 +852,7 @@ function convert_department_dn($dn, $base = NULL)
* \return the ou associated the the RDN or nothing
*
*/
-function get_ou($name)
+function get_ou ($name)
{
global $config;
@@ -945,7 +945,7 @@ function get_ou($name)
*
* \return the ou of the userRDN
*/
-function get_people_ou()
+function get_people_ou ()
{
return get_ou('userRDN');
}
@@ -961,7 +961,7 @@ function get_people_ou()
*
* \return the base from the dn
*/
-function get_base_from_people($dn)
+function get_base_from_people ($dn)
{
global $config;
@@ -986,7 +986,7 @@ function get_base_from_people($dn)
* \return Returns TRUE if strictNamingRules is set to TRUE or if the
* config object is not available, otherwise FALSE.
*/
-function strict_uid_mode()
+function strict_uid_mode ()
{
global $config;
@@ -1020,7 +1020,7 @@ function strict_uid_mode()
*
*
*/
-function gen_locked_message(array $locks, $dn, $allow_readonly = FALSE)
+function gen_locked_message (array $locks, $dn, $allow_readonly = FALSE)
{
session::set('dn', $dn);
$remove = FALSE;
@@ -1125,7 +1125,7 @@ function to_string ($value)
*
* \return string $s the result of the rewrite
*/
-function rewrite($s)
+function rewrite ($s)
{
global $REWRITE;
@@ -1145,7 +1145,7 @@ function rewrite($s)
*
* \return base of the given DN
*/
-function dn2base($dn, $ou = NULL)
+function dn2base ($dn, $ou = NULL)
{
if ($ou === NULL) {
if (get_people_ou() != '') {
@@ -1158,7 +1158,7 @@ function dn2base($dn, $ou = NULL)
$dn = preg_replace("/,$ou/i", ',', $dn);
}
- return preg_replace ('/^[^,]+,/i', '', $dn);
+ return preg_replace('/^[^,]+,/i', '', $dn);
}
/*!
@@ -1171,7 +1171,7 @@ function dn2base($dn, $ou = NULL)
*
* \return TRUE if command exists and is executable, otherwise FALSE.
*/
-function check_command($cmdline)
+function check_command ($cmdline)
{
$cmd = preg_replace("/ .*$/", '', $cmdline);
@@ -1199,7 +1199,7 @@ function check_command($cmdline)
*
* \return the $display variable
*/
-function print_header($image, $headline, $info = '')
+function print_header ($image, $headline, $info = '')
{
$smarty = get_smarty();
$smarty->assign('headline', $headline);
@@ -1222,7 +1222,7 @@ function print_header($image, $headline, $info = '')
*
* \return string Converted netmask
*/
-function normalize_netmask($netmask)
+function normalize_netmask ($netmask)
{
/* Check for notation of netmask */
if (!preg_match('/^([0-9]+\.){3}[0-9]+$/', $netmask)) {
@@ -1272,7 +1272,7 @@ function normalize_netmask($netmask)
*
* \return the number of bits in the netmask
*/
-function netmask_to_bits($netmask)
+function netmask_to_bits ($netmask)
{
$nm = explode('.', $netmask, 4);
@@ -1304,7 +1304,7 @@ function netmask_to_bits($netmask)
* \return a byte value or the original value if specified string is simply
* a numeric value
*/
-function to_byte($value)
+function to_byte ($value)
{
$value = strtolower(trim($value));
@@ -1373,7 +1373,7 @@ function humanReadableSize ($bytes, $precision = 2)
*
* \return Return TRUE is value is found, FALSE if not.
*/
-function in_array_ics($value, array $items)
+function in_array_ics ($value, array $items)
{
return preg_grep('/^'.preg_quote($value, '/').'$/i', $items);
}
@@ -1385,7 +1385,7 @@ function in_array_ics($value, array $items)
*
* \return string with caracters removed
*/
-function validate($string)
+function validate ($string)
{
return strip_tags(str_replace('\0', '', $string));
}
@@ -1401,7 +1401,7 @@ function validate($string)
* \param boolean $followLinks TRUE to follow links, FALSE (default)
* for not following links
*/
-function rmdirRecursive($path, $followLinks = FALSE)
+function rmdirRecursive ($path, $followLinks = FALSE)
{
$dir = opendir($path);
while ($entry = readdir($dir)) {
@@ -1428,7 +1428,7 @@ function rmdirRecursive($path, $followLinks = FALSE)
*
* \return array content of directory in ascending sorted manner.
*/
-function scan_directory($path, $sort_desc = FALSE)
+function scan_directory ($path, $sort_desc = FALSE)
{
$ret = FALSE;
@@ -1464,7 +1464,7 @@ function scan_directory($path, $sort_desc = FALSE)
*
* \param string $directory smarty compile dir
*/
-function clean_smarty_compile_dir($directory)
+function clean_smarty_compile_dir ($directory)
{
if (is_dir($directory) && is_readable($directory)) {
// Set revision filename to REVISION
@@ -1507,7 +1507,7 @@ function clean_smarty_compile_dir($directory)
*
* \return TRUE if successfully created FALSE otherwise
*/
-function create_revision($revision_file, $revision)
+function create_revision ($revision_file, $revision)
{
$result = FALSE;
@@ -1535,7 +1535,7 @@ function create_revision($revision_file, $revision)
*
* \return TRUE if revision match FALSE otherwise
*/
-function compare_revision($revision_file, $revision)
+function compare_revision ($revision_file, $revision)
{
// FALSE means revision differs
$result = FALSE;
@@ -1576,7 +1576,7 @@ function compare_revision($revision_file, $revision)
*
* \return return key or empty result
*/
-function array_key_ics($ikey, array $items)
+function array_key_ics ($ikey, array $items)
{
$tmp = array_change_key_case($items, CASE_LOWER);
$ikey = strtolower($ikey);
@@ -1597,10 +1597,10 @@ function array_key_ics($ikey, array $items)
*
* \return boolean TRUE or FALSE
*/
-function array_differs(array $src, array $dst)
+function array_differs (array $src, array $dst)
{
/* If the count is differing, the arrays differ */
- if (count ($src) != count ($dst)) {
+ if (count($src) != count($dst)) {
return TRUE;
}
@@ -1616,7 +1616,7 @@ function array_differs(array $src, array $dst)
*
* \return boolean TRUE or FALSE
*/
-function array_differs_recursive($src, $dst)
+function array_differs_recursive ($src, $dst)
{
if (is_array($src)) {
if (!is_array($dst)) {
@@ -1644,7 +1644,7 @@ function array_differs_recursive($src, $dst)
* \param string $input string where we should add \ before special caracters
*
*/
-function normalizeLdap($input)
+function normalizeLdap ($input)
{
trigger_error('deprecated, use ldap_escape_f');
return addcslashes($input, '*()\\/');
@@ -1655,7 +1655,7 @@ function normalizeLdap($input)
*
* \param string $cfg A config object
*/
-function check_schema(array $cfg)
+function check_schema (array $cfg)
{
$checks = array();
@@ -1777,7 +1777,7 @@ function check_schema(array $cfg)
*
* \return string
*/
-function get_post($name)
+function get_post ($name)
{
if (!isset($_POST[$name])) {
trigger_error("Requested POST value (".$name.") does not exists, you should add a check to prevent this message.");
@@ -1790,7 +1790,7 @@ function get_post($name)
/*!
* \brief Return class name in correct case
*/
-function get_correct_class_name($cls)
+function get_correct_class_name ($cls)
{
global $class_mapping;
if (isset($class_mapping) && is_array($class_mapping)) {
@@ -1839,7 +1839,7 @@ function change_password ($dn, $password, $hash = "")
}
/* Lock or unlock samba account */
-function lock_samba_account($mode, array $attrs)
+function lock_samba_account ($mode, array $attrs)
{
global $config;
if (!isset($attrs['sambaNTPassword'][0])) {
@@ -1870,7 +1870,7 @@ function lock_samba_account($mode, array $attrs)
}
/* Lock or unlock ssh account */
-function lock_ssh_account($mode, array $attrs, &$modify)
+function lock_ssh_account ($mode, array $attrs, &$modify)
{
if (!isset($attrs['sshPublicKey'])) {
return;
@@ -1898,7 +1898,7 @@ function lock_ssh_account($mode, array $attrs, &$modify)
*
* \return either the result or "" in any other case
*/
-function getEntryCSN($dn)
+function getEntryCSN ($dn)
{
global $config;
if (empty($dn) || !is_object($config)) {
@@ -1927,7 +1927,7 @@ function getEntryCSN($dn)
*
* \param string $type The content identifier, default value is "application/octet-stream";
*/
-function send_binary_content($data, $name, $type = "application/octet-stream")
+function send_binary_content ($data, $name, $type = "application/octet-stream")
{
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
@@ -1937,7 +1937,7 @@ function send_binary_content($data, $name, $type = "application/octet-stream")
header("Content-type: ".$type);
/* Strip name if it is a complete path */
- if (preg_match ("/\//", $name)) {
+ if (preg_match("/\//", $name)) {
$name = basename($name);
}
@@ -1949,7 +1949,7 @@ function send_binary_content($data, $name, $type = "application/octet-stream")
}
-function reverse_html_entities($str, $type = ENT_QUOTES, $charset = "UTF-8")
+function reverse_html_entities ($str, $type = ENT_QUOTES, $charset = "UTF-8")
{
if (is_string($str)) {
return htmlentities($str, $type, $charset);
@@ -1972,7 +1972,7 @@ function reverse_html_entities($str, $type = ENT_QUOTES, $charset = "UTF-8")
*
* \return string The encoded String
*/
-function xmlentities($str)
+function xmlentities ($str)
{
if (is_string($str)) {
return htmlspecialchars($str, ENT_QUOTES);
@@ -1989,7 +1989,7 @@ function xmlentities($str)
*/
function get_random_char ()
{
- $randno = rand (0, 63);
+ $randno = rand(0, 63);
if ($randno < 12) {
// Digits, '/' and '.'
return chr($randno + 46);
@@ -2009,7 +2009,7 @@ function get_random_char ()
*
* \param String $password The password used
*/
-function cred_decrypt($input, $password)
+function cred_decrypt ($input, $password)
{
/************************* Inspired by Crypt/CBC.pm *******************************/
$input = pack('H*', $input);
@@ -2035,13 +2035,13 @@ function cred_decrypt($input, $password)
}
-function get_object_info()
+function get_object_info ()
{
return session::get('objectinfo');
}
-function set_object_info($str = "")
+function set_object_info ($str = "")
{
session::set('objectinfo', $str);
}
@@ -2055,7 +2055,7 @@ function set_object_info($str = "")
*
* \param string $mask The netmask of the network
*/
-function isIpInNet($ip, $net, $mask)
+function isIpInNet ($ip, $net, $mask)
{
// Move to long ints
$ip = ip2long($ip);
@@ -2076,7 +2076,7 @@ function expandIPv6 ($ip)
}
/* Mark the occurance of a string with a span */
-function mark($needle, $haystack)
+function mark ($needle, $haystack)
{
$result = '';
@@ -2088,12 +2088,12 @@ function mark($needle, $haystack)
return $result.$haystack;
}
-function reset_errors()
+function reset_errors ()
{
session::set('errorsAlreadyPosted', array());
}
-function load_all_classes()
+function load_all_classes ()
{
global $BASE_DIR, $class_list, $class_mapping;
/* Initially load all classes */
@@ -2114,7 +2114,7 @@ function load_all_classes()
if (!function_exists('random_int')) {
// PHP<7, we fallback on openssl_random_pseudo_bytes
- function random_int($min, $max)
+ function random_int ($min, $max)
{
$range = $max - $min;
if ($range <= 0) {
@@ -2144,17 +2144,17 @@ if (!function_exists('random_int')) {
}
}
-function ldap_escape_f($str, $ignore = '')
+function ldap_escape_f ($str, $ignore = '')
{
return ldap_escape($str, $ignore, LDAP_ESCAPE_FILTER);
}
-function ldap_escape_dn($str, $ignore = '')
+function ldap_escape_dn ($str, $ignore = '')
{
return ldap_escape($str, $ignore, LDAP_ESCAPE_DN);
}
-function mail_utf8($to, $from_user, $from_email, $subject, $message, $replyto_user = NULL, $replyto_email = NULL, $type = 'plain')
+function mail_utf8 ($to, $from_user, $from_email, $subject, $message, $replyto_user = NULL, $replyto_email = NULL, $type = 'plain')
{
$subject = "=?UTF-8?B?".base64_encode($subject)."?=";
@@ -2191,7 +2191,7 @@ function mail_utf8($to, $from_user, $from_email, $subject, $message, $replyto_us
}
/* Calls fopen, gives errors as an array if any, file handle if successful */
-function fopenWithErrorHandling(...$args)
+function fopenWithErrorHandling (...$args)
{
$errors = array();
set_error_handler(
diff --git a/include/functions_debug.inc b/include/functions_debug.inc
index 76d2803dcd38379afc2021862534c0307b006e2f..7df84694d6f97290eb2778bfd1ce878d6e19da82 100644
--- a/include/functions_debug.inc
+++ b/include/functions_debug.inc
@@ -82,7 +82,7 @@ class printAClass {
/*!
* \brief printAClass constructor
*/
- function __construct()
+ function __construct ()
{
$this->export_hash = uniqid('');
}
@@ -110,7 +110,7 @@ class printAClass {
*
* \param boolean $key_bg_color false
*/
- function print_a($array, $iteration = FALSE, $key_bg_color = FALSE)
+ function print_a ($array, $iteration = FALSE, $key_bg_color = FALSE)
{
if (!$key_bg_color) {
$key_bg_color = $this->key_bg_color;
@@ -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)) {
@@ -245,7 +245,7 @@ function print_a($array, $return_mode = FALSE, $show_object_vars = FALSE, $expor
$output = '<span style="color:red;font-size:small;">print_a( '.gettype( $array ).' )</span>';
}
- error_reporting ($e);
+ error_reporting($e);
if ($return_mode) {
return $output;
} else {
@@ -254,7 +254,7 @@ function print_a($array, $return_mode = FALSE, $show_object_vars = FALSE, $expor
}
}
-function _script_globals()
+function _script_globals ()
{
global $GLOBALS_initial_count;
@@ -275,7 +275,7 @@ function _script_globals()
/*!
* \brief Show the runtime
*/
-function show_runtime()
+function show_runtime ()
{
$MICROTIME_END = microtime();
$MICROTIME_START = explode(' ', $GLOBALS['MICROTIME_START']);
@@ -294,7 +294,7 @@ function show_runtime()
* show_vars(1) shows all
* show_vars(,1) shows object properties in addition
*/
-function show_vars($show_all_vars = FALSE, $show_object_vars = FALSE)
+function show_vars ($show_all_vars = FALSE, $show_object_vars = FALSE)
{
if (isset($GLOBALS['no_vars'])) {
return;
diff --git a/include/login/class_LoginCAS.inc b/include/login/class_LoginCAS.inc
index 439c139ee52840c0c815ddba6260346bfac77bb2..b06143bf9684e3caa227badcc6ee590ca3967329 100644
--- a/include/login/class_LoginCAS.inc
+++ b/include/login/class_LoginCAS.inc
@@ -24,13 +24,13 @@
class LoginCAS extends LoginMethod
{
/*! \brief Displayed name */
- static function getLabel()
+ static function getLabel ()
{
return _('CAS');
}
/*! \brief All login steps in the right order for CAS login */
- static function loginProcess()
+ static function loginProcess ()
{
global $config, $message, $ui;
diff --git a/include/login/class_LoginHTTPAuth.inc b/include/login/class_LoginHTTPAuth.inc
index 3fe017faa78df159de870eda43cb729d976b671f..99829c487bf7d9e8e839a231430989b11a1f1593 100644
--- a/include/login/class_LoginHTTPAuth.inc
+++ b/include/login/class_LoginHTTPAuth.inc
@@ -24,13 +24,13 @@
class LoginHTTPAuth extends LoginMethod
{
/*! \brief Displayed name */
- static function getLabel()
+ static function getLabel ()
{
return _('HTTP Basic Auth');
}
/*! \brief All login steps in the right order for HTTP auth login */
- static function loginProcess()
+ static function loginProcess ()
{
global $config, $message;
@@ -60,7 +60,7 @@ class LoginHTTPAuth extends LoginMethod
}
/*! \brief Return HTTP authentication header */
- static function authenticateHeader($message = 'Authentication required')
+ static function authenticateHeader ($message = 'Authentication required')
{
header('WWW-Authenticate: Basic realm="FusionDirectory"');
header('HTTP/1.0 401 Unauthorized');
diff --git a/include/login/class_LoginHTTPHeader.inc b/include/login/class_LoginHTTPHeader.inc
index 4028f3c2e7dadc42b44e6438d14a64f201e9dc2d..0eb6c1503b01cab0ea7902d8511e989e58dc847f 100644
--- a/include/login/class_LoginHTTPHeader.inc
+++ b/include/login/class_LoginHTTPHeader.inc
@@ -24,13 +24,13 @@
class LoginHTTPHeader extends LoginMethod
{
/*! \brief Displayed name */
- static function getLabel()
+ static function getLabel ()
{
return _('HTTP Header');
}
/*! \brief All login steps in the right order for HTTP Header login */
- static function loginProcess()
+ static function loginProcess ()
{
global $config, $message, $ui;
diff --git a/include/login/class_LoginMethod.inc b/include/login/class_LoginMethod.inc
index 4d435dfdd4d90588b0d8a0f47a11eb8332957f1d..81629aa82bd68e763f5ed97ebf61f634e6b27052 100644
--- a/include/login/class_LoginMethod.inc
+++ b/include/login/class_LoginMethod.inc
@@ -29,14 +29,14 @@ class LoginMethod
static protected $username;
static protected $password;
- static function init()
+ static function init ()
{
static::$username = NULL;
static::$password = NULL;
}
/*! \brief Runs schemaCheck if activated in configuration */
- static function runSchemaCheck()
+ static function runSchemaCheck ()
{
global $config;
if ($config->get_cfg_value('schemaCheck') != 'TRUE') {
@@ -61,7 +61,7 @@ class LoginMethod
}
/*! \brief Check if locking LDAP branch is here or create it */
- static function checkForLockingBranch()
+ static function checkForLockingBranch ()
{
global $config;
$ldap = $config->get_ldap_link();
@@ -75,7 +75,7 @@ class LoginMethod
/*! \brief Check username for invalid characters and check password is not empty
* Also trims username */
- static function validateUserInput()
+ static function validateUserInput ()
{
global $message, $smarty;
static::$username = trim(static::$username);
@@ -84,14 +84,14 @@ class LoginMethod
return FALSE;
} elseif (mb_strlen(static::$password, 'UTF-8') == 0) {
$message = _('Please specify your password!');
- $smarty->assign ('focusfield', 'password');
+ $smarty->assign('focusfield', 'password');
return FALSE;
}
return TRUE;
}
/*! \brief Performs an LDAP bind with $username and $password */
- static function ldapLoginUser()
+ static function ldapLoginUser ()
{
global $ui, $config, $message, $smarty;
/* Login as user, initialize user ACL's */
@@ -103,14 +103,14 @@ class LoginMethod
logging::log('security', 'login', '', array(), 'Authentication failed for user "'.static::$username.'"');
}
$message = _('Please check the username/password combination.');
- $smarty->assign ('focusfield', 'password');
+ $smarty->assign('focusfield', 'password');
return FALSE;
}
return TRUE;
}
/*! \brief Called after successful login, return FALSE if account is expired */
- static function loginAndCheckExpired()
+ static function loginAndCheckExpired ()
{
global $ui, $config, $plist, $message, $smarty;
/* Remove all locks of this user */
@@ -138,7 +138,7 @@ class LoginMethod
if ($expired == POSIX_ACCOUNT_EXPIRED) {
logging::log('security', 'login', '', array(), 'Account for user "'.static::$username.'" has expired');
$message = _('Account locked. Please contact your system administrator!');
- $smarty->assign ('focusfield', 'username');
+ $smarty->assign('focusfield', 'username');
return FALSE;
}
}
@@ -146,19 +146,19 @@ class LoginMethod
}
/*! \brief Final step of successful login: redirect to main.php */
- static function redirect()
+ static function redirect ()
{
global $config;
/* Not account expired or password forced change go to main page */
logging::log('security', 'login', '', array(), 'User "'.static::$username.'" logged in successfully.');
session::global_set('connected', 1);
session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
- header ('Location: main.php');
+ header('Location: main.php');
exit;
}
/*! \brief Run each step in $steps, stop on errors */
- static function runSteps($steps)
+ static function runSteps ($steps)
{
foreach ($steps as $step) {
$status = static::$step();
@@ -173,7 +173,7 @@ class LoginMethod
}
/*! \brief All login steps in the right order */
- static function loginProcess()
+ static function loginProcess ()
{
global $config;
$method = $config->get_cfg_value('LoginMethod', '');
@@ -193,12 +193,12 @@ class LoginMethod
}
/*! \brief Displayed name for each login method. Returning FALSE disables a method */
- static function getLabel()
+ static function getLabel ()
{
return FALSE;
}
- static function getMethods()
+ static function getMethods ()
{
$methods = array(
'LoginPost',
diff --git a/include/login/class_LoginPost.inc b/include/login/class_LoginPost.inc
index d6430e51d418721e954a47a30f7056e329eb2b80..7d89777c7bd7b740fbfbabed5081b7af10d40678 100644
--- a/include/login/class_LoginPost.inc
+++ b/include/login/class_LoginPost.inc
@@ -24,19 +24,19 @@
class LoginPost extends LoginMethod
{
/*! \brief Displayed name */
- static function getLabel()
+ static function getLabel ()
{
return _('HTML form');
}
/*! \brief All login steps in the right order for standard POST login */
- static function loginProcess()
+ static function loginProcess ()
{
global $smarty, $config, $message;
static::init();
- $smarty->assign ('focusfield', 'username');
+ $smarty->assign('focusfield', 'username');
if (($_SERVER['REQUEST_METHOD'] == 'POST') && isset($_POST['login']) && isset($_POST['username']) && isset($_POST['password'])) {
@@ -64,7 +64,7 @@ class LoginPost extends LoginMethod
}
/*! \brief Display the login page and exit() */
- static protected function displayLogin()
+ static protected function displayLogin ()
{
global $smarty,$message,$config,$ssl,$error_collector,$error_collector_mailto;
diff --git a/include/management/actions/class_Action.inc b/include/management/actions/class_Action.inc
index 12d30f1923543318fb3153ce5ebcf2cde1809bcd..869cfa4fb6fe2e47c49a685f3eaaf9342ab005ab 100644
--- a/include/management/actions/class_Action.inc
+++ b/include/management/actions/class_Action.inc
@@ -49,7 +49,7 @@ class Action
protected $parent;
- function __construct($name, $label, $icon, $targets, $callable, array $acls = array(), $inmenu = TRUE, $inline = TRUE, array $validTypes = array())
+ function __construct ($name, $label, $icon, $targets, $callable, array $acls = array(), $inmenu = TRUE, $inline = TRUE, array $validTypes = array())
{
if ($targets == '0') {
$inline = FALSE;
@@ -117,42 +117,42 @@ class Action
}
}
- function setParent(management $parent)
+ function setParent (management $parent)
{
$this->parent = $parent;
}
- function getName()
+ function getName ()
{
return $this->name;
}
- function getLabel()
+ function getLabel ()
{
return $this->label;
}
- function setSeparator($bool)
+ function setSeparator ($bool)
{
$this->separator = $bool;
}
- function setEnableFunction(callable $callable)
+ function setEnableFunction (callable $callable)
{
$this->enabledCallable = $callable;
}
- function setInMenu($inmenu)
+ function setInMenu ($inmenu)
{
$this->inmenu = $inmenu;
}
- function listActions()
+ function listActions ()
{
return array($this->name);
}
- function execute($management, $action)
+ function execute ($management, $action)
{
if ($this->callable === FALSE) {
return;
@@ -170,7 +170,7 @@ class Action
return call_user_func($func, $action);
}
- function fillMenuItems(&$actions)
+ function fillMenuItems (&$actions)
{
if (!$this->inmenu) {
return;
@@ -189,11 +189,11 @@ class Action
);
}
- function fillRowClasses(&$classes, ListingEntry $entry)
+ function fillRowClasses (&$classes, ListingEntry $entry)
{
}
- function renderColumnIcons(ListingEntry $entry)
+ function renderColumnIcons (ListingEntry $entry)
{
if (!$this->inline) {
return '';
@@ -218,7 +218,7 @@ class Action
' title="'.$this->label.'" alt="'.$this->label.'" name="listing_'.$this->name.'_'.$entry->row.'"/>';
}
- function isEnabledFor(ListingEntry $entry = NULL)
+ function isEnabledFor (ListingEntry $entry = NULL)
{
if (isset($this->enabledCallable)) {
return call_user_func($this->enabledCallable, $this->name, $entry);
@@ -226,7 +226,7 @@ class Action
return TRUE;
}
- function hasPermission($dn, $type = NULL, $template = FALSE)
+ function hasPermission ($dn, $type = NULL, $template = FALSE)
{
global $ui;
diff --git a/include/management/actions/class_HiddenAction.inc b/include/management/actions/class_HiddenAction.inc
index 6e9513b03192f138c0e1f4c6db4bfaba62d19bab..632c5a5a52cb705c3b04e5830d07fdcd196e6574 100644
--- a/include/management/actions/class_HiddenAction.inc
+++ b/include/management/actions/class_HiddenAction.inc
@@ -23,7 +23,7 @@
*/
class HiddenAction extends Action
{
- function __construct($name, $callable, array $acl = array())
+ function __construct ($name, $callable, array $acl = array())
{
parent::__construct($name, '', '', '0', $callable, $acl, FALSE, FALSE);
}
diff --git a/include/management/actions/class_SubMenuAction.inc b/include/management/actions/class_SubMenuAction.inc
index d99e828ed3617c34af04db49772f89a1bc63c59a..43e2e769726b5f0b169c5dbb21037ee6a7f55909 100644
--- a/include/management/actions/class_SubMenuAction.inc
+++ b/include/management/actions/class_SubMenuAction.inc
@@ -26,7 +26,7 @@ class SubMenuAction extends Action
protected $actions = array();
protected $handlers = array();
- function __construct($name, $label, $icon, array $actions, $inmenu = TRUE)
+ function __construct ($name, $label, $icon, array $actions, $inmenu = TRUE)
{
parent::__construct($name, $label, $icon, '0', FALSE, array(), $inmenu, FALSE);
$this->actions = $actions;
@@ -38,7 +38,7 @@ class SubMenuAction extends Action
}
}
- function addAction(Action $action)
+ function addAction (Action $action)
{
$this->actions[] = $action;
$names = $action->listActions();
@@ -49,7 +49,7 @@ class SubMenuAction extends Action
$this->parent->registerAction($this);
}
- function setParent(management $parent)
+ function setParent (management $parent)
{
parent::setParent($parent);
foreach ($this->actions as $action) {
@@ -57,12 +57,12 @@ class SubMenuAction extends Action
}
}
- function listActions()
+ function listActions ()
{
return array_keys($this->handlers);
}
- function execute($management, $action)
+ function execute ($management, $action)
{
if (isset($action['subaction']) && isset($this->handlers[$action['action'].'_'.$action['subaction']])) {
return $this->handlers[$action['action'].'_'.$action['subaction']]->execute($management, $action);
@@ -71,7 +71,7 @@ class SubMenuAction extends Action
}
}
- function fillMenuItems(&$actions)
+ function fillMenuItems (&$actions)
{
if (!$this->inmenu) {
return;
@@ -93,7 +93,7 @@ class SubMenuAction extends Action
}
}
- function renderColumnIcons(ListingEntry $entry)
+ function renderColumnIcons (ListingEntry $entry)
{
}
}
diff --git a/include/management/class_DateFilterElement.inc b/include/management/class_DateFilterElement.inc
index 9368fa401253e61a01841be2f2e6094f3e42d52f..16d6ae906ca57d52e1f65f84a996fe50b683842d 100644
--- a/include/management/class_DateFilterElement.inc
+++ b/include/management/class_DateFilterElement.inc
@@ -29,7 +29,7 @@ class DateFilterElement extends FilterElement
protected $max;
protected $types;
- public function __construct(managementFilter $parent, $attribute, $label, $types = array())
+ public function __construct (managementFilter $parent, $attribute, $label, $types = array())
{
global $config;
@@ -40,7 +40,7 @@ class DateFilterElement extends FilterElement
$this->types = $types;
}
- public function update()
+ public function update ()
{
if (!empty($_POST['nt_'.$this->attribute])) {
$this->min = $_POST['nt_'.$this->attribute];
@@ -54,7 +54,7 @@ class DateFilterElement extends FilterElement
}
}
- public function render()
+ public function render ()
{
$smarty = get_smarty();
$smarty->assign('NAME', $this->label);
@@ -64,7 +64,7 @@ class DateFilterElement extends FilterElement
return $smarty->fetch(get_template_path('management/filter-element-date.tpl'));
}
- public function getFilters($type, array &$filters)
+ public function getFilters ($type, array &$filters)
{
if (!empty($this->types) && !in_array_ics($type, $this->types)) {
return FALSE;
diff --git a/include/management/class_EntrySortIterator.inc b/include/management/class_EntrySortIterator.inc
index 25f42f63747c0452b9dbb36f75e498feb1635681..0e80a2609681feec4c49d95940f95360c3f05d0e 100644
--- a/include/management/class_EntrySortIterator.inc
+++ b/include/management/class_EntrySortIterator.inc
@@ -36,7 +36,7 @@ class EntrySortIterator implements Iterator
*
* \param bool $direction Direction
*/
- public function __construct(array $entries, Column $column, $direction)
+ public function __construct (array $entries, Column $column, $direction)
{
// Sort for attribute
if (is_object($column)) {
@@ -62,7 +62,7 @@ class EntrySortIterator implements Iterator
*
* \return the first element of the array
*/
- function rewind()
+ function rewind ()
{
return reset($this->data);
}
@@ -72,7 +72,7 @@ class EntrySortIterator implements Iterator
*
* \return The current element pointed by array pointer
*/
- function current()
+ function current ()
{
return current($this->data);
}
@@ -82,7 +82,7 @@ class EntrySortIterator implements Iterator
*
* \return the key element of the array
*/
- function key()
+ function key ()
{
return key($this->data);
}
@@ -92,7 +92,7 @@ class EntrySortIterator implements Iterator
*
* \return The next element pointed by array pointer
*/
- function next()
+ function next ()
{
return next($this->data);
}
@@ -102,7 +102,7 @@ class EntrySortIterator implements Iterator
*
* \return TRUE if the array is valid, return FALSE otherwise
*/
- function valid()
+ function valid ()
{
return (key($this->data) !== NULL);
}
diff --git a/include/management/class_FilterElement.inc b/include/management/class_FilterElement.inc
index c47596e185bc62c1363d9e960e5851e7e99203ac..ce5b371339c820afdf3c9b977d44a05e0fd48125 100644
--- a/include/management/class_FilterElement.inc
+++ b/include/management/class_FilterElement.inc
@@ -32,16 +32,16 @@ class FilterElement
}
/* Reads POST */
- public function update()
+ public function update ()
{
}
- public function render()
+ public function render ()
{
}
/* Fills LDAP filters for the given type. Returns TRUE if type should be skipped altogether. */
- public function getFilters($type, array &$filters)
+ public function getFilters ($type, array &$filters)
{
return FALSE;
}
diff --git a/include/management/class_ListingEntry.inc b/include/management/class_ListingEntry.inc
index 8a2608bbaf59c12d13d37ce81332a451171212a3..2489e19a5a949c7d17576c1270e7dbbd4a87c84f 100644
--- a/include/management/class_ListingEntry.inc
+++ b/include/management/class_ListingEntry.inc
@@ -29,7 +29,7 @@ class ListingEntry implements ArrayAccess
/* Cache where columns may store stuff */
public $cache = array();
- public function __construct(managementListing $listing, $type, $dn, array $attrs, $row = NULL)
+ public function __construct (managementListing $listing, $type, $dn, array $attrs, $row = NULL)
{
$this->listing = $listing;
$this->type = $type;
@@ -38,47 +38,47 @@ class ListingEntry implements ArrayAccess
$this->row = $row;
}
- public function offsetSet($offset, $value)
+ public function offsetSet ($offset, $value)
{
$this->attrs[$offset] = $value;
}
- public function offsetExists($offset)
+ public function offsetExists ($offset)
{
return isset($this->attrs[$offset]);
}
- public function offsetUnset($offset)
+ public function offsetUnset ($offset)
{
unset($this->attrs[$offset]);
}
- public function offsetGet($offset)
+ public function offsetGet ($offset)
{
return (isset($this->attrs[$offset]) ? $this->attrs[$offset] : NULL);
}
- public function getPid()
+ public function getPid ()
{
return $this->listing->pid;
}
- public function isTemplate()
+ public function isTemplate ()
{
return preg_match('/^template_/', $this->type);
}
- public function getTemplatedType()
+ public function getTemplatedType ()
{
return preg_replace('/^template_/', '', $this->type);
}
- public function getTemplatedFields()
+ public function getTemplatedFields ()
{
return templateHandling::fieldsFromLDAP($this->attrs);
}
- public function checkAcl($acls)
+ public function checkAcl ($acls)
{
global $ui;
@@ -93,7 +93,7 @@ class ListingEntry implements ArrayAccess
return TRUE;
}
- public function snapshotCreationAllowed()
+ public function snapshotCreationAllowed ()
{
global $ui;
@@ -101,7 +101,7 @@ class ListingEntry implements ArrayAccess
return $ui->allow_snapshot_create($this->dn, $infos['aclCategory']);
}
- public function snapshotRestoreAllowed()
+ public function snapshotRestoreAllowed ()
{
global $ui;
diff --git a/include/management/class_ManagementConfigurationDialog.inc b/include/management/class_ManagementConfigurationDialog.inc
index e48e2d2c827c52de65fbb8d0733308800068c0e3..102cdfd3c6d21323c393d5e850244c928c614cc9 100644
--- a/include/management/class_ManagementConfigurationDialog.inc
+++ b/include/management/class_ManagementConfigurationDialog.inc
@@ -23,7 +23,7 @@ class ManagementColumnAttribute extends CompositeAttribute
function __construct ($label, $description, $ldapName, $attributes, $acl = "")
{
- parent::__construct ($description, $ldapName, $attributes, FALSE, FALSE, $acl, $label);
+ parent::__construct($description, $ldapName, $attributes, FALSE, FALSE, $acl, $label);
}
}
@@ -120,7 +120,7 @@ class ManagementConfigurationDialog extends simplePlugin
$this->attributesAccess['managementColumns']->setValue($value);
}
- function attrIsWriteable($attr): bool
+ function attrIsWriteable ($attr): bool
{
global $config, $ui;
diff --git a/include/management/class_TabFilterElement.inc b/include/management/class_TabFilterElement.inc
index b0bff3ce9bbd0397c8d125b68dbc144076c37c02..de6ca943328c3bc69663c9ead9d456c9088703c9 100644
--- a/include/management/class_TabFilterElement.inc
+++ b/include/management/class_TabFilterElement.inc
@@ -23,7 +23,7 @@ class TabFilterElement extends FilterElement
{
protected $tabs;
- public function __construct(managementFilter $parent)
+ public function __construct (managementFilter $parent)
{
global $config;
@@ -54,7 +54,7 @@ class TabFilterElement extends FilterElement
}
}
- public function update()
+ public function update ()
{
foreach ($this->tabs as $class => &$tab) {
$tab['checked'] = isset($_POST['filter_tab_'.$class]);
@@ -62,7 +62,7 @@ class TabFilterElement extends FilterElement
unset($tab);
}
- public function render()
+ public function render ()
{
if (empty($this->tabs)) {
return '';
@@ -82,7 +82,7 @@ class TabFilterElement extends FilterElement
return $smarty->fetch(get_template_path('management/filter-element.tpl'));
}
- public function getFilters($type, array &$filters)
+ public function getFilters ($type, array &$filters)
{
foreach ($this->tabs as $tab) {
if ($tab['checked']) {
diff --git a/include/management/class_management.inc b/include/management/class_management.inc
index 4f2b6cd6e398b4d7763ee4d8e03d94c8e8ef31a4..e3a53fd1d70040bf506218d176a35ce2f4cc9d2d 100644
--- a/include/management/class_management.inc
+++ b/include/management/class_management.inc
@@ -131,17 +131,17 @@ class management
$this->configureActions();
}
- protected function setUpListing()
+ protected function setUpListing ()
{
$this->listing = new managementListing($this);
}
- protected function setUpFilter()
+ protected function setUpFilter ()
{
$this->filter = new managementFilter($this);
}
- protected function setUpHeadline()
+ protected function setUpHeadline ()
{
$plInfos = pluglist::pluginInfos(get_class($this));
@@ -150,7 +150,7 @@ class management
$this->icon = $plInfos['plIcon'];
}
- protected function configureActions()
+ protected function configureActions ()
{
global $config;
@@ -323,7 +323,7 @@ class management
/*!
* \brief Register an action to show in the action menu and/or the action column
*/
- function registerAction(Action $action)
+ function registerAction (Action $action)
{
$action->setParent($this);
$this->actions[$action->getName()] = $action;
@@ -332,7 +332,7 @@ class management
}
}
- public function getColumnConfiguration()
+ public function getColumnConfiguration ()
{
global $config;
@@ -350,7 +350,7 @@ class management
return $this->columnConfiguration;
}
- public function setColumnConfiguration($columns)
+ public function setColumnConfiguration ($columns)
{
$this->columnConfiguration = $columns;
$this->listing->reloadColumns();
@@ -360,7 +360,7 @@ class management
* \brief Detects actions/events send by the ui
* and the corresponding targets.
*/
- function detectPostActions()
+ function detectPostActions ()
{
if (!is_object($this->listing)) {
throw new FusionDirectoryException('No valid listing object');
@@ -390,7 +390,7 @@ class management
/*!
* \brief Calls the registered method for a given action/event.
*/
- function handleAction(array $action)
+ function handleAction (array $action)
{
// Start action
if (isset($action['subaction']) && isset($this->actionHandlers[$action['action'].'_'.$action['subaction']])) {
@@ -400,7 +400,7 @@ class management
}
}
- protected function handleSubAction(array $action)
+ protected function handleSubAction (array $action)
{
if (preg_match('/^tab_/', $action['subaction'])) {
$tab = preg_replace('/^tab_/', '', $action['subaction']);
@@ -476,7 +476,7 @@ class management
return $this->renderList();
}
- function renderList()
+ function renderList ()
{
global $config, $ui;
@@ -498,12 +498,12 @@ class management
return $this->getHeader().$smarty->fetch(get_template_path('management/management.tpl'));
}
- protected function renderFilter()
+ protected function renderFilter ()
{
return $this->filter->render();
}
- protected function renderActionMenu()
+ protected function renderActionMenu ()
{
$menuActions = array();
foreach ($this->actions as $action) {
@@ -520,7 +520,7 @@ class management
return $smarty->fetch(get_template_path('management/actionmenu.tpl'));
}
- function renderActionColumn(ListingEntry $entry)
+ function renderActionColumn (ListingEntry $entry)
{
// Go thru all actions
$result = '';
@@ -531,7 +531,7 @@ class management
return $result;
}
- function fillActionRowClasses(&$classes, ListingEntry $entry)
+ function fillActionRowClasses (&$classes, ListingEntry $entry)
{
foreach ($this->actions as $action) {
$action->fillRowClasses($classes, $entry);
@@ -544,7 +544,7 @@ class management
* concurrent modifications.
* This locks will automatically removed here.
*/
- function remove_lock()
+ function remove_lock ()
{
if (!empty($this->currentDn) && ($this->currentDn != 'new')) {
del_lock($this->currentDn);
@@ -554,7 +554,7 @@ class management
}
}
- function is_modal_dialog()
+ function is_modal_dialog ()
{
return (is_object($this->tabObject) || is_object($this->dialogObject));
}
@@ -562,7 +562,7 @@ class management
/*!
* \brief Generates the plugin header which is displayed whenever a tab object is opened.
*/
- protected function getHeader()
+ protected function getHeader ()
{
if ($this->skipHeader) {
return '';
@@ -571,7 +571,7 @@ class management
return print_header($this->icon, $this->title, get_object_info());
}
- function openTabObject($object, $base)
+ function openTabObject ($object, $base)
{
$this->tabObject = $object;
$this->tabObject->set_acl_base($base);
@@ -582,7 +582,7 @@ class management
* \brief This method closes dialogs
* and cleans up the cached object info and the ui.
*/
- public function closeDialogs()
+ public function closeDialogs ()
{
$this->previousDn = $this->currentDn;
$this->currentDn = '';
@@ -597,7 +597,7 @@ class management
set_object_info();
}
- protected function listAclCategories()
+ protected function listAclCategories ()
{
$cat = array();
foreach ($this->objectTypes as $type) {
@@ -610,7 +610,7 @@ class management
/*!
* \brief Generates the footer which is used whenever a tab object is displayed.
*/
- protected function _getTabFooter()
+ protected function _getTabFooter ()
{
// Do not display tab footer for non tab objects
if (!($this->tabObject instanceOf simpleTabs)) {
@@ -658,7 +658,7 @@ class management
}
}
- function enablePaste($action, ListingEntry $entry = NULL)
+ function enablePaste ($action, ListingEntry $entry = NULL)
{
if ($entry === NULL) {
return $this->cpHandler->entries_queued();
@@ -676,7 +676,7 @@ class management
* action: The name of the action which was the used as trigger.
* target: A list of object dns, which should be affected by this method.
*/
- function newEntry(array $action)
+ function newEntry (array $action)
{
$type = $action['subaction'];
@@ -689,7 +689,7 @@ class management
@DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->currentDn, 'Create entry initiated');
}
- function newEntryTemplate(array $action)
+ function newEntryTemplate (array $action)
{
if (static::$skipTemplates) {
return;
@@ -699,7 +699,7 @@ class management
$this->tabObject->setTemplateMode('template_cn');
}
- function newEntryFromTemplate(array $action)
+ function newEntryFromTemplate (array $action)
{
if (static::$skipTemplates) {
return;
@@ -720,7 +720,7 @@ class management
$this->dialogObject = new templateDialog($this, $type, $dn);
}
- function applyTemplateToEntry(array $action)
+ function applyTemplateToEntry (array $action)
{
global $ui;
if (static::$skipTemplates) {
@@ -778,7 +778,7 @@ class management
* action: The name of the action which was the used as trigger.
* target: A list of object dns, which should be affected by this method.
*/
- function editEntry(array $action)
+ function editEntry (array $action)
{
global $ui;
@@ -802,7 +802,7 @@ class management
if ($locks = get_locks($this->currentDn, TRUE)) {
return gen_locked_message($locks, $this->currentDn, TRUE);
}
- add_lock ($this->currentDn, $ui->dn);
+ add_lock($this->currentDn, $ui->dn);
// Open object
$this->openTabObject(objects::open($this->currentDn, $entry->getTemplatedType()), $this->currentDn);
@@ -817,7 +817,7 @@ class management
* \brief Editing an object was caneled.
* Close dialogs/tabs and remove locks.
*/
- function cancelEdit()
+ function cancelEdit ()
{
if (($this->tabObject instanceOf simpleTabs) && ($this->dialogObject instanceOf templateDialog)) {
$this->handleTemplateApply(TRUE);
@@ -832,7 +832,7 @@ class management
* - Calls 'simpleTabs::save' to save back object modifications (e.g. to ldap).
* - Calls 'management::closeDialogs' to return to the object listing.
*/
- function saveChanges()
+ function saveChanges ()
{
if (($this->tabObject instanceOf simpleTabs) && ($this->dialogObject instanceOf templateDialog)) {
$this->tabObject->save_object();
@@ -868,7 +868,7 @@ class management
/*!
* \brief Save object modifications and keep dialogs opened
*/
- function applyChanges()
+ function applyChanges ()
{
if ($this->tabObject instanceOf simpleTabs) {
$this->tabObject->save_object();
@@ -887,7 +887,7 @@ class management
/*! \brief Queue selected objects to be removed.
* Checks ACLs, Locks and ask for confirmation.
*/
- function removeRequested(array $action)
+ function removeRequested (array $action)
{
global $ui;
$disallowed = array();
@@ -943,7 +943,7 @@ class management
/*! \brief Display confirmation dialog
*/
- protected function removeConfirmationDialog(array $objects)
+ protected function removeConfirmationDialog (array $objects)
{
$smarty = get_smarty();
$smarty->assign('objects', $objects);
@@ -954,7 +954,7 @@ class management
/*! \brief Deletion was confirmed, delete the objects queued.
* Checks ACLs just in case.
*/
- function removeConfirmed(array $action)
+ function removeConfirmed (array $action)
{
global $ui;
@DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->currentDns, 'Entry deletion confirmed');
@@ -983,7 +983,7 @@ class management
$this->closeDialogs();
}
- function configureDialog(array $action)
+ function configureDialog (array $action)
{
$this->dialogObject = new ManagementConfigurationDialog($this);
}
@@ -991,7 +991,7 @@ class management
/*! \brief This method is used to queue and process copy&paste actions.
* Allows to copy, cut and paste mutliple entries at once.
*/
- function copyPasteHandler(array $action = array('action' => ''))
+ function copyPasteHandler (array $action = array('action' => ''))
{
global $ui;
@@ -1044,7 +1044,7 @@ class management
/*!
* \brief Opens the snapshot creation dialog for the given target.
*/
- function createSnapshotDialog(array $action)
+ function createSnapshotDialog (array $action)
{
global $config, $ui;
@DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $action['targets'], 'Snaptshot creation initiated!');
@@ -1067,7 +1067,7 @@ class management
* \brief Displays the "Restore snapshot dialog" for a given target.
* If no target is specified, open the restore removed object dialog.
*/
- function restoreSnapshotDialog(array $action)
+ function restoreSnapshotDialog (array $action)
{
global $config, $ui;
@@ -1094,7 +1094,7 @@ class management
}
- function export(array $action)
+ function export (array $action)
{
if (!isset($this->exporters[$action['action']])) {
trigger_error('Unknown exporter '.$action['action']);
@@ -1109,7 +1109,7 @@ class management
/* Methods related to Snapshots */
- function getSnapshotBases()
+ function getSnapshotBases ()
{
$bases = array();
foreach ($this->objectTypes as $type) {
@@ -1128,7 +1128,7 @@ class management
/*!
* \brief Get all deleted snapshots
*/
- function getAllDeletedSnapshots()
+ function getAllDeletedSnapshots ()
{
$bases = $this->getSnapshotBases();
$tmp = array();
@@ -1143,7 +1143,7 @@ class management
*
* \param string $dn The DN
*/
- function getAvailableSnapsShots($dn)
+ function getAvailableSnapsShots ($dn)
{
return $this->snapHandler->getAvailableSnapsShots($dn);
}
@@ -1151,7 +1151,7 @@ class management
/*
* \brief Whether snapshot restore action should be enabled for an entry
*/
- function enableSnapshotRestore($action, ListingEntry $entry = NULL)
+ function enableSnapshotRestore ($action, ListingEntry $entry = NULL)
{
if ($entry !== NULL) {
/* For entries */
@@ -1165,7 +1165,7 @@ class management
/*!
* \brief Creates a new snapshot entry
*/
- function createSnapshot($dn, $description)
+ function createSnapshot ($dn, $description)
{
global $ui;
if ($this->currentDn !== $dn) {
@@ -1186,7 +1186,7 @@ class management
*
* \param String $dn The DN of the snapshot
*/
- function restoreSnapshot($dn)
+ function restoreSnapshot ($dn)
{
global $ui;
if (!empty($dn) && $ui->allow_snapshot_restore($dn, $this->dialogObject->aclCategory, $this->dialogObject->global)) {
@@ -1204,7 +1204,7 @@ class management
*
* \param string $dn DN of the snapshot
*/
- function removeSnapshot($dn)
+ function removeSnapshot ($dn)
{
global $ui;
if (!empty($dn) && $ui->allow_snapshot_delete($dn, $this->dialogObject->aclCategory)) {
diff --git a/include/management/class_managementFilter.inc b/include/management/class_managementFilter.inc
index 316feba582328ef0f553858e07d61d51598d50d5..d18490da4cb16bd2a09f6d1e349effffec747cf6 100644
--- a/include/management/class_managementFilter.inc
+++ b/include/management/class_managementFilter.inc
@@ -47,7 +47,7 @@ class managementFilter
*
* \param string $parent management instance
*/
- function __construct($parent)
+ function __construct ($parent)
{
global $config;
@@ -68,17 +68,17 @@ class managementFilter
);
}
- function setScope($scope)
+ function setScope ($scope)
{
$this->scope = $scope;
}
- function addElement(FilterElement $element)
+ function addElement (FilterElement $element)
{
$this->filterElements[] = $element;
}
- function update($base)
+ function update ($base)
{
global $ui;
@@ -117,7 +117,7 @@ class managementFilter
/*!
* \brief Render
*/
- function render()
+ function render ()
{
$smarty = get_smarty();
diff --git a/include/management/class_managementListing.inc b/include/management/class_managementListing.inc
index 66e97f311402608970a5900aaae9f7a10f37ceb3..27c18de9e9bb1546a67df12fd6b9320b32cf2377 100644
--- a/include/management/class_managementListing.inc
+++ b/include/management/class_managementListing.inc
@@ -57,7 +57,7 @@ class managementListing
*
* \param string $parent management instance
*/
- function __construct($parent, $baseMode = TRUE, $multiSelect = TRUE)
+ function __construct ($parent, $baseMode = TRUE, $multiSelect = TRUE)
{
global $config, $ui;
@@ -85,12 +85,12 @@ class managementListing
$this->reloadColumns();
}
- function getBaseMode()
+ function getBaseMode ()
{
return $this->baseMode;
}
- function reloadColumns()
+ function reloadColumns ()
{
$columnInfos = $this->parent->getColumnConfiguration();
@@ -102,12 +102,12 @@ class managementListing
$this->columns[1]->setTemplateAttributes(array('cn'));
}
- function getColumns()
+ function getColumns ()
{
return $this->columns;
}
- function renderHeader()
+ function renderHeader ()
{
$this->header = array();
@@ -139,7 +139,7 @@ class managementListing
/*!
* \brief Render
*/
- function render()
+ function render ()
{
global $ui;
@@ -209,7 +209,7 @@ class managementListing
return $smarty->fetch(get_template_path('management/list.tpl'));
}
- function getIterator()
+ function getIterator ()
{
return new EntrySortIterator($this->entries, $this->columns[$this->sortColumn], $this->sortDirection[$this->sortColumn]);
}
@@ -217,7 +217,7 @@ class managementListing
/*!
* \brief Updates base and sorting according to POST and GET infos
*/
- function updateBase()
+ function updateBase ()
{
global $ui;
@@ -281,7 +281,7 @@ class managementListing
/*!
* \brief Update a listing
*/
- function update($dn = NULL)
+ function update ($dn = NULL)
{
if ($dn === NULL) {
$this->updateBase();
@@ -311,7 +311,7 @@ class managementListing
*
* \param string $base
*/
- function setBase($base)
+ function setBase ($base)
{
global $ui;
$this->base = $base;
@@ -321,7 +321,7 @@ class managementListing
}
}
- function tryAndSetBase($base)
+ function tryAndSetBase ($base)
{
if (isset($this->bases[$base])) {
$this->setBase($base);
@@ -333,12 +333,12 @@ class managementListing
*
* \return the base
*/
- function getBase()
+ function getBase ()
{
return $this->base;
}
- function renderBase()
+ function renderBase ()
{
if (!$this->baseMode) {
return;
@@ -347,7 +347,7 @@ class managementListing
return $this->baseSelector->render();
}
- function renderNavigation()
+ function renderNavigation ()
{
$enableBack = TRUE;
$enableRoot = TRUE;
@@ -421,7 +421,7 @@ class managementListing
/*!
* \brief Get action
*/
- function getAction()
+ function getAction ()
{
global $config;
@@ -514,7 +514,7 @@ class managementListing
/*!
* \brief Refresh the bases list
*/
- function refreshBasesList()
+ function refreshBasesList ()
{
global $config;
$ui = get_userinfo();
@@ -552,7 +552,7 @@ class managementListing
*
* \param string $dn The DN
*/
- function getEntry($dn)
+ function getEntry ($dn)
{
if (isset($this->entries[$dn])) {
return $this->entries[$dn];
@@ -560,12 +560,12 @@ class managementListing
return NULL;
}
- function getMultiSelect()
+ function getMultiSelect ()
{
return $this->multiSelect;
}
- function fillSearchedAttributes($type, array &$attrs)
+ function fillSearchedAttributes ($type, array &$attrs)
{
global $ui;
diff --git a/include/management/class_selectManagement.inc b/include/management/class_selectManagement.inc
index 7c1df53eb62ca9b8bff90a2fbb057f8e940650b1..dd1df043db839bd0a36803c181d7bf3540d24346 100644
--- a/include/management/class_selectManagement.inc
+++ b/include/management/class_selectManagement.inc
@@ -36,29 +36,29 @@ class selectManagement extends management
array('LinkColumn', array('attributes' => 'description', 'label' => 'Description')),
);
- function __construct($objectTypes = FALSE, $multiSelect = TRUE, $neededAttrs = array())
+ function __construct ($objectTypes = FALSE, $multiSelect = TRUE, $neededAttrs = array())
{
$this->neededAttrs = $neededAttrs;
$this->multiSelect = $multiSelect;
parent::__construct($objectTypes);
}
- protected function setUpListing()
+ protected function setUpListing ()
{
$this->listing = new managementListing($this, TRUE, $this->multiSelect);
}
- protected function setUpHeadline()
+ protected function setUpHeadline ()
{
$this->headline = _('Please select the desired entries');
}
- protected function configureActions()
+ protected function configureActions ()
{
$this->registerAction(new HiddenAction('configure', 'configureDialog'));
}
- function renderList()
+ function renderList ()
{
$list = parent::renderList();
diff --git a/include/management/columns/class_ActionsColumn.inc b/include/management/columns/class_ActionsColumn.inc
index 62245dcf063683ba0a294de042a7cd01797c5e34..db5484e876b9a3ee517121a3c038b6cbac516462 100644
--- a/include/management/columns/class_ActionsColumn.inc
+++ b/include/management/columns/class_ActionsColumn.inc
@@ -23,17 +23,17 @@
*/
class ActionsColumn extends Column
{
- function isSortable()
+ function isSortable ()
{
return FALSE;
}
- function fillRowClasses(&$classes, ListingEntry $entry)
+ function fillRowClasses (&$classes, ListingEntry $entry)
{
$this->parent->parent->fillActionRowClasses($classes, $entry);
}
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
return $this->parent->parent->renderActionColumn($entry);
}
diff --git a/include/management/columns/class_Column.inc b/include/management/columns/class_Column.inc
index 6798af368a1d40d09a1b1fc714b153a54ebd418e..6b09b594316eabe44e18bf81e514bd1afee91a95 100644
--- a/include/management/columns/class_Column.inc
+++ b/include/management/columns/class_Column.inc
@@ -43,7 +43,7 @@ class Column
* \param string $type a column class
* \param array $data an associative array with "attributes" and "label"
* */
- static function build(managementListing $parent, $type, array $data)
+ static function build (managementListing $parent, $type, array $data)
{
$attributes = NULL;
$label = NULL;
@@ -60,14 +60,14 @@ class Column
return new $type($parent, $attributes, $label);
}
- function __construct(managementListing $parent, array $attributes = NULL, $label = NULL)
+ function __construct (managementListing $parent, array $attributes = NULL, $label = NULL)
{
$this->parent = $parent;
$this->setAttributesVar('attributes', $attributes);
$this->label = $label;
}
- protected function setAttributesVar($var, array $attributes = NULL)
+ protected function setAttributesVar ($var, array $attributes = NULL)
{
if (is_array($attributes) && is_numeric(key($attributes))) {
$val = array();
@@ -84,32 +84,32 @@ class Column
}
}
- function setTemplateAttributes(array $attributes = NULL)
+ function setTemplateAttributes (array $attributes = NULL)
{
$this->setAttributesVar('templateAttributes', $attributes);
}
- function isSortable()
+ function isSortable ()
{
return TRUE;
}
- function isExportable()
+ function isExportable ()
{
return !empty($this->attributes);
}
- function getHtmlProps()
+ function getHtmlProps ()
{
return '';
}
- function getHtmlCellProps()
+ function getHtmlCellProps ()
{
return '';
}
- function getLabel()
+ function getLabel ()
{
if (isset($this->label)) {
return _($this->label);
@@ -118,7 +118,7 @@ class Column
}
}
- function fillNeededAttributes(array &$attrs)
+ function fillNeededAttributes (array &$attrs)
{
if (isset($this->attributes)) {
foreach ($this->attributes as $attr => $how) {
@@ -131,7 +131,7 @@ class Column
}
}
- function fillSearchedAttributes(array &$attrs)
+ function fillSearchedAttributes (array &$attrs)
{
if (isset($this->attributes)) {
foreach (array_keys($this->attributes) as $attr) {
@@ -146,11 +146,11 @@ class Column
}
}
- function fillRowClasses(&$classes, ListingEntry $entry)
+ function fillRowClasses (&$classes, ListingEntry $entry)
{
}
- protected function getAttributeValue(ListingEntry $entry)
+ protected function getAttributeValue (ListingEntry $entry)
{
$attrs = $this->attributes;
if (isset($this->templateAttributes) && $entry->isTemplate()) {
@@ -170,7 +170,7 @@ class Column
return '';
}
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
$value = $this->getAttributeValue($entry);
if ($value == '') {
@@ -189,12 +189,12 @@ class Column
}
}
- function getRawExportValue(ListingEntry $entry)
+ function getRawExportValue (ListingEntry $entry)
{
return $this->getAttributeValue($entry);
}
- function compare(ListingEntry $ao, ListingEntry $bo)
+ function compare (ListingEntry $ao, ListingEntry $bo)
{
$a = $this->getAttributeValue($ao);
$b = $this->getAttributeValue($bo);
diff --git a/include/management/columns/class_LdapGeneralizedTimeColumn.inc b/include/management/columns/class_LdapGeneralizedTimeColumn.inc
index 78518b4301a1f792ea0ccd51c1ce874ea942ec11..608bc99bd5251220901b00e6454b20a3ad2cf822 100644
--- a/include/management/columns/class_LdapGeneralizedTimeColumn.inc
+++ b/include/management/columns/class_LdapGeneralizedTimeColumn.inc
@@ -26,7 +26,7 @@ class LdapGeneralizedTimeColumn extends LinkColumn
{
protected $type = 'string';
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
$value = $this->getAttributeValue($entry);
if ($value != '') {
diff --git a/include/management/columns/class_LinkColumn.inc b/include/management/columns/class_LinkColumn.inc
index 4925d7311016e0e67f8f9bc5019947efd4032f6b..ba42c974b41f965de4146ed4001beb98b90cc1b3 100644
--- a/include/management/columns/class_LinkColumn.inc
+++ b/include/management/columns/class_LinkColumn.inc
@@ -23,12 +23,12 @@
*/
class LinkColumn extends Column
{
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
return $this->renderLink($entry, parent::renderCell($entry));
}
- protected function renderLink(ListingEntry $entry, $htmlValue)
+ protected function renderLink (ListingEntry $entry, $htmlValue)
{
if ($this->parent->parent instanceof selectManagement) {
if ($this->parent->getMultiSelect()) {
diff --git a/include/management/columns/class_ObjectTypeColumn.inc b/include/management/columns/class_ObjectTypeColumn.inc
index 8e3038745a67ec1276aad09d0dd2c34dac8c6636..8c3ced2f978a02c8ad3abdb6902d65b2b997dc43 100644
--- a/include/management/columns/class_ObjectTypeColumn.inc
+++ b/include/management/columns/class_ObjectTypeColumn.inc
@@ -23,12 +23,12 @@
*/
class ObjectTypeColumn extends Column
{
- function isSortable()
+ function isSortable ()
{
return FALSE;
}
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
if ($entry->isTemplate()) {
$infos = objects::infos($entry->getTemplatedType());
diff --git a/include/management/columns/class_PropertiesColumn.inc b/include/management/columns/class_PropertiesColumn.inc
index 3e54f13d8cef5d9feabbabbb875449eb46687fca..ce76d2796b76629977ea13d3ee1d8461481c44bf 100644
--- a/include/management/columns/class_PropertiesColumn.inc
+++ b/include/management/columns/class_PropertiesColumn.inc
@@ -25,7 +25,7 @@ class PropertiesColumn extends Column
{
protected $tabs;
- function __construct(managementListing $parent, array $attributes = NULL, $label = NULL)
+ function __construct (managementListing $parent, array $attributes = NULL, $label = NULL)
{
global $config;
@@ -47,7 +47,7 @@ class PropertiesColumn extends Column
}
}
- function fillNeededAttributes(array &$attrs)
+ function fillNeededAttributes (array &$attrs)
{
foreach ($this->tabs as $classes) {
foreach ($classes as $class) {
@@ -56,7 +56,7 @@ class PropertiesColumn extends Column
}
}
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
$tabs = $this->computeIcons($entry);
$result = '';
@@ -73,7 +73,7 @@ class PropertiesColumn extends Column
return $result;
}
- function compare(ListingEntry $ao, ListingEntry $bo)
+ function compare (ListingEntry $ao, ListingEntry $bo)
{
if ($ao->getTemplatedType() != $bo->getTemplatedType()) {
return strcmp($ao->getTemplatedType(), $bo->getTemplatedType());
@@ -86,7 +86,7 @@ class PropertiesColumn extends Column
return strcmp($a, $b);
}
- protected function computeSortString(ListingEntry $entry)
+ protected function computeSortString (ListingEntry $entry)
{
if (isset($entry->cache[__CLASS__]['sort'])) {
return $entry->cache[__CLASS__]['sort'];
@@ -104,7 +104,7 @@ class PropertiesColumn extends Column
return $entry->cache[__CLASS__]['sort'];
}
- protected function computeIcons(ListingEntry $entry)
+ protected function computeIcons (ListingEntry $entry)
{
if (isset($entry->cache[__CLASS__]['icons'])) {
return $entry->cache[__CLASS__]['icons'];
@@ -137,7 +137,7 @@ class PropertiesColumn extends Column
'tab' => $class,
);
} else {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $pInfos['plShortName']." ($class)", 'No icon for');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $pInfos['plShortName']." ($class)", 'No icon for');
}
} else {
$icons[] = array(
diff --git a/include/management/columns/class_UnixTimestampColumn.inc b/include/management/columns/class_UnixTimestampColumn.inc
index 63e911fb498e50c9b117b88844f181db0b752c1f..4e1c01cd5883afe0ef0a1fcc49f17de473f87fa9 100644
--- a/include/management/columns/class_UnixTimestampColumn.inc
+++ b/include/management/columns/class_UnixTimestampColumn.inc
@@ -25,7 +25,7 @@ class UnixTimestampColumn extends LinkColumn
{
protected $type = 'integer';
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
$value = $this->getAttributeValue($entry);
if ($value != '') {
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_password-methods-clear.inc
index 70d13d1c10538157028035f704526be66cbb2071..9a877f77b2f3123f529ff97c0ea56b38c9f0390e 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_password-methods-clear.inc
@@ -38,7 +38,7 @@ class passwordMethodClear extends passwordMethod
/*!
* \brief passwordMethodClear Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -47,7 +47,7 @@ class passwordMethodClear extends passwordMethod
*
* \return TRUE
*/
- function is_available()
+ function is_available ()
{
return TRUE;
}
@@ -57,7 +57,7 @@ class passwordMethodClear extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
return $pwd;
}
@@ -65,7 +65,7 @@ class passwordMethodClear extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return "clear";
}
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index 5e76216e557aff3d48637a493f8d522c3fa55e3c..87984b1d385ab8c7de53d096c0d939ba2d9bcad8 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -35,7 +35,7 @@ class passwordMethodCrypt extends passwordMethod
/*!
* \brief passwordMethodCrypt Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -44,7 +44,7 @@ class passwordMethodCrypt extends passwordMethod
*
* \return TRUE if is avaibable, otherwise return false
*/
- function is_available()
+ function is_available ()
{
return function_exists('crypt');
}
@@ -54,7 +54,7 @@ class passwordMethodCrypt extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
if ($this->hash == "crypt/standard-des") {
$salt = "";
@@ -105,7 +105,7 @@ class passwordMethodCrypt extends passwordMethod
return '{CRYPT}'.($locked ? '!' : '').crypt($pwd, $salt);
}
- function checkPassword($pwd, $hash)
+ function checkPassword ($pwd, $hash)
{
// Not implemented
return FALSE;
@@ -114,7 +114,7 @@ class passwordMethodCrypt extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
$hashes = array();
if (CRYPT_STD_DES == 1) {
@@ -151,7 +151,7 @@ class passwordMethodCrypt extends passwordMethod
*
* \param string $password_hash
*/
- static function _extract_method($password_hash)
+ static function _extract_method ($password_hash)
{
if (!preg_match('/^{crypt}/i', $password_hash)) {
return "";
diff --git a/include/password-methods/class_password-methods-empty.inc b/include/password-methods/class_password-methods-empty.inc
index 8fc8a7b4b619eb6f7286c452e43faaa01e612e85..24c5c468a0127bb73d051c8807ba9805aabcbd69 100644
--- a/include/password-methods/class_password-methods-empty.inc
+++ b/include/password-methods/class_password-methods-empty.inc
@@ -39,7 +39,7 @@ class passwordMethodEmpty extends passwordMethod
/*!
* \brief passwordMethodClear Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -48,7 +48,7 @@ class passwordMethodEmpty extends passwordMethod
*
* \return TRUE
*/
- function is_available()
+ function is_available ()
{
return TRUE;
}
@@ -58,7 +58,7 @@ class passwordMethodEmpty extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
return ($locked ? static::LOCKVALUE : '');
}
@@ -66,7 +66,7 @@ class passwordMethodEmpty extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return 'empty';
}
@@ -76,12 +76,12 @@ class passwordMethodEmpty extends passwordMethod
*
* \return boolean FALSE
*/
- function need_password()
+ function need_password ()
{
return FALSE;
}
- static function _extract_method($password_hash)
+ static function _extract_method ($password_hash)
{
if (empty($password_hash) || ($password_hash == static::LOCKVALUE)) {
return static::get_hash_name();
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index 835a8adcd7adc9b6ebe0a60c0335fddbbc318fbe..7637e354bf5db54db5b432b44ef0b78a4b9c731b 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -35,7 +35,7 @@ class passwordMethodMd5 extends passwordMethod
/*!
* \brief passwordMethodMd5 Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -44,7 +44,7 @@ class passwordMethodMd5 extends passwordMethod
*
* \return TRUE if is avaibable, otherwise return false
*/
- function is_available()
+ function is_available ()
{
return function_exists('md5');
}
@@ -54,7 +54,7 @@ class passwordMethodMd5 extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
return '{MD5}'.($locked ? '!' : '').base64_encode( pack('H*', md5($pwd)));
}
@@ -62,7 +62,7 @@ class passwordMethodMd5 extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return 'md5';
}
diff --git a/include/password-methods/class_password-methods-sasl.inc b/include/password-methods/class_password-methods-sasl.inc
index 064e7154b29880f56d7c3f4d1997a236dba71fd6..d0a2e898c1b97ad9852efc7cf360e2bc0cb9507e 100644
--- a/include/password-methods/class_password-methods-sasl.inc
+++ b/include/password-methods/class_password-methods-sasl.inc
@@ -40,7 +40,7 @@ class passwordMethodsasl extends passwordMethod
* \param string $dn The DN
* \param object $userTab The user main tab object
*/
- function __construct($dn = '', $userTab = NULL)
+ function __construct ($dn = '', $userTab = NULL)
{
global $config;
$this->realm = trim($config->get_cfg_value('saslRealm', ''));
@@ -72,7 +72,7 @@ class passwordMethodsasl extends passwordMethod
*
* \return TRUE if is avaibable
*/
- function is_available()
+ function is_available ()
{
if (empty($this->realm) && empty($this->exop)) {
return FALSE;
@@ -85,7 +85,7 @@ class passwordMethodsasl extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
if (empty($this->exop)) {
if (empty($this->realm)) {
@@ -98,7 +98,7 @@ class passwordMethodsasl extends passwordMethod
}
}
- function checkPassword($pwd, $hash)
+ function checkPassword ($pwd, $hash)
{
// We do not store passwords, can’t know if they’re the same
return FALSE;
@@ -107,7 +107,7 @@ class passwordMethodsasl extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return 'sasl';
}
@@ -117,7 +117,7 @@ class passwordMethodsasl extends passwordMethod
*
* \return boolean FALSE
*/
- function need_password()
+ function need_password ()
{
global $config;
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 8e05c7b745e8bda8556ffd10a57f050175206e2a..af5acbc7d781f2bddb6966e877d8bc08e708cb04 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -34,7 +34,7 @@ class passwordMethodsha extends passwordMethod
/*!
* \brief passwordMethodsha Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -43,7 +43,7 @@ class passwordMethodsha extends passwordMethod
*
* \return TRUE if is avaibable, otherwise return false
*/
- function is_available()
+ function is_available ()
{
return (function_exists('sha1') || function_exists('mhash'));
}
@@ -53,7 +53,7 @@ class passwordMethodsha extends passwordMethod
*
* \param string $password Password
*/
- function generate_hash($password, $locked = FALSE)
+ function generate_hash ($password, $locked = FALSE)
{
if (function_exists('sha1')) {
$hash = '{SHA}'.($locked ? '!' : '').base64_encode(pack('H*', sha1($password)));
@@ -70,7 +70,7 @@ class passwordMethodsha extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return 'sha';
}
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index 655bb75a2f76c88c29ef147ee0f99ede98f394c0..9f3ab5b75c2a0b785441507a7729867cfd70a5f4 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -34,7 +34,7 @@ class passwordMethodsmd5 extends passwordMethod
/*!
* \brief passwordMethodsmd5 Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -43,7 +43,7 @@ class passwordMethodsmd5 extends passwordMethod
*
* \return TRUE if is avaibable, otherwise return false
*/
- function is_available()
+ function is_available ()
{
return function_exists('md5');
}
@@ -53,14 +53,14 @@ class passwordMethodsmd5 extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
$salt0 = substr(pack('h*', md5(random_int(0, PHP_INT_MAX))), 0, 8);
$salt = substr(pack('H*', md5($salt0 . $pwd)), 0, 4);
return '{SMD5}'.($locked ? '!' : '').base64_encode(pack('H*', md5($pwd . $salt)) . $salt);
}
- function checkPassword($pwd, $hash)
+ function checkPassword ($pwd, $hash)
{
$hash = base64_decode(substr($hash, 6));
$salt = substr($hash, 16);
@@ -72,7 +72,7 @@ class passwordMethodsmd5 extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return 'smd5';
}
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index c0d287b55e6eefd6361792349ad01158bb5eb8ef..f31f53b887450664f72a9f36b0fe92aa121662cf 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -34,7 +34,7 @@ class passwordMethodssha extends passwordMethod
/*!
* \brief passwordMethodssha Constructor
*/
- function __construct()
+ function __construct ()
{
}
@@ -43,7 +43,7 @@ class passwordMethodssha extends passwordMethod
*
* \return TRUE if is avaibable, otherwise return false
*/
- function is_available()
+ function is_available ()
{
return (function_exists('sha1') || function_exists('mhash'));
}
@@ -53,7 +53,7 @@ class passwordMethodssha extends passwordMethod
*
* \param string $pwd Password
*/
- function generate_hash($pwd, $locked = FALSE)
+ function generate_hash ($pwd, $locked = FALSE)
{
if (function_exists('sha1')) {
$salt = substr(pack('h*', md5(random_int(0, PHP_INT_MAX))), 0, 8);
@@ -69,7 +69,7 @@ class passwordMethodssha extends passwordMethod
return $pwd;
}
- function checkPassword($pwd, $hash)
+ function checkPassword ($pwd, $hash)
{
$hash = base64_decode(substr($hash, 6));
$salt = substr($hash, 20);
@@ -88,7 +88,7 @@ class passwordMethodssha extends passwordMethod
/*!
* \brief Get the hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
return 'ssha';
}
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index 5ad44c626c19c34d368cbc3b4244f419079371c9..7a822dcae41777e8c43323f35444bf569cbeb20a 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -40,14 +40,14 @@ class passwordMethod
* \param string $dn The DN
* \param object $userTab The user main tab object
*/
- function __construct($dn = '', $userTab = NULL)
+ function __construct ($dn = '', $userTab = NULL)
{
}
/*!
* \brief Get the Hash name
*/
- static function get_hash_name()
+ static function get_hash_name ()
{
trigger_error("get_hash_name can't be called on main class");
}
@@ -57,7 +57,7 @@ class passwordMethod
*
* \return boolean TRUE
*/
- function need_password()
+ function need_password ()
{
return TRUE;
}
@@ -67,7 +67,7 @@ class passwordMethod
*
* \return boolean
*/
- function is_lockable()
+ function is_lockable ()
{
return $this->lockable;
}
@@ -77,7 +77,7 @@ class passwordMethod
*
* \param string $dn The DN
*/
- function is_locked($dn = '', $pwd = '')
+ function is_locked ($dn = '', $pwd = '')
{
global $config;
if (!$this->lockable) {
@@ -105,7 +105,7 @@ class passwordMethod
*
* \param string $dn
*/
- function lock_account($dn = "")
+ function lock_account ($dn = "")
{
return $this->generic_modify_account($dn, 'LOCK');
}
@@ -114,7 +114,7 @@ class passwordMethod
* \brief Unlocks an account which was locked by 'lock_account()'.
* For details about the locking mechanism see 'lock_account()'.
*/
- function unlock_account($dn = "")
+ function unlock_account ($dn = "")
{
return $this->generic_modify_account($dn, 'UNLOCK');
}
@@ -123,7 +123,7 @@ class passwordMethod
* \brief Unlocks an account which was locked by 'lock_account()'.
* For details about the locking mechanism see 'lock_account()'.
*/
- private function generic_modify_account($dn, $mode)
+ private function generic_modify_account ($dn, $mode)
{
global $config;
if (!$this->lockable) {
@@ -206,7 +206,7 @@ class passwordMethod
/*!
* \brief This function returns all loaded classes for password encryption
*/
- static function get_available_methods()
+ static function get_available_methods ()
{
global $class_mapping;
$ret = FALSE;
@@ -250,7 +250,7 @@ class passwordMethod
/*!
* \brief Get desciption
*/
- function get_description()
+ function get_description ()
{
return "";
}
@@ -258,7 +258,7 @@ class passwordMethod
/*!
* \brief Method to check if a password matches a hash
*/
- function checkPassword($pwd, $hash)
+ function checkPassword ($pwd, $hash)
{
return ($hash == $this->generate_hash($pwd));
}
@@ -267,7 +267,7 @@ class passwordMethod
/*!
* \brief Return true if this password method provides a configuration dialog
*/
- function is_configurable()
+ function is_configurable ()
{
return FALSE;
}
@@ -275,7 +275,7 @@ class passwordMethod
/*!
* \brief Provide a subdialog to configure a password method
*/
- function configure()
+ function configure ()
{
return "";
}
@@ -286,7 +286,7 @@ class passwordMethod
*
* \param string $dn The DN
*/
- function save($dn)
+ function save ($dn)
{
}
@@ -298,7 +298,7 @@ class passwordMethod
*
* \param string $dn The DN
*/
- static function get_method($password_hash, $dn = "")
+ static function get_method ($password_hash, $dn = "")
{
$methods = passwordMethod::get_available_methods();
@@ -328,7 +328,7 @@ class passwordMethod
*
* \param string $password_hash
*/
- static function _extract_method($password_hash)
+ static function _extract_method ($password_hash)
{
$hash = static::get_hash_name();
if (preg_match("/^\{$hash\}/i", $password_hash)) {
@@ -345,7 +345,7 @@ class passwordMethod
*
* \param string $hash
*/
- static function make_hash($password, $hash)
+ static function make_hash ($password, $hash)
{
$methods = passwordMethod::get_available_methods();
$tmp = new $methods[$hash]();
@@ -358,7 +358,7 @@ class passwordMethod
*
* \param string $hash
*/
- function set_hash($hash)
+ function set_hash ($hash)
{
$this->hash = $hash;
}
@@ -367,7 +367,7 @@ class passwordMethod
/*!
* \brief Get a hash
*/
- function get_hash()
+ function get_hash ()
{
return $this->hash;
}
@@ -379,7 +379,7 @@ class passwordMethod
*
* \param string $password The password
*/
- static function is_harmless($password)
+ static function is_harmless ($password)
{
global $config;
if ($config->get_cfg_value("strictPasswordRules") == "TRUE") {
diff --git a/include/php_setup.inc b/include/php_setup.inc
index b183e324fca0fb3c16d2f956e575954014cb2de8..da665fd580eaa43f6c1896ca2af44566220119c2 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -26,7 +26,7 @@
*/
require_once ("variables.inc");
-function html_trace($errstr = "")
+function html_trace ($errstr = "")
{
static $hideArgs = array(
'ldap_init' => array(3),
@@ -163,7 +163,7 @@ function html_trace($errstr = "")
*
* \param string $errline The error line
*/
-function gosaRaiseError($errno, $errstr, $errfile, $errline)
+function gosaRaiseError ($errno, $errstr, $errfile, $errline)
{
global $error_collector,$config, $error_collector_mailto;
@@ -276,13 +276,13 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
/*!
* \brief Dummy error handler
*/
-function dummy_error_handler()
+function dummy_error_handler ()
{
}
/*! \brief Returns TRUE if SSLÂ was used to contact FD, whether directly or through a proxy
*/
-function sslOn()
+function sslOn ()
{
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
return (strcasecmp($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') == 0);
@@ -295,7 +295,7 @@ function sslOn()
/*! \brief Returns SSL URL to redirect to
*/
-function sslUrl()
+function sslUrl ()
{
$ssl = 'https://';
if (empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -323,7 +323,7 @@ date_default_timezone_set("GMT");
/* Get base dir for reference */
$BASE_DIR = dirname(dirname(__FILE__));
$ROOT_DIR = $BASE_DIR."/html";
-error_reporting (E_ALL | E_STRICT);
+error_reporting(E_ALL | E_STRICT);
/* Register error handler */
$error_collector = "";
diff --git a/include/select/class_filterLDAPBlacklist.inc b/include/select/class_filterLDAPBlacklist.inc
index 08cf34dbc8aa518f7b5bf0fba19f0b4c69b1f5ae..a6a5a0368672a074314eae7cc78d3a08e13412ee 100644
--- a/include/select/class_filterLDAPBlacklist.inc
+++ b/include/select/class_filterLDAPBlacklist.inc
@@ -25,13 +25,13 @@
*/
class filterLDAPBlacklist {
- static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
+ static function query ($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
{
$result = filterLDAP::query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage);
return filterLDAPBlacklist::filterByBlacklist($result);
}
- static function filterByBlacklist($entries)
+ static function filterByBlacklist ($entries)
{
if (session::is_set('filterWhitelist')) {
$wlist = session::get('filterWhitelist');
diff --git a/include/select/groupSelect/class_groupSelect.inc b/include/select/groupSelect/class_groupSelect.inc
index 87eeff3cf014feb52232e4ffa7aa82b4c1c4ebb3..9e9784b8882a7cbd529352a98af6abfce808171a 100644
--- a/include/select/groupSelect/class_groupSelect.inc
+++ b/include/select/groupSelect/class_groupSelect.inc
@@ -26,7 +26,7 @@ class groupSelect extends simpleSelectManagement
protected $objectTypes = array('group');
protected $autoFilter = FALSE;
- function __construct()
+ function __construct ()
{
$this->filterXMLPath = get_template_path('group-filter.xml', TRUE, dirname(__FILE__));
diff --git a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index 4390a401011c2d0e1d526e412f3381ecb0fac407..c8581d3fde55c9f08291b2c4b7c90cb855a83f34 100644
--- a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
+++ b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
@@ -119,7 +119,7 @@ class BaseSelectorAttribute extends Attribute
}
}
- function checkValue($value)
+ function checkValue ($value)
{
if (!is_string($value) && (!is_object($value) || !method_exists($value, '__toString' ))) {
throw new InvalidValueException(_('Base field value should always be a string'));
@@ -164,7 +164,7 @@ class BaseSelectorAttribute extends Attribute
return $this->renderAcl($display);
}
- function getHtmlId()
+ function getHtmlId ()
{
if (isset($this->baseSelector)) {
return $this->baseSelector->getInputHtmlId();
@@ -173,7 +173,7 @@ class BaseSelectorAttribute extends Attribute
}
}
- function serializeAttribute(array &$attributes, $form = TRUE)
+ function serializeAttribute (array &$attributes, $form = TRUE)
{
if (!$form || $this->visible) {
parent::serializeAttribute($attributes, $form);
diff --git a/include/simpleplugin/attributes/class_BooleanAttribute.inc b/include/simpleplugin/attributes/class_BooleanAttribute.inc
index f6f1aee18a2e317862c66c0d3a2ee61e18a70ade..1fd7838ee186477fe5afe212dfdc299f5328b209 100644
--- a/include/simpleplugin/attributes/class_BooleanAttribute.inc
+++ b/include/simpleplugin/attributes/class_BooleanAttribute.inc
@@ -45,12 +45,12 @@ class BooleanAttribute extends Attribute
$this->falseValue = $falseValue;
}
- function setTemplatable($bool)
+ function setTemplatable ($bool)
{
$this->templatable = $bool;
}
- protected function isTemplatable()
+ protected function isTemplatable ()
{
/* Allow to set to %askme% if we are not (de)activating other fields */
return (!$this->submitForm && empty($this->managedAttributes) && $this->templatable);
@@ -90,7 +90,7 @@ class BooleanAttribute extends Attribute
}
}
- function displayValue($value)
+ function displayValue ($value)
{
if ($this->isTemplate() && $this->isTemplatable() && ($value === '%askme%')) {
return $value;
diff --git a/include/simpleplugin/attributes/class_CompositeAttribute.inc b/include/simpleplugin/attributes/class_CompositeAttribute.inc
index 445a25c32cf1fbdbe4bcd8deb452c0c56c56b266..5a0a8df3f2ec2c610b7161e54832d0d6617621b9 100644
--- a/include/simpleplugin/attributes/class_CompositeAttribute.inc
+++ b/include/simpleplugin/attributes/class_CompositeAttribute.inc
@@ -62,7 +62,7 @@ class CompositeAttribute extends Attribute
unset($attribute);
}
- function setIsSubAttribute($bool)
+ function setIsSubAttribute ($bool)
{
parent::setIsSubAttribute($bool);
foreach ($this->attributes as &$attribute) {
@@ -99,7 +99,7 @@ class CompositeAttribute extends Attribute
$this->linearRendering = $bool;
}
- function readValues($value)
+ function readValues ($value)
{
$res = preg_match($this->readFormat, $value, $m);
if ($res === 1) {
@@ -121,7 +121,7 @@ class CompositeAttribute extends Attribute
return array_fill(0, count($this->attributes), '');
}
- function writeValues(array $values)
+ function writeValues (array $values)
{
if ($this->writeFormat === FALSE) {
return $values;
@@ -221,7 +221,7 @@ class CompositeAttribute extends Attribute
unset($attribute);
}
- function renderAttribute(array &$attributes, $readOnly)
+ function renderAttribute (array &$attributes, $readOnly)
{
if ($this->visible) {
if ($this->linearRendering) {
@@ -236,7 +236,7 @@ class CompositeAttribute extends Attribute
}
}
- function getForHtmlId()
+ function getForHtmlId ()
{
// Label (if any) should point to the first attribute
if (isset($this->attributes[0])) {
@@ -246,7 +246,7 @@ class CompositeAttribute extends Attribute
}
}
- function serializeAttribute(array &$attributes, $form = TRUE)
+ function serializeAttribute (array &$attributes, $form = TRUE)
{
if ($form) {
if ($this->visible) {
@@ -269,7 +269,7 @@ class CompositeAttribute extends Attribute
}
}
- function renderFormInput()
+ function renderFormInput ()
{
$display = "";
foreach ($this->attributes as &$attribute) {
@@ -282,7 +282,7 @@ class CompositeAttribute extends Attribute
return $display;
}
- public function htmlIds()
+ public function htmlIds ()
{
$ret = array();
foreach ($this->attributes as &$attribute) {
diff --git a/include/simpleplugin/attributes/class_DateAttribute.inc b/include/simpleplugin/attributes/class_DateAttribute.inc
index 16dcbc1c99a2f4d6ee75dd35e36928dc8ab34a49..bee7bfe0a28e217695f6b236fda89840facf09cc 100644
--- a/include/simpleplugin/attributes/class_DateAttribute.inc
+++ b/include/simpleplugin/attributes/class_DateAttribute.inc
@@ -78,7 +78,7 @@ class DateAttribute extends Attribute
}
}
- protected function ldapToDate($ldapValue)
+ protected function ldapToDate ($ldapValue)
{
$date = DateTime::createFromFormat($this->format, $ldapValue, new DateTimeZone('UTC'));
if ($date !== FALSE) {
@@ -88,12 +88,12 @@ class DateAttribute extends Attribute
}
}
- protected function dateToLdap(DateTime $dateValue)
+ protected function dateToLdap (DateTime $dateValue)
{
return $dateValue->format($this->format);
}
- function getDateValue()
+ function getDateValue ()
{
$value = $this->value;
if (!($value instanceof DateTime)) {
@@ -180,7 +180,7 @@ class GeneralizedTimeDateAttribute extends DateAttribute
parent::__construct($label, $description, $ldapName, $required, '', $defaultValue, $defaultDate, $acl);
}
- protected function ldapToDate($ldapValue)
+ protected function ldapToDate ($ldapValue)
{
try {
return LdapGeneralizedTime::fromString($ldapValue);
@@ -189,7 +189,7 @@ class GeneralizedTimeDateAttribute extends DateAttribute
}
}
- protected function dateToLdap(DateTime $dateValue)
+ protected function dateToLdap (DateTime $dateValue)
{
return LdapGeneralizedTime::toString($dateValue);
}
@@ -226,7 +226,7 @@ class TimeHisAttribute extends CompositeAttribute
$this->setLinearRendering(TRUE);
}
- function readValues($value)
+ function readValues ($value)
{
$values = parent::readValues($value);
if ($this->convert) {
@@ -242,7 +242,7 @@ class TimeHisAttribute extends CompositeAttribute
return $values;
}
- function writeValues(array $values)
+ function writeValues (array $values)
{
if ($this->convert) {
$datetime = new DateTime('T'.implode(':', $values), timezone::getDefaultTimeZone());
@@ -256,7 +256,7 @@ class TimeHisAttribute extends CompositeAttribute
return parent::writeValues($values);
}
- function displayValue($value)
+ function displayValue ($value)
{
$values = parent::readValues($value);
$datetime = new DateTime('T'.implode(':', $values), timezone::utc());
diff --git a/include/simpleplugin/attributes/class_FileAttribute.inc b/include/simpleplugin/attributes/class_FileAttribute.inc
index 8c310ec4404903f66430369c4205da0c24954f87..9118adf6fd72905b0e25bf4b2107bb28195e11f4 100644
--- a/include/simpleplugin/attributes/class_FileAttribute.inc
+++ b/include/simpleplugin/attributes/class_FileAttribute.inc
@@ -25,7 +25,7 @@ class FileAttribute extends Attribute
{
protected $binary = TRUE;
- function loadPostValue()
+ function loadPostValue ()
{
$this->postValue = $this->value;
if (!empty($_FILES[$this->getHtmlId()]['name']) && $this->isVisible()) {
@@ -52,7 +52,7 @@ class FileAttribute extends Attribute
*
* \param filehandle $handle The handle on the opened uploaded file
*/
- function readFile($handle)
+ function readFile ($handle)
{
$postValue = fread($handle, 1024);
while (!feof($handle)) {
@@ -69,7 +69,7 @@ class FileAttribute extends Attribute
return $this->renderAcl($display);
}
- function displayValue($value)
+ function displayValue ($value)
{
return sprintf(_('%s (%d bytes)'), $this->getLabel(), mb_strlen($value, '8bit'));
}
@@ -79,7 +79,7 @@ class FileAttribute extends Attribute
* \param array &$attributes the attributes array
* \param boolean $form
*/
- function serializeAttribute(array &$attributes, $form = TRUE)
+ function serializeAttribute (array &$attributes, $form = TRUE)
{
if (!$form || $this->visible) {
parent::serializeAttribute($attributes, $form);
@@ -94,7 +94,7 @@ class FileAttribute extends Attribute
*
* \param mixed $value the value
*/
- function serializeValue($value = NULL)
+ function serializeValue ($value = NULL)
{
if ($value === NULL) {
$value = $this->getValue();
@@ -110,7 +110,7 @@ class FileAttribute extends Attribute
*
* \param mixed $value the value
*/
- function deserializeValue($value)
+ function deserializeValue ($value)
{
if ($this->disabled) {
return sprintf(_('Attribute %s is disabled, its value could not be set'), $this->getLdapName());
@@ -140,7 +140,7 @@ class FileDownloadAttribute extends FileAttribute
$this->binary = ($extension != '.txt');
}
- function computeFilename()
+ function computeFilename ()
{
return $this->getLdapName().$this->extension;
}
@@ -188,7 +188,7 @@ class FileDownloadAttribute extends FileAttribute
return $this->renderAcl($display);
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
$ids = array();
@@ -202,7 +202,7 @@ class FileDownloadAttribute extends FileAttribute
return $ids;
}
- function renderAttribute(array &$attributes, $readOnly)
+ function renderAttribute (array &$attributes, $readOnly)
{
if ($this->upload === FALSE) {
parent::renderAttribute($attributes, FALSE);
@@ -272,7 +272,7 @@ class FileTextAreaAttribute extends FileDownloadAttribute
return $this->renderAcl($display).parent::renderFormInput();
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
$ids = parent::htmlIds();
@@ -301,7 +301,7 @@ class ImageAttribute extends FileAttribute
$this->forceSize = $forceSize;
}
- function setPlaceholder($placeholder)
+ function setPlaceholder ($placeholder)
{
$this->placeholder = $placeholder;
}
@@ -415,7 +415,7 @@ class ImageAttribute extends FileAttribute
return $this->renderAcl($display);
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
return array($id.'_img',$id,'upload'.$id);
diff --git a/include/simpleplugin/attributes/class_FlagsAttribute.inc b/include/simpleplugin/attributes/class_FlagsAttribute.inc
index 8db7cc10968d41b2897ab2ae34cc6e07f0d28b87..8d5a30755edc865b551c61ef6aa10f618083b5eb 100644
--- a/include/simpleplugin/attributes/class_FlagsAttribute.inc
+++ b/include/simpleplugin/attributes/class_FlagsAttribute.inc
@@ -59,7 +59,7 @@ class FlagsAttribute extends StringAttribute
}
}
- function getValue()
+ function getValue ()
{
$value = '[';
if (is_object($this->plugin)) {
diff --git a/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc b/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc
index 9a5ced3fbcbd30c812687311aac76794cedb1218..0445b13b66b6f76e25b96dbd28e0235dafabb240 100644
--- a/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc
+++ b/include/simpleplugin/attributes/class_PhoneNumberAttribute.inc
@@ -74,7 +74,7 @@ class anyPhoneSelect extends phoneSelect
*/
class phoneSelectDialog extends GenericDialog
{
- function __construct($simplePlugin, $attribute, $type)
+ function __construct ($simplePlugin, $attribute, $type)
{
$this->attribute = $attribute;
switch ($type) {
@@ -154,7 +154,7 @@ class PhoneNumberButtonAttribute extends PhoneNumberAttribute
return $display;
}
- public function htmlIds()
+ public function htmlIds ()
{
$ids = parent::htmlIds();
if ($this->type !== FALSE) {
diff --git a/include/simpleplugin/attributes/class_SelectAttribute.inc b/include/simpleplugin/attributes/class_SelectAttribute.inc
index 0349f4fb046b47ded329193dca7ec74afa71b96b..b60d2ebebe61087c1be654bd626e8194ea0defe4 100644
--- a/include/simpleplugin/attributes/class_SelectAttribute.inc
+++ b/include/simpleplugin/attributes/class_SelectAttribute.inc
@@ -191,7 +191,7 @@ class SelectAttribute extends Attribute
return $this->renderAcl($display);
}
- function serializeAttribute(array &$attributes, $form = TRUE)
+ function serializeAttribute (array &$attributes, $form = TRUE)
{
if (!$form || $this->visible) {
parent::serializeAttribute($attributes, $form);
@@ -206,7 +206,7 @@ class SelectAttribute extends Attribute
}
/*! \brief Set the size of the HTML input tag, useful to display several options on the screen instead of just one */
- function setSize($size)
+ function setSize ($size)
{
$this->size = $size;
}
@@ -248,7 +248,7 @@ class ObjectSelectAttribute extends SelectAttribute
}
}
- function updateChoices()
+ function updateChoices ()
{
$objects = objects::ls($this->objectType, $this->objectAttrs, NULL, $this->objectFilter);
$this->setChoices(array_keys($objects), array_values($objects));
diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index f3c2a589ae59cee7bfcf9ce5f5df6fc93f473c8c..42e69c7198bbeb0c95e2d825f3d9c32e39107777 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -48,7 +48,7 @@ class SetAttribute extends Attribute
$this->valueUnicity = $valueUnicity;
}
- function setIsSubAttribute($bool)
+ function setIsSubAttribute ($bool)
{
parent::setIsSubAttribute($bool);
$this->attribute->setIsSubAttribute($this->isSubAttribute);
@@ -174,7 +174,7 @@ class SetAttribute extends Attribute
return $this->renderAcl($display).$attr_display.$this->renderAcl($buttons);
}
- function renderOnlyFormInput()
+ function renderOnlyFormInput ()
{
if (($this->size < 15) && ($this->size < count($this->value))) {
$this->size = min(15, count($this->value));
@@ -205,7 +205,7 @@ class SetAttribute extends Attribute
);
}
- function handleEditingValue()
+ function handleEditingValue ()
{
if ($this->editingValue === FALSE) {
$this->attribute->resetToDefault();
@@ -227,7 +227,7 @@ class SetAttribute extends Attribute
}
}
- function renderAttribute(array &$attributes, $readOnly)
+ function renderAttribute (array &$attributes, $readOnly)
{
if ($this->attribute === FALSE) {
return parent::renderAttribute($attributes, $readOnly);
@@ -259,7 +259,7 @@ class SetAttribute extends Attribute
}
}
- function serializeAttribute(array &$attributes, $form = TRUE)
+ function serializeAttribute (array &$attributes, $form = TRUE)
{
parent::serializeAttribute($attributes, $form);
if ($this->attribute === FALSE) {
@@ -276,7 +276,7 @@ class SetAttribute extends Attribute
}
}
- function getForHtmlId()
+ function getForHtmlId ()
{
// Label should point to the attribute
if (is_object($this->attribute)) {
@@ -299,7 +299,7 @@ class SetAttribute extends Attribute
return array_values($this->value);
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
return array_merge(array('add'.$id,'del'.$id,'row'.$id), $this->attribute->htmlIds());
@@ -317,7 +317,7 @@ class SetAttribute extends Attribute
}
}
- function getArrayValues()
+ function getArrayValues ()
{
$result = array();
foreach ($this->value as $value) {
@@ -331,7 +331,7 @@ class SetAttribute extends Attribute
return $result;
}
- function foreignKeyUpdate($oldvalue, $newvalue, array $source)
+ function foreignKeyUpdate ($oldvalue, $newvalue, array $source)
{
foreach ($this->value as $key => &$value) {
if (($source['FIELD'] == 'dn') && ($source['MODE'] == 'move')) {
@@ -355,17 +355,17 @@ class SetAttribute extends Attribute
unset($value);
}
- function foreignKeyCheck($value, array $source)
+ function foreignKeyCheck ($value, array $source)
{
return in_array($value, $this->value);
}
- function setSize($size)
+ function setSize ($size)
{
$this->size = $size;
}
- function checkValue($value)
+ function checkValue ($value)
{
if (!is_array($value)) {
throw new InvalidValueException(sprintf(_('SetAttribute "%s" was set to a non-compatible value'), $this->getLabel()));
@@ -396,12 +396,12 @@ class OrderedArrayAttribute extends SetAttribute
$this->edit_enabled = $edit_enabled;
}
- function setHeaders($h)
+ function setHeaders ($h)
{
$this->headers = $h;
}
- function readValue($value)
+ function readValue ($value)
{
if ($this->order) {
return preg_split('/:/', $value, 2);
@@ -410,7 +410,7 @@ class OrderedArrayAttribute extends SetAttribute
}
}
- function writeValue($key, $value)
+ function writeValue ($key, $value)
{
if ($this->order) {
return $key.":".$value;
@@ -482,7 +482,7 @@ class OrderedArrayAttribute extends SetAttribute
return '{$div_'.$id.'}'."\n";
}
- protected function genRowIcons($key, $value)
+ protected function genRowIcons ($key, $value)
{
$id = $this->getHtmlId();
@@ -569,7 +569,7 @@ class OrderedArrayAttribute extends SetAttribute
}
}
- protected function handlePostValueActions($id, $postValue)
+ protected function handlePostValueActions ($id, $postValue)
{
if ($this->order) {
if (preg_match('/^'.$id.'_up_/', $postValue)) {
@@ -606,7 +606,7 @@ class OrderedArrayAttribute extends SetAttribute
return FALSE;
}
- protected function handleAddAndEditValue()
+ protected function handleAddAndEditValue ()
{
$id = $this->getHtmlId();
if ($this->attribute === FALSE) {
@@ -627,7 +627,7 @@ class OrderedArrayAttribute extends SetAttribute
}
}
- protected function handleEdit($key)
+ protected function handleEdit ($key)
{
$this->editingValue = $this->value[$key];
$this->delPostValue($key);
@@ -642,7 +642,7 @@ class OrderedArrayAttribute extends SetAttribute
}
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
$ids = array('add'.$id);
diff --git a/include/simpleplugin/attributes/class_StringAttribute.inc b/include/simpleplugin/attributes/class_StringAttribute.inc
index 9ea60c5cb0a104fc571d0d00992a4b5186346f0f..81ecde381ff23e063c37703aa5f40f2f3285e1c1 100644
--- a/include/simpleplugin/attributes/class_StringAttribute.inc
+++ b/include/simpleplugin/attributes/class_StringAttribute.inc
@@ -142,7 +142,7 @@ class StringAttribute extends Attribute
return $this->autocomplete;
}
- function checkValue($value)
+ function checkValue ($value)
{
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 878f08451c41af1bc3947c3d035ceac19a98b3c3..88c2b5bf2d605ec4fad7692d4e4b092e31616797 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -120,7 +120,7 @@ class Attribute
$this->manageAttributes($this->getValue());
}
- function setIsSubAttribute($bool)
+ function setIsSubAttribute ($bool)
{
$this->isSubAttribute = $bool;
}
@@ -583,7 +583,7 @@ class Attribute
*
* \param bool $readOnly should we show text or input
*/
- function renderAttribute(array &$attributes, $readOnly)
+ function renderAttribute (array &$attributes, $readOnly)
{
if ($this->visible) {
if ($readOnly) {
@@ -620,7 +620,7 @@ class Attribute
* \param array &$attributes the attributes array
* \param boolean $form
*/
- function serializeAttribute(array &$attributes, $form = TRUE)
+ function serializeAttribute (array &$attributes, $form = TRUE)
{
if (!$form || $this->visible) {
$class = get_class($this);
@@ -653,7 +653,7 @@ class Attribute
*
* \param mixed $value the value
*/
- function deserializeValue($value)
+ function deserializeValue ($value)
{
if ($this->disabled) {
return sprintf(_('Attribute %s is disabled, its value could not be set'), $this->getLdapName());
@@ -665,7 +665,7 @@ class Attribute
*
* \param mixed $value the value
*/
- function serializeValue($value = NULL)
+ function serializeValue ($value = NULL)
{
if ($value === NULL) {
$value = $this->getValue();
@@ -677,7 +677,7 @@ class Attribute
*
* \param string $display the display information to pass through ACL
*/
- function renderAcl($display)
+ function renderAcl ($display)
{
return '{render aclName="'.$this->getAcl().'" acl=$'.$this->getAcl()."ACL}\n$display\n{/render}";
}
@@ -707,7 +707,7 @@ class Attribute
));
}
- public function htmlIds()
+ public function htmlIds ()
{
return array($this->getHtmlId());
}
@@ -738,7 +738,7 @@ class Attribute
return $this->renderFormInput();
}
- function foreignKeyUpdate($oldvalue, $newvalue, array $source)
+ function foreignKeyUpdate ($oldvalue, $newvalue, array $source)
{
if ($source['MODE'] == 'move') {
if ($source['FIELD'] == 'dn') {
@@ -753,12 +753,12 @@ class Attribute
}
}
- function foreignKeyCheck($value, array $source)
+ function foreignKeyCheck ($value, array $source)
{
return ($this->getValue() == $value);
}
- protected function renderInputField($type, $name, array $attributes = array())
+ protected function renderInputField ($type, $name, array $attributes = array())
{
$input = '<input type="'.$type.'" '.
'name="'.$name.'" id="'.$name.'"'.
@@ -822,7 +822,7 @@ class FakeAttribute extends Attribute
$this->setInLdap(FALSE);
}
- function renderAttribute(array &$attributes, $readOnly)
+ function renderAttribute (array &$attributes, $readOnly)
{
$attributes[$this->getLdapName()] = $this->getValue();
}
@@ -908,7 +908,7 @@ class DisplayAttribute extends DisplayLDAPAttribute
{
function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = "", $acl = "")
{
- parent::__construct ($label, $description, $ldapName, $required, $defaultValue, $acl);
+ parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
$this->setInLdap(FALSE);
}
}
@@ -921,7 +921,7 @@ class ObjectLinkAttribute extends DisplayLDAPAttribute
function __construct ($label, $description, $ldapName, $required, $type, $defaultValue = "", $acl = "")
{
- parent::__construct ($label, $description, $ldapName, $required, $defaultValue, $acl);
+ parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
$this->type = $type;
}
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index ae72b4fac3d07c7b2b46d607448c04b30a0b3c4d..5b4ba78175b3b7960cae33c3ddc4dd6b99ca993e 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -29,7 +29,7 @@ class GenericDialog
protected $post_cancel = 'add_cancel';
protected $post_finish = 'add_finish';
- function __construct($simplePlugin, $attribute)
+ function __construct ($simplePlugin, $attribute)
{
$this->attribute = $attribute;
$this->dialog = new $this->dialogClass();
@@ -231,7 +231,7 @@ class DialogAttribute extends SetAttribute
return $buttons;
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
$ids = array('add'.$id.'_dialog','del'.$id,'row'.$id);
@@ -278,7 +278,7 @@ class DialogOrderedArrayAttribute extends OrderedArrayAttribute
}
}
- protected function handleEdit($key)
+ protected function handleEdit ($key)
{
$this->editingValue = $this->value[$key];
$this->delPostValue($key);
@@ -289,7 +289,7 @@ class DialogOrderedArrayAttribute extends OrderedArrayAttribute
{
}
- function addValue($value)
+ function addValue ($value)
{
$this->value[] = $value;
$this->reIndexValues();
@@ -308,14 +308,14 @@ class DialogOrderedArrayAttribute extends OrderedArrayAttribute
);
}
- public function htmlIds()
+ public function htmlIds ()
{
$ids = parent::htmlIds();
$ids[0] .= '_dialog';
return $ids;
}
- protected function getAttributeArrayValue($key, $value)
+ protected function getAttributeArrayValue ($key, $value)
{
/* Convert text value to displayable array value */
die('Pure virtual method');
@@ -434,7 +434,7 @@ class GenericDialogAttribute extends DialogAttribute
}
}
- function foreignKeyUpdate($oldvalue, $newvalue, array $source)
+ function foreignKeyUpdate ($oldvalue, $newvalue, array $source)
{
foreach ($this->value as $key => &$value) {
if (($source['FIELD'] == 'dn') && ($source['MODE'] == 'move')) {
@@ -471,7 +471,7 @@ class GenericSelectManagementDialog extends GenericSelectDialog
{
protected $dialogClass = 'selectManagement';
- function __construct($simplePlugin, $attribute)
+ function __construct ($simplePlugin, $attribute)
{
$this->attribute = $attribute;
$this->dialog = new $this->dialogClass(...$this->attribute->selectManagementParameters);
@@ -604,7 +604,7 @@ class GroupsAttribute extends GenericDialogAttribute
function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = array(), $acl = '')
{
- parent::__construct ($label, $description, $ldapName, $required, $defaultValue, 'dn', 'cn', $acl);
+ parent::__construct($label, $description, $ldapName, $required, $defaultValue, 'dn', 'cn', $acl);
}
function addValue ($dn, $entry)
@@ -612,7 +612,7 @@ class GroupsAttribute extends GenericDialogAttribute
if (!in_array($dn, $this->value)) {
$display = $entry['cn'][0];
if (isset($entry['description'][0]) && !empty($entry['description'][0])) {
- $display .= ' ['.preg_replace ('/^Group of user/', _('Group of user'), $entry['description'][0]).']';
+ $display .= ' ['.preg_replace('/^Group of user/', _('Group of user'), $entry['description'][0]).']';
}
$this->value[] = $dn;
@@ -678,7 +678,7 @@ class MailsAttribute extends DialogAttribute
return $buttons;
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
return array('add'.$id,'add'.$id.'_dialog','del'.$id,'row'.$id);
@@ -905,7 +905,7 @@ class ObjectAttribute extends DialogButtonAttribute
}
}
- public function htmlIds()
+ public function htmlIds ()
{
$id = $this->getHtmlId();
$ids = array($id.'_dialog');
@@ -926,7 +926,7 @@ class UserAttribute extends ObjectAttribute
{
function __construct ($label, $description, $ldapName, $required, $defaultValue = '', $acl = '')
{
- parent::__construct ($label, $description, $ldapName, $required, 'user', $defaultValue = '', $acl = '');
+ parent::__construct($label, $description, $ldapName, $required, 'user', $defaultValue = '', $acl = '');
}
}
@@ -937,7 +937,7 @@ class GenericSimplePluginDialog extends GenericDialog
{
protected $initialDialogValue = NULL;
- function __construct($simplePlugin, $attribute, $value = array())
+ function __construct ($simplePlugin, $attribute, $value = array())
{
$this->attribute = $attribute;
$this->dialog = new $this->dialogClass('new');
diff --git a/include/simpleplugin/class_helpersAttribute.inc b/include/simpleplugin/class_helpersAttribute.inc
index f2538d0120702d817b1c79c7b783980dc5b1b671..81b63b777e695c986070a60fe2125b53d014d4b1 100644
--- a/include/simpleplugin/class_helpersAttribute.inc
+++ b/include/simpleplugin/class_helpersAttribute.inc
@@ -136,18 +136,18 @@ class CharSeparatedCompositeAttribute extends CompositeAttribute
{
private $sep;
- function __construct($description, $ldapName, $attributes, $sep, $acl = "", $label = "Composite attribute")
+ function __construct ($description, $ldapName, $attributes, $sep, $acl = "", $label = "Composite attribute")
{
parent::__construct($description, $ldapName, $attributes, '', '', $acl, $label);
$this->sep = $sep;
}
- function readValues($value)
+ function readValues ($value)
{
return explode($this->sep, $value);
}
- function writeValues(array $values)
+ function writeValues (array $values)
{
return join($this->sep, $values);
}
@@ -158,7 +158,7 @@ class CharSeparatedCompositeAttribute extends CompositeAttribute
*/
class PipeSeparatedCompositeAttribute extends CharSeparatedCompositeAttribute
{
- function __construct($description, $ldapName, $attributes, $acl = "", $label = "Composite attribute")
+ function __construct ($description, $ldapName, $attributes, $acl = "", $label = "Composite attribute")
{
parent::__construct($description, $ldapName, $attributes, '|', $acl, $label);
}
@@ -171,7 +171,7 @@ class CommaListAttribute extends CompositeAttribute
{
private $sep = ',';
- function __construct($ldapName, $attribute, $sep = ',')
+ function __construct ($ldapName, $attribute, $sep = ',')
{
parent::__construct(
$attribute->getDescription(), $ldapName,
@@ -182,7 +182,7 @@ class CommaListAttribute extends CompositeAttribute
$this->sep = $sep;
}
- function readValues($value)
+ function readValues ($value)
{
if ($value == '') {
return array(array());
@@ -191,7 +191,7 @@ class CommaListAttribute extends CompositeAttribute
}
}
- function writeValues(array $values)
+ function writeValues (array $values)
{
return join($this->sep, $values[0]);
}
@@ -216,7 +216,7 @@ class UnitIntAttribute extends CompositeAttribute
$this->setRequired($required); /* As we use linear rendering we want the asterisk in the label if required */
}
- function readValues($value)
+ function readValues ($value)
{
if ($value === '') {
return array('', 0);
@@ -235,7 +235,7 @@ class UnitIntAttribute extends CompositeAttribute
return array($value / $choices[$i], $choices[$i]);
}
- function writeValues(array $values)
+ function writeValues (array $values)
{
if ($values[0] === '') {
return '';
@@ -243,7 +243,7 @@ class UnitIntAttribute extends CompositeAttribute
return $values[0] * $values[1];
}
- function displayValue($value)
+ function displayValue ($value)
{
$values = $this->readValues($value);
return $values[0].$this->attributes[1]->displayValue($values[1]);
@@ -264,7 +264,7 @@ class BytesSizeAttribute extends UnitIntAttribute
1024 ** 3 => _('GiB'),
1024 ** 4 => _('TiB'),
);
- parent::__construct ($label, $description, $ldapName, $required, $units, $min, $max, $defaultValue, $acl);
+ parent::__construct($label, $description, $ldapName, $required, $units, $min, $max, $defaultValue, $acl);
}
}
@@ -281,7 +281,7 @@ class TimeAttribute extends UnitIntAttribute
3600 => _('hours'),
86400 => _('days'),
);
- parent::__construct ($label, $description, $ldapName, $required, $units, $min, $max, $defaultValue, $acl);
+ parent::__construct($label, $description, $ldapName, $required, $units, $min, $max, $defaultValue, $acl);
}
}
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 49addac8fb78183cf89803b71300d99fd98ff7ea..1a57bda72c3903c60082bf47e4ce0bce42dbc2b2 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -34,7 +34,7 @@ class templateDialog
protected $post_finish = 'template_continue';
protected $post_cancel = 'template_cancel';
- function __construct($simpleManagement, $type, $dn = NULL, $target = NULL)
+ function __construct ($simpleManagement, $type, $dn = NULL, $target = NULL)
{
$this->simpleManagement = $simpleManagement;
$this->type = $type;
@@ -200,7 +200,7 @@ class simpleManagement
public static $skipTemplates = TRUE;
public static $skipSnapshots = FALSE;
- function __construct()
+ function __construct ()
{
global $config;
@@ -479,12 +479,12 @@ class simpleManagement
return $data;
}
- function getHeadpage()
+ function getHeadpage ()
{
return $this->headpage;
}
- function getFilter()
+ function getFilter ()
{
return $this->filter;
}
@@ -494,7 +494,7 @@ class simpleManagement
*
* \param object $filter The new filter
*/
- function setFilter($filter)
+ function setFilter ($filter)
{
$this->filter = $filter;
}
@@ -506,17 +506,17 @@ class simpleManagement
* When the action/event new is send, the method 'createUser'
* will be called.
*/
- function registerAction($action, $target)
+ function registerAction ($action, $target)
{
$this->actions[$action] = $target;
}
- function getType($dn)
+ function getType ($dn)
{
return $this->getHeadpage()->getType($dn);
}
- function renderList()
+ function renderList ()
{
global $config;
$smarty = get_smarty();
@@ -543,7 +543,7 @@ class simpleManagement
* \brief Execute this plugin
* Handle actions/events, locking, snapshots, dialogs, tabs,...
*/
- function execute()
+ function execute ()
{
// Ensure that html posts and gets are kept even if we see a 'Entry islocked' dialog.
$vars = array('/^act$/','/^listing/','/^PID$/');
@@ -598,7 +598,7 @@ class simpleManagement
/*!
* \brief Generates the plugin header which is displayed whenever a tab object is opened.
*/
- protected function getHeader()
+ protected function getHeader ()
{
if ($this->skipHeader) {
return '';
@@ -617,7 +617,7 @@ class simpleManagement
/*!
* \brief Generates the footer which is used whenever a tab object is displayed.
*/
- protected function _getTabFooter()
+ protected function _getTabFooter ()
{
// Do not display tab footer for non tab objects
if (!($this->tabObject instanceOf simpleTabs)) {
@@ -665,7 +665,7 @@ class simpleManagement
*
* \param Array $all A combination of both 'action' and 'target'.
*/
- function newEntry($action, array $target, array $all)
+ function newEntry ($action, array $target, array $all)
{
$type = strtoupper(preg_replace('/^new_/', '', $action));
@@ -677,10 +677,10 @@ 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)
+ function newEntryTemplate ($action, array $target, array $all)
{
if (static::$skipTemplates) {
return;
@@ -690,7 +690,7 @@ class simpleManagement
$this->tabObject->setTemplateMode('template_cn');
}
- function newEntryFromTemplate($action, array $target, array $all)
+ function newEntryFromTemplate ($action, array $target, array $all)
{
if (static::$skipTemplates) {
return;
@@ -712,7 +712,7 @@ class simpleManagement
$this->dialogObject = new templateDialog($this, $type, $dn);
}
- function applyTemplateToEntry($action, array $target, array $all)
+ function applyTemplateToEntry ($action, array $target, array $all)
{
global $ui;
if (static::$skipTemplates) {
@@ -730,7 +730,7 @@ class simpleManagement
}
// Add locks
- add_lock ($this->dns, $ui->dn);
+ add_lock($this->dns, $ui->dn);
$this->dn = array_shift($this->dns);
$this->dialogObject = new templateDialog($this, $type, NULL, $this->dn);
@@ -751,7 +751,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)) {
@@ -771,7 +771,7 @@ class simpleManagement
* - Calls 'simpleTabs::save' to save back object modifications (e.g. to ldap).
* - Calls 'simpleManagement::closeDialogs' to return to the object listing.
*/
- protected function saveChanges()
+ protected function saveChanges ()
{
if (($this->tabObject instanceOf simpleTabs) && ($this->dialogObject instanceOf templateDialog)) {
$this->tabObject->save_object();
@@ -785,7 +785,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();
}
@@ -797,7 +797,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();
}
@@ -807,7 +807,7 @@ class simpleManagement
/*!
* \brief Save object modifications and keep dialogs opened
*/
- protected function applyChanges()
+ protected function applyChanges ()
{
if ($this->tabObject instanceOf simpleTabs) {
$this->tabObject->save_object();
@@ -815,7 +815,7 @@ class simpleManagement
if (count($msgs)) {
msg_dialog::displayChecks($msgs);
} else {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Modifications applied!');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Modifications applied!');
$this->tabObject->re_init();
}
}
@@ -825,7 +825,7 @@ class simpleManagement
* \brief Editing an object was caneled.
* Close dialogs/tabs and remove locks.
*/
- protected function cancelEdit()
+ protected function cancelEdit ()
{
if (($this->tabObject instanceOf simpleTabs) && ($this->dialogObject instanceOf templateDialog)) {
$this->handleTemplateApply(TRUE);
@@ -844,7 +844,7 @@ class simpleManagement
*
* \param Array $all A combination of both 'action' and 'target'.
*/
- function editEntry($action, array $target, array $all)
+ function editEntry ($action, array $target, array $all)
{
global $ui;
// Do not create a new tabObject while there is already one opened,
@@ -874,11 +874,11 @@ class simpleManagement
if ($locks = get_locks($this->dn, TRUE)) {
return gen_locked_message($locks, $this->dn, TRUE);
}
- add_lock ($this->dn, $ui->dn);
+ add_lock($this->dn, $ui->dn);
// 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']) && !$this->handleSubAction($all)) {
trigger_error('Was not able to handle subaction: '.$all['subaction']);
}
@@ -889,7 +889,7 @@ class simpleManagement
* \brief Detects actions/events send by the ui
* and the corresponding targets.
*/
- function detectPostActions()
+ function detectPostActions ()
{
if (!is_object($this->headpage)) {
trigger_error("No valid headpage given....!");
@@ -918,7 +918,7 @@ class simpleManagement
/*!
* \brief Calls the registered method for a given action/event.
*/
- function handleActions($action)
+ function handleActions ($action)
{
// Start action
if (isset($this->actions[$action['action']])) {
@@ -930,7 +930,7 @@ class simpleManagement
}
}
- protected function handleSubAction($all)
+ protected function handleSubAction ($all)
{
if (preg_match('/^tab_/', $all['subaction'])) {
$tab = preg_replace('/^tab_/', '', $all['subaction']);
@@ -944,7 +944,7 @@ class simpleManagement
return FALSE;
}
- function openTabObject($object, $base)
+ function openTabObject ($object, $base)
{
$this->tabObject = $object;
$this->tabObject->set_acl_base($base);
@@ -955,7 +955,7 @@ class simpleManagement
* \brief This method closes dialogs
* and cleans up the cached object info and the ui.
*/
- public function closeDialogs()
+ public function closeDialogs ()
{
$this->last_dn = $this->dn;
$this->dn = "";
@@ -977,7 +977,7 @@ class simpleManagement
* concurrent modifications.
* This locks will automatically removed here.
*/
- function remove_lock()
+ function remove_lock ()
{
if (!empty($this->dn) && $this->dn != "new") {
del_lock($this->dn);
@@ -987,7 +987,7 @@ class simpleManagement
}
}
- function is_modal_dialog()
+ function is_modal_dialog ()
{
return (is_object($this->tabObject) || is_object($this->dialogObject));
}
@@ -995,13 +995,13 @@ class simpleManagement
/*! \brief Queue selected objects to be removed.
* Checks ACLs, Locks and ask for confirmation.
*/
- protected function removeEntryRequested($action, array $target, array $all)
+ protected function removeEntryRequested ($action, array $target, array $all)
{
global $ui;
$disallowed = array();
$this->dns = array();
- @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) {
@@ -1052,7 +1052,7 @@ class simpleManagement
'type' => $info['name']
);
}
- add_lock ($this->dns, $ui->dn);
+ add_lock($this->dns, $ui->dn);
// Display confirmation dialog.
$smarty = get_smarty();
@@ -1062,10 +1062,10 @@ class simpleManagement
}
}
- function removeEntryConfirmed($action, array $target, array $all)
+ 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);
@@ -1104,10 +1104,10 @@ class simpleManagement
*
* \param Array $target A list of object dns, which should be affected by this method.
*/
- function createSnapshotDialog($action, array $target)
+ 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);
@@ -1133,7 +1133,7 @@ class simpleManagement
*
* \param Array $target A list of object dns, which should be affected by this method.
*/
- function restoreSnapshotDialog($action, array $target)
+ function restoreSnapshotDialog ($action, array $target)
{
global $config, $ui;
// Set current restore base for snapshot handling.
@@ -1163,7 +1163,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->dialogObject = new SnapshotRestoreDialog($this->dn, $this, !count($target), $aclCategory);
} else {
msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $this->dn),
@@ -1177,7 +1177,7 @@ class simpleManagement
* @param array $target A list of object dns, which should be affected by this method.
* @param array $all A combination of both 'action' and 'target'.
*/
- function copyPasteHandler($action = '', array $target = array(), array $all = array())
+ function copyPasteHandler ($action = '', array $target = array(), array $all = array())
{
global $ui;
// Return without any actions while copy&paste handler is disabled.
@@ -1200,11 +1200,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!');
}
}
}
@@ -1235,7 +1235,7 @@ class simpleManagement
/*!
* \brief Creates a new snapshot entry
*/
- function createSnapshot($dn, $description)
+ function createSnapshot ($dn, $description)
{
global $ui;
if ($this->dn !== $dn) {
@@ -1244,7 +1244,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);
@@ -1256,12 +1256,12 @@ class simpleManagement
*
* \param String $dn The DN of the snapshot
*/
- function restoreSnapshot($dn)
+ function restoreSnapshot ($dn)
{
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),
@@ -1269,7 +1269,7 @@ class simpleManagement
}
}
- function getSnapshotBases()
+ function getSnapshotBases ()
{
$bases = array();
foreach ($this->storagePoints as $sp) {
@@ -1287,7 +1287,7 @@ class simpleManagement
/*!
* \brief Get all deleted snapshots
*/
- function getAllDeletedSnapshots()
+ function getAllDeletedSnapshots ()
{
$bases = $this->getSnapshotBases();
$tmp = array();
@@ -1302,7 +1302,7 @@ class simpleManagement
*
* \param string $dn The DN
*/
- function getAvailableSnapsShots($dn)
+ function getAvailableSnapsShots ($dn)
{
return $this->snapHandler->getAvailableSnapsShots($dn);
}
@@ -1312,12 +1312,12 @@ class simpleManagement
*
* \param string $dn DN of the snapshot
*/
- function removeSnapshot($dn)
+ function removeSnapshot ($dn)
{
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 ae2d2d5cbc6255fe22d5ad782598ece2755f1f3c..6eaf819cf8ffaa0b1c2211c4257f8d176b0a18a6 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -515,7 +515,7 @@ class simplePlugin
return $attr.'='.ldap_escape_dn($this->attributesAccess[$attr]->computeLdapValue()).','.$ou.$base;
}
- protected function addAttribute(string $section, Attribute $attr)
+ protected function addAttribute (string $section, Attribute $attr)
{
$name = $attr->getLdapName();
$this->attributesInfo[$section]['attrs'][$name] = $attr;
@@ -524,7 +524,7 @@ class simplePlugin
unset($this->$name);
}
- protected function removeAttribute(string $section, string $id)
+ protected function removeAttribute (string $section, string $id)
{
unset($this->attributesInfo[$section]['attrs'][$id]);
unset($this->attributesAccess[$id]);
diff --git a/include/simpleplugin/class_simpleSelectManagement.inc b/include/simpleplugin/class_simpleSelectManagement.inc
index c220c6f756ce7cb38cdf0b23a3a9a016301d0c61..dc51592212ff9addd124f33e16adc2a166cae8b6 100644
--- a/include/simpleplugin/class_simpleSelectManagement.inc
+++ b/include/simpleplugin/class_simpleSelectManagement.inc
@@ -33,7 +33,7 @@ class simpleSelectManagement extends simpleManagement
protected $departmentRootVisible = FALSE;
- function __construct()
+ function __construct ()
{
if ($this->listXMLPath === NULL) {
$this->listXMLPath = get_template_path('simple-select-list.xml', TRUE, dirname(__FILE__));
@@ -67,7 +67,7 @@ class simpleSelectManagement extends simpleManagement
$this->filter->category = $infos['aclCategory'];
}
- static function filterSelectLink()
+ static function filterSelectLink ()
{
if (func_num_args() < 4) {
return ' ';
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index 0049944fb9e7d8fefa1997453365c4dfa2d6f4a9..5d8bc7268fd61652418a2cfda0caef6607c4f4f5 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -54,7 +54,7 @@ class simpleTabs
/*!
* \brief Tabs classes constructor
* */
- function __construct($type, $dn, $attrs_object = NULL)
+ function __construct ($type, $dn, $attrs_object = NULL)
{
global $config;
@@ -119,7 +119,7 @@ class simpleTabs
*
* This maybe usefull if for example the apply button was pressed.
*/
- function re_init()
+ function re_init ()
{
$baseobject = NULL;
foreach ($this->by_object as $name => $object) {
@@ -140,7 +140,7 @@ class simpleTabs
/*!
* \brief Sets the active tabs from this instance to an other one. Used by templates
*/
- function setActiveTabs(&$tabObject)
+ function setActiveTabs (&$tabObject)
{
foreach ($this->by_object as $class => $plugin) {
if ($plugin->is_account || $plugin->ignore_account) {
@@ -149,7 +149,7 @@ class simpleTabs
}
}
- function resetCopyInfos()
+ function resetCopyInfos ()
{
$this->dn = 'new';
foreach ($this->by_object as &$obj) {
@@ -158,30 +158,30 @@ class simpleTabs
unset($obj);
}
- function resetBase()
+ function resetBase ()
{
global $ui;
$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');
$baseobject->base = $ui->getCurrentBase();
if (!($baseobject instanceOf simplePlugin) && is_object($baseobject->baseSelector)) {
/* 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');
}
}
- function getBaseObject()
+ function getBaseObject ()
{
return $this->by_object[$this->baseclass];
}
/*! \brief Indicates if this tab class is read-only (because of locks) */
- function readOnly()
+ function readOnly ()
{
return $this->getBaseObject()->readOnly();
}
@@ -189,7 +189,7 @@ class simpleTabs
/*!
* \brief Save the tab(s) contents
*/
- function execute()
+ function execute ()
{
/* Look for pressed tab button first */
foreach ($this->by_object as $class => &$obj) {
@@ -217,7 +217,7 @@ class simpleTabs
/*!
* \brief Save a tabs object
*/
- function save_object()
+ function save_object ()
{
/* Ensure that the currently selected tab is valid. */
if (!isset($this->by_name[$this->current])) {
@@ -229,7 +229,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();
}
@@ -240,7 +240,7 @@ class simpleTabs
*
* \param boolean $disabled false
*/
- function gen_tabs($disabled = FALSE)
+ function gen_tabs ($disabled = FALSE)
{
$display = "";
if (!$disabled) {
@@ -305,7 +305,7 @@ class simpleTabs
/*!
* \brief Remove object from LDAP
*/
- function delete()
+ function delete ()
{
if (!$this->getBaseObject()->acl_is_removeable()) {
msg_dialog::display(_('Permission'), msgPool::permDelete($this->getBaseObject()->dn), ERROR_DIALOG);
@@ -326,7 +326,7 @@ class simpleTabs
/*!
* \brief Check
*/
- protected function check()
+ protected function check ()
{
global $config;
$messages = array();
@@ -350,7 +350,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();
@@ -373,7 +373,7 @@ class simpleTabs
*
* \param boolean $ignore_account false
*/
- function save()
+ function save ()
{
global $ui;
$messages = $this->check();
@@ -385,7 +385,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 array(
sprintf(_('Failed to compute DN for object: %s'), $e->getMessage())
@@ -414,7 +414,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;
@@ -462,10 +462,10 @@ class simpleTabs
* \param array $attrs an LDAP-like values array
* \param array $skip Attributes to skip
*/
- function adapt_from_template($attrs, $skip = array())
+ function adapt_from_template ($attrs, $skip = array())
{
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);
}
@@ -475,7 +475,7 @@ class simpleTabs
/*!
* \brief Add special Tabs
*/
- function addSpecialTabs()
+ function addSpecialTabs ()
{
global $config;
$baseobject = $this->getBaseObject();
@@ -496,7 +496,7 @@ class simpleTabs
*
* \param string $base The new acl base
*/
- function set_acl_base($base = "")
+ function set_acl_base ($base = "")
{
/* Update reference, transfer variables */
$first = ($base == "");
@@ -511,7 +511,7 @@ class simpleTabs
unset($obj);
}
- function setTemplateMode($cn)
+ function setTemplateMode ($cn)
{
$this->getBaseObject()->_template_cn = $cn;
@@ -529,7 +529,7 @@ class simpleTabs
unset($obj);
}
- public function setIgnoreAcls($bool)
+ public function setIgnoreAcls ($bool)
{
$this->ignoreAcls = $bool;
}
@@ -539,7 +539,7 @@ class simpleTabs
return $this->by_object[$this->current]->is_modal_dialog();
}
- function objectInfos()
+ function objectInfos ()
{
if ($this->objectType === FALSE) {
return FALSE;
@@ -548,7 +548,7 @@ class simpleTabs
}
/* Return tab or service if activated, FALSEÂ otherwise */
- function getTabOrServiceObject($tab)
+ function getTabOrServiceObject ($tab)
{
if (isset($this->by_object[$tab]) && ($this->by_object[$tab]->is_account || $this->by_object[$tab]->ignore_account)) {
return $this->by_object[$tab];
diff --git a/include/variables.inc b/include/variables.inc
index 51e98c5b7c39628de1dc9f7f10e7f151bbcd308d..95dd6230d831b0b8aef10b00afcf8154e2a918ed 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -28,7 +28,7 @@
require_once('variables_common.inc');
if (!defined("CONFIG_DIR")) {
- define ("CONFIG_DIR", "/etc/fusiondirectory/"); /* FusionDirectory etc path */
+ define("CONFIG_DIR", "/etc/fusiondirectory/"); /* FusionDirectory etc path */
}
/*!
@@ -36,7 +36,7 @@ if (!defined("CONFIG_DIR")) {
* e.g. SetEnv CONFIG_FILE fusiondirectory.conf 1.0
*/
if (!defined("CONFIG_FILE")) {
- define ("CONFIG_FILE", "fusiondirectory.conf"); /* FusionDirectory filename */
+ define("CONFIG_FILE", "fusiondirectory.conf"); /* FusionDirectory filename */
}
/*!
@@ -47,37 +47,37 @@ define("SMARTY", "/usr/share/php/smarty3/Smarty.class.php");
/*!
* \brief Smarty compile dir
*/
-define ("SPOOL_DIR", "/var/spool/fusiondirectory/"); /* FusionDirectory spool directory */
+define("SPOOL_DIR", "/var/spool/fusiondirectory/"); /* FusionDirectory spool directory */
/*!
* \brief Global cache dir
*/
-define ("CACHE_DIR", "/var/cache/fusiondirectory/"); /* FusionDirectory var directory */
+define("CACHE_DIR", "/var/cache/fusiondirectory/"); /* FusionDirectory var directory */
/*!
* \brief Global locale cache dir
*/
-define ("LOCALE_DIR", "/var/cache/fusiondirectory/locale/"); /* FusionDirectory locale directory */
+define("LOCALE_DIR", "/var/cache/fusiondirectory/locale/"); /* FusionDirectory locale directory */
/*!
* \brief Global tmp dir
*/
-define ("TEMP_DIR", "/var/cache/fusiondirectory/tmp/"); /* FusionDirectory tmp directory */
+define("TEMP_DIR", "/var/cache/fusiondirectory/tmp/"); /* FusionDirectory tmp directory */
/*!
* \brief Directory containing the configuration template
*/
-define ("CONFIG_TEMPLATE_DIR", "/var/cache/fusiondirectory/template/"); /* FusionDirectory template directory */
+define("CONFIG_TEMPLATE_DIR", "/var/cache/fusiondirectory/template/"); /* FusionDirectory template directory */
/*!
* \brief Directory containing the fai logs
*/
-define ("FAI_LOG_DIR", "/var/cache/fusiondirectory/fai/"); /* FusionDirectory fai directory */
+define("FAI_LOG_DIR", "/var/cache/fusiondirectory/fai/"); /* FusionDirectory fai directory */
/*!
* \brief Directory containing the vacation files
*/
-define ("SUPANN_DIR", "/etc/fusiondirectory/supann/"); /* FusionDirectory supann template directory */
+define("SUPANN_DIR", "/etc/fusiondirectory/supann/"); /* FusionDirectory supann template directory */
/*!
* \brief name of the class.cache file
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 2574f4735860a7d0ca56f282187b38b1099773f7..6187c6ed21604ffe116767c0785ffe9146a5cc81 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -29,7 +29,7 @@
* e.g. SetEnv CONFIG_DIR /etc/fusiondirectory
*/
if (isset($_SERVER['CONFIG_DIR'])) {
- define ("CONFIG_DIR", $_SERVER['CONFIG_DIR']);
+ define("CONFIG_DIR", $_SERVER['CONFIG_DIR']);
}
/*
@@ -37,18 +37,18 @@ if (isset($_SERVER['CONFIG_DIR'])) {
* e.g. SetEnv CONFIG_FILE fusiondirectory.conf 1.0
*/
if (isset($_SERVER['CONFIG_FILE'])) {
- define ("CONFIG_FILE", $_SERVER['CONFIG_FILE']);
+ define("CONFIG_FILE", $_SERVER['CONFIG_FILE']);
}
/*!
* \brief php library path
*/
-define ("PHP_DIR", "/usr/share/php"); /*! Define php directory */
+define("PHP_DIR", "/usr/share/php"); /*! Define php directory */
/*!
* \brief php pear path
*/
-define ("PEAR_DIR", "/usr/share/php"); /*! Define PEAR directory */
+define("PEAR_DIR", "/usr/share/php"); /*! Define PEAR directory */
/*!
* \brief fpdf library path
@@ -63,21 +63,21 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
/*!
* \brief FusionDirectory Version
*/
-define ("FD_VERSION", "1.4-dev"); /*! Define FusionDirectory version */
+define("FD_VERSION", "1.4-dev"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
*/
-define ("CONFIGRDN", "cn=config,ou=fusiondirectory,"); /*! Define FusionDirectory config object */
+define("CONFIGRDN", "cn=config,ou=fusiondirectory,"); /*! Define FusionDirectory config object */
/*!
* \brief Minimum PHPÂ version
*/
-define ('PHP_MIN_VERSION', '5.6.0');
+define('PHP_MIN_VERSION', '5.6.0');
/*!
* \brief Toggle crashing on PHP error, used for test suites
*/
-define ('PHP_ERROR_FATAL', 'FALSE');
+define('PHP_ERROR_FATAL', 'FALSE');
?>
diff --git a/plugins/addons/dashboard/class_dashboard.inc b/plugins/addons/dashboard/class_dashboard.inc
index 6560242fe2aa999f99cec10133de040d7a96e54b..c7e94324c6e916218899f6164553ada7f31ae4bd 100644
--- a/plugins/addons/dashboard/class_dashboard.inc
+++ b/plugins/addons/dashboard/class_dashboard.inc
@@ -63,7 +63,7 @@ class dashboard extends simplePlugin
}
/* Compute some statistics */
- function overview_stats()
+ function overview_stats ()
{
global $config;
$stats = array();
@@ -116,7 +116,7 @@ class dashboard extends simplePlugin
return $stats;
}
- static function mainInc($classname = NULL, $entry_dn = NULL, $tabs = TRUE, $edit_mode = FALSE, $objectType = FALSE)
+ static function mainInc ($classname = NULL, $entry_dn = NULL, $tabs = TRUE, $edit_mode = FALSE, $objectType = FALSE)
{
if ($classname === NULL) {
$classname = get_called_class();
diff --git a/plugins/addons/dashboard/class_dashboardUsers.inc b/plugins/addons/dashboard/class_dashboardUsers.inc
index 84d1b3fd1cc58d8879bfc60ef77f01406c42cf76..5ab8831f82d0d3697794c7a9c59c78ff0cd782aa 100644
--- a/plugins/addons/dashboard/class_dashboardUsers.inc
+++ b/plugins/addons/dashboard/class_dashboardUsers.inc
@@ -218,7 +218,7 @@ class dashboardUsers extends simplePlugin
);
}
- static function get_user_infos($attrs)
+ static function get_user_infos ($attrs)
{
global $config;
diff --git a/plugins/addons/dashboard/tabs_dashBoard.inc b/plugins/addons/dashboard/tabs_dashBoard.inc
index fa48afe6a04b2103b944135bfb45bcc6cc821dcf..0d0d350b1cbe7bf3ad617fc5d5ff83342588390a 100644
--- a/plugins/addons/dashboard/tabs_dashBoard.inc
+++ b/plugins/addons/dashboard/tabs_dashBoard.inc
@@ -20,7 +20,7 @@
class tabs_dashboard extends simpleTabs_noSpecial
{
- function __construct($type, $dn, $copied_object = NULL)
+ function __construct ($type, $dn, $copied_object = NULL)
{
parent::__construct($type, $dn, $copied_object);
if (!class_available('dhcpService') && !class_available('dnsZone')) {
@@ -29,7 +29,7 @@ class tabs_dashboard extends simpleTabs_noSpecial
}
}
- function save()
+ function save ()
{
}
}
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/admin/acl/class_aclAssignment.inc
index 1cd801eddf5ef77b16bc61eeb0876955504a3d4d..2c55fe3d78c1fd2bd1280e8195a9064a74ad61e2 100644
--- a/plugins/admin/acl/class_aclAssignment.inc
+++ b/plugins/admin/acl/class_aclAssignment.inc
@@ -107,7 +107,7 @@ class aclAssignmentDialogWindow extends simplePlugin
return $display;
}
- function getAclEntry()
+ function getAclEntry ()
{
$entry = array(
'scope' => $this->aclMode,
@@ -180,7 +180,7 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
protected $dialogClass = 'ACLsAssignmentDialog';
protected $height = 300;
- protected function getAttributeArrayValue($key, $value)
+ protected function getAttributeArrayValue ($key, $value)
{
/* Convert text value to displayable array value */
sort($value['members']);
@@ -193,7 +193,7 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
return $value;
}
- function readValue($value)
+ function readValue ($value)
{
$acl = explode(':', $value);
return array($acl[0], array(
@@ -203,12 +203,12 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
));
}
- function writeValue($key, $value)
+ function writeValue ($key, $value)
{
return $key.':'.$value['scope'].':'.base64_encode($value['role']).':'.join(',', array_map('base64_encode', $value['members']));
}
- function foreignKeyUpdate($oldvalue, $newvalue, array $source)
+ function foreignKeyUpdate ($oldvalue, $newvalue, array $source)
{
foreach ($this->value as $key => &$value) {
if ($source['FIELD'] == 'dn') {
@@ -243,7 +243,7 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
unset($value);
}
- function foreignKeyCheck($oldvalue, array $source)
+ function foreignKeyCheck ($oldvalue, array $source)
{
foreach ($this->value as $value) {
if (
@@ -314,7 +314,7 @@ class aclAssignment extends simplePlugin
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
{
- parent::__construct ($dn, $object, $parent, FALSE);
+ parent::__construct($dn, $object, $parent, FALSE);
$this->attributesInfo['main']['name'] = sprintf(_('Assignments on object or subtree %s'), $this->dn);
}
@@ -334,7 +334,7 @@ class aclAssignment extends simplePlugin
}
}
- function post_remove()
+ function post_remove ()
{
parent::post_remove();
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 96946d139d73f866edbc4c7f52d63c070337b471..90ee9eb4af4f81e7bd55f3ebfd25a8928daa2d68 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -150,13 +150,13 @@ class aclManagement extends management
);
}
- protected function setUpListing()
+ protected function setUpListing ()
{
/* Set baseMode to FALSE */
$this->listing = new managementListing($this, FALSE);
}
- protected function setUpFilter()
+ protected function setUpFilter ()
{
/* Set scope to sub */
parent::setUpFilter();
@@ -166,7 +166,7 @@ class aclManagement extends management
/*!
* \brief Opens aclAssignmentCreationDialog to enter an arbitrary DN
*/
- function newEntry(array $action)
+ function newEntry (array $action)
{
$this->dialogObject = new aclAssignmentCreationDialog($this);
}
@@ -175,7 +175,7 @@ class aclManagement extends management
/*!
* \brief Called by aclAssignmentCreationDialog
*/
- function newEntryConfirmed($dn)
+ function newEntryConfirmed ($dn)
{
$type = 'aclAssignment';
@@ -190,12 +190,12 @@ class aclManagement extends management
set_object_info($this->currentDn);
$this->openTabObject($tabObject, $this->listing->getBase());
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->currentDn, 'Creating new ACLÂ assignment');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->currentDn, 'Creating new ACLÂ assignment');
}
/*! \brief Display confirmation dialog
*/
- protected function removeConfirmationDialog(array $objects)
+ protected function removeConfirmationDialog (array $objects)
{
$smarty = get_smarty();
$smarty->assign('objects', $objects);
@@ -203,7 +203,7 @@ class aclManagement extends management
return $smarty->fetch(get_template_path('remove.tpl', TRUE, dirname(__FILE__)));
}
- protected function renderFilter()
+ protected function renderFilter ()
{
/* Hide filter box */
return '';
diff --git a/plugins/admin/aclrole/class_aclEditionDialog.inc b/plugins/admin/aclrole/class_aclEditionDialog.inc
index 9a57ae267f204a4ba1ae1b816015e8be44b238c3..f4e4918b1aeadc84db46d81718e0e8bbaa2c66dd 100644
--- a/plugins/admin/aclrole/class_aclEditionDialog.inc
+++ b/plugins/admin/aclrole/class_aclEditionDialog.inc
@@ -28,7 +28,7 @@ class ACLEditionDialog extends GenericDialog
protected $aclContents = array();
protected $savedAclContents = array();
- function __construct($simplePlugin, $attribute, $acl = NULL)
+ function __construct ($simplePlugin, $attribute, $acl = NULL)
{
$this->attribute = $attribute;
$this->initialAclValue = $acl;
@@ -55,7 +55,7 @@ class ACLEditionDialog extends GenericDialog
return FALSE;
}
- function save_object()
+ function save_object ()
{
global $config;
@@ -233,7 +233,7 @@ class ACLEditionDialog extends GenericDialog
*
* \return String containing checkbox
*/
- function mkchkbx($name, $text, $state = FALSE)
+ function mkchkbx ($name, $text, $state = FALSE)
{
$tname = preg_replace('/[^a-z0-9]/i', '_', $name);
return '<input id="acl_'.$tname.'" type="checkbox" name="acl_'.$name.'"'.($state ? ' checked="checked"' : '').'/>'."\n".
@@ -248,7 +248,7 @@ class ACLEditionDialog extends GenericDialog
*
* \return String containing checkbox
*/
- function mkrwbx($name, $state = '')
+ function mkrwbx ($name, $state = '')
{
$rstate = (preg_match('/r/', $state) ? ' checked="checked"' : '');
$wstate = (preg_match('/w/', $state) ? ' checked="checked"' : '');
@@ -267,7 +267,7 @@ class ACLEditionDialog extends GenericDialog
*
* \return the acl selector form
*/
- function buildAclSelector($list)
+ function buildAclSelector ($list)
{
$display = '<input type="hidden" name="acl_dummy_0_0_0" value="1"/>';
$cols = 3;
diff --git a/plugins/admin/aclrole/class_aclRole.inc b/plugins/admin/aclrole/class_aclRole.inc
index b73fd858c0906fbc0de0cdbe39b24f256ea495f8..4d1070af6d607bbd2a609e00c367f318e06ff0f7 100644
--- a/plugins/admin/aclrole/class_aclRole.inc
+++ b/plugins/admin/aclrole/class_aclRole.inc
@@ -24,7 +24,7 @@ class ACLsAttribute extends DialogOrderedArrayAttribute
protected $order = TRUE;
protected $dialogClass = 'ACLEditionDialog';
- protected function getAttributeArrayValue($key, $value)
+ protected function getAttributeArrayValue ($key, $value)
{
/* Convert text value to displayable array value */
@@ -39,13 +39,13 @@ class ACLsAttribute extends DialogOrderedArrayAttribute
return array($summary);
}
- function readValue($value)
+ function readValue ($value)
{
$acl = explode(':', $value, 2);
return array($acl[0], acl::extractACL($acl[1]));
}
- function writeValue($key, $value)
+ function writeValue ($key, $value)
{
$acl = '';
foreach ($value as $object => $contents) {
diff --git a/plugins/admin/aclrole/class_aclRoleManagement.inc b/plugins/admin/aclrole/class_aclRoleManagement.inc
index 0135666f6efb31426be11e07478b8e72f6de76c2..7df82edc09fefb267db1956cc7e66dd04466a211 100644
--- a/plugins/admin/aclrole/class_aclRoleManagement.inc
+++ b/plugins/admin/aclrole/class_aclRoleManagement.inc
@@ -20,7 +20,7 @@
class aclRoleManagement extends management
{
- public static function plInfo()
+ public static function plInfo ()
{
return array(
'plShortName' => _('ACL roles'),
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index d7537df1c135e48dac4e6423764236a3c8a61479..1c1c9db1016838f273b79861f20ca62ca0ae840b 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -56,7 +56,7 @@ class department extends simplePlugin
{
return static::getDepartmentAttributesInfo(_('department'));
}
- static function getDepartmentAttributesInfo($name)
+ static function getDepartmentAttributesInfo ($name)
{
$attributesInfo = array(
'properties' => array(
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index bff9b3bf5488f20fbb1b13ab830ea07a809c02c8..a4f810b12b500145857b5f402de2fd62ac9a4aef 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -39,7 +39,7 @@ class departmentManagement extends management
}
// Overriden save handler - We've to take care about the department tagging here.
- function saveChanges()
+ function saveChanges ()
{
$str = parent::saveChanges();
if (!empty($str)) {
@@ -49,7 +49,7 @@ class departmentManagement extends management
$this->refreshDeps();
}
- function refreshDeps()
+ function refreshDeps ()
{
global $config, $ui;
$config->get_departments();
@@ -59,7 +59,7 @@ class departmentManagement extends management
}
// Overridden remove request method - Avoid removal of the ldap base.
- protected function removeEntryRequested($action, array $target, array $all)
+ protected function removeEntryRequested ($action, array $target, array $all)
{
global $config;
$target = array_remove_entries(array($config->current['BASE']), $target);
@@ -67,13 +67,13 @@ class departmentManagement extends management
}
// Finally remove departments and update department browsers
- function removeEntryConfirmed($action, array $target, array $all)
+ function removeEntryConfirmed ($action, array $target, array $all)
{
parent::removeEntryConfirmed($action, $target, $all);
$this->refreshDeps();
}
- static function getDepartmentTypes()
+ static function getDepartmentTypes ()
{
return array('DEPARTMENT','COUNTRY','DCOBJECT','DOMAIN','LOCALITY','ORGANIZATION');
}
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 3058f6c5c6c0a3f873c679d69cd82eb014ce8763..9ce8d88ff1138ca5bd86ad1b4b8ac97ae9242090 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -21,7 +21,7 @@
class deptabs extends simpleTabs
{
- function save()
+ function save ()
{
$errors = parent::save();
diff --git a/plugins/admin/groups/class_GroupContentColumn.inc b/plugins/admin/groups/class_GroupContentColumn.inc
index afc3c25f894857952971b7aa7418da7bb7d4d0e7..39fbf81a93a6c510fd3fda8889bd29467a2340ba 100644
--- a/plugins/admin/groups/class_GroupContentColumn.inc
+++ b/plugins/admin/groups/class_GroupContentColumn.inc
@@ -23,7 +23,7 @@
*/
class GroupContentColumn extends Column
{
- function renderCell(ListingEntry $entry)
+ function renderCell (ListingEntry $entry)
{
global $config;
diff --git a/plugins/admin/groups/class_GroupContentFilterElement.inc b/plugins/admin/groups/class_GroupContentFilterElement.inc
index 6dbe61e361e3628513ed1c7b3c265307192a7d0b..0a8b062c0cbdd00b5eebd8165e0dad5f905ace44 100644
--- a/plugins/admin/groups/class_GroupContentFilterElement.inc
+++ b/plugins/admin/groups/class_GroupContentFilterElement.inc
@@ -25,7 +25,7 @@ class GroupContentFilterElement extends FilterElement
{
protected $types;
- public function __construct(managementFilter $parent)
+ public function __construct (managementFilter $parent)
{
global $config;
@@ -46,7 +46,7 @@ class GroupContentFilterElement extends FilterElement
}
}
- public function update()
+ public function update ()
{
foreach ($this->types as $type => &$infos) {
$infos['checked'] = isset($_POST['filter_member_'.$type]);
@@ -54,7 +54,7 @@ class GroupContentFilterElement extends FilterElement
unset($infos);
}
- public function render()
+ public function render ()
{
$inputs = array();
foreach ($this->types as $type => $infos) {
@@ -71,7 +71,7 @@ class GroupContentFilterElement extends FilterElement
return $smarty->fetch(get_template_path('management/filter-element.tpl'));
}
- public function getFilters($type, array &$filters)
+ public function getFilters ($type, array &$filters)
{
if (strtoupper($type) == 'OGROUP') {
foreach ($this->types as $type => $infos) {
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 18109851d6c2455a013d8804bad7bccaf608a4c5..2422e0cae7379a76a1488b62f70494792507b174 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -34,7 +34,7 @@ class groupManagement extends management
protected $siActive = FALSE;
- static function plInfo()
+ static function plInfo ()
{
return array(
'plShortName' => _('Groups and roles'),
@@ -49,7 +49,7 @@ class groupManagement extends management
);
}
- function __construct()
+ function __construct ()
{
// Check if we are able to communicate with Argonaut server
if (class_available('supportDaemon') && class_available('argonautAction')) {
@@ -63,7 +63,7 @@ class groupManagement extends management
$this->filter->addElement(new GroupContentFilterElement($this->filter));
}
- protected function configureActions()
+ protected function configureActions ()
{
parent::configureActions();
@@ -101,7 +101,7 @@ class groupManagement extends management
/*! \brief Handle Argonaut events
* All schedules and triggered events are handled here.
*/
- function handleEvent($action)
+ function handleEvent ($action)
{
global $config;
@@ -186,7 +186,7 @@ class groupManagement extends management
/*! \brief Save event dialogs.
* And append the new Argonaut event.
*/
- function saveEventDialog()
+ function saveEventDialog ()
{
$this->dialogObject->save_object();
$msgs = $this->dialogObject->check();
@@ -207,7 +207,7 @@ class groupManagement extends management
/*! \brief Detects actions/events send by the ui
* and the corresponding targets.
*/
- function detectPostActions()
+ function detectPostActions ()
{
$action = parent::detectPostActions();
if (isset($_POST['save_event_dialog'])) {
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 16924d949d154de42c2d899d00d53c75547e2d75..7fd5daf76cc07cd7ad8e9042d871ed8b03d994b8 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -94,7 +94,7 @@ class GroupMembersAttribute extends ObjectsAttribute
}
}
- function renderOnlyFormInput()
+ function renderOnlyFormInput ()
{
if (($this->size < 15) && ($this->size < count($this->value))) {
$this->size = min(15, count($this->value));
@@ -124,7 +124,7 @@ class GroupMembersAttribute extends ObjectsAttribute
return $display;
}
- function ldapAttributesToGet()
+ function ldapAttributesToGet ()
{
return array(
'objectClass',
@@ -137,7 +137,7 @@ class GroupMembersAttribute extends ObjectsAttribute
);
}
- function listObjectTypes()
+ function listObjectTypes ()
{
/* Refresh types and displays */
$this->getDisplayValues();
@@ -334,7 +334,7 @@ class ogroup extends simplePlugin
return $errors;
}
- function reload()
+ function reload ()
{
$this->gosaGroupObjects = $this->attributesAccess['member']->listObjectTypes();
}
@@ -387,7 +387,7 @@ class ogroup extends simplePlugin
return parent::ldap_save();
}
- function getGroupObjectTypes()
+ function getGroupObjectTypes ()
{
$this->reload();
return $this->gosaGroupObjects;
diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/admin/groups/class_roleGeneric.inc
index 64a79bb1d8ebfdd78aa7a5c3119bd4ed4fa35ad7..95d0a2d30418a78f08576d0bf7444fc7dc66dbc6 100644
--- a/plugins/admin/groups/class_roleGeneric.inc
+++ b/plugins/admin/groups/class_roleGeneric.inc
@@ -22,7 +22,7 @@ class RoleMembersAttribute extends UsersAttribute
{
protected $whitelistDns = NULL;
- function getFilterWhiteList()
+ function getFilterWhiteList ()
{
global $config;
if ($config->get_cfg_value('RestrictRoleMembers') == 'TRUE') {
diff --git a/plugins/admin/groups/tabs_ogroups.inc b/plugins/admin/groups/tabs_ogroups.inc
index 64e63ce1270056e0fc36f9ef57cb30ba2cd98f8a..d9ff1015f744e2346ee04106421f69ebaaa76128 100644
--- a/plugins/admin/groups/tabs_ogroups.inc
+++ b/plugins/admin/groups/tabs_ogroups.inc
@@ -24,14 +24,14 @@ class ogrouptabs extends simpleTabs_noSpecial
protected $groupObjects = NULL;
protected $removed_tabs = array();
- function __construct($type, $dn, $copied_object = NULL)
+ function __construct ($type, $dn, $copied_object = NULL)
{
parent::__construct($type, $dn, $copied_object);
$this->loadtabs($this->getBaseObject()->gosaGroupObjects);
}
- function loadtabs($gosaGroupObjects)
+ function loadtabs ($gosaGroupObjects)
{
global $config;
if ($this->groupObjects == $gosaGroupObjects) {
@@ -109,7 +109,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;
@@ -130,7 +130,7 @@ class ogrouptabs extends simpleTabs_noSpecial
unset($this->plNotify["$class"]);
}
- function gen_tabs($disabled = FALSE)
+ function gen_tabs ($disabled = FALSE)
{
$this->loadtabs($this->getBaseObject()->getGroupObjectTypes());
return parent::gen_tabs($disabled);
@@ -139,7 +139,7 @@ class ogrouptabs extends simpleTabs_noSpecial
/*!
* \brief Sets the active tabs from this instance to an other one. Used by templates
*/
- function setActiveTabs(&$tabObject)
+ function setActiveTabs (&$tabObject)
{
$tabObject->loadtabs($this->groupObjects);
foreach ($this->by_object as $class => $plugin) {
@@ -149,12 +149,12 @@ class ogrouptabs extends simpleTabs_noSpecial
}
}
- function check($ignore_account = FALSE)
+ function check ($ignore_account = FALSE)
{
return parent::check(FALSE);
}
- function save()
+ function save ()
{
$errors = parent::save();
@@ -162,7 +162,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);
@@ -175,7 +175,7 @@ class ogrouptabs extends simpleTabs_noSpecial
return $errors;
}
- function save_object($save_current = FALSE)
+ function save_object ($save_current = FALSE)
{
parent::save_object($save_current);
diff --git a/plugins/admin/users/class_LockAction.inc b/plugins/admin/users/class_LockAction.inc
index e2e38a52c7660416068af122b62a3ff193ff73a2..0045bdcbdf237d384db004667005cbe8bfaa448e 100644
--- a/plugins/admin/users/class_LockAction.inc
+++ b/plugins/admin/users/class_LockAction.inc
@@ -20,7 +20,7 @@
class LockAction extends Action
{
- function __construct($name, $targets, $callable, array $acl = array(), $inmenu = TRUE, $inline = TRUE)
+ function __construct ($name, $targets, $callable, array $acl = array(), $inmenu = TRUE, $inline = TRUE)
{
parent::__construct(
$name,
@@ -32,7 +32,7 @@ class LockAction extends Action
$targets, $callable, $acl, $inmenu, $inline);
}
- function isLocked(ListingEntry $entry)
+ function isLocked (ListingEntry $entry)
{
if (isset($entry['userPassword']) && preg_match('/^\{[^\}]/', $entry['userPassword'])) {
return (preg_match('/^[^\}]*+\}!/', $entry['userPassword']) === 1);
@@ -43,7 +43,7 @@ class LockAction extends Action
return NULL;
}
- function fillMenuItems(&$actions)
+ function fillMenuItems (&$actions)
{
if (!$this->inmenu) {
return;
@@ -70,14 +70,14 @@ class LockAction extends Action
);
}
- function fillRowClasses(&$classes, ListingEntry $entry)
+ function fillRowClasses (&$classes, ListingEntry $entry)
{
if ($this->isLocked($entry) === TRUE) {
$classes[] = 'entry-locked';
}
}
- function renderColumnIcons(ListingEntry $entry)
+ function renderColumnIcons (ListingEntry $entry)
{
if (!$this->inline) {
return '';
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 1180329ee478ef7383c3154fca1a8d5d41bc1943..3137c16dd169837636d69ac0459872ae942b744b 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -34,7 +34,7 @@ class userManagement extends management
array('ActionsColumn', array('label' => 'Actions')),
);
- static function plInfo()
+ static function plInfo ()
{
return array(
'plShortName' => _('Users'),
@@ -50,7 +50,7 @@ class userManagement extends management
}
- protected function configureActions()
+ protected function configureActions ()
{
parent::configureActions();
@@ -66,10 +66,10 @@ class userManagement extends management
/* !\brief Lock/unlock multiple users.
*/
- function lockUsers(array $action)
+ function lockUsers (array $action)
{
global $config, $ui;
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $action, 'Lock');
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $action, 'Lock');
// Filter out entries we are not allowed to modify
$disallowed = array();
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index e67359eab67fb5168c710cc9e0f6e6265ddfa811..671688a9690b704fe268a57864cc40153804d67d 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -36,7 +36,7 @@ class DebugLevelAttribute extends SetAttribute
}
}
- function computeLdapValue()
+ function computeLdapValue ()
{
$value = 0;
foreach ($this->value as $v) {
@@ -587,7 +587,7 @@ class configInLdap extends simplePlugin
return $messages;
}
- static function get_themes()
+ static function get_themes ()
{
$themesdir = '../ihtml/themes/';
$themes = array_keys(session::global_get(IconTheme::$session_var));
@@ -601,7 +601,7 @@ class configInLdap extends simplePlugin
return array_unique($themes);
}
- static function mainInc($classname = NULL, $entry_dn = NULL, $tabs = TRUE, $edit_mode = TRUE, $objectType = FALSE)
+ static function mainInc ($classname = NULL, $entry_dn = NULL, $tabs = TRUE, $edit_mode = TRUE, $objectType = FALSE)
{
global $config;
diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc
index 8d5c7f29ca42382eaf0a198ce939f00b0bd5ab9f..01557ca350b7bea4b31cccf2266e94edb7b4e0e9 100644
--- a/plugins/generic/references/class_reference.inc
+++ b/plugins/generic/references/class_reference.inc
@@ -68,7 +68,7 @@ class reference extends simplePlugin
return parent::execute();
}
- function fillRefs()
+ function fillRefs ()
{
if (!isset($this->parent)) {
$this->refs = NULL;
diff --git a/plugins/personal/generic/class_UserPasswordAttribute.inc b/plugins/personal/generic/class_UserPasswordAttribute.inc
index 2e9161b0be3e12f3996e90c9b5219fba1db28aea..a4d781859b7793c750557fa97ac3a2cd9db0668c 100644
--- a/plugins/personal/generic/class_UserPasswordAttribute.inc
+++ b/plugins/personal/generic/class_UserPasswordAttribute.inc
@@ -39,7 +39,7 @@ class UserPasswordAttribute extends CompositeAttribute
}
}
- parent::__construct (
+ parent::__construct(
$description, $ldapName,
array(
new SelectAttribute(
@@ -71,7 +71,7 @@ class UserPasswordAttribute extends CompositeAttribute
$this->attributes[4]->setTemplatable(FALSE);
}
- public function setParent(&$plugin)
+ public function setParent (&$plugin)
{
global $config;
parent::setParent($plugin);
@@ -90,7 +90,7 @@ class UserPasswordAttribute extends CompositeAttribute
}
/* We need to handle method select disabling manually */
- function renderAttribute(array &$attributes, $readOnly)
+ function renderAttribute (array &$attributes, $readOnly)
{
global $config;
if ($this->visible) {
@@ -148,7 +148,7 @@ class UserPasswordAttribute extends CompositeAttribute
$this->checkIfMethodNeedsPassword();
}
- function checkIfMethodNeedsPassword()
+ function checkIfMethodNeedsPassword ()
{
$method = $this->attributes[0]->getValue();
$methodInfo = $method.$this->attributes[3]->getValue();
@@ -171,12 +171,12 @@ class UserPasswordAttribute extends CompositeAttribute
$this->previousMethodInfo = $methodInfo;
}
- function readValues($value)
+ function readValues ($value)
{
return $this->readUserPasswordValues($value, $this->plugin->is_template);
}
- function readUserPasswordValues($value, $istemplate)
+ function readUserPasswordValues ($value, $istemplate)
{
global $config;
$pw_storage = $config->get_cfg_value('passwordDefaultHash', 'ssha');
@@ -188,7 +188,7 @@ class UserPasswordAttribute extends CompositeAttribute
}
list($value, $password) = explode('|', $value, 2);
}
- if (preg_match ('/^{[^}]+}/', $value)) {
+ if (preg_match('/^{[^}]+}/', $value)) {
$tmp = passwordMethod::get_method($value);
if (is_object($tmp)) {
$pw_storage = $tmp->get_hash();
@@ -203,7 +203,7 @@ class UserPasswordAttribute extends CompositeAttribute
return array($pw_storage, $password, $password, $value, $locked);
}
- function writeValues(array $values)
+ function writeValues (array $values)
{
if ($this->plugin->is_template && ($values[0] == '%askme%')) {
return '%askme%';
@@ -225,7 +225,7 @@ class UserPasswordAttribute extends CompositeAttribute
}
}
- function check()
+ function check ()
{
$error = parent::check();
if (!empty($error)) {
@@ -236,17 +236,17 @@ class UserPasswordAttribute extends CompositeAttribute
}
}
- function getMethod()
+ function getMethod ()
{
return $this->attributes[0]->getValue();
}
- function getClear()
+ function getClear ()
{
return $this->attributes[1]->getValue();
}
- function isLocked()
+ function isLocked ()
{
return $this->attributes[4]->getValue();
}
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 9c0985a2eb199f69511f3e78e9bad8f3c1a412ee..cbf0fe72cda106a12642922fb04236cc871ffd8a 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -36,7 +36,7 @@ class setup
var $o_steps = array();
var $captured_values = array();
- function __construct()
+ function __construct ()
{
$this->o_steps = array(
new setupStepWelcome($this),
@@ -58,7 +58,7 @@ class setup
}
}
- function execute()
+ function execute ()
{
/* Display phpinfo() dialog when $_GET['info'] is set,
* but only do this, if user is allowed to use the setup.
@@ -78,7 +78,7 @@ class setup
/* Save posted attributes */
- function save_object()
+ function save_object ()
{
/* Call save_object for current setup step */
$this->o_steps[$this->i_current]->save_object();
@@ -149,7 +149,7 @@ class setup
}
- function disable_steps_from($start)
+ function disable_steps_from ($start)
{
for ($i = $start; $i < $this->i_steps; $i++) {
$this->o_steps[$i]->set_enabled(FALSE);
@@ -159,7 +159,7 @@ class setup
/* Create navigation menu */
- function get_navigation_html()
+ function get_navigation_html ()
{
$str = '<ul class="menu"><li><a>FusionDirectory Setup</a><ul>';
foreach ($this->o_steps as $key => $step) {
@@ -201,7 +201,7 @@ class setup
}
- function get_bottom_html()
+ function get_bottom_html ()
{
/* Skip adding forward/backward button,
* if the currently opened step is a sub dialog
@@ -223,20 +223,20 @@ class setup
}
/* Create header entry */
- function get_header_text()
+ function get_header_text ()
{
return $this->o_steps[$this->i_current]->get_title();
}
/* Create header entry */
- function get_header_image()
+ function get_header_image ()
{
return $this->o_steps[$this->i_current]->header_image;
}
/* Check if the given step id is valid and selectable */
- function selectable_step($id)
+ function selectable_step ($id)
{
if (isset($this->o_steps[$id]) && $this->o_steps[$id]->is_enabled()) {
return TRUE;
@@ -244,7 +244,7 @@ class setup
return FALSE;
}
- function step_name_to_id($name)
+ function step_name_to_id ($name)
{
foreach ($this->o_steps as $id => $class) {
if (get_class($class) == $name) {
@@ -255,7 +255,7 @@ class setup
}
/* Called when LDAP is configured */
- function read_ldap_config()
+ function read_ldap_config ()
{
global $config;
/* Get attributes from current ldap step */
@@ -293,7 +293,7 @@ class setup
}
}
- static function mainInc()
+ static function mainInc ()
{
global $setup, $display;
diff --git a/setup/class_setupStepChecks.inc b/setup/class_setupStepChecks.inc
index 324fefb175ea582cd904467ae1901a9a06eb029e..15ddbf3d623dd253dd84860bf74117161ccaf8bb 100644
--- a/setup/class_setupStepChecks.inc
+++ b/setup/class_setupStepChecks.inc
@@ -58,7 +58,7 @@ class setupStepChecks extends setupStep
}
/* Execute all checks */
- function run_checks()
+ function run_checks ()
{
$basic_checks = array();
$config_checks = array();
diff --git a/setup/class_setupStepFinish.inc b/setup/class_setupStepFinish.inc
index 1a2960c3e4d7a68065317702089c0d9d9a940254..d32c5ba40ae3fe9232cd103fa9a11dff6ab46922 100644
--- a/setup/class_setupStepFinish.inc
+++ b/setup/class_setupStepFinish.inc
@@ -42,7 +42,7 @@ class setupStepFinish extends setupStep
$this->s_description = _('Write configuration file');
}
- function get_conf_data()
+ function get_conf_data ()
{
$smarty = get_smarty();
$cv = $this->parent->captured_values;
@@ -52,7 +52,7 @@ class setupStepFinish extends setupStep
return $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
}
- function insertConfigDefaults()
+ function insertConfigDefaults ()
{
/* Insert default config values, even for installed plugin */
global $config, $ui, $plist, $BASE_DIR;
@@ -121,7 +121,7 @@ class setupStepFinish extends setupStep
}
/* check if given file is world readable */
- function is_world_readable($file)
+ function is_world_readable ($file)
{
clearstatcache();
$p = fileperms($file);
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 56b344a2c70e5cd469c11e30bb2e98cd1d782bac..91ca88627ed860c89735c9d2a2d79e38f8d44a3c 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -54,7 +54,7 @@ class CheckFailedException extends FusionDirectoryException
$this->error = $error;
}
- public function getError()
+ public function getError ()
{
return $this->error;
}
@@ -78,7 +78,7 @@ class StepMigrateDialog extends GenericDialog
$this->check = $check;
}
- public function dialog_execute()
+ public function dialog_execute ()
{
if (
isset($_POST['dialog_showchanges']) ||
@@ -124,7 +124,7 @@ class StepMigrateCheck
$this->step = $step;
}
- public function run($fnc = NULL)
+ public function run ($fnc = NULL)
{
if ($fnc === NULL) {
$fnc = $this->fnc;
@@ -159,7 +159,7 @@ class StepMigrateCheck
return '<input type="submit" name="'.$this->name.'_'.$id.'" value="'.$value.'"/>';
}
- public function migrate_confirm()
+ public function migrate_confirm ()
{
$migrateConfirmFnc = $this->fnc.'_migrate'.'_confirm';
$res = $this->step->$migrateConfirmFnc($this);
@@ -169,7 +169,7 @@ class StepMigrateCheck
return $res;
}
- public function dialog_refresh()
+ public function dialog_refresh ()
{
$migrateRefreshFnc = $this->fnc.'_migrate'.'_refresh';
return $this->step->$migrateRefreshFnc($this);
@@ -225,7 +225,7 @@ class setupStepMigrate extends setupStep
$this->s_description = _('Analyze your current LDAP for FusionDirectory compatibility');
}
- function fill_defaultRoles()
+ function fill_defaultRoles ()
{
$this->defaultRoles = array(
array(
@@ -249,7 +249,7 @@ class setupStepMigrate extends setupStep
);
}
- function initialize_checks()
+ function initialize_checks ()
{
global $config;
$config->get_departments();
@@ -271,7 +271,7 @@ class setupStepMigrate extends setupStep
}
/* Return ldif information for a given attribute array */
- function array_to_ldif($attrs)
+ function array_to_ldif ($attrs)
{
$ret = '';
unset($attrs['count']);
@@ -316,7 +316,7 @@ class setupStepMigrate extends setupStep
* If the parameter just_check is TRUE, then just check for the OCs.
* If the Parameter is FALSE, try to add the required object classes.
*/
- function check_baseOC(&$checkobj)
+ function check_baseOC (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -465,7 +465,7 @@ class setupStepMigrate extends setupStep
* Create and remove a dummy object,
* to ensure that we have the necessary permissions
*/
- function check_permissions(&$checkobj)
+ function check_permissions (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -491,7 +491,7 @@ class setupStepMigrate extends setupStep
}
/* Try to create dummy object */
- $ldap->cd ($dn);
+ $ldap->cd($dn);
$res = $ldap->add($testEntry);
$ldap->cat($dn);
if (!$ldap->count()) {
@@ -520,7 +520,7 @@ class setupStepMigrate extends setupStep
/* Check if there are users which will
* be invisible for FusionDirectory
*/
- function check_accounts(&$checkobj)
+ function check_accounts (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -601,7 +601,7 @@ class setupStepMigrate extends setupStep
);
}
- function check_accounts_migrate_confirm(&$checkobj, $only_ldif = FALSE)
+ function check_accounts_migrate_confirm (&$checkobj, $only_ldif = FALSE)
{
return $this->check_multipleGeneric_migrate_confirm(
$checkobj,
@@ -642,7 +642,7 @@ class setupStepMigrate extends setupStep
return $infos;
}
- function check_multipleGeneric_migrate_confirm(&$checkobj, $oc, $mandatory, $only_ldif)
+ function check_multipleGeneric_migrate_confirm (&$checkobj, $oc, $mandatory, $only_ldif)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -699,7 +699,7 @@ class setupStepMigrate extends setupStep
}
/* Check Acls if there is at least one object with acls defined */
- function check_adminAccount(&$checkobj)
+ function check_adminAccount (&$checkobj)
{
global $config;
@@ -829,7 +829,7 @@ class setupStepMigrate extends setupStep
return '';
}
- function check_adminAccount_create(&$checkobj)
+ function check_adminAccount_create (&$checkobj)
{
$infos = array(
'uid' => 'fd-admin',
@@ -839,7 +839,7 @@ class setupStepMigrate extends setupStep
$this->openDialog(new StepMigrateDialog($checkobj, 'setup_migrate_adminAccount.tpl', $infos));
}
- function check_adminAccount_migrate_confirm(&$checkobj)
+ function check_adminAccount_migrate_confirm (&$checkobj)
{
global $config, $ui;
@@ -897,7 +897,7 @@ class setupStepMigrate extends setupStep
return TRUE;
}
- function check_adminAccount_migrate_refresh(&$checkobj)
+ function check_adminAccount_migrate_refresh (&$checkobj)
{
return array(
'uid' => $_POST['uid'],
@@ -907,7 +907,7 @@ class setupStepMigrate extends setupStep
}
/* Check if default roles and groupes have been inserted */
- function check_defaultACLs(&$checkobj)
+ function check_defaultACLs (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -947,7 +947,7 @@ class setupStepMigrate extends setupStep
}
}
- function check_defaultACLs_migrate(&$checkobj)
+ function check_defaultACLs_migrate (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -979,7 +979,7 @@ class setupStepMigrate extends setupStep
}
/* Search for users outside the people ou */
- function check_outsideUsers(&$checkobj)
+ function check_outsideUsers (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -1028,7 +1028,7 @@ class setupStepMigrate extends setupStep
}
}
- function check_outsideUsers_migrate(&$checkobj)
+ function check_outsideUsers_migrate (&$checkobj)
{
global $config;
$this->check_multipleGeneric_migrate(
@@ -1042,7 +1042,7 @@ class setupStepMigrate extends setupStep
);
}
- function check_outsideUsers_migrate_refresh(&$checkobj)
+ function check_outsideUsers_migrate_refresh (&$checkobj)
{
global $config;
return $this->check_multipleGeneric_migrate_refresh(
@@ -1056,7 +1056,7 @@ class setupStepMigrate extends setupStep
);
}
- function check_outsideUsers_migrate_confirm(&$checkobj, $only_ldif = FALSE, $ou = 'userRDN')
+ function check_outsideUsers_migrate_confirm (&$checkobj, $only_ldif = FALSE, $ou = 'userRDN')
{
global $config;
$ldap = $config->get_ldap_link();
@@ -1101,7 +1101,7 @@ class setupStepMigrate extends setupStep
}
/* Search for groups outside the group ou */
- function check_outsideGroups(&$checkobj)
+ function check_outsideGroups (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -1147,7 +1147,7 @@ class setupStepMigrate extends setupStep
}
}
- function check_outsideGroups_migrate(&$checkobj)
+ function check_outsideGroups_migrate (&$checkobj)
{
global $config;
$this->check_multipleGeneric_migrate(
@@ -1161,7 +1161,7 @@ class setupStepMigrate extends setupStep
);
}
- function check_outsideGroups_migrate_refresh(&$checkobj)
+ function check_outsideGroups_migrate_refresh (&$checkobj)
{
global $config;
return $this->check_multipleGeneric_migrate_refresh(
@@ -1175,13 +1175,13 @@ class setupStepMigrate extends setupStep
);
}
- function check_outsideGroups_migrate_confirm(&$checkobj, $only_ldif = FALSE)
+ function check_outsideGroups_migrate_confirm (&$checkobj, $only_ldif = FALSE)
{
return $this->check_outsideUsers_migrate_confirm($checkobj, $only_ldif, 'groupRDN');
}
/* Check if there are invisible organizational Units */
- function check_orgUnits(&$checkobj)
+ function check_orgUnits (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -1256,7 +1256,7 @@ class setupStepMigrate extends setupStep
}
}
- function check_orgUnits_migrate(&$checkobj)
+ function check_orgUnits_migrate (&$checkobj)
{
$this->check_multipleGeneric_migrate(
$checkobj,
@@ -1267,7 +1267,7 @@ class setupStepMigrate extends setupStep
);
}
- function check_orgUnits_migrate_refresh(&$checkobj)
+ function check_orgUnits_migrate_refresh (&$checkobj)
{
return $this->check_multipleGeneric_migrate_refresh(
$checkobj,
@@ -1278,7 +1278,7 @@ class setupStepMigrate extends setupStep
);
}
- function check_orgUnits_migrate_confirm(&$checkobj, $only_ldif)
+ function check_orgUnits_migrate_confirm (&$checkobj, $only_ldif)
{
return $this->check_multipleGeneric_migrate_confirm(
$checkobj,
@@ -1289,7 +1289,7 @@ class setupStepMigrate extends setupStep
}
/* Check if there are uidNumbers which are used more than once */
- function check_uidNumber(&$checkobj)
+ function check_uidNumber (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();
@@ -1333,7 +1333,7 @@ class setupStepMigrate extends setupStep
}
/* Check if there are duplicated gidNumbers present in ldap */
- function check_gidNumber(&$checkobj)
+ function check_gidNumber (&$checkobj)
{
global $config;
$ldap = $config->get_ldap_link();