Asterisk update

This commit is contained in:
Roland Gruber 2012-03-10 18:20:13 +00:00
parent 896ce661cc
commit b85c139303
7 changed files with 1103 additions and 1748 deletions

View File

@ -1,9 +1,7 @@
<pdf type="asteriskExt" filename="printLogo.jpg" headline="LDAP Account Manager"> <pdf type="asteriskExt" filename="printLogo.jpg" headline="LDAP Account Manager">
<section name="_asteriskExtension_cn"> <section name="_asteriskExtension_AstExtension">
<entry name="asteriskExtension_AstExtension" />
<entry name="asteriskExtension_AstApplication" />
<entry name="asteriskExtension_AstApplicationData" />
<entry name="asteriskExtension_AstContext" /> <entry name="asteriskExtension_AstContext" />
<entry name="asteriskExtension_member" /> <entry name="asteriskExtension_owners" />
<entry name="asteriskExtension_rules" />
</section> </section>
</pdf> </pdf>

View File

@ -1,7 +0,0 @@
<pdf type="asteriskExtNewUI" filename="printLogo.jpg" headline="LDAP Account Manager">
<section name="_asteriskExtensionNewUI_AstExtension">
<entry name="asteriskExtensionNewUI_AstContext" />
<entry name="asteriskExtensionNewUI_owners" />
<entry name="asteriskExtensionNewUI_rules" />
</section>
</pdf>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,10 @@
<?php <?php
/* /*
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam) This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2009 Pozdnyak Pavel Copyright (C) 2009 - 2012 Pozdnyak Pavel
2010 - 2012 Roland Gruber 2010 - 2012 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -20,103 +21,102 @@ $Id$
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/** /**
* The account type for Asterisk extensions. * The account type for Asterisk extensions.
* *
* @package types * @package types
* @author Pozdnyak Pavel * @author Pozdnyak Pavel
* @author Roland Gruber * @author Roland Gruber
*/ */
/** /**
* The account type for Asterisk extensions. * The account type for Asterisk extensions.
* *
* @package types * @package types
*/ */
class asteriskExt extends baseType { class asteriskExt extends baseType {
/** /**
* Constructs a new domain type object. * Constructs a new domain type object.
*/ */
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
$this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another extension'); $this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another extension');
$this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to extensions list'); $this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to extensions list');
} }
/** /**
* Returns the alias name of this account type. * Returns the alias name of this account type.
* *
* @return string alias name * @return string alias name
*/ */
function getAlias() { function getAlias() {
return _("Asterisk extensions"); return _("Asterisk extensions");
} }
/** /**
* Returns the description of this account type. * Returns the description of this account type.
* *
* @return string description * @return string description
*/ */
function getDescription() { function getDescription() {
return _("Asterisk extensions entries"); return _("Asterisk extensions entries");
} }
/** /**
* Returns the class name for the list object. * Returns the class name for the list object.
* *
* @return string class name * @return string class name
*/ */
function getListClassName() { function getListClassName() {
return "lamAsteriskExtList"; return "lamAsteriskExtList";
} }
/** /**
* Returns the default attribute list for this account type. * Returns the default attribute list for this account type.
* *
* @return string attribute list * @return string attribute list
*/ */
function getDefaultListAttributes() { function getDefaultListAttributes() {
return "#cn;#AstExtension;#AstPriority"; return "#AstExtension;#AstContext;#member";
} }
/** /**
* Returns a list of attributes which have a translated description. * Returns a list of attributes which have a translated description.
* This is used for the head row in the list view. * This is used for the head row in the list view.
* *
* @return array list of descriptions * @return array list of descriptions
*/ */
function getListAttributeDescriptions() { function getListAttributeDescriptions() {
return array( return array(
"cn" => _("Extension name"), "astextension" => _("Extension name"),
"astextension" => _("Label"), "astcontext" => _("Account context"),
"astpriority" => _("Priority") "member" => _("Owner"),
); );
} }
/** /**
* Returns the the title text for the title bar on the new/edit page. * Returns the the title text for the title bar on the new/edit page.
* *
* @param array $attributes list of LDAP attributes for the displayed account (null, if new account) * @param array $attributes list of LDAP attributes for the displayed account (null, if new account)
* @return String title text * @return String title text
*/ */
public function getTitleBarTitle($attributes) { public function getTitleBarTitle($attributes) {
if ($attributes == null) { if ($attributes == null) {
return _("New extension"); return _("New extension");
} }
// check if a common name is set // check if a common name is set
if (isset($attributes['cn'][0])) { if (isset($attributes['AstExtension'][0])) {
return htmlspecialchars($attributes['cn'][0]); return htmlspecialchars($attributes['AstExtension'][0]);
} }
// fall back to default // fall back to default
return parent::getTitleBarTitle($attributes); return parent::getTitleBarTitle($attributes);
} }
} }
/** /**
* Generates the list view. * Generates the list view.
* *
@ -126,21 +126,74 @@ class asteriskExt extends baseType {
*/ */
class lamAsteriskExtList extends lamList { class lamAsteriskExtList extends lamList {
/** /**
* Constructor * Constructor
* *
* @param string $type account type * @param string $type account type
* @return lamList list object * @return lamList list object
*/ */
function __construct($type) { function __construct($type) {
parent::__construct($type); parent::__construct($type);
$this->labels = array( $this->labels = array(
'nav' => _("Extension count: %s"), 'nav' => _("Extension count: %s"),
'error_noneFound' => _("No Asterisk extensions found."), 'error_noneFound' => _("No Asterisk extensions found."),
'newEntry' => _("New extension"), 'newEntry' => _("New extension"),
'deleteEntry' => _("Delete selected extensions")); 'deleteEntry' => _("Delete selected extensions"));
}
/**
* Forces the list view to show only specific attributes.
*
* @see lamList::listGetParams()
*/
protected function listGetParams() {
// check if only PDF should be shown
parent::listGetParams();
$this->attrArray = array("astextension", "astcontext", "member");
$this->descArray = array(_("Extension name"), _("Account context"), _("Owner"));
}
/**
* Groups the extensions.
*
* (non-PHPdoc)
* @see lamList::listRefreshData()
*/
protected function listRefreshData() {
parent::listRefreshData();
// configure search filter
$module_filter = get_ldap_filter($this->type); // basic filter is provided by modules
$filter = "(&" . $module_filter . $this->filterPart . ")";
$attrs = $this->attrArray;
$attrs[] = "astpriority";
$entries = searchLDAP($this->suffix, $filter, $attrs);
$lastError = getLastLDAPError();
if ($lastError != null) {
call_user_func_array('StatusMessage', $lastError);
} }
$entries = $this->normalizeLdapOutput($entries);
$this->entries = $entries;
// generate list of possible suffixes
$typeObj = new $this->type();
$this->possibleSuffixes = $typeObj->getSuffixList();
}
/**
* Groups the extensions.
*
* @param array $entries extension entries
*/
private function normalizeLdapOutput($entries){
$entries = array_map("unserialize", array_unique(array_map("serialize", $entries)));
foreach($entries as $key=> $value){
if($entries[$key]["astpriority"][0] > 1){
unset($entries[$key]);
}
}
return $entries;
}
} }
?> ?>

