@@ -456,7 +456,7 @@ abstract class baseModule {
* Example: return array('uid' => 'normal', 'cn' => 'low')
*
* @return array list of attributes
- *
+ *
* @see baseModule::get_metaData()
*/
public function get_RDNAttributes() {
@@ -466,7 +466,7 @@ abstract class baseModule {
/**
* This function returns a list with all depending and conflicting modules.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* The return value is an array with two sub arrays, "depends" and "conflicts".
@@ -479,7 +479,7 @@ abstract class baseModule {
* Example: return array("depends" => array("posixAccount", array("qmail", "sendmail")), "conflicts" => array("exim"))
*
* @return array list of dependencies and conflicts
- *
+ *
* @see baseModule::get_metaData()
*/
public function get_dependencies() {
@@ -496,9 +496,9 @@ abstract class baseModule {
* The field name are used as keywords to load
* and save profiles. We recommend to use the module name as prefix for them
* (e.g. posixAccount_homeDirectory) to avoid naming conflicts.
- *
+ *
* @return htmlElement meta HTML object
- *
+ *
* @see baseModule::get_metaData()
* @see htmlElement
*/
@@ -520,7 +520,7 @@ abstract class baseModule {
*
* @param array $options a hash array (name => value) containing the user input
* @return array list of error messages (array(type, title, text)) to generate StatusMessages, if any
- *
+ *
* @see baseModule::get_metaData()
*/
public function check_profileOptions($options) {
@@ -601,11 +601,11 @@ abstract class baseModule {
/**
* This function loads the values from an account profile to the module's internal data structures.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* @param array $profile hash array with profile values (identifier => value)
- *
+ *
* @see baseModule::get_metaData()
*/
public function load_profile($profile) {
@@ -621,7 +621,7 @@ abstract class baseModule {
/**
* Returns a list of configuration options.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* The field names are used as keywords to load and save settings.
@@ -630,7 +630,7 @@ abstract class baseModule {
* @param array $scopes account types (user, group, host)
* @param array $allScopes list of all active account modules and their scopes (module => array(scopes))
* @return mixed htmlElement or array of htmlElement
- *
+ *
* @see baseModule::get_metaData()
* @see htmlElement
*/
@@ -665,7 +665,7 @@ abstract class baseModule {
/**
* Checks input values of module settings.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* If the input data is invalid the return value is an array that contains subarrays to build StatusMessages ('message type', 'message head', 'message text').
@@ -674,7 +674,7 @@ abstract class baseModule {
* @param array $scopes list of account types which are used
* @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements.
* @return array list of error messages
- *
+ *
* @see baseModule::get_metaData()
*/
public function check_configOptions($scopes, &$options) {
@@ -795,9 +795,9 @@ abstract class baseModule {
* This example only uses one column but you can just use more tags per tag to display more columns.
*
* 'myAttribute' => 'AttrName| 123 | | 456 | | 789 | '
- *
+ *
* @return array PDF entries
- *
+ *
* @see baseModule::get_metaData()
*/
public function get_pdfFields() {
@@ -813,10 +813,10 @@ abstract class baseModule {
public function get_pdfEntries($pdfKeys) {
return array();
}
-
+
/**
* Adds a simple PDF entry to the given array.
- *
+ *
* @param array $result result array (entry will be added here)
* @param String $name ID
* @param String $label label name
@@ -843,7 +843,7 @@ abstract class baseModule {
/**
* Adds a simple PDF entry with the given key and value.
- *
+ *
* @param array $result result array (entry will be added here)
* @param String $name ID
* @param String $label label name
@@ -858,6 +858,32 @@ abstract class baseModule {
$result[get_class($this) . '_' . $name] = array('' . $label . '' . $value . '');
}
+ /**
+ * Adds a table entry to the PDF.
+ *
+ * @param array $result result array (entry will be added here)
+ * @param String $name ID
+ * @param PDFTable $table table
+ */
+ public function addPDFTable(&$result, $name, $table) {
+ $first = true;
+ foreach ($table->rows as $row) {
+ $xml = '';
+ if ($first && !empty($table->label)) {
+ $xml .= '' . $table->label . '';
+ }
+ $xml .= '';
+ foreach ($row->cells as $cell) {
+ $width = empty($cell->width) ? '' : ' width="' . $cell->width . '"';
+ $content = ($cell->bold) ? '' . $cell->content . '' : $cell->content;
+ $xml .= '| ' . $content . ' | ';
+ }
+ $xml .= ' ';
+ $result[get_class($this) . '_' . $name][] = $xml;
+ $first = false;
+ }
+ }
+
/**
* Returns an array containing all input columns for the file upload.
*
@@ -879,7 +905,7 @@ abstract class baseModule {
*
* @param array $selectedModules list of selected account modules
* @return array column list
- *
+ *
* @see baseModule::get_metaData()
*/
public function get_uploadColumns($selectedModules) {
@@ -895,7 +921,7 @@ abstract class baseModule {
* The named modules may not be active, LAM will check this automatically.
*
* @return array list of module names
- *
+ *
* @see baseModule::get_metaData()
*/
public function get_uploadPreDepends() {
@@ -920,7 +946,7 @@ abstract class baseModule {
// must be implemented in sub modules
return array();
}
-
+
/**
* Maps simple upload fields directly to LDAP attribute values.
*
@@ -970,7 +996,7 @@ abstract class baseModule {
*
* @param string $id The id string for the help entry needed.
* @return array The desired help entry.
- *
+ *
* @see baseModule::get_metaData()
*/
public function get_help($id) {
@@ -987,7 +1013,7 @@ abstract class baseModule {
/**
* This function is used to check if this module page can be displayed.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* Your module might depend on input of other modules. This function determines if the user
@@ -1003,7 +1029,7 @@ abstract class baseModule {
/**
* This function is used to check if all settings for this module have been made.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* This function tells LAM if it can create/modify the LDAP account. If your module needs any
@@ -1019,7 +1045,7 @@ abstract class baseModule {
/**
* Controls if the module button the account page is visible and activated.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* Possible return values:
@@ -1034,10 +1060,10 @@ abstract class baseModule {
public function getButtonStatus() {
return "enabled";
}
-
+
/**
* Runs any actions that need to be done before an LDAP entry is created.
- *
+ *
* @param array $attributes LDAP attributes of this entry (attributes are provided as reference, handle modifications of $attributes with care)
* @return array array which contains status messages. Each entry is an array containing the status message parameters.
*/
@@ -1047,7 +1073,7 @@ abstract class baseModule {
/**
* This function is responsible to do additional tasks after the account has been created in LDAP (e.g. modifying group memberships, adding Quota etc..).
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* This function is called as long as the returned status is 'finished'. Please make sure
@@ -1077,7 +1103,7 @@ abstract class baseModule {
/**
* Returns a list of modifications which have to be made to the LDAP account.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
*
@@ -1092,7 +1118,7 @@ abstract class baseModule {
*
"info" values with informational value (e.g. to be used later by pre/postModify actions)
*
*
This builds the required comands from $this-attributes and $this->orig.
- *
+ *
* @return array list of modifications
*/
public function save_attributes() {
@@ -1101,11 +1127,11 @@ abstract class baseModule {
/**
* Allows the module to run commands before the LDAP entry is changed or created.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* The modification is aborted if an error message is returned.
- *
+ *
* @param boolean $newAccount new account
* @param array $attributes LDAP attributes of this entry (added/modified attributes are provided as reference, handle modifications of $attributes with care)
* @return array array which contains status messages. Each entry is an array containing the status message parameters.
@@ -1113,10 +1139,10 @@ abstract class baseModule {
public function preModifyActions($newAccount, $attributes) {
return array();
}
-
+
/**
* Allows the module to run commands after the LDAP entry is changed or created.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* @param boolean $newAccount new account
@@ -1126,32 +1152,32 @@ abstract class baseModule {
public function postModifyActions($newAccount, $attributes) {
return array();
}
-
+
/**
* Allows the module to run commands before the LDAP entry is deleted.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
- *
+ *
* @return array Array which contains status messages. Each entry is an array containing the status message parameters.
*/
public function preDeleteActions() {
return array();
}
-
+
/**
* Allows the module to run commands after the LDAP entry is deleted.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
- *
+ *
* @return array Array which contains status messages. Each entry is an array containing the status message parameters.
*/
public function postDeleteActions() {
return array();
}
-
+
/**
* This function returns an array with the same syntax as save_attributes().
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* It allows additional LDAP changes when an account is deleted.
@@ -1164,7 +1190,7 @@ abstract class baseModule {
/**
* This function creates meta HTML code which will be displayed when an account should be deleted.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* This can be used to interact with the user, e.g. should the home directory be deleted? The output
@@ -1176,25 +1202,25 @@ abstract class baseModule {
public function display_html_delete() {
return 0;
}
-
+
/**
* This function processes user input.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
* It checks the user input and saves changes in the module's data structures.
*
* Example: return array(array('ERROR', 'Invalid input!', 'This is not allowed here.'));
- *
+ *
* @return array Array which contains status messages. Each entry is an array containing the status message parameters.
*/
public abstract function process_attributes();
-
+
/**
* This function creates meta HTML code to display the module page.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
- *
+ *
* @return htmlElement meta HTML object
*
* @see htmlElement
@@ -1205,7 +1231,7 @@ abstract class baseModule {
* Adds a simple text input field to the given htmlTable.
* The field name will be the same as the attribute name. There must also be a help entry with the attribute name as ID.
* A new line will also be added after this entry so multiple calls will show the fields one below the other.
- *
+ *
* @param htmlTable $container parent container
* @param String $attrName attribute name
* @param String $label label name
@@ -1241,14 +1267,14 @@ abstract class baseModule {
$container->addElement($input, true);
return $input;
}
-
+
/**
* Adds a text input field that may contain multiple values to the given htmlTable.
* The field name will be the same as the attribute name plus a counting number (e.g. street_0).
* The last field will be followed by a button to add a new value. This is named add_{attribute name} (e.g. add_street).
* There must be a help entry with the attribute name as ID.
* A new line will also be added after this entry so multiple calls will show the fields one below the other.
- *
+ *
* @param htmlTable $container parent container
* @param String $attrName attribute name
* @param String $label label name
@@ -1314,12 +1340,12 @@ abstract class baseModule {
$help->alignment = htmlElement::ALIGN_TOP;
$container->addElement($help, true);
}
-
+
/**
* Validates a multi-value text field.
* The input fields must be created with function addMultiValueInputTextField().
* If validation is used then there must exist a message named [{attribute name}][0] (e.g. $this->messages['street'][0]).
- *
+ *
* @param String $attrName attribute name
* @param array $errors errors array where to put validation errors
* @param String $validationID validation ID for function get_preg() (default: null, null means no validation)
@@ -1345,11 +1371,11 @@ abstract class baseModule {
}
$this->attributes[$attrName] = array_values(array_unique($this->attributes[$attrName]));
}
-
+
/**
* Adds a simple text input field for the self service.
* The field name will be the same as the class name plus "_" plus attribute name (e.g. posixAccount_cn).
- *
+ *
* @param array $container array that is used as return value for getSelfServiceOptions()
* @param String $name attribute name (== field name)
* @param String $label label to display in front of input field
@@ -1385,12 +1411,12 @@ abstract class baseModule {
new htmlOutputText($this->getSelfServiceLabel($name, $label)), $field
));
}
-
+
/**
* Checks the input value of a self service text field.
* The field name must be the same as the class name plus "_" plus attribute name (e.g. posixAccount_cn).
* If validation is used then there must exist a message named [{attribute name}][0] (e.g. $this->messages['street'][0]).
- *
+ *
* @param array $container return value of checkSelfServiceOptions()
* @param String $name attribute name
* @param array $attributes LDAP attributes
@@ -1419,10 +1445,10 @@ abstract class baseModule {
}
}
}
-
+
/**
* Returns a list of managed object classes for this module.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* This is used to fix spelling errors in LDAP-Entries (e.g. if "posixACCOUNT" is read instead of "posixAccount" from LDAP).
@@ -1430,7 +1456,7 @@ abstract class baseModule {
* Example: return array('posixAccount')
*
* @return array list of object classes
- *
+ *
* @see baseModule::get_metaData()
*/
public function getManagedObjectClasses() {
@@ -1440,13 +1466,13 @@ abstract class baseModule {
/**
* Returns a list of aliases for LDAP attributes.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* All alias attributes will be renamed to the given attribute names.
*
* @return array list of aliases like array("alias name" => "attribute name")
- *
+ *
* @see baseModule::get_metaData()
*/
public function getLDAPAliases() {
@@ -1459,7 +1485,7 @@ abstract class baseModule {
* All attribute names will be renamed to match the given spelling.
*
* @return array list of attributes
- *
+ *
* @see baseModule::get_metaData()
*/
public function getManagedAttributes() {
@@ -1469,11 +1495,11 @@ abstract class baseModule {
/**
* This function returns a list of PHP extensions (e.g. hash) which are needed by this module.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* @return array extensions
- *
+ *
* @see baseModule::get_metaData()
*/
public function getRequiredExtensions() {
@@ -1483,11 +1509,11 @@ abstract class baseModule {
/**
* This function returns a list of possible LDAP attributes (e.g. uid, cn, ...) which can be used to search for LDAP objects.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* @return array attributes
- *
+ *
* @see baseModule::get_metaData()
*/
public function getSelfServiceSearchAttributes() {
@@ -1497,23 +1523,23 @@ abstract class baseModule {
/**
* Returns a list of possible input fields and their descriptions.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* Format: array( => )
*
* @return array fields
- *
+ *
* @see baseModule::get_metaData()
*/
public function getSelfServiceFields() {
if (isset($this->meta['selfServiceFieldSettings']) && is_array($this->meta['selfServiceFieldSettings'])) return $this->meta['selfServiceFieldSettings'];
else return array();
}
-
+
/**
* Returns if a given self service field can be set in read-only mode.
- *
+ *
* @param String $fieldID field identifier
* @param selfServiceProfile $profile currently edited profile
* @return boolean may be set read-only
@@ -1524,10 +1550,10 @@ abstract class baseModule {
}
return false;
}
-
+
/**
* Returns if a self service field can be relabeled.
- *
+ *
* @param String $fieldID field ID
* @param selfServiceProfile $profile currently edited profile
* @return boolean may be relabeled
@@ -1538,10 +1564,10 @@ abstract class baseModule {
}
return true;
}
-
+
/**
* Returns the field label. This can be either the given default label or an override value from profile.
- *
+ *
* @param String $fieldID field ID
* @param String $defaultLabel default label text
* @return String label
@@ -1556,7 +1582,7 @@ abstract class baseModule {
/**
* Returns the meta HTML code for each input field.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* It is not possible to display help links.
@@ -1566,7 +1592,7 @@ abstract class baseModule {
* @param boolean $passwordChangeOnly indicates that the user is only allowed to change his password and no LDAP content is readable
* @param array $readOnlyFields list of read-only fields
* @return array list of meta HTML elements (field name => htmlTableRow)
- *
+ *
* @see htmlElement
*/
public function getSelfServiceOptions($fields, $attributes, $passwordChangeOnly, $readOnlyFields) {
@@ -1582,7 +1608,7 @@ abstract class baseModule {
*
del: array of attributes to remove
*
mod: array of attributes to modify
*
info: array of values with informational value (e.g. to be used later by pre/postModify actions)
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* @param string $fields input fields
@@ -1598,7 +1624,7 @@ abstract class baseModule {
/**
* Returns a list of self service configuration settings.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* The name attributes are used as keywords to load
@@ -1607,7 +1633,7 @@ abstract class baseModule {
*
* @param selfServiceProfile $profile currently edited profile
* @return htmlElement meta HTML object
- *
+ *
* @see baseModule::get_metaData()
* @see htmlElement
*/
@@ -1622,7 +1648,7 @@ abstract class baseModule {
/**
* Checks if the self service settings are valid.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* If the input data is invalid the return value is an array that contains arrays
@@ -1637,12 +1663,12 @@ abstract class baseModule {
// needs to be implemented by the subclasses, if needed
return array();
}
-
+
/**
* Allows the module to run commands before the LDAP entry is changed or created.
- *
+ *
* An error message should be printed if the function returns false.
- *
+ *
* @param boolean $newAccount is new account or existing one
* @param array $attributes LDAP attributes of this entry
* @return boolean true, if no problems occured
@@ -1650,7 +1676,7 @@ abstract class baseModule {
public function preModifySelfService($newAccount, $attributes) {
return true;
}
-
+
/**
* Allows the module to run commands after the LDAP entry is changed or created.
*
@@ -1661,24 +1687,24 @@ abstract class baseModule {
public function postModifySelfService($newAccount, $attributes) {
return true;
}
-
+
/**
* This allows modules to create a link to a module specific page
* for the self service.
* The link is shown on the login page of the self service. You
* can use this to provide e.g. a page to reset passwords.
- *
+ *
* @param array $settings self service settings
* @return String link text (null if no special page used)
*/
public function getLinkToSpecialSelfServicePage($settings) {
return null;
}
-
+
/**
* This function creates meta HTML code to display the module specific page
* for the self service.
- *
+ *
* @param selfServiceProfile $profile self service settings
* @return htmlElement meta HTML object
*
@@ -1690,7 +1716,7 @@ abstract class baseModule {
/**
* Returns the {@link accountContainer} object.
- *
+ *
* @return accountContainer accountContainer object
*
* @see accountContainer
@@ -1703,7 +1729,7 @@ abstract class baseModule {
return null;
}
}
-
+
/**
* Returns the LDAP attributes which are managed in this module.
*
@@ -1712,7 +1738,7 @@ abstract class baseModule {
public function getAttributes() {
return $this->attributes;
}
-
+
/**
* Returns the LDAP attributes which are managed in this module (with unchanged values).
*
@@ -1721,14 +1747,14 @@ abstract class baseModule {
public function getOriginalAttributes() {
return $this->orig;
}
-
+
/**
* Returns the path to the module icon.
* The path must be releative to graphics (e.g. key.png) or an URL (/icons/icon.png or http://server/icon.png).
* You can also set $this->meta['icon']. The preferred size is 32x32px.
*
* @return unknown
- *
+ *
* @see baseModule::get_metaData()
*/
public function getIcon() {
@@ -1737,7 +1763,7 @@ abstract class baseModule {
}
return null;
}
-
+
/**
* Manages AJAX requests.
* This function may be called with or without an account container.
@@ -1745,30 +1771,30 @@ abstract class baseModule {
public function handleAjaxRequest() {
// modules that use AJAX need to implement this function
}
-
+
/**
* Specifies if this module supports the LAM admin interface.
* The LAM admin interface are the pages that allow to manage e.g. users and groups.
* In contrast there is also the LAM self service interface. Most modules support
* the admin interface.
- *
+ *
* @return boolean support admin interface
*/
public function supportsAdminInterface() {
return true;
}
-
+
/**
* Returns a list of jobs that can be run.
- *
+ *
* @param LAMConfig $config configuration
*/
public function getSupportedJobs(&$config) {
return array();
}
-
-
-
+
+
+
// helper functions
/**
@@ -1789,5 +1815,71 @@ abstract class baseModule {
}
+/**
+ * Represents a table for PDF export.
+ *
+ * @package PDF
+ * @author Roland Gruber
+ */
+class PDFTable {
+
+ /** optional label of table */
+ public $label = null;
+ /** list of PDFTableRow elements */
+ public $rows = array();
+
+}
+
+/**
+ * Represents a table row for PDF export.
+ *
+ * @package PDF
+ * @author Roland Gruber
+ */
+class PDFTableRow {
+
+ /** list of PDFTableCell */
+ public $cells = array();
+
+}
+
+/**
+ * Represents a table cell for PDF export.
+ *
+ * @package PDF
+ * @author Roland Gruber
+ */
+class PDFTableCell {
+
+ const ALIGN_LEFT = 'L';
+ const ALIGN_RIGHT = 'R';
+ const ALIGN_CENTER = 'C';
+
+ /** content text of cell */
+ public $content = '';
+ /** text alignment */
+ public $align = self::ALIGN_LEFT;
+ /** cell width (e.g. "20%") */
+ public $width = null;
+ /** bold text */
+ public $bold = false;
+
+ /**
+ * Constructor.
+ *
+ * @param String $content cell content
+ * @param String $align cell alignment (default: left)
+ * @param String $width width (e.g. "20%")
+ * @param boolean $bold print in bold
+ */
+ public function __construct($content, $align = null, $width = null, $bold = false) {
+ $this->content = empty($content) ? ' ' : $content;
+ $this->align = ($align == null) ? self::ALIGN_LEFT : $align;
+ $this->width = $width;
+ $this->bold = $bold;
+ }
+
+}
+
?>
\ No newline at end of file
diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc
index aa83f6cd..f12e5b8d 100644
--- a/lam/lib/modules/asteriskExtension.inc
+++ b/lam/lib/modules/asteriskExtension.inc
@@ -2,10 +2,10 @@
/*
$Id$
-
+
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2009 - 2012 Pavel Pozdniak
- 2009 - 2014 Roland Gruber
+ 2009 - 2015 Roland Gruber
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
@@ -56,7 +56,7 @@ class asteriskExtension extends baseModule {
/**
* Returns true if this module can manage accounts of the current type, otherwise false.
- *
+ *
* @return boolean true if module fits
*/
public function can_manage() {
@@ -138,7 +138,7 @@ class asteriskExtension extends baseModule {
'owners' => _('Extension owners'),
'rules' => _('Rules'),
);
-
+
$return['upload_columns'] = array(
array(
'name' => 'asteriskExtension_AstExtension',
@@ -146,7 +146,7 @@ class asteriskExtension extends baseModule {
'help' => 'AstExtension',
'example' => '500',
'required' => true
- ),
+ ),
array(
'name' => 'asteriskExtension_AstContext',
'description' => _('Account context'),
@@ -158,7 +158,7 @@ class asteriskExtension extends baseModule {
'name' => 'asteriskExtension_owner',
'description' => _('Extension owners'),
'help' => 'member',
- 'example' => 'uid=user1,o=test;uid=user2,o=test',
+ 'example' => 'uid=user1,o=test;uid=user2,o=test',
),
array(
'name' => 'asteriskExtension_AstApplication',
@@ -172,8 +172,8 @@ class asteriskExtension extends baseModule {
'description' => _('Application data'),
'help' => 'AstApplicationData',
'example' => _('test-start'),
- ),
-
+ ),
+
);
return $return;
}
@@ -191,7 +191,7 @@ class asteriskExtension extends baseModule {
$this->messages['AstPriority'][0] = array('ERROR', _('Please enter the priority.'));
$this->messages['AstExtensionAstPriority'][0] = array('ERROR', _('This pair of extension name and priority already exists.'));
$this->messages['member'][0] = array('ERROR', _('Please add at least one extension owner.'));
-
+
}
/**
@@ -217,7 +217,7 @@ class asteriskExtension extends baseModule {
if ( !$this->isExtensionOwnerSet()) {
$this->setDefaultExtensionOwner();
}
-
+
$this->render_exten_owners_set_controls($return);
return $return;
@@ -225,7 +225,7 @@ class asteriskExtension extends baseModule {
/**
* This function prints management elements to manipulate owners of an extension.
- *
+ *
* @param htmlTable container
*/
function render_exten_owners_set_controls($renderContainer) {
@@ -251,7 +251,7 @@ class asteriskExtension extends baseModule {
/**
* Loads all related extension entries.
- *
+ *
* @param String $extension extension name
*/
function load_extension_parts($extension) {
@@ -273,7 +273,7 @@ class asteriskExtension extends baseModule {
/**
* Generates the meta HTML for the rules.
- *
+ *
* @param String $extension extension name
* @param htmlTable $renderContainer container
*/
@@ -288,7 +288,7 @@ class asteriskExtension extends baseModule {
$suggestedExtName = $this->generateNextExtensionName();
$extNameInput = new htmlTableExtendedInputField(_("Extension name"), 'AstExtension', $suggestedExtName, 'AstExtension');
$extNameInput->setRequired(true);
- $renderContainer->addElement($extNameInput, true);
+ $renderContainer->addElement($extNameInput, true);
} else {
$extNameInput = new htmlTableExtendedInputField(_("Extension name"), 'AstExtension', $extension, 'AstExtension');
$extNameInput->setRequired(true);
@@ -324,7 +324,7 @@ class asteriskExtension extends baseModule {
$upDownButtons->addElement(new htmlButton('rule_down_button_' . $i, 'down.gif', true));
}
$renderContainer->addElement($upDownButtons, true);
-
+
$renderContainer->addElement(new htmlSpacer(null, '30px'), true);
}
@@ -333,26 +333,26 @@ class asteriskExtension extends baseModule {
if ($this->addRuleFlag || sizeof($entries) == 0) {
$this->render_extension(null, sizeof($entries), $renderContainer);
-
+
if ($this->addRuleFlag) {
$upDownButtons = new htmlTable();
$renderContainer->addElement(new htmlButton("delete_rule_" . $i, _('Delete rule')), false);
$upDownButtons->addElement(new htmlButton('rule_up_button_' . $i, 'up.gif', true), false);
- $renderContainer->addElement($upDownButtons, true);
+ $renderContainer->addElement($upDownButtons, true);
}
-
+
$displayEntrNum++;
$this->addRuleFlag = false;
}
$hidenInput = new htmlHiddenInput("extension_rows", $displayEntrNum); //the size of found rows plus 1 for new one;
$renderContainer->addElement($hidenInput, true);
-
+
$renderContainer->addElement(new htmlButton("add_rule", _('Add another rule')), true);
}
/**
* Generates the meta HTML for a single rule.
- *
+ *
* @param array $extensLine attributes of rule
* @param int $placeInList rule position
* @param htmlTable $renderContainer container
@@ -378,7 +378,7 @@ class asteriskExtension extends baseModule {
/**
* Sorts an array of arrays by the given key.
- *
+ *
* @param array $array array
* @param String $on key
* @param String $order order (SORT_ASC or SORT_DESC)
@@ -520,10 +520,10 @@ class asteriskExtension extends baseModule {
return array();
}
-
+
/**
* Returns if the extension was moved to another OU.
- *
+ *
* @return boolean true if moved
*/
function isMoveToNewSuffix(){
@@ -533,12 +533,12 @@ class asteriskExtension extends baseModule {
}
return false;
}
-
-
-
+
+
+
/**
* Returns true if at least one owner is set and false otherwise
- *
+ *
* @return boolean true if one or more owners
*/
function isExtensionOwnerSet(){
@@ -547,7 +547,7 @@ class asteriskExtension extends baseModule {
}
return false;
}
-
+
/**
* Writes variables into object and does some regex checks.
*
@@ -556,7 +556,7 @@ class asteriskExtension extends baseModule {
function process_attributes() {
$errors = array();
$extensionName = array();
-
+
if (!isset($_POST['generate_extension_name'])) {
//perform normal set of operations
@@ -602,7 +602,7 @@ class asteriskExtension extends baseModule {
/**
* Processes the rule data.
- *
+ *
* @param String $extensionName extension name
* @param String $extensionContext extension context
* @return array error messages
@@ -610,7 +610,7 @@ class asteriskExtension extends baseModule {
function processExtensionRows($extensionName, $extensionContext) {
$errors = array();
if (isset($_POST['extension_rows']) && get_preg($_POST['extension_rows'], 'digit')) {
-
+
$extensionPriorityCntr = 1;
$this->extensionRows = array();
for ($entryCounter = 0; $entryCounter < $_POST['extension_rows']; $entryCounter++) {
@@ -619,7 +619,7 @@ class asteriskExtension extends baseModule {
$singleExtAddErrors = $this->processSingleExtension($extRow,$extensionName, $extensionContext, $entryCounter,$extensionPriorityCntr);
$errors = $errors + $singleExtAddErrors;
-
+
if ((isset($extRow['astapplication'][0]) && $extRow['astapplication'][0] != "") ||
(isset($extRow['astapplicationdata'][0]) && $extRow['astapplicationdata'][0] != "")
) {
@@ -628,23 +628,23 @@ class asteriskExtension extends baseModule {
}
}
}
-
+
//trow error banner if last row unporpertly filled (for now the only reason for that is unfilled AstApplication filed)
if (isset($_POST['AstApplicationData_' . ($_POST['extension_rows'] - 1)]) && $_POST['AstApplicationData_' . ($_POST['extension_rows'] - 1)] != "" &&
($_POST['AstApplication_' . ($_POST['extension_rows'] - 1)] == "" || !isset($_POST['AstApplication_' . ($_POST['extension_rows'] - 1)]))) {
$errors[] = $this->messages['AstApplication'][0];
}
-
+
//process priority change on rule
$this->processPriorityChange();
-
+
//finally sort extensions by priority
$this->extensionRows = $this->array_sort($this->extensionRows, 'astpriority');
}
return $errors;
}
-
+
/**
* Set extension owner as current logged in user.
*/
@@ -653,10 +653,10 @@ class asteriskExtension extends baseModule {
$this->extensionOwners[0] = $login;
$this->attributes['member'] = array($login);
}
-
+
/**
* Returns the default extension owner.
- *
+ *
* @return String owner
*/
function getDefaultExtensionOwner(){
@@ -664,17 +664,17 @@ class asteriskExtension extends baseModule {
$login = $credentials[0];
return $login;
}
-
+
/**
* Fills the fileds of a single extension row.
- * In Asterisk it would only be an extension name,a priority,an application, but LDAP spicific
+ * In Asterisk it would only be an extension name,a priority,an application, but LDAP spicific
* add to processing context field.
- *
+ *
* @param array $extRow - hash array to store single extension properties;
* @param String $extensionName extension name
* @param String $extensionContext extension context
* @param int $entryCounter - counter to distinguish single extensuion properties from $_POST
- * @param int $extensionPriorityCntr - it is the variable where actual number of extension rules wuld be aggregated
+ * @param int $extensionPriorityCntr - it is the variable where actual number of extension rules wuld be aggregated
*/
function processSingleExtension(&$extRow,$extensionName, $extensionContext ,$entryCounter,$extensionPriorityCntr) {
$errors = array();
@@ -704,13 +704,13 @@ class asteriskExtension extends baseModule {
$extRow['astapplicationdata'][0] = $_POST['AstApplicationData_' . $entryCounter];
}
- //Fille the member filed
+ //Fille the member filed
$extRow['member'] = $this->extensionOwners;
if (!isset($extRow['member']) || count($extRow['member']) == 0) {
if (!isset($_POST['form_subpage_' . get_class($this) . '_user_open'])) {
$errors[] = $this->messages['member'][0];
}
- }
+ }
return $errors;
}
@@ -734,7 +734,7 @@ class asteriskExtension extends baseModule {
* Search by extension name and retun true if fields with this extension name exists
* and false otherwise.
* Equal extension names are allowed in different OUs.
- *
+ *
* @param String $extension extension name
* @return boolean true if there are entries with this extension name.
*/
@@ -759,13 +759,13 @@ class asteriskExtension extends baseModule {
* This function searches in the base subtree and finds all extensions names within.
* The generation algorithm is the naive one, so only work when extension is numbers.
* All extension name is sorted and new extension name will be greates on + 1.
- *
+ *
* @return String suggested extension name
*/
function generateNextExtensionName() {
$searchClass = "AsteriskExtension";
$searchScope = 'asteriskExt';
-
+
$suggeted_extension = ''; //default empty value
if( isset($this->extensionRows[0]['astextension'][0]) ){
$suggeted_extension = $this->extensionRows[0]['astextension'][0];
@@ -790,7 +790,7 @@ class asteriskExtension extends baseModule {
}
}
}
-
+
return $suggeted_extension;
}
@@ -817,28 +817,26 @@ class asteriskExtension extends baseModule {
$this->addSimplePDFField($return, 'owners', _('Extension owners'), 'member', '; ');
// rules
$entries = $this->load_extension_parts($extName);
- $rulePDF = array();
- $rulePDF[] = '| | ';
- $rulePDF[] = '| | ';
- $rulePDF[] = '| | ';
- $rulePDF[] = '' .
- '| ' . _('Name') . ' | ' .
- '' . _('Application') . ' | ' .
- '' . _('Application data') . ' | ' .
- '' . _('Priority') . ' | ' .
- ' ';
+ $pdfTable = new PDFTable();
+ $pdfRow = new PDFTableRow();
+ $pdfRow->cells[] = new PDFTableCell(_('Name'), null, '20%', true);
+ $pdfRow->cells[] = new PDFTableCell(_('Application'), null, '30%', true);
+ $pdfRow->cells[] = new PDFTableCell(_('Application data'), null, '30%', true);
+ $pdfRow->cells[] = new PDFTableCell(_('Priority'), null, '20%', true);
+ $pdfTable->rows[] = $pdfRow;
for ($i = 0; $i < sizeof($entries); $i++) {
- $appdata = ' ';
- if (isset($entries[$i]['astapplicationdata'][0])) {
- $appdata = $entries[$i]['astapplicationdata'][0];
- }
- $rulePDF[] = '' .
- '| ' . $entries[$i]['cn'][0] . ' | ' .
- '' . $entries[$i]['astapplication'][0] . ' | ' .
- '' . $appdata . ' | ' .
- '' . $entries[$i]['astpriority'][0] . ' | ';
+ $appdata = ' ';
+ if (isset($entries[$i]['astapplicationdata'][0])) {
+ $appdata = $entries[$i]['astapplicationdata'][0];
+ }
+ $pdfRow = new PDFTableRow();
+ $pdfRow->cells[] = new PDFTableCell($entries[$i]['cn'][0], null, '20%');
+ $pdfRow->cells[] = new PDFTableCell($entries[$i]['astapplication'][0], null, '30%');
+ $pdfRow->cells[] = new PDFTableCell($appdata, null, '30%');
+ $pdfRow->cells[] = new PDFTableCell($entries[$i]['astpriority'][0], null, '20%');
+ $pdfTable->rows[] = $pdfRow;
}
- $return[get_class($this) . '_rules'] = $rulePDF;
+ $this->addPDFTable($return, 'rules', $pdfTable);
return $return;
}
@@ -855,7 +853,7 @@ class asteriskExtension extends baseModule {
$messages = array();
//hash to strore extension_name => priority. For new extensoin priority will be 1
$extensionNamePriorityMap = array();
- for ($i = 0; $i < sizeof($rawAccounts); $i++) {
+ for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
if (!in_array("AsteriskExtension", $partialAccounts[$i]['objectClass']))
$partialAccounts[$i]['objectClass'][] = "AsteriskExtension";
@@ -863,7 +861,7 @@ class asteriskExtension extends baseModule {
$partialAccounts[$i]['objectClass'][] = "groupOfNames";
// attributes
$partialAccounts[$i]['AstExtension'] = $rawAccounts[$i][$ids['asteriskExtension_AstExtension']];
-
+
$extensionName = $partialAccounts[$i]['AstExtension'];
$astPriorityTmp = 0;
if(isset ($extensionNamePriorityMap[$extensionName])){
@@ -872,28 +870,28 @@ class asteriskExtension extends baseModule {
}else{
$astPriorityTmp = 1;
$extensionNamePriorityMap[$extensionName] = $astPriorityTmp;
- }
+ }
$partialAccounts[$i]['AstPriority'] = $astPriorityTmp;
-
+
$partialAccounts[$i]['cn'] = $extensionName . '-' . $astPriorityTmp;
-
+
if (isset($rawAccounts[$i][$ids['asteriskExtension_owner']]) && $rawAccounts[$i][$ids['asteriskExtension_owner']] != '' ) {
$partialAccounts[$i]['member'] = explode(';', $rawAccounts[$i][$ids['asteriskExtension_owner']]);
} else {
$partialAccounts[$i]['member'] = $this->getDefaultExtensionOwner();
}
-
+
$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'asteriskExtension_AstApplication', 'AstApplication');
$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'asteriskExtension_AstApplicationData', 'AstApplicationData');
$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'asteriskExtension_AstContext', 'AstContext');
}
-
+
return $messages;
}
-
+
/**
* Get list of all applications for given extension and move it into new suffix.
- *
+ *
* @param array $rowOrig attributes of original extension
* @return array list of error messages
*/
@@ -908,12 +906,12 @@ class asteriskExtension extends baseModule {
$errors[] = array('ERROR', sprintf(_('Was unable to rename DN: %s.'), $this->getAccountContainer()->dn_orig), getDefaultLDAPErrorString($_SESSION['ldap']->server()));
logNewMessage(LOG_ERR, 'Unable to rename ' . $oldDN . ' to ' . $newRDN . ',' . $this->getAccountContainer()->dnSuffix);
}
- }
+ }
}
-
+
/**
* Returns a list of modifications which have to be made to the LDAP account.
- *
+ *
* Calling this method requires the existence of an enclosing {@link accountContainer}.
*
*
@@ -928,7 +926,7 @@ class asteriskExtension extends baseModule {
*
"info" values with informational value (e.g. to be used later by pre/postModify actions)
*
*
This builds the required comands from $this-attributes and $this->orig.
- *
+ *
* @return array list of modifications
*/
function save_attributes() {
@@ -949,10 +947,10 @@ class asteriskExtension extends baseModule {
ldap_mod_add($_SESSION['ldap']->server(), "cn=" . $row["cn"][0] . "," . $this->getAccountContainer()->dnSuffix, $diffVals);
}
$diffValsSerialysed = array_diff(array_map("serialize", array_intersect_key($row, $rowOrig)), array_map("serialize", $rowOrig));
-
+
//if new suffix jast move old rows to the new suffix and go on
$this->moveExtentionToNewSuffix($rowOrig);
-
+
if (count($diffValsSerialysed) != 0) {
$diffVals = array_map("unserialize", $diffValsSerialysed);
if($row["cn"][0] == $rowOrig["cn"][0]){
@@ -960,7 +958,7 @@ class asteriskExtension extends baseModule {
}else{
$origDN = "cn=" . $rowOrig["cn"][0] . "," . $this->getAccountContainer()->dnSuffix;
$newRDN = "cn=" . $row["cn"][0];
-
+
ldap_rename($_SESSION['ldap']->server(), $origDN, $newRDN, $this->getAccountContainer()->dnSuffix, true);
ldap_mod_replace($_SESSION['ldap']->server(), $newRDN . "," . $this->getAccountContainer()->dnSuffix, $diffVals);
}
@@ -974,21 +972,21 @@ class asteriskExtension extends baseModule {
$row = $this->extensionRows[$rowCounter];
ldap_add($_SESSION['ldap']->server(), "cn=" . $row["cn"][0] . "," . $this->getAccountContainer()->dnSuffix, $row);
}
-
+
//a trick for Edit again to work
$this->getAccountContainer()->dn_orig = "cn=" . $this->extensionRows[0]['cn'][0] . "," . $this->getAccountContainer()->dnSuffix;
$this->getAccountContainer()->finalDN = "cn=" . $this->extensionRows[0]['cn'][0] . "," . $this->getAccountContainer()->dnSuffix;
-
+
$retun_obj = $this->getAccountContainer()->save_module_attributes($this->orig, $this->orig);
-
+
return $retun_obj;
}
/**
* Runs ufter main deltete procedure was done and do postmorten for other parts of extension
* wtith priority > 1.
- *
- * @return array error messages
+ *
+ * @return array error messages
*/
function postDeleteActions() {
@@ -1001,8 +999,8 @@ class asteriskExtension extends baseModule {
for ($rowCounter = 0; $rowCounter < count($entries); $rowCounter++) {
$rowOrig = $entries[$rowCounter];
- if ($rowOrig["astpriority"][0] > 1) {
- ldap_delete($_SESSION['ldap']->server(), $rowOrig['dn']);
+ if ($rowOrig["astpriority"][0] > 1) {
+ ldap_delete($_SESSION['ldap']->server(), $rowOrig['dn']);
}
}
return array();
|