diff --git a/contrib/bin/fusiondirectory-encrypt-passwords b/contrib/bin/fusiondirectory-encrypt-passwords index 05b3043d1897fa32f19d3119ec3d9c7079a0ab39..f35a6c7b1684b61bf0766ee315c6364bb30f7b46 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 0596da1e8d67d813b35282af5e0b06330f0dc8ab..2b51bd0bc899c6464a25369d2df90c3cdae2dc29 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 9ac56bc9f65091662a07192ccd1fa89ea9d642fb..93df9992a8856f97d4ff0bd2fdb5e7187029c525 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 fca73b2b39a3877cf742f9ee28eae8e60354f36e..f057d05d6348d4aeb9688b22f3d27d47b2a6bb1a 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 ae7e6d5354ded6e859236a70ab3444fb27890b72..2445df6f26fd6fc18a5881136bd792aa09aab510 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 f4929a5d52704c1723ef8d3da2f81ab07013dcfb..d4bfa059240b86ee91d5397ee36ac520fa607780 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 3442a01e8499198e0b4dd2d7090de05257acec9c..4a44e22aa1de2e03c3eb8256dbb3b38b1b102e2f 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 51c3fd6ce35dfc9959595bb8a6304772d6951b67..937af46e3412dc0c40a97a75193747709cb70fc8 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 ed541e443eb538df884e465e8b93208df281401c..a01ba76531743e7eadfa06756ad3b10a2d7c6d3b 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 29af961b18916377054b3b8fa3a45543f6e5594f..60aa3b993b4a157f530673a3ad3ed4ebd0b63c52 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 d69473875689f63f99ddc8e3147861a28cec9911..0facb21ddb976a59ef5b126ace32376932ecb373 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 dc588dd79ed239d12f4cabc8c183e652fb97e424..6bce2b9baa6e72c98bab3d02d36f7d85eff229e1 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 7e9cfa4ef1e3976bc27eed8f0077bdaffb01d9a5..cccc19c67d9a6a9dafd651fd6f8f247d6cd723cf 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 d4b35bb322386bbf2ba0f7ac4d125a62a12f575e..8999b37c95c3123e4177bdd2ff2bdcf191f4d6cb 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 da204326c107492fe3ce2a201f2ca1c4fbc16d1a..a7924fc65806b503181a63aad162fb0a23883260 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 0929dade237a861d7e90aca64cdeefe14567f525..7be41c4226833bc1695499a44897847468d4b6a2 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 a3cbe73075bfb28d7c84aa27d95b38ec44a713e4..c1586310856bbed67fbd74637e743f62484a8075 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 1c822c65d1a9dd5ab3e64c423a075e38dce3b27b..36a88c3a7ec3e067ec7633e2ec6446ada20168a9 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 c687ec061d063584bdcb5b703c585921b3827bb8..5112db3fbf808678df6f5603b1331585c22d9341 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 3c0c3aee8ca8eda0a83f5f5c4c9733dc0562ea1d..60c5909c9de83196fef9247c484331465fb3d391 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 c4734ad521c53c288a46bd6a8f2d8c5570067fbd..d4057f650ce58e80f17c38472c5308902c1a73aa 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 3d9ff950bae16dc37304f454988c284da38cd0c0..2b795e968101cc238a20d9818ca088f7fcf26030 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 628a4025ae7355ea19fabfee23ae97e5dea1efcd..38ed13c11f76a94fc4b21b5fa4bed03f5dd87f45 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 0c1bba5f53bcdc116a935625870a1f094814ef4a..4055cca435d141815d0208bb02b475b4324f500d 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 3d78fe5d1914df6a3080f5469ee206df11fb0d96..6c7c179a3803cfe7b0ae5f60b8428d018f7c8455 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 a379a42ed29ef99a9d83c16e959b4875edfb1d8a..02ac80ab7c9fbe1d0557fe175e5f8871998b01c1 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 6769196d1dcc0dbafaa55b7a845f8352e90d0cf8..6c6acbd83a2eeaa34394dd1527071cd54be46fe6 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 7e2319f2924cada6e460a92e586fe01ba95ebc15..a6b321f7a1ef6b246f3083a036d9ec875907beff 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 c45f721c6d5431a8c688c48e6b4fae2f7e3aad63..a162fa8f0a9e27abf3bb8035d9c627e245c406b8 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 be003dcc4c34adb36207b581be898caa091ea725..3884e73b908839f79a5bfa294aa28d21d05933fd 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 898fb76d389f663f4a75993fabe1c5bea26a654b..85f174eac8fb235013610c4ce4aaa1ae5ef08058 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 1a14fdf3b26ac87b684da176bc3e6135e0f6b256..7b638a47ddeb995692e19043fc08ca417dbe9764 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 410f842c2807db87ca302e5b1f101692040e8e1f..cdc214e277f446b3e73a498afba24d36f7d2b8c5 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 f3cdd66832f8261c895c06df11df5afd84e479d3..6423bb56b11510ac31f81bfcec3eebaad55598e4 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 94429921bd331aa72cb2497af1271fc63fea71e4..cf93bb87eedec1c642b76942290eea7cb9bbe7be 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 a40db7d37e4b8aec5dfd1dfe342d9d7482e14e58..8895bea5a3adf2b305356d30232d0c3f25bf534b 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 bb7060d90032c3ddb967966b84b8a75a865109ea..93b85537273749408763fd115184c43dd91dc5d4 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 4764ea5b18997daaac211180ddcafe4cf6f65bae..161e5f0052268fd4abe3ecd70c62b0c95c83d7a2 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 9265a2350a854dda1732eb3db28add6ef50e0786..1168ba0a9cb456d51c8401a8e2702cba902fa7aa 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 b21c8192e0270a7cc854c31652807e55d8458b01..491bf9d2082da9480fee590d786e928eb37aa1e2 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 a27182c7c900f671b1f8397e7bb94269122f453d..1b2dd01d89a0bbf6501045329a7b0ec1fc325196 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 acf2aaf3ecfa89ab2520e1529b065ae34e3483ce..1505c977ce4aac9164d9cb7514faa4ccc0c09443 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 2cc47d057be41a81bd917efec933cdf82a2fd066..91a96e524a4143a181551c1efbae68bff9577d90 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 14d9ab8e6a71b26a9b1f60ef091f7c4b40188dd3..ab7dfed135e2313cbebfdc6213f203d78d8864fb 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 a8c361674630c70c6f24f656572c97f71dd355c3..5ca27851a3af6b239f0486237fff473c644e17a6 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 1e28b45cf8460fc884db89d58c2f858b5a4ea424..6b0f9fa5effb82265d27927de03a8fcfd2b68a2c 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 29a256f5a43c52e4dcf6b8e29d716be77012be78..fb436d68229d50db06189335105f9405a54881c5 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 db9361f329fa634e9609f69cdcecd22b3e84e493..42348eb6dbfcf9240cc55d578c2b0d4adbf4c7a0 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 281fad773d5d6c7525a0e4a8276d57b42cc72522..4a54b181b4fd8f6e12c9f3694f764c714af18072 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 e7c817c316cbfbe18535bb924328d67c50fd1513..7b75f2d7c4934b8b35a3e594790f678e255510a7 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 f6ada4abfe28e95bf7b0c64443865d164570074d..0116dc531d01f57b54fbeb30fdaa5edea42f0d45 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 7b7a3cfaf9f977e97a1cc2cde6f2fd4deeff15a2..1b0c881a0a5c2dc67ce36d9a8903b513a6a6ce77 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 261288896ec819dbd8ed9b044bd1311b427fcead..eeefc7b3856c31ccd0855c201b421adbaaea0f49 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 cbb16d14c9b20abab408a275d9bfb40eea6e92da..1b0c09e6d43e46c419a7bceb0b1c40a0f927169c 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 dcd12248af7c1360e727cdc664e526027ad53fd3..adad27265b98c42ebbcc951cf9c10e12e78c1a1a 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 b126005e30e4341227670fb38311fb0bc16364f6..5836bc9335b7767ecbf1711f60ebcd58f55ce301 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 9777cc4ad758ceee43a749c9edc0b0cdb7afe5c5..8c3ea3f89cb974eafd5e776ae05ae2d5393e6323 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 2580b27fd47bd6be23975bfe670c53411da8341f..a6eaced3d5d743c75775d08742e0683bfbf6e8fe 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 082a5ff9fbb3dfc7e0811c00d83521a52e85a992..a25273d8324bb93394d9e9ea6bfe65ef08891d8f 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 a7d3f8f6116d0eb4f1d590076a2360641f1e127d..d062b90d746478aca813f44b6c65b59a3a49cfdc 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 e512ffdbfebc71eee3df2eaef8f22f9b854e2b70..eb90ad43baf01da44799717f3144f12a0834190c 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 652d74fa6f5fe718391f82dfbd69189c7529202f..b5e6d09a5563894d743c043abe092ac3f5137c97 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 43e4868cf53f6d68ae6d1315751e7eabfd77f8ed..4870873709f50e9541990aaf98003d7581a7318b 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 f7dc6dafff51b6700dea25ab3d4134863394c785..5f991bb7e0bf771ca58ffefdcc7eea18b19814b0 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 a90637dbf5e9e16eb41b8d2bf077011cf489a562..b9041648477faabae81529fcb3d0f6e16b553758 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 e7c5967e6cbc6b982bd5fe32f23819fb92812979..71d2f6369d10a2d8d48dfde5cef2737a1a77b6a2 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 6f7e1389c3da68c5210612c20f26d84498a2d2da..14bbd6e744308c05daf793c82edace36315bb678 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 5202200f6ff3188276d1b920f3c7bf6ea490132a..8020e262a5a322cbf94952d1bdbbe180b6939e25 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 150d21dd73674dfd08294adbc1b87a1c28f805ec..7c147c6c31f388f6ac2da08a46aca2cc98fe6c8a 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 e29ee4ff5c1899c781005662e514d08ade4edb60..d319726fc469bfba078b9794948d40a15bc9ed85 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 f3ae3e9e7bf25f95e618c7f11b1f2a86aa238893..5043ec5d65cb66b087f2f071318ecacbf24dafeb 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 9f92a675e0a96f6feb280a084b1b51290b814328..94a419c37302ff84c3f3ee6bc7b21bfb8575d78d 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 05525016adf9277ca711210b6982df831c3459dc..3b85f45505c6aca6b120686f2860eed9bf21204a 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 6e9cf063c83d71eb01682120d5f8bab3f771d0d6..994155dd8b09a828fbea0694ef77bdf17010eb63 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 02697e6d3319d5277b8c1d23133f75204309b0a9..d6d70abeffc2932b8c543911d9c35d3227a6a878 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 76e25643c878ab887b21660b0fb1cb87157331d0..29bd4fe65f80c6912a218be3ae37e7db0cdde75d 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 9318b1d0e5a6b5461bdf53470524e9515950c223..fc5d7553e9a8d0f01baf0efa1c1fa575ccaa5491 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 8a1fbb43608953ab5c57060a5885a20cfa2ca0fc..fe285b81a2da2f04dfc340ddb83336e87f5d3daf 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 abec8d2fcc44b7b1c7e801d5d40b1fff9062602a..3c66b8a4431489f9000a0dffd45fe625bfb1465c 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 4c5904a64e2e973728ae5f844c8e69483d7e0a53..20f4fb125835d55e151e866897f85b678bee1d3b 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 69d0d5ff4bcbf468c4c527b5af5a2f6efd074549..a8ae9553dbf80604ca0f511bbcc669081335e9fc 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 4b741d2be2aff256f7450a53a62d4db428c3978c..077751344e70458bf6facc36e74fdfdd5860e664 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 615058210064940659c59b23240b68b1a0c133f0..e615f17631098c43ac49fc28c042348690a3c7cc 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 c8b742ffbaa4713f99b69f355dff258c1e8f8b41..6cab2ee67e6db0bd56f8fe6b69c575aab93608e5 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 ed809bc66491bc0e84a4ab87bed2ec7ad2e6191b..84e1f743f8c74782d45aeb66c07eeee7af83b94d 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 756dc71cb64c36c83a3e79c2267ea3e65605ebc6..15cfcbb887a4d98a15c9d8909600d18546f25427 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 8c14f859dd2471b52e9aa5fea80d1485787e570b..38531995cbe2408a33290918b2f563d897c55772 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 272898e56eb3c7dfa5ac4944be62d59773a48010..2c027d579d35531975aa85846bdfddfeebb40870 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 b60010503d8542a15d8088bb73533ccf291cfd47..fd8e4922bddd86e4c5fe77b9917fea6da5429dc2 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 d497ffc21e659e3a74aac75de7bf02f310af16a6..65f0818bb4f3e3a5e906581b86b06852079fdafa 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 402078f91d4951d2443c2ab52eb6ee6b0c24ef27..efc33718fcd6a8ecfb03a683c024c9bd246e7233 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 62e0b7415ccc2271f3b8954a8f698e8f8ce81865..07700150fc11ac21ebc0a972eaec5f4dec4ae925 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 dd0749f42f8a8e95e5f9f028d3f76425205ab814..7966b5f102dddce6f684ff185c9f1433020c8b7a 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 d50d910964a023e7d7981b4023310e8adde051e4..0a2887d2cf83c40885c4bc349e75819be709e5be 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 70bd646646831ecd8059a568b6930a3043387c1f..c81a89808f39558e96da3e6ab4050eb8013349ef 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 097226a865700ce7911f4289b926a263f23f87e9..e3c3c956e82f80da710e3ced3a2863badbac9b44 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 43879a16b0b227a671030c30879d659a457b38df..3f903a5093b15ea997a7f27db6d2f423ea569fc3 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 bead88ce25c15a89bb69c3990e94a6555ad33107..1bb4b8090fd75bfaaabbf55785aac5511177fd7d 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 b6893d9986af61d5f594a153c630b90e3f363fa3..edf615c55a3e98d818483cf41cbe4278d10664ca 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 43b71b29bc6d222b227cc5408adaa35b14671955..ed8e95c88a083850e684efffddf69a6484c5c106 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 9e2eef00f86337afb195cba2f20852ee5f42380f..ea82295901e0443da0a5993726ec155596a3de7c 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 842c39c5a16a2a8cedf367ac2b34ec7e6e9780cf..7dc80109354f0a81868487f21b90dfd2635c826d 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 95472c059c2af61a452975dab6348a44e3a90b17..dbd57ef1138763f9b2dfb4de5545f772e703691e 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 9dbe3c350b8b91581b52f2dc0229a00b817d3cf7..c052dedf09a5ba0931191b239bea4365918f0c55 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 8eee8514e80ba57fcb8b004cc2ee01a8bec43e27..a188c53f2fe6d88c9f6c4fbcc7a8c5edf9658011 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 fba14e46cce6eb1c7442b6ee739f6f4647c6460a..f51fb78c2c7e5cfcc946a24ff5df64afe3527709 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 6c06871aaadd56941f8cc5f16b4dabe83cd672d8..c265decb552db564df4c46762c023c1d2adcbda8 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 b0bd0c4d2e31d7ecf1e0de67d7057e325b213f6a..eaeaa15d4e2f901ff19a6c67298f9c92cc3f630a 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 4fa917856ea985d5b998e6885bf3d0bd4d1df681..e33af366cfdde6af8805c607bdd7ba24e09d961d 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 cda5ff8ed5eea994fad2bc136a723239d1444307..2e502af5bfb31be8ec2f37d3cff846e1a18d96e7 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 c3a7f1846d24d6d4c228f09281c0d78ae97c0d88..e3b431b0e4a46efa2e8aa172724fb711dabffd29 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 3fc6fc3695b274fa52f611ba23fdfb4c29252474..a56f3243eb4eec84234a03c43df699e139b47970 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 451938a98302454bd9bcfc48b9a03b5c6b8aae1d..a86078b3fe3dbd85977d3b88a80fe8d9faebfde0 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 052ebe5d922bc6a394d91fbe67ef3b7dc68f7fc0..3951d69a525ac076375b6575eda0d3f731bbbe59 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 dc0251a63f2c2047b36938a514d38ddaf64cf851..81eb96e7cc55b3978d0d14fa8aea1b931e537a4b 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 fdee6ef336e97ca97e52919f78844f9b2cd6be2c..d301ea3cec441d586c9aa0a2fd3bcf72b30a95bd 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 fce459ec7a4b2aa6563d022c54febf2d9cb9da09..bdf2cead050462a4c0b6c91cff090537edeb9419 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 74b8b51b7f4127abcbbeefc4f780c088e46086c5..d721178403b3006f127b85dcb1d22c6719464e26 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