View File

@ -1,198 +0,0 @@
<?php
/*
$Id$
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2009 - 2012 Pozdnyak Pavel
2010 - 2012 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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
* The account type for Asterisk extensions.
*
* @package types
* @author Pozdnyak Pavel
* @author Roland Gruber
*/
/**
* The account type for Asterisk extensions.
*
* @package types
*/
class asteriskExtNewUI extends baseType {
/**
* Constructs a new domain type object.
*/
public function __construct() {
parent::__construct();
$this->LABEL_CREATE_ANOTHER_ACCOUNT = _('Create another extension');
$this->LABEL_BACK_TO_ACCOUNT_LIST = _('Back to extensions list');
}
/**
* Returns the alias name of this account type.
*
* @return string alias name
*/
function getAlias() {
return _("Asterisk extensions new UI");
}
/**
* Returns the description of this account type.
*
* @return string description
*/
function getDescription() {
return _("Asterisk extensions entries");
}
/**
* Returns the class name for the list object.
*
* @return string class name
*/
function getListClassName() {
return "lamAsteriskExtNewUIList";
}
/**
* Returns the default attribute list for this account type.
*
* @return string attribute list
*/
function getDefaultListAttributes() {
return "#AstExtension;#AstContext;#member";
}
/**
* Returns a list of attributes which have a translated description.
* This is used for the head row in the list view.
*
* @return array list of descriptions
*/
function getListAttributeDescriptions() {
return array(
"astextension" => _("Extension name"),
"astcontext" => _("Account context"),
"member" => _("Owner"),
);
}
/**
* Returns the the title text for the title bar on the new/edit page.
*
* @param array $attributes list of LDAP attributes for the displayed account (null, if new account)
* @return String title text
*/
public function getTitleBarTitle($attributes) {
if ($attributes == null) {
return _("New extension");
}
// check if a common name is set
if (isset($attributes['AstExtension'][0])) {
return htmlspecialchars($attributes['AstExtension'][0]);
}
// fall back to default
return parent::getTitleBarTitle($attributes);
}
}
/**
* Generates the list view.
*
* @package lists
* @author Pozdnyak Pavel
*
*/
class lamAsteriskExtNewUIList extends lamList {
/**
* Constructor
*
* @param string $type account type
* @return lamList list object
*/
function __construct($type) {
parent::__construct($type);
$this->labels = array(
'nav' => _("Extension count: %s"),
'error_noneFound' => _("No Asterisk extensions found."),
'newEntry' => _("New extension"),
'deleteEntry' => _("Delete selected extensions"));
}
/**
* Forces the list view to show only specific attributes.
*
* @see lamList::listGetParams()
*/
protected function listGetParams() {
// check if only PDF should be shown
parent::listGetParams();
$this->attrArray = array("astextension", "astcontext", "member");
}
/**
* Groups the extensions.
*
* (non-PHPdoc)
* @see lamList::listRefreshData()
*/
protected function listRefreshData() {
parent::listRefreshData();
// configure search filter
$module_filter = get_ldap_filter($this->type); // basic filter is provided by modules
$filter = "(&" . $module_filter . $this->filterPart . ")";
$attrs = $this->attrArray;
$attrs[] = "astpriority";
$entries = searchLDAP($this->suffix, $filter, $attrs);
$lastError = getLastLDAPError();
if ($lastError != null) {
call_user_func_array('StatusMessage', $lastError);
}
$entries = $this->normalizeLdapOutput($entries);
$this->entries = $entries;
// generate list of possible suffixes
$typeObj = new $this->type();
$this->possibleSuffixes = $typeObj->getSuffixList();
}
/**
* Groups the extensions.
*
* @param array $entries extension entries
*/
private function normalizeLdapOutput($entries){
$entries = array_map("unserialize", array_unique(array_map("serialize", $entries)));
foreach($entries as $key=> $value){
if($entries[$key]["astpriority"][0] > 1){
unset($entries[$key]);
}
}
return $entries;
}
}
?>