From e588897aa35b294251e6569d99690c299dd0dddd Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Fri, 22 Mar 2013 20:10:16 +0100
Subject: [PATCH] Fixes: #2101 update the copyright in all plugins
---
contrib/bin/fusiondirectory-encrypt-passwords | 10 +-
contrib/bin/fusiondirectory-insert-schema | 2 +-
contrib/bin/fusiondirectory-schema2ldif | 2 +-
contrib/bin/fusiondirectory-setup | 2 +-
.../man/fusiondirectory-encrypt-passwords.pod | 2 +-
html/autocomplete.php | 2 +-
html/class_passwordRecovery.inc | 2 +-
html/getbin.php | 2 +-
html/index.php | 2 +-
html/logout.php | 2 +-
html/main.php | 2 +-
html/progress.php | 2 +-
html/recovery.php | 2 +-
html/setup.php | 2 +-
include/accept-to-gettext.inc | 2 +-
include/class_CopyPasteHandler.inc | 8 +-
include/class_SnapShotDialog.inc | 12 +-
include/class_SnapshotHandler.inc | 2 +-
include/class_acl.inc | 2 +-
include/class_baseSelector.inc | 58 +++---
include/class_certificate.inc | 88 ++++-----
include/class_config.inc | 2 +-
include/class_databaseManagement.inc | 2 +-
include/class_departmentSortIterator.inc | 14 +-
include/class_divSelectBox.inc | 2 +-
include/class_divlist.inc | 184 +++++++++---------
include/class_filter.inc | 2 +-
include/class_filterLDAP.inc | 2 +-
include/class_ldap.inc | 36 ++--
include/class_ldapMultiplexer.inc | 10 +-
include/class_listing.inc | 2 +-
include/class_listingSortIterator.inc | 20 +-
include/class_log.inc | 46 ++---
include/class_management.inc | 2 +-
include/class_msgPool.inc | 2 +-
include/class_msg_dialog.inc | 2 +-
include/class_plugin.inc | 4 +-
include/class_pluglist.inc | 2 +-
include/class_session.inc | 22 +--
include/class_sortableListing.inc | 70 +++----
include/class_tabs.inc | 2 +-
include/class_tests.inc | 2 +-
include/class_timezone.inc | 8 +-
include/class_userinfo.inc | 2 +-
include/class_xml.inc | 28 +--
include/functions.inc | 2 +-
.../class_password-methods-clear.inc | 2 +-
.../class_password-methods-crypt.inc | 2 +-
.../class_password-methods-md5.inc | 2 +-
.../class_password-methods-sasl.inc | 2 +-
.../class_password-methods-sha.inc | 2 +-
.../class_password-methods-smd5.inc | 2 +-
.../class_password-methods-ssha.inc | 2 +-
.../class_password-methods.inc | 2 +-
include/php_setup.inc | 2 +-
include/variables.inc | 2 +-
include/variables_common.inc | 2 +-
plugins/admin/acl/class_aclManagement.inc | 2 +-
plugins/admin/acl/class_aclRole.inc | 2 +-
plugins/admin/acl/class_filterACL.inc | 8 +-
plugins/admin/acl/main.inc | 2 +-
plugins/admin/acl/tabs_acl.inc | 2 +-
plugins/admin/acl/tabs_acl_role.inc | 2 +-
.../departments/class_countryGeneric.inc | 2 +-
plugins/admin/departments/class_dcObject.inc | 2 +-
.../admin/departments/class_department.inc | 2 +-
.../class_departmentManagement.inc | 2 +-
plugins/admin/departments/class_domain.inc | 2 +-
.../departments/class_localityGeneric.inc | 2 +-
.../departments/class_organizationGeneric.inc | 2 +-
plugins/admin/departments/tabs_department.inc | 2 +-
.../admin/groups/class_filterGroupLDAP.inc | 2 +-
plugins/admin/groups/class_group.inc | 2 +-
.../admin/groups/class_groupManagement.inc | 2 +-
plugins/admin/groups/main.inc | 2 +-
.../class_singleUserSelect.inc | 8 +-
plugins/admin/groups/tabs_group.inc | 2 +-
.../userGroupSelect/class_userGroupSelect.inc | 4 +-
.../groups/userSelect/class_userSelect.inc | 8 +-
plugins/admin/ogroups/class_ogroup.inc | 2 +-
.../admin/ogroups/class_ogroupManagement.inc | 2 +-
plugins/admin/ogroups/main.inc | 2 +-
.../class_filterLDAPDepartmentBlacklist.inc | 2 +-
.../objectSelect/class_objectSelect.inc | 6 +-
plugins/admin/ogroups/tabs_ogroups.inc | 2 +-
.../admin/password/class_recoveryConfig.inc | 2 +-
plugins/admin/password/main.inc | 3 +-
plugins/admin/users/class_userManagement.inc | 2 +-
plugins/admin/users/main.inc | 2 +-
plugins/config/class_configInLdap.inc | 2 +-
plugins/config/class_mainPluginsConfig.inc | 2 +-
plugins/config/class_pluginsConfigInLdap.inc | 2 +-
plugins/config/main.inc | 2 +-
plugins/config/tabs_configInLdap.inc | 2 +-
.../generic/references/class_reference.inc | 2 +-
plugins/generic/welcome/main.inc | 2 +-
plugins/personal/generic/class_user.inc | 2 +-
plugins/personal/generic/main.inc | 2 +-
plugins/personal/password/class_password.inc | 2 +-
plugins/personal/password/main.inc | 2 +-
plugins/personal/posix/class_posixAccount.inc | 2 +-
.../groupSelect/class_filterLDAPBlacklist.inc | 2 +-
.../posix/groupSelect/class_groupSelect.inc | 4 +-
plugins/personal/posix/main.inc | 2 +-
.../posix/trustSelect/class_trustSelect.inc | 2 +-
setup/class_setup.inc | 2 +-
setup/class_setupStep.inc | 2 +-
setup/class_setupStep_Checks.inc | 2 +-
setup/class_setupStep_Config1.inc | 2 +-
setup/class_setupStep_Config2.inc | 2 +-
setup/class_setupStep_Config3.inc | 2 +-
setup/class_setupStep_Finish.inc | 2 +-
setup/class_setupStep_Language.inc | 2 +-
setup/class_setupStep_Ldap.inc | 2 +-
setup/class_setupStep_Migrate.inc | 2 +-
setup/class_setupStep_Schema.inc | 2 +-
setup/class_setupStep_Welcome.inc | 8 +-
setup/main.inc | 2 +-
118 files changed, 427 insertions(+), 428 deletions(-)
diff --git a/contrib/bin/fusiondirectory-encrypt-passwords b/contrib/bin/fusiondirectory-encrypt-passwords
index 05b3043d1..f35a6c7b1 100644
--- a/contrib/bin/fusiondirectory-encrypt-passwords
+++ b/contrib/bin/fusiondirectory-encrypt-passwords
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@ echo "Starting password encryption\n";
echo "* generating random master key\n";
$master_key= get_random_string();
-# Do we have a valid fusiondirectory.secrets, already?
+# Do we have a valid fusiondirectory.secrets, already?
if (file_exists($confsecret)) {
die ("There's already a $confsecret. Cannot convert your existing fusiondirectory.conf - aborted\n");
} else {
@@ -96,11 +96,11 @@ foreach ($referrals as $referral) {
$pw->nodeValue= cred_encrypt($pw->nodeValue, $master_key);
}
-# Encrypt the snapshot passwords
+# Encrypt the snapshot passwords
$locations= $config->getElementsByTagName("location");
foreach ($locations as $location) {
- $name = $location->attributes->getNamedItem("name");
- $node = $location->attributes->getNamedItem("snapshotAdminPassword");
+ $name = $location->attributes->getNamedItem("name");
+ $node = $location->attributes->getNamedItem("snapshotAdminPassword");
if ($node->nodeValue) {
echo "* encrypting snapshot pasword for location: ".$name->nodeValue."\n";
$node->nodeValue = cred_encrypt($node->nodeValue, $master_key);;
diff --git a/contrib/bin/fusiondirectory-insert-schema b/contrib/bin/fusiondirectory-insert-schema
index 0596da1e8..2b51bd0bc 100644
--- a/contrib/bin/fusiondirectory-insert-schema
+++ b/contrib/bin/fusiondirectory-insert-schema
@@ -4,7 +4,7 @@
#
# fusiondirectory-insert-schema -- insert schema needed into the ldap server
#
-# Copyright (C) 2011-2012 FusionDirectory project
+# Copyright (C) 2011-2013 FusionDirectory project
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/contrib/bin/fusiondirectory-schema2ldif b/contrib/bin/fusiondirectory-schema2ldif
index 9ac56bc9f..93df9992a 100644
--- a/contrib/bin/fusiondirectory-schema2ldif
+++ b/contrib/bin/fusiondirectory-schema2ldif
@@ -11,7 +11,7 @@
# Based on work of Radovan Semancik
# schema2ldif, Version 1.2, (c) 2005-2009 Radovan Semancik
# schema2ldif, Version 1.3, (c) 2011 Antoine Gallavardin
-# schema2ldif, Version 1.4 & 1.5 (c) 2011 FusionDirectory Project
+# schema2ldif, Version 1.4 & 1.5 (c) 2011-2013 FusionDirectory Project
# Changes:
#
# v1.0.1: Added X-ORIGIN injection
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index fca73b2b3..f057d05d6 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1020,7 +1020,7 @@ This code is part of FusionDirectory (http://www.fusiondirectory.org/)
=over 2
-=item Copyright (C) 2011-2012 FusionDirectory
+=item Copyright (C) 2011-2013 FusionDirectory
=back
diff --git a/contrib/man/fusiondirectory-encrypt-passwords.pod b/contrib/man/fusiondirectory-encrypt-passwords.pod
index ae7e6d535..2445df6f2 100644
--- a/contrib/man/fusiondirectory-encrypt-passwords.pod
+++ b/contrib/man/fusiondirectory-encrypt-passwords.pod
@@ -26,7 +26,7 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
=item Copyright (C) 2003-2010 GONICUS GmbH
-=item Copyright (C) 2011-2012 FusionDirectory project
+=item Copyright (C) 2011-2013 FusionDirectory project
=back
diff --git a/html/autocomplete.php b/html/autocomplete.php
index f4929a5d5..d4bfa0592 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 3442a01e8..4a44e22aa 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/getbin.php b/html/getbin.php
index 51c3fd6ce..937af46e3 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/index.php b/html/index.php
index ed541e443..a01ba7653 100644
--- a/html/index.php
+++ b/html/index.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/logout.php b/html/logout.php
index 29af961b1..60aa3b993 100644
--- a/html/logout.php
+++ b/html/logout.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/main.php b/html/main.php
index d69473875..0facb21dd 100644
--- a/html/main.php
+++ b/html/main.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/progress.php b/html/progress.php
index dc588dd79..6bce2b9ba 100644
--- a/html/progress.php
+++ b/html/progress.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/recovery.php b/html/recovery.php
index 7e9cfa4ef..cccc19c67 100644
--- a/html/recovery.php
+++ b/html/recovery.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/setup.php b/html/setup.php
index d4b35bb32..8999b37c9 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index da204326c..a7924fc65 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -3,7 +3,7 @@
* accept-to-gettext.inc -- convert information in 'Accept-*' headers to
* gettext language identifiers.
* Copyright (c) 2003, Wouter Verhelst <wouter@debian.org>
- * Copyright (c) 2012, FusionDirectory project <contact@fusiondirectory.org>
+ * Copyright (c) 2012-2013, FusionDirectory project <contact@fusiondirectory.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 0929dade2..7be41c422 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -120,8 +120,8 @@ class CopyPasteHandler {
/*!
* \brief This removes all objects from queue.
- * Remove hdd dumps of current entries too.
- * Remove entries older than 24 hours.
+ * Remove hdd dumps of current entries too.
+ * Remove entries older than 24 hours.
*/
function cleanup_queue()
{
@@ -168,7 +168,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
+ * Create unique names, ids, or what ever
*/
function execute($base)
{
diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index a3cbe7307..c15863108 100644
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
/*!
* \file class_SnapShotDialog.inc
* Source code for SnapShotDialog
- */
+ */
/*!
* \brief This class contains all the function needed to make dialogs
@@ -56,8 +56,8 @@ class SnapShotDialog extends plugin
*
* \param string $dn The DN
*
- * \param string $parent
- */
+ * \param string $parent
+ */
function SnapShotDialog(&$config, $dn, &$parent)
{
plugin::plugin($config,$dn);
@@ -182,7 +182,7 @@ class SnapShotDialog extends plugin
/*!
* \brief Check the snapshot dialog
- */
+ */
function check()
{
$message = plugin::check();
@@ -196,7 +196,7 @@ class SnapShotDialog extends plugin
/*!
* \brief Save an object
- */
+ */
function save_object()
{
plugin::save_object();
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index 1c822c65d..36a88c3a7 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_acl.inc b/include/class_acl.inc
index c687ec061..5112db3fb 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 3c0c3aee8..60c5909c9 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
/*!
* \file class_baseSelector.inc
* Source code for Class Base Selector
- */
+ */
/*!
@@ -43,11 +43,11 @@ class baseSelector {
/*!
* \brief baseSelector contructor
- *
+ *
* \param Array $bases The Bases
- *
+ *
* \param String $base Empty string
- */
+ */
function __construct($bases, $base= "")
{
// Initialize pid
@@ -60,9 +60,9 @@ class baseSelector {
/*!
* \brief Set a new flag to the submit button
- *
+ *
* \param Boolean $flag Flag for the submit button
- */
+ */
function setSubmitButton($flag)
{
$this->submitButton= $flag;
@@ -70,9 +70,9 @@ class baseSelector {
/*!
* \brief Set a new value of the member height
- *
+ *
* \param Integer $value The new value of the height
- */
+ */
function setHeight($value)
{
$this->height= $value;
@@ -80,9 +80,9 @@ class baseSelector {
/*!
* \brief Set a new value of the member base
- *
+ *
* \param String $base The new value of the base
- */
+ */
function setBase($base)
{
if (isset($this->pathMapping[$base])) {
@@ -93,11 +93,11 @@ class baseSelector {
/*!
* \brief Check the base value
- *
+ *
* \param String $base The base value which will be checked
- *
+ *
* \return boolean
- */
+ */
function checkBase($base)
{
return isset($this->pathMapping[$base]);
@@ -105,9 +105,9 @@ class baseSelector {
/*!
* \brief Check the last base value updated
- *
+ *
* \return Boolean the last state of the object
- */
+ */
function checkLastBaseUpdate()
{
return $this->lastState;
@@ -115,9 +115,9 @@ class baseSelector {
/*!
* \brief Set new bases
- *
+ *
* \param Array $bases The new value of the bases
- */
+ */
function setBases($bases)
{
global $config;
@@ -142,9 +142,9 @@ class baseSelector {
/*!
* \brief Update the base
- *
+ *
* \param Boolean $force false
- */
+ */
function update($force= false)
{
global $config;
@@ -180,7 +180,7 @@ class baseSelector {
}
}
}
- }
+ }
}
@@ -262,9 +262,9 @@ class baseSelector {
/*!
* \brief Replace all space of the string by non-breaking space
- *
+ *
* \param String $string The string which his space will be replaced
- */
+ */
function gennonbreaks($string)
{
return str_replace('-', '‑', str_replace(' ', ' ', $string));
@@ -272,9 +272,9 @@ class baseSelector {
/*!
* \brief Accessor of the member tree
- *
+ *
* \return members tree of the ACL class
- */
+ */
function render()
{
return $this->tree;
@@ -282,9 +282,9 @@ class baseSelector {
/*!
* \brief Accessor of the base
- *
+ *
* \return String containts the base of the object
- */
+ */
function getBase()
{
return $this->base;
@@ -292,9 +292,9 @@ class baseSelector {
/*!
* \brief Accessor of the action
- *
+ *
* \return action of the object if exists
- */
+ */
function getAction()
{
// Do not do anything if this is not our BPID, or there's even no BPID available...
diff --git a/include/class_certificate.inc b/include/class_certificate.inc
index c4734ad52..d4057f650 100644
--- a/include/class_certificate.inc
+++ b/include/class_certificate.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -29,32 +29,32 @@
define("PEM","pem");
define("DER","der");
-/*!
+/*!
* \brief This class contains all the function needed to import certificates
*/
-class certificate
+class certificate
{
/* vars */
var $data;
var $type;
var $error;
- /*
+ /*
* \brief Certificate constructor (initialize all vars)
- */
+ */
function certificate()
{
$this->data= "";
$this->type= false;
- $this->error="";
+ $this->error="";
$this->info = array();
- }
+ }
- /*
+ /*
* \brief Reads specified Certfile/string and convert it to PEM
- *
+ *
* \param string $data
- *
+ *
* \param boolean $type false
*/
function import($data,$type=false)
@@ -84,15 +84,15 @@ class certificate
/* Data can't be empty */
if($data = ""){
$this->certificate();
- $this->error = _("Certificate is empty!");
+ $this->error = _("Certificate is empty!");
return(false);
}
/* Prefer specified certtype*/
if($type) {
- $this->type = $type;
+ $this->type = $type;
}else{
- /* Detect certtype, cause there is none specified */
+ /* Detect certtype, cause there is none specified */
/* PEM always starts with ----BEGIN CERTIFICATE-----*/
if(strstr($this->data,"CERTIFICATE")) {
@@ -103,7 +103,7 @@ class certificate
}
}
- /* Convert to PEM to give $this->info the ability to read the cert */
+ /* Convert to PEM to give $this->info the ability to read the cert */
if($this->type == DER ) {
$this->derTOpem();
}
@@ -122,12 +122,12 @@ class certificate
return(true);
}
- /*
+ /*
* \brief Get all data of a certificate
- *
+ *
* \param boolean $ret true
- *
- * \return Array with all containing data
+ *
+ * \return Array with all containing data
*/
function info($ret = true)
{
@@ -151,7 +151,7 @@ class certificate
}else{
return(false);
}
- }
+ }
function getvalidfrom_date()
{
@@ -162,12 +162,12 @@ class certificate
}
}
-
+
/*!
* \brief Get the name of the certificate
- *
- * \return String with the name, but return false if not found
- */
+ *
+ * \return String with the name, but return false if not found
+ */
function getname()
{
if(isset($this->info['name'])){
@@ -176,12 +176,12 @@ class certificate
return(false);
}
}
-
+
/*!
* \brief Get the CN of the certificate
- *
- * \return String with the CN, but return false if not found
- */
+ *
+ * \return String with the CN, but return false if not found
+ */
function getCN()
{
if(isset($this->info['subject']['CN'])){
@@ -210,9 +210,9 @@ class certificate
}
/*!
* \brief Get the serial number of the certificate
- *
+ *
* \return Integer number, but return false if not found
- */
+ */
function getSerialNumber()
{
if(isset($this->info['serialNumber'])){
@@ -224,20 +224,20 @@ class certificate
/*
* \brief Check if the certificate is valid
- * Is valide if the length of array > 1
- * and type is true
- */
+ * Is valide if the length of array > 1
+ * and type is true
+ */
function isvalid()
{
return (($this->type != false)&&(count($this->info)>1));
}
-
- /*
+
+ /*
* \brief Export Certificate to specified file, with specified method
- *
+ *
* \param boolean $type
- *
+ *
* \param string $filename Initialized at 'temp'
*/
function export($type,$filename="temp")
@@ -248,7 +248,7 @@ class certificate
if($this->type!= $type){
$strConv = $this->type."TO".$type;
$this->$strConv();
- }
+ }
/* open file for writing */
$fp = fopen($filename,"w+");
@@ -257,18 +257,18 @@ class certificate
$this->error= msgPool::cannotWriteFile($filename);
return(false);
}else{
- fwrite($fp,$this->data,strlen($this->data));
+ fwrite($fp,$this->data,strlen($this->data));
}
return(true);
}else{
$this->error= _("No valid certificate loaded!");
- return(false);
+ return(false);
}
return(false);
- }
+ }
- /*
+ /*
* \brief Convert der to pem Certificate
*/
function derTOpem()
@@ -276,7 +276,7 @@ class certificate
/* if type is DER start convert */
if($this->type == DER) {
/* converting */
- $this->type= PEM;
+ $this->type= PEM;
$str = base64_encode($this->data);
$len = strlen($str);
@@ -293,13 +293,13 @@ class certificate
$strend .= "-----END CERTIFICATE-----";
$this->data = $strend;
- return(true);
+ return(true);
}
return(false);
}
/*
- * Convert pem to der Certificate
+ * Convert pem to der Certificate
*/
function pemTOder()
{
diff --git a/include/class_config.inc b/include/class_config.inc
index 3d9ff950b..2b795e968 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_databaseManagement.inc b/include/class_databaseManagement.inc
index 628a4025a..38ed13c11 100644
--- a/include/class_databaseManagement.inc
+++ b/include/class_databaseManagement.inc
@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index 0c1bba5f5..4055cca43 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ class departmentSortIterator implements Iterator {
* \param array $data departmentSortIterator data
*
* \param $direction Direction
- */
+ */
public function __construct($data, $direction) {
function depSort($ao, $bo) {
@@ -79,20 +79,20 @@ class departmentSortIterator implements Iterator {
* \brief Put the array pointer to the first element
*
* \return the first element of the array
- */
+ */
function rewind() {
return reset($this->data);
}
-
+
/*!
* \brief Get the current data element
- *
+ *
* \return The current element pointed by array pointer
*/
function current() {
return current($this->data);
}
-
+
/*!
* \brief Get the key element
*
@@ -101,7 +101,7 @@ class departmentSortIterator implements Iterator {
function key() {
return key($this->data);
}
-
+
/*!
* \brief Get the next data element
*
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index 3d78fe5d1..6c7c179a3 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_divlist.inc b/include/class_divlist.inc
index a379a42ed..02ac80ab7 100644
--- a/include/class_divlist.inc
+++ b/include/class_divlist.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,11 +23,11 @@
/*!
* \file class_divlist.inc
* Source code for class divlist
- */
-
+ */
+
/*!
* \brief This class contains all function to manage page
- */
+ */
class divlist {
var $a_entries;
@@ -39,7 +39,7 @@ class divlist {
//FIXME: Ignoring the fact, that they were missing - height and width are numeric...
var $s_height;
var $s_width;
-
+
// Members for page managment
var $i_currentPage;
var $i_entriesPerPage;
@@ -47,14 +47,14 @@ class divlist {
var $force_height = false;
var $list_footer = "";
var $fix_list_for_plugins = FALSE;
-
+
// Added php 4 constructor
/*!
* \brief Divlist constructor.
- * Initialized all the vars
- *
+ * Initialized all the vars
+ *
* \param string $pageid Identifier for the page
- */
+ */
function divlist($pageid){
$this->i_currentPage = 0;
@@ -71,16 +71,16 @@ class divlist {
/*!
* \brief Divlist destructor
- */
+ */
function __destruct(){
-
+
}
/*!
* \brief Set the plugin mode
- *
+ *
* \param boolean $val true
- */
+ */
function SetPluginMode($val = TRUE)
{
$this->fix_list_for_plugins = $val;
@@ -88,9 +88,9 @@ class divlist {
/*!
* \brief Set a footer
- *
+ *
* \param string $str The new footer
- */
+ */
function SetFooter($str)
{
$this->list_footer = $str;
@@ -98,42 +98,42 @@ class divlist {
/*!
* \brief Add an entry
- *
+ *
* \param $a_entriedata The entry to add
- */
+ */
function AddEntry($a_entriedata) {
$this->a_entries[] = $a_entriedata;
}
/*!
* \brief Disable the page numbers
- */
+ */
function DisablePageNums() {
$this->b_displayPageNums =false;
}
/*!
* \brief Set a header at the page
- *
+ *
* \param string $a_headerdata The header of the page
- */
+ */
function SetHeader($a_headerdata) {
$this->a_header[] = $a_headerdata ;
}
-
+
/*!
* \brief Set the height of the page
- *
+ *
* \param integer $s_height The height
- */
+ */
function SetHeight($s_height) {
$this->s_height= $s_height;
$this->force_height = true;
}
-
+
/*!
* \brief Set the width of the page
- *
+ *
* \param integer $s_width The width
*/
function SetWidth($s_width) {
@@ -145,16 +145,16 @@ class divlist {
/*!
* \brief Set the number of entries per page
- *
+ *
* \param int $i_num The number
- */
+ */
function SetEntriesPerPage($i_num){
$this->i_entriesPerPage=$i_num;
}
-
+
/*!
* \brief This fonction draw the list of the page
- */
+ */
function DrawList(){
$s_return = "";
if(!$this->force_height){
@@ -169,38 +169,38 @@ class divlist {
$s_return.= $this->_generateHeader();
$s_return.= $this->_generatePage();
- $s_return.= $this->_generateFooter();
+ $s_return.= $this->_generateFooter();
$s_return.= "</table>";
-
+
return ($s_return);
}
-
+
/*!
* \brief Calculate the number of the current page
- */
+ */
function _numpages(){
$cnt = count($this->a_entries);
-
+
$pages = (int) ($cnt / $this->i_entriesPerPage);
if($cnt % $this->i_entriesPerPage){
$pages++;
}
-
+
return $pages;
}
-
+
/*!
* \brief Calculate the number of entries
- *
+ *
* \return the number of entries
- */
+ */
function _numentries(){
return count($this->a_entries);
}
/*!
* \brief Generate the footer of the page
- */
+ */
function _generateFooter()
{
$s_return = "";
@@ -227,15 +227,15 @@ class divlist {
}
return($s_return);
}
-
+
/*!
* \brief Generate the page's header
- */
+ */
function _generateHeader(){
$s_return = "";
$s_value = "";
$s_key = "";
-
+
// Using scrolltable?
if($this->i_entriesPerPage == 0) {
if(!$this->force_height) {
@@ -258,7 +258,7 @@ class divlist {
$this->cols++;
}
-
+
// Attach a 13px-wide column (used as scrollbar space in body-table),
// but do this only if we are really using scrolltables.
if($this->i_entriesPerPage == 0) {
@@ -269,25 +269,25 @@ class divlist {
$s_return.= "\n</tr>";
return $s_return;
}
-
+
/*!
* \brief Set the structure of table
- *
+ *
* \param string $msg The summary
- */
+ */
function SetSummary($msg){
$this->s_summary = $msg;
}
/*!
* \brief Generate de page
- */
+ */
function _generatePage(){
-
+
$s_value = "";
$s_key = "";
$s_return = "";
-
+
if($this->i_entriesPerPage == 0) {
// We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table.
if(!$this->force_height || $this->fix_list_for_plugins) {
@@ -298,7 +298,7 @@ class divlist {
$s_return .= "<table summary='' style='height:100%;width:581px;' cellspacing='0' id='t_scrollbody_onlywidth'>";
}
}
-
+
$i_alternate=0;
if(isset($_GET['start'])){
session::set('start'.$this->pageid,$_GET['start']);
@@ -321,46 +321,46 @@ class divlist {
}
return($str);
} else {
-
+
//FIXME: Ahrg. I'd like to read this code without wasting my time.
if ($this->i_entriesPerPage > 0) {
while($start > $this->_numentries()){
$start = $start - $this->i_entriesPerPage;
- }
-
+ }
+
$stop = $start + $this->i_entriesPerPage;
-
+
$appendempty = ($this->_numentries() -$start);
-
+
for($i = $start ; $i < $stop;$i++){
-
+
if(isset($this->a_entries[$i])){
-
+
$s_value = $this->a_entries[$i];
-
- // Alternation of background color
+
+ // Alternation of background color
if($i_alternate) $i_alternate=0; else $i_alternate=1;
-
+
$s_return .= "\n<tr class='rowxp".$i_alternate."'>";
-
- $cnt = 0;
-
- foreach($s_value as $s_key2 => $s_value2 ){
-
- $cnt++;
-
+
+ $cnt = 0;
+
+ foreach($s_value as $s_key2 => $s_value2 ){
+
+ $cnt++;
+
if(!isset($s_value2['class'])){
- $class = "list".$i_alternate;
+ $class = "list".$i_alternate;
}else{
$class = $s_value2['class'];
}
-
+
if(!isset($s_value2['attach'])){
$style = "";
}else{
$style = " ".$s_value2['attach']." " ;
}
-
+
$s_return .= "\n<td ".$style." class='".$class."'>";
$s_return .= $s_value2['string'];
$s_return .= "\n</td>";
@@ -368,11 +368,11 @@ class divlist {
if($cnt == 0 ){
$s_return.="\n<td> </td>";
}
-
+
$s_return .= "\n</tr>";
- }
+ }
}
-
+
if(!(($stop)<$this->_numentries())){
$nums = $stop - $this->_numentries();// - $stop;
for($i = 0 ; $i < $nums ; $i ++ ){
@@ -386,47 +386,47 @@ class divlist {
}
}
$s_return.="\n</tr>";
- }
+ }
}
-
+
if($this->b_displayPageNums){
$s_return .= "<tr><td colspan='".$this->cols."' align='center'>".range_selector($this->_numentries(),$start,$this->i_entriesPerPage)."</td></tr>";
}
} else {
// $this->i_entriesPerPage <= 0
// We should display all entries on one page
-
+
$i = $this->_numEntries();
foreach($this->a_entries as $s_key => $s_value){
$i--;
-
- if($i_alternate!=0){
- $i_alternate=0;
+
+ if($i_alternate!=0){
+ $i_alternate=0;
} else {
$i_alternate=1;
}
-
+
$s_return .= "\n<tr class='rowxp".$i_alternate."'>";
-
- $cnt = 0;
-
- foreach($s_value as $s_key2 => $s_value2 ){
-
- $this->cols = count($s_value) ;
- $cnt++;
-
+
+ $cnt = 0;
+
+ foreach($s_value as $s_key2 => $s_value2 ){
+
+ $this->cols = count($s_value) ;
+ $cnt++;
+
if(!isset($s_value2['class'])){
- $class = "list".$i_alternate;
+ $class = "list".$i_alternate;
} else {
$class = $s_value2['class'];
}
-
+
if(!isset($s_value2['attach'])){
$style = "";
} else {
$style = " ".$s_value2['attach']." " ;
}
-
+
$s_return .= "\n<td ".$style." class='".$class."'>";
$s_return .= $s_value2['string'];
$s_return .= "</td>";
@@ -444,7 +444,7 @@ class divlist {
}
}
$s_return.="\n</tr>";
-
+
if($this->i_entriesPerPage == 0) {
$s_return .= "\n</table></div></td>";
}
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 6769196d1..6c6acbd83 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index 7e2319f29..a6b321f7a 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index c45f721c6..a162fa8f0 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -5,7 +5,7 @@
Copyright (C) 2003-2010 Cajus Pollmeier
Copyright (C) 2003 Alejandro Escanero Blanco <aescanero@chaosdimension.org>
Copyright (C) 1998 Eric Kilfoil <eric@ipass.net>
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,23 +40,23 @@ define("SPECIALS_OVERRIDE", TRUE);
class LDAP{
- var $hascon = false;
- var $reconnect = false;
- var $tls = false;
- var $cid; //connection identifier
- var $hasres = array();
- var $sr = array();
- var $re = array();
- var $basedn = "";
- var $start = array(); // 0 if we are fetching the first entry, otherwise 1
- var $error = ""; // Any error messages to be returned can be put here
- var $srp = 0;
- var $objectClasses = array(); // Information read from slapd.oc.conf
- var $binddn = ""; // the dn for the bind
- var $bindpw = ""; //the dn's password for the bind
- var $hostname = "";
- var $follow_referral = FALSE;
- var $referrals = array();
+ var $hascon = false;
+ var $reconnect = false;
+ var $tls = false;
+ var $cid; //connection identifier
+ var $hasres = array();
+ var $sr = array();
+ var $re = array();
+ var $basedn = "";
+ var $start = array(); // 0 if we are fetching the first entry, otherwise 1
+ var $error = ""; // Any error messages to be returned can be put here
+ var $srp = 0;
+ var $objectClasses = array(); // Information read from slapd.oc.conf
+ var $binddn = ""; // the dn for the bind
+ var $bindpw = ""; //the dn's password for the bind
+ var $hostname = "";
+ var $follow_referral = FALSE;
+ var $referrals = array();
var $max_ldap_query_time = 0; // 0, empty or negative values will disable this check
/*!
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index be003dcc4..3884e73b9 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
/*!
* \brief This class contains all function to manage ldap multiplexer
- */
+ */
class ldapMultiplexer {
/* Internal stuff */
@@ -40,7 +40,7 @@ class ldapMultiplexer {
* \brief LADP multiplexer constructor
*
* \param $object Object LDAP
- */
+ */
public function __construct(&$object) {
/* Store object */
$this->object= $object;
@@ -55,7 +55,7 @@ class ldapMultiplexer {
* \param string $methodName The name of the method
*
* \param $parameters Parameters for the method
- */
+ */
public function __call($methodName, $parameters) {
/* Add resource pointer if the mentioned methods are used */
if (preg_match('/^(search|ls|cat|fetch|clearResult|resetResult|count|getDN|recursive_remove|rmdir_recursive|create_missing_trees|import_single_entry|import_complete_ldif)$/', $methodName)){
@@ -72,7 +72,7 @@ class ldapMultiplexer {
* \brief Get a member name from a ldap object
*
* \param string $memberName
- */
+ */
public function __get($memberName) {
return $this->object->$memberName;
}
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 898fb76d3..85f174eac 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index 1a14fdf3b..7b638a47d 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,12 +26,12 @@
*/
/*!
- * \brief This class contains all the function needed to sort list
+ * \brief This class contains all the function needed to sort list
* go up, go down , back , next. etc...
*/
class listingSortIterator implements Iterator {
private $data;
-
+
/*!
* \brief listingSortIterator constructor
*
@@ -42,14 +42,14 @@ class listingSortIterator implements Iterator {
* \param $attribute Attribute
*
* \param string $type
- */
+ */
public function __construct($data, $direction, $attribute, $type= "string") {
global $_sortAttribute;
global $_sortType;
- $_sortAttribute= $attribute;
- $_sortType= $type;
+ $_sortAttribute= $attribute;
+ $_sortType= $type;
- // Inline function to
+ // Inline function to
function attrSort($ao, $bo) {
global $_sortAttribute;
global $_sortType;
@@ -108,19 +108,19 @@ class listingSortIterator implements Iterator {
$this->data= $data;
}
}
-
+
/*!
* \brief Put the array pointer to the first element
*
* \return the first element of the array
- */
+ */
function rewind() {
return reset($this->data);
}
/*!
* \brief Get the current data element
- *
+ *
* \return The current element pointed by array pointer
*/
function current() {
diff --git a/include/class_log.inc b/include/class_log.inc
index 410f842c2..cdc214e27 100644
--- a/include/class_log.inc
+++ b/include/class_log.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,12 +23,12 @@
/*!
* \file class_log.inc
* Source code for the class log
- */
+ */
-/*!
+/*!
* \brief This is the base class for the FusionDirectory logging functionality.
- * All logging should lead to this class.
- *
+ * All logging should lead to this class.
+ *
* \author Fabian Hickert <hickert@gonicus.de>
* \version 2.6
* \date 11.04.2007
@@ -37,19 +37,19 @@ class log {
var $config;
- /*!
+ /*!
* \brief logging constructor
- *
+ *
* \param $action One of these values (modify|create|remove|snapshot|copy)
- *
+ *
* \param $objecttype represents the current edited objecttype, like users/user
- *
+ *
* \param $object represents the current edited object dn
- *
+ *
* \param $changes_array An array containing names of all touched attributes
- *
- * \param $result A status message, containing errors or success messages
- *
+ *
+ * \param $result A status message, containing errors or success messages
+ *
* \sa log()
*/
function log($action,$objecttype,$object,$changes_array = array(),$result = "")
@@ -59,13 +59,13 @@ class log {
$changes_array = array();
}
- $entry = array();
+ $entry = array();
if(!session::global_is_set('config')){
$entry['user']= "unkown";
}else{
$this->config = session::global_get('config');
- $ui = get_userinfo();
+ $ui = get_userinfo();
$entry['user']= @$ui->dn;
}
@@ -75,7 +75,7 @@ class log {
$changes .= $str.",";
}
$changes = preg_replace("/,$/","",$changes );
-
+
/* Create data object */
$entry['timestamp'] = time();
$entry['action'] = $action;
@@ -105,9 +105,9 @@ class log {
/*!
* \brief Check the options
- *
+ *
* \param Array $entry to be checked
- */
+ */
function check($entry = array())
{
$msgs = array();
@@ -119,15 +119,15 @@ class log {
if(!isset($entry['objecttype']) || empty($entry['objecttype'])){
$msgs[] = _("Specified objectType is empty or invalid!");
}
-
+
return($msgs);
}
-
- /*
+
+ /*
* \brief This function is used to into the systems syslog
- *
- * \param Array $entry Entry to be loged
+ *
+ * \param Array $entry Entry to be loged
*/
function log_into_syslog($entry)
{
diff --git a/include/class_management.inc b/include/class_management.inc
index f3cdd6683..6423bb56b 100644
--- a/include/class_management.inc
+++ b/include/class_management.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index 94429921b..cf93bb87e 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index a40db7d37..8895bea5a 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index bb7060d90..93b855372 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1287,7 +1287,7 @@ class plugin
/*!
* \brief Calls external hooks which are defined for this plugin (fusiondirectory.conf)
* Replaces placeholder by class values of this plugin instance.
- * Allows to a add special replacements.
+ * Allows to a add special replacements.
*/
static function callHook($plugin, $cmd, $addAttrs = array(), &$returnOutput = array(), &$returnCode = NULL)
{
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 4764ea5b1..161e5f005 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_session.inc b/include/class_session.inc
index 9265a2350..1168ba0a9 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
/*!
* \file class_session.inc
* Source code for class session
- */
+ */
/*!
* \brief This class contains all the function needed to manage sessions
@@ -37,14 +37,14 @@ class session {
public static function get_element_size()
{
-
+
}
/*!
* \brief Add channel in the session
*
* \param string $name Name of the new channel
- */
+ */
public static function add_channel($name)
{
/* If there's already such kind of channel, skip... */
@@ -82,7 +82,7 @@ class session {
* \brief Check if the name of the session is set
*
* \param string $name The name of the session
- */
+ */
public static function is_set($name)
{
$channel= "";
@@ -108,7 +108,7 @@ class session {
* \brief Check if a session is defined
*
* \param string $name Name of the session
- */
+ */
public static function global_is_set($name)
{
return(isset($_SESSION[$name]));
@@ -179,7 +179,7 @@ class session {
$ret = &$_SESSION[$channel][$name];
return($ret);
}
-
+
/*!
* \brief Accessor of a session
*
@@ -226,7 +226,7 @@ class session {
unset($_SESSION[$name]);
}
}
-
+
/*!
* \brief Unset a session
*
@@ -249,7 +249,7 @@ class session {
/*!
* \brief Start a session
- */
+ */
public static function start()
{
/* Set cookie lifetime to one day (The parameter is in seconds ) */
@@ -286,7 +286,7 @@ class session {
/*!
* \brief Destroy a session
- */
+ */
public static function destroy()
{
@session_destroy();
@@ -300,7 +300,7 @@ class session {
/*!
* \brief Get all sessions
- */
+ */
public static function &get_all()
{
$ret = &$_SESSION;
diff --git a/include/class_sortableListing.inc b/include/class_sortableListing.inc
index b21c8192e..491bf9d20 100644
--- a/include/class_sortableListing.inc
+++ b/include/class_sortableListing.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
* \file class_sortableListing.inc
* Source code for class sortableListing
*/
-
+
define ('LIST_NORMAL', 0);
define ('LIST_MARKED', 1);
define ('LIST_DISABLED', 2);
-/*! \brief This class contains all the function needed to make list
+/*! \brief This class contains all the function needed to make list
* and management them
*/
class sortableListing {
@@ -69,7 +69,7 @@ class sortableListing {
* \param $displayData null
*
* \param boolean $reorderable false
- */
+ */
public function sortableListing($data= array(), $displayData= null, $reorderable= false)
{
global $config;
@@ -77,7 +77,7 @@ class sortableListing {
// Save data to display
$this->setListData($data, $displayData);
- // Get list of used IDs
+ // Get list of used IDs
if(!session::is_set('sortableListing_USED_IDS')){
session::set('sortableListing_USED_IDS',array());
}
@@ -110,7 +110,7 @@ class sortableListing {
* \brief Set new reorderable value
*
* \param boolean $bool
- */
+ */
public function setReorderable($bool)
{
$this->reorderable= $bool;
@@ -120,7 +120,7 @@ class sortableListing {
* \brief Set a default sort column
*
* \param integer $id
- */
+ */
public function setDefaultSortColumn($id)
{
$this->sortColumn = $id;
@@ -132,7 +132,7 @@ class sortableListing {
* \param array $data
*
* \param array $displayData
- */
+ */
public function setListData($data, $displayData= null)
{
// Save data to display
@@ -151,7 +151,7 @@ class sortableListing {
* \brief Set a data
*
* \param array $data
- */
+ */
private function setData($data)
{
$this->data= $data;
@@ -161,7 +161,7 @@ class sortableListing {
* \brief Set a display data
*
* \param array $data
- */
+ */
private function setDisplayData($data)
{
if (!is_array($data)) {
@@ -202,12 +202,12 @@ class sortableListing {
}
}
}
-
+
/*!
* \brief Set width
*
* \param string $width px
- */
+ */
public function setWidth($width)
{
$this->width= $width;
@@ -217,7 +217,7 @@ class sortableListing {
* \brief Set instant delete value
*
* \param boolean $flag
- */
+ */
public function setInstantDelete($flag)
{
$this->instantDelete= $flag;
@@ -227,7 +227,7 @@ class sortableListing {
* \brief Set color alternate value
*
* \param boolean $flag
- */
+ */
public function setColorAlternate($flag)
{
$this->colorAlternate= $flag;
@@ -237,7 +237,7 @@ class sortableListing {
* \brief Set editable value
*
* \param boolean $flag
- */
+ */
public function setEditable($flag)
{
$this->editable= $flag;
@@ -257,7 +257,7 @@ class sortableListing {
* \brief Set height
*
* \param string $height px
- */
+ */
public function setHeight($height)
{
$this->height= $height;
@@ -268,7 +268,7 @@ class sortableListing {
* \brief Set CSS class
*
* \param string $css
- */
+ */
public function setCssClass($css)
{
$this->cssclass= $css;
@@ -278,7 +278,7 @@ class sortableListing {
* \brief Set header
*
* \param array $header
- */
+ */
public function setHeader($header)
{
$this->header= $header;
@@ -288,7 +288,7 @@ class sortableListing {
* \brief Set a colspecs
*
* \param array $specs
- */
+ */
public function setColspecs($specs)
{
$this->colspecs= $specs;
@@ -296,7 +296,7 @@ class sortableListing {
/*!
* \brief Render
- */
+ */
public function render()
{
$result= "<div class='sortableListContainer' id='scroll_".$this->id."' style='min-width:".$this->width.";height: ".$this->height."'>\n";
@@ -340,7 +340,7 @@ class sortableListing {
$link= "href='?plug=".$_GET['plug']."&PID=".$this->id."&act=SORT_$i'";
$sorter= "";
if ($i == $this->sortColumn){
- $sorter= " <img border='0' title='".($this->sortDirection[$i]?_("Up"):_("Down"))."'
+ $sorter= " <img border='0' title='".($this->sortDirection[$i]?_("Up"):_("Down"))."'
src='images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png' align='top'>";
}
@@ -434,14 +434,14 @@ class sortableListing {
/*!
* \brief Update sortableListing
- */
+ */
public function update()
{
// Filter GET with "act" attributes
if (!$this->reorderable){
if(isset($_GET['act']) && isset($_GET['PID']) && $this->id == $_GET['PID']) {
-
+
$key= validate($_GET['act']);
if (preg_match('/^SORT_([0-9]+)$/', $key, $match)) {
@@ -455,7 +455,7 @@ class sortableListing {
}
}
-
+
// Update mapping according to sort parameters
$this->sortData();
}
@@ -463,7 +463,7 @@ class sortableListing {
/*!
* \brief Save an object
- */
+ */
public function save_object()
{
// Do not do anything if this is not our PID, or there's even no PID available...
@@ -538,7 +538,7 @@ class sortableListing {
/*!
* \brief Get action
- */
+ */
public function getAction()
{
// Do not do anything if we're not posted
@@ -560,8 +560,8 @@ class sortableListing {
/*!
* \brief Delete an entry
*
- * \param $id Entry identifier
- */
+ * \param $id Entry identifier
+ */
private function deleteEntry($id)
{
// Remove mapping
@@ -575,7 +575,7 @@ class sortableListing {
/*!
* \brief GEt maintained data
- */
+ */
public function getMaintainedData()
{
$tmp= array();
@@ -590,7 +590,7 @@ class sortableListing {
* \brief Chech if is modified
*
* \return TRUE if is modified, return FALSE otherwise
- */
+ */
public function isModified()
{
return $this->modified;
@@ -600,7 +600,7 @@ class sortableListing {
* \brief Set a acl value
*
* \param string $acl
- */
+ */
public function setAcl($acl)
{
$this->acl= $acl;
@@ -608,7 +608,7 @@ class sortableListing {
/*!
* \brief Sort the data
- */
+ */
public function sortData()
{
if(!count($this->data)) return;
@@ -645,7 +645,7 @@ class sortableListing {
* \param $displayEntry null
*
* \param $key null
- */
+ */
public function addEntry($entry, $displayEntry= null, $key= null)
{
// Only add if not already there
@@ -701,7 +701,7 @@ class sortableListing {
* \brief Get the key
*
* \param string $index
- */
+ */
public function getKey($index) {
return isset($this->keys[$index])?$this->keys[$index]:null;
}
@@ -710,7 +710,7 @@ class sortableListing {
* \brief Get data
*
* \param string $index
- */
+ */
public function getData($index) {
$realkey = $this->keys[$index];
return($this->data[$realkey]);
diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index a27182c7c..1b2dd01d8 100644
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_tests.inc b/include/class_tests.inc
index acf2aaf3e..1505c977c 100644
--- a/include/class_tests.inc
+++ b/include/class_tests.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_timezone.inc b/include/class_timezone.inc
index 2cc47d057..91a96e524 100644
--- a/include/class_timezone.inc
+++ b/include/class_timezone.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,16 +23,16 @@
/*!
* \file class_timezone.inc
* Source code for class timezone
- */
+ */
/*!
* \brief This class contains all the function needed to manage the
* timezones
- */
+ */
class timezone {
/*
- * \brief This function returns the offset for the default timezone.
+ * \brief This function returns the offset for the default timezone.
*
* \param $stamp is used to detect summer or winter time.
* In case of PHP5, the integrated timezone functions are used.
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 14d9ab8e6..ab7dfed13 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/class_xml.inc b/include/class_xml.inc
index a8c361674..5ca27851a 100644
--- a/include/class_xml.inc
+++ b/include/class_xml.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,12 +23,12 @@
/*!
* \file class_xml.inc
* Source code for class xml
- */
+ */
/*!
* \brief This class contains all the function needed to manage xml
* files
- */
+ */
class xml {
/*!
@@ -37,14 +37,14 @@ class xml {
* \param string $file XML Filename
*
* \param string $schema Schema of the XML file
- */
+ */
static function validate($file, $schema) {
// Enable user error handling
libxml_use_internal_errors(true);
-
+
$xml= new DOMDocument();
$xml->load($file);
-
+
if (!$xml->schemaValidate($schema)) {
$errors = libxml_get_errors();
foreach ($errors as $error) {
@@ -79,7 +79,7 @@ class xml {
* \param integer $get_attributes Initialized at 1
*
* \param string $priority Initialized at 'tag'
- */
+ */
static function xml2array($contents, $get_attributes=1, $priority = 'tag') {
if(!$contents) return array();
@@ -117,7 +117,7 @@ class xml {
$result = array();
$attributes_data = array();
-
+
if(isset($value)) {
if($priority == 'tag') $result = $value;
else $result['value'] = $value; //Put the value in a assoc array if we are in the 'Attribute' mode
@@ -149,7 +149,7 @@ class xml {
} else {//This section will make the value an array if multiple tags with the same name appear together
$current[$tag] = array($current[$tag],$result);//This will combine the existing item and the new item together to make an array
$repeated_tag_index[$tag.'_'.$level] = 2;
-
+
if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
unset($current[$tag.'_attr']);
@@ -172,7 +172,7 @@ class xml {
// ...push the new element into that array.
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
-
+
if($priority == 'tag' and $get_attributes and $attributes_data) {
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
}
@@ -183,11 +183,11 @@ class xml {
$repeated_tag_index[$tag.'_'.$level] = 1;
if($priority == 'tag' and $get_attributes) {
if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
-
+
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
unset($current[$tag.'_attr']);
}
-
+
if($attributes_data) {
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
}
@@ -200,8 +200,8 @@ class xml {
$current = &$parent[$level-1];
}
}
-
+
return($xml_array);
}
-}
+}
diff --git a/include/functions.inc b/include/functions.inc
index 1e28b45cf..6b0f9fa5e 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_password-methods-clear.inc
index 29a256f5a..fb436d682 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_password-methods-clear.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_password-methods-crypt.inc
index db9361f32..42348eb6d 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_password-methods-crypt.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_password-methods-md5.inc
index 281fad773..4a54b181b 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_password-methods-md5.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-sasl.inc b/include/password-methods/class_password-methods-sasl.inc
index e7c817c31..7b75f2d7c 100644
--- a/include/password-methods/class_password-methods-sasl.inc
+++ b/include/password-methods/class_password-methods-sasl.inc
@@ -1,7 +1,7 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2011-2012 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_password-methods-sha.inc
index f6ada4abf..0116dc531 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_password-methods-smd5.inc
index 7b7a3cfaf..1b0c881a0 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_password-methods-smd5.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index 261288896..eeefc7b38 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index cbb16d14c..1b0c09e6d 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/php_setup.inc b/include/php_setup.inc
index dcd12248a..adad27265 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/variables.inc b/include/variables.inc
index b126005e3..5836bc933 100644
--- a/include/variables.inc
+++ b/include/variables.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 9777cc4ad..8c3ea3f89 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 2580b27fd..a6eaced3d 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/acl/class_aclRole.inc b/plugins/admin/acl/class_aclRole.inc
index 082a5ff9f..a25273d83 100644
--- a/plugins/admin/acl/class_aclRole.inc
+++ b/plugins/admin/acl/class_aclRole.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/acl/class_filterACL.inc b/plugins/admin/acl/class_filterACL.inc
index a7d3f8f61..d062b90d7 100644
--- a/plugins/admin/acl/class_filterACL.inc
+++ b/plugins/admin/acl/class_filterACL.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ class filterACL {
$res[$entry['dn']]=$entry;
}
}
- return(array_values($res));
+ return(array_values($res));
}
static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH, $method= "")
@@ -66,7 +66,7 @@ class filterACL {
// Initialize search bases
$bases= array();
-
+
// Get list of sub bases to search on
if (count($objectStorage) == 0) {
$bases[$base]= "";
@@ -130,7 +130,7 @@ class filterACL {
if (preg_match("/size limit/i", $ldap->get_error())){
session::set('limit_exceeded', TRUE);
$limit_exceeded = TRUE;
- }
+ }
/* Crawl through result entries and perform the migration to the
result array */
diff --git a/plugins/admin/acl/main.inc b/plugins/admin/acl/main.inc
index e512ffdbf..eb90ad43b 100644
--- a/plugins/admin/acl/main.inc
+++ b/plugins/admin/acl/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/acl/tabs_acl.inc b/plugins/admin/acl/tabs_acl.inc
index 652d74fa6..b5e6d09a5 100644
--- a/plugins/admin/acl/tabs_acl.inc
+++ b/plugins/admin/acl/tabs_acl.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/acl/tabs_acl_role.inc b/plugins/admin/acl/tabs_acl_role.inc
index 43e4868cf..487087370 100644
--- a/plugins/admin/acl/tabs_acl_role.inc
+++ b/plugins/admin/acl/tabs_acl_role.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_countryGeneric.inc b/plugins/admin/departments/class_countryGeneric.inc
index f7dc6daff..5f991bb7e 100644
--- a/plugins/admin/departments/class_countryGeneric.inc
+++ b/plugins/admin/departments/class_countryGeneric.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/admin/departments/class_dcObject.inc
index a90637dbf..b90416484 100644
--- a/plugins/admin/departments/class_dcObject.inc
+++ b/plugins/admin/departments/class_dcObject.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index e7c5967e6..71d2f6369 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 6f7e1389c..14bbd6e74 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/admin/departments/class_domain.inc
index 5202200f6..8020e262a 100644
--- a/plugins/admin/departments/class_domain.inc
+++ b/plugins/admin/departments/class_domain.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_localityGeneric.inc b/plugins/admin/departments/class_localityGeneric.inc
index 150d21dd7..7c147c6c3 100644
--- a/plugins/admin/departments/class_localityGeneric.inc
+++ b/plugins/admin/departments/class_localityGeneric.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/class_organizationGeneric.inc b/plugins/admin/departments/class_organizationGeneric.inc
index e29ee4ff5..d319726fc 100644
--- a/plugins/admin/departments/class_organizationGeneric.inc
+++ b/plugins/admin/departments/class_organizationGeneric.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index f3ae3e9e7..5043ec5d6 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/class_filterGroupLDAP.inc b/plugins/admin/groups/class_filterGroupLDAP.inc
index 9f92a675e..94a419c37 100644
--- a/plugins/admin/groups/class_filterGroupLDAP.inc
+++ b/plugins/admin/groups/class_filterGroupLDAP.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
index 05525016a..3b85f4550 100644
--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 6e9cf063c..994155dd8 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/main.inc b/plugins/admin/groups/main.inc
index 02697e6d3..d6d70abef 100644
--- a/plugins/admin/groups/main.inc
+++ b/plugins/admin/groups/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc b/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
index 76e25643c..29bd4fe65 100644
--- a/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
+++ b/plugins/admin/groups/singleUserSelect/class_singleUserSelect.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,9 +30,9 @@ class singleUserSelect extends management
{
$this->config = $config;
$this->ui = $ui;
-
+
$this->storagePoints = array(get_ou("userRDN"));
-
+
# // Build filter
# if (session::global_is_set(get_class($this)."_filter")){
# $filter= session::global_get(get_class($this)."_filter");
@@ -47,6 +47,6 @@ class singleUserSelect extends management
$headpage->setFilter($filter);
parent::__construct($config, $ui, "users", $headpage);
}
-}
+}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 9318b1d0e..fc5d7553e 100644
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc b/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
index 8a1fbb436..fe285b81a 100644
--- a/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
+++ b/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
class userGroupSelect extends management
{
- // Tab definition
+ // Tab definition
protected $skipFooter = TRUE;
protected $skipHeader = TRUE;
diff --git a/plugins/admin/groups/userSelect/class_userSelect.inc b/plugins/admin/groups/userSelect/class_userSelect.inc
index abec8d2fc..3c66b8a44 100644
--- a/plugins/admin/groups/userSelect/class_userSelect.inc
+++ b/plugins/admin/groups/userSelect/class_userSelect.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,9 +30,9 @@ class userSelect extends management
{
$this->config = $config;
$this->ui = $ui;
-
+
$this->storagePoints = array(get_ou("userRDN"));
-
+
# // Build filter
# if (session::global_is_set(get_class($this)."_filter")){
# $filter= session::global_get(get_class($this)."_filter");
@@ -47,6 +47,6 @@ class userSelect extends management
$headpage->setFilter($filter);
parent::__construct($config, $ui, "users", $headpage);
}
-}
+}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 4c5904a64..20f4fb125 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 69d0d5ff4..a8ae9553d 100644
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/ogroups/main.inc b/plugins/admin/ogroups/main.inc
index 4b741d2be..077751344 100644
--- a/plugins/admin/ogroups/main.inc
+++ b/plugins/admin/ogroups/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc b/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
index 615058210..e615f1763 100644
--- a/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
+++ b/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/ogroups/objectSelect/class_objectSelect.inc b/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
index c8b742ffb..6cab2ee67 100644
--- a/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
+++ b/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
class objectSelect extends management
{
- // Tab definition
+ // Tab definition
protected $skipFooter = TRUE;
protected $skipHeader = TRUE;
@@ -31,7 +31,7 @@ class objectSelect extends management
$this->config = $config;
$this->ui = $ui;
$this->storagePoints = array(
- get_ou("userRDN"),
+ get_ou("userRDN"),
get_ou("groupRDN"),
get_ou("applicationRDN"),
get_ou("terminalRDN"),
diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index ed809bc66..84e1f743f 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/password/class_recoveryConfig.inc b/plugins/admin/password/class_recoveryConfig.inc
index 756dc71cb..15cfcbb88 100644
--- a/plugins/admin/password/class_recoveryConfig.inc
+++ b/plugins/admin/password/class_recoveryConfig.inc
@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2011-2012 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/password/main.inc b/plugins/admin/password/main.inc
index 8c14f859d..38531995c 100644
--- a/plugins/admin/password/main.inc
+++ b/plugins/admin/password/main.inc
@@ -2,8 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 272898e56..2c027d579 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/admin/users/main.inc b/plugins/admin/users/main.inc
index b60010503..fd8e4922b 100644
--- a/plugins/admin/users/main.inc
+++ b/plugins/admin/users/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index d497ffc21..65f0818bb 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -1,7 +1,7 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/config/class_mainPluginsConfig.inc
index 402078f91..efc33718f 100644
--- a/plugins/config/class_mainPluginsConfig.inc
+++ b/plugins/config/class_mainPluginsConfig.inc
@@ -1,7 +1,7 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/class_pluginsConfigInLdap.inc b/plugins/config/class_pluginsConfigInLdap.inc
index 62e0b7415..07700150f 100644
--- a/plugins/config/class_pluginsConfigInLdap.inc
+++ b/plugins/config/class_pluginsConfigInLdap.inc
@@ -1,7 +1,7 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/main.inc b/plugins/config/main.inc
index dd0749f42..7966b5f10 100644
--- a/plugins/config/main.inc
+++ b/plugins/config/main.inc
@@ -1,7 +1,7 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index d50d91096..0a2887d2c 100644
--- a/plugins/config/tabs_configInLdap.inc
+++ b/plugins/config/tabs_configInLdap.inc
@@ -1,7 +1,7 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc
index 70bd64664..c81a89808 100644
--- a/plugins/generic/references/class_reference.inc
+++ b/plugins/generic/references/class_reference.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index 097226a86..e3c3c956e 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 43879a16b..3f903a509 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index bead88ce2..1bb4b8090 100644
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc
index b6893d998..edf615c55 100644
--- a/plugins/personal/password/class_password.inc
+++ b/plugins/personal/password/class_password.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index 43b71b29b..ed8e95c88 100644
--- a/plugins/personal/password/main.inc
+++ b/plugins/personal/password/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 9e2eef00f..ea8229590 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc b/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
index 842c39c5a..7dc801093 100644
--- a/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
+++ b/plugins/personal/posix/groupSelect/class_filterLDAPBlacklist.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/posix/groupSelect/class_groupSelect.inc b/plugins/personal/posix/groupSelect/class_groupSelect.inc
index 95472c059..dbd57ef11 100644
--- a/plugins/personal/posix/groupSelect/class_groupSelect.inc
+++ b/plugins/personal/posix/groupSelect/class_groupSelect.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,6 +47,6 @@ class groupSelect extends management
$headpage->setFilter($filter);
parent::__construct($config, $ui, "groups", $headpage);
}
-}
+}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
index 9dbe3c350..c052dedf0 100644
--- a/plugins/personal/posix/main.inc
+++ b/plugins/personal/posix/main.inc
@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2012 FusionDirectory
+ Copyright (C) 2012-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/personal/posix/trustSelect/class_trustSelect.inc b/plugins/personal/posix/trustSelect/class_trustSelect.inc
index 8eee8514e..a188c53f2 100644
--- a/plugins/personal/posix/trustSelect/class_trustSelect.inc
+++ b/plugins/personal/posix/trustSelect/class_trustSelect.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index fba14e46c..f51fb78c2 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 6c06871aa..c265decb5 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index b0bd0c4d2..eaeaa15d4 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 4fa917856..e33af366c 100644
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index cda5ff8ed..2e502af5b 100644
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index c3a7f1846..e3b431b0e 100644
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index 3fc6fc369..a56f3243e 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index 451938a98..a86078b3f 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 052ebe5d9..3951d69a5 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index dc0251a63..81eb96e7c 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Schema.inc b/setup/class_setupStep_Schema.inc
index fdee6ef33..d301ea3ce 100644
--- a/setup/class_setupStep_Schema.inc
+++ b/setup/class_setupStep_Schema.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStep_Welcome.inc
index fce459ec7..bdf2cead0 100644
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStep_Welcome.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ class Step_Welcome extends setup_step
{
$this->is_enabled = TRUE;
$this->is_active = TRUE;
- $this->update_strings();
+ $this->update_strings();
}
function update_strings()
@@ -39,7 +39,7 @@ class Step_Welcome extends setup_step
$this->s_info = _("The welcome message");
$this->s_title_long = _("Welcome to FusionDirectory setup wizard");
}
-
+
function execute()
{
$smarty = get_smarty();
@@ -52,7 +52,7 @@ class Step_Welcome extends setup_step
function save_object()
{
$id = "";
-
+
/* Get auth ID from file */
$path = '/tmp/fusiondirectory.auth';
if (file_exists($path) && is_readable($path)){
diff --git a/setup/main.inc b/setup/main.inc
index 74b8b51b7..d72117840 100644
--- a/setup/main.inc
+++ b/setup/main.inc
@@ -3,7 +3,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2007 Fabian Hickert
- Copyright (C) 2011 FusionDirectory
+ Copyright (C) 2011-2013 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--
GitLab