Clarifying variable names

Restoring "broken" parts from half-assed congregation integration
Getting save user form to work (ALMOST!)
Other bugfixes

git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@275 06cd67b6-e706-0410-b29e-9de616bca6e9

diff --git a/andrew.session b/andrew.session
index e0931a7..34c2b8b 100644 (file)
--- a/andrew.session
+++ b/andrew.session
@@ -60,63 +60,63 @@
       </profile>
       <profile remote_host="dev04.alkaloid.net" remote_port="22" remote_path="/srv/vhost/sites/shout.dev04.alkaloid.net/shout" remote_protocol="sftp" user="bklang" name="Shout Dev" >
         <uploadeditem upload_time="0" url="config/" />
-        <uploadeditem upload_time="1138396403" url="config/applist.xml.dist" />
-        <uploadeditem upload_time="1138318792" url="config/conf.xml" />
-        <uploadeditem upload_time="1138318792" url="config/defines.php.dist" />
-        <uploadeditem upload_time="1138396077" url="dialplan.php" />
+        <uploadeditem upload_time="1138465344" url="config/applist.xml.dist" />
+        <uploadeditem upload_time="1138318762" url="config/conf.xml" />
+        <uploadeditem upload_time="1138318762" url="config/defines.php.dist" />
+        <uploadeditem upload_time="1138465344" url="dialplan.php" />
         <uploadeditem upload_time="0" url="dialplan/" />
-        <uploadeditem upload_time="1134075506" url="dialplan/edit.php" />
-        <uploadeditem upload_time="1138380566" url="index.php" />
+        <uploadeditem upload_time="1134254291" url="dialplan/edit.php" />
+        <uploadeditem upload_time="1138479849" url="index.php" />
         <uploadeditem upload_time="0" url="lib/" />
-        <uploadeditem upload_time="1134075506" url="lib/Dialplan.php" />
-        <uploadeditem upload_time="1138318792" url="lib/Driver.php" />
+        <uploadeditem upload_time="1134254292" url="lib/Dialplan.php" />
+        <uploadeditem upload_time="1138318762" url="lib/Driver.php" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1138318043" url="lib/Driver/ldap.php" />
-        <uploadeditem upload_time="1138318792" url="lib/Shout.php" />
+        <uploadeditem upload_time="1138482665" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1138318762" url="lib/Shout.php" />
         <uploadeditem upload_time="1134075507" url="lib/System.php" />
-        <uploadeditem upload_time="1138394180" url="lib/User.php" />
-        <uploadeditem upload_time="1138318792" url="lib/api.php" />
-        <uploadeditem upload_time="1134367769" url="lib/base.php" />
+        <uploadeditem upload_time="1138481293" url="lib/User.php" />
+        <uploadeditem upload_time="1138468753" url="lib/api.php" />
+        <uploadeditem upload_time="1138468370" url="lib/base.php" />
         <uploadeditem upload_time="1134075507" url="lib/defines.php" />
-        <uploadeditem upload_time="1137381911" url="lib/version.php" />
+        <uploadeditem upload_time="1137381879" url="lib/version.php" />
         <uploadeditem upload_time="0" url="main/" />
         <uploadeditem upload_time="1134254292" url="main/dialplan.php" />
         <uploadeditem upload_time="1134254291" url="main/moh.php" />
         <uploadeditem upload_time="1134075507" url="main/system.php" />
         <uploadeditem upload_time="1134254291" url="main/users.php" />
-        <uploadeditem upload_time="1138318792" url="moh.php" />
-        <uploadeditem upload_time="1138318792" url="security.php" />
+        <uploadeditem upload_time="1138318762" url="moh.php" />
+        <uploadeditem upload_time="1138318762" url="security.php" />
         <uploadeditem upload_time="0" url="templates/" />
-        <uploadeditem upload_time="1138311990" url="templates/common-header.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/content_page" />
+        <uploadeditem upload_time="1138318762" url="templates/common-header.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/content_page" />
         <uploadeditem upload_time="0" url="templates/context/" />
-        <uploadeditem upload_time="1134075418" url="templates/context/contextline.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
         <uploadeditem upload_time="1131723538" url="templates/dialplan/contexttree.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/dialplan/dialplanlist.inc" />
         <uploadeditem upload_time="1131767776" url="templates/dialplan/extensiondetail.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/dialplan/manager.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/dialplan/priority-form-begin.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/dialplan/priority-form-end.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/dialplan/priority-form-line.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/dialplan/manager.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/dialplan/priority-form-begin.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/dialplan/priority-form-end.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/dialplan/priority-form-line.inc" />
         <uploadeditem upload_time="0" url="templates/javascript/" />
-        <uploadeditem upload_time="1134075507" url="templates/javascript/dialplan.js" />
-        <uploadeditem upload_time="1134075418" url="templates/menu.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/table-limiter-begin.inc" />
-        <uploadeditem upload_time="1134075418" url="templates/table-limiter-end.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/javascript/dialplan.js" />
+        <uploadeditem upload_time="1134254292" url="templates/menu.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/table-limiter-begin.inc" />
+        <uploadeditem upload_time="1134254292" url="templates/table-limiter-end.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
-        <uploadeditem upload_time="1138386376" url="templates/users/userlist.inc" />
+        <uploadeditem upload_time="1138479954" url="templates/users/userlist.inc" />
         <uploadeditem upload_time="0" url="themes/" />
         <uploadeditem upload_time="0" url="themes/graphics/" />
-        <uploadeditem upload_time="1134075418" url="themes/graphics/add-extension.gif" />
-        <uploadeditem upload_time="1134075418" url="themes/graphics/add-user.gif" />
-        <uploadeditem upload_time="1134075418" url="themes/screen.css" />
-        <uploadeditem upload_time="1138342874" url="usermgr.php" />
+        <uploadeditem upload_time="1134254292" url="themes/graphics/add-extension.gif" />
+        <uploadeditem upload_time="1134254292" url="themes/graphics/add-user.gif" />
+        <uploadeditem upload_time="1134254292" url="themes/screen.css" />
+        <uploadeditem upload_time="1138479877" url="usermgr.php" />
         <uploadeditem upload_time="0" url="usermgr/" />
-        <uploadeditem upload_time="1138317269" url="usermgr/delete.php" />
-        <uploadeditem upload_time="1138394180" url="usermgr/edit.php" />
-        <uploadeditem upload_time="1138317269" url="usermgr/list.php" />
-        <uploadeditem upload_time="1138394180" url="usermgr/save.php" />
+        <uploadeditem upload_time="1138317244" url="usermgr/delete.php" />
+        <uploadeditem upload_time="1138479479" url="usermgr/edit.php" />
+        <uploadeditem upload_time="1138317244" url="usermgr/list.php" />
+        <uploadeditem upload_time="1138483239" url="usermgr/save.php" />
         <uploadeditem upload_time="1134254292" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
         <uploadeditem upload_time="1138311486" url="users/add.php" />

diff --git a/andrew.webprj b/andrew.webprj
index 565bef8..6532fc1 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -4,39 +4,39 @@
     <upload/>
     <defaultDTD>-//w3c//dtd xhtml 1.0 strict//en</defaultDTD>
     <item url="config/" uploadstatus="1" />
-    <item modified_time="1138318792" url="config/conf.xml" uploadstatus="1" />
+    <item modified_time="1138318762" url="config/conf.xml" uploadstatus="1" />
     <item url="dialplan/" uploadstatus="1" />
-    <item modified_time="1134075506" url="dialplan/edit.php" uploadstatus="1" />
+    <item modified_time="1134254291" url="dialplan/edit.php" uploadstatus="1" />
     <item url="lib/" uploadstatus="1" />
     <item url="lib/Driver/" uploadstatus="1" />
-    <item modified_time="1138318043" url="lib/Driver/ldap.php" uploadstatus="1" />
-    <item modified_time="1134367769" url="lib/base.php" uploadstatus="1" />
-    <item modified_time="1134075506" url="lib/Dialplan.php" uploadstatus="1" />
-    <item modified_time="1138318792" url="lib/Driver.php" uploadstatus="1" />
-    <item modified_time="1138318792" url="lib/Shout.php" uploadstatus="1" />
-    <item modified_time="1138394180" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1138482665" url="lib/Driver/ldap.php" uploadstatus="1" />
+    <item modified_time="1138468370" url="lib/base.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/Dialplan.php" uploadstatus="1" />
+    <item modified_time="1138318762" url="lib/Driver.php" uploadstatus="1" />
+    <item modified_time="1138318762" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1138481293" url="lib/User.php" uploadstatus="1" />
     <item url="templates/" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/context/contextline.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/context/contextline.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/dialplan/priority-form-begin.inc" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/dialplan/priority-form-end.inc" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/dialplan/priority-form-line.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/dialplan/priority-form-begin.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/dialplan/priority-form-end.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/dialplan/priority-form-line.inc" uploadstatus="1" />
     <item url="templates/users/" uploadstatus="1" />
-    <item modified_time="1138386376" url="templates/users/userlist.inc" uploadstatus="1" />
-    <item modified_time="1138311990" url="templates/common-header.inc" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/content_page" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/menu.inc" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/table-limiter-begin.inc" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/table-limiter-end.inc" uploadstatus="1" />
+    <item modified_time="1138479954" url="templates/users/userlist.inc" uploadstatus="1" />
+    <item modified_time="1138318762" url="templates/common-header.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/content_page" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/menu.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/table-limiter-begin.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/table-limiter-end.inc" uploadstatus="1" />
     <item url="themes/" uploadstatus="1" />
     <item url="themes/graphics/" uploadstatus="1" />
-    <item modified_time="1134075418" url="themes/graphics/add-extension.gif" uploadstatus="1" />
-    <item modified_time="1134075418" url="themes/graphics/add-user.gif" uploadstatus="1" />
-    <item modified_time="1134075418" url="themes/screen.css" uploadstatus="1" />
-    <item modified_time="1138396077" url="dialplan.php" uploadstatus="1" />
-    <item modified_time="1138380566" url="index.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="themes/graphics/add-extension.gif" uploadstatus="1" />
+    <item modified_time="1134254292" url="themes/graphics/add-user.gif" uploadstatus="1" />
+    <item modified_time="1134254292" url="themes/screen.css" uploadstatus="1" />
+    <item modified_time="1138465344" url="dialplan.php" uploadstatus="1" />
+    <item modified_time="1138479849" url="index.php" uploadstatus="1" />
     <item url="" uploadstatus="1" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
       <profile remote_host="" remote_port="" remote_path="" remote_protocol="ftp" user="" name="@" />
@@ -99,11 +99,11 @@
     </uploadprofiles>
     <templates>templates/</templates>
     <toolbars>toolbars/</toolbars>
-    <item modified_time="1138318792" url="lib/api.php" uploadstatus="1" />
-    <item modified_time="1138318792" url="security.php" uploadstatus="1" />
+    <item modified_time="1138468753" url="lib/api.php" uploadstatus="1" />
+    <item modified_time="1138318762" url="security.php" uploadstatus="1" />
     <item url="templates/javascript/" uploadstatus="1" />
-    <item modified_time="1134075507" url="templates/javascript/dialplan.js" uploadstatus="1" />
-    <item modified_time="1134075418" url="templates/dialplan/manager.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/javascript/dialplan.js" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/dialplan/manager.inc" uploadstatus="1" />
     <treestatus>
       <openfolder url="lib" />
       <openfolder url="lib/Driver" />
@@ -126,15 +126,15 @@
       <mailinglist address="" />
     </teamdata>
     <events/>
-    <item modified_time="1137381911" url="lib/version.php" uploadstatus="1" />
-    <item modified_time="1138318792" url="moh.php" uploadstatus="1" />
-    <item modified_time="1138342874" url="usermgr.php" uploadstatus="1" />
-    <item modified_time="1138318792" url="config/defines.php.dist" uploadstatus="1" />
+    <item modified_time="1137381879" url="lib/version.php" uploadstatus="1" />
+    <item modified_time="1138318762" url="moh.php" uploadstatus="1" />
+    <item modified_time="1138479877" url="usermgr.php" uploadstatus="1" />
+    <item modified_time="1138318762" url="config/defines.php.dist" uploadstatus="1" />
     <item url="usermgr/" uploadstatus="1" />
-    <item modified_time="1138394180" url="usermgr/edit.php" uploadstatus="1" />
-    <item modified_time="1138317269" url="usermgr/list.php" uploadstatus="1" />
-    <item modified_time="1138394180" url="usermgr/save.php" uploadstatus="1" />
-    <item modified_time="1138317269" url="usermgr/delete.php" uploadstatus="1" />
-    <item modified_time="1138396403" url="config/applist.xml.dist" uploadstatus="1" />
+    <item modified_time="1138479479" url="usermgr/edit.php" uploadstatus="1" />
+    <item modified_time="1138317244" url="usermgr/list.php" uploadstatus="1" />
+    <item modified_time="1138483239" url="usermgr/save.php" uploadstatus="1" />
+    <item modified_time="1138317244" url="usermgr/delete.php" uploadstatus="1" />
+    <item modified_time="1138465344" url="config/applist.xml.dist" uploadstatus="1" />
   </project>
 </webproject>

diff --git a/index.php b/index.php
index 7daac18..d4f94e5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,16 +11,6 @@
  */
 
 @define('SHOUT_BASE', dirname(__FILE__));
-$shout_configured = (@is_readable(SHOUT_BASE . '/config/conf.php') &&
-                     @is_readable(SHOUT_BASE . '/config/defines.php'));# &&
-                     #@is_readable(SHOUT_BASE . '/config/prefs.php'));
-if (!$shout_configured) {
-    require SHOUT_BASE . '/../lib/Test.php';
-    Horde_Test::configFilesMissing('Shout', SHOUT_BASE,
-                                   array('conf.php', 'defines.php'));
-                                   #, 'prefs.php'));
-}
-
 require_once SHOUT_BASE . '/lib/base.php';
 require_once SHOUT_BASE . '/lib/Shout.php';
 

diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php
index ba69261..7a7a20c 100644 (file)
--- a/lib/Driver/ldap.php
+++ b/lib/Driver/ldap.php
@@ -35,6 +35,43 @@ class Shout_Driver_ldap extends Shout_Driver
     {
         parent::Shout_Driver($params);
         $this->_connect();
+
+        /* These next lines will translate between indexes used in the
+         * application and LDAP.  The rationale is that translation here will
+         * help make Congregation more driver-independant.  The keys used to
+         * contruct user arrays should be more appropriate to human-legibility
+         * (name instead of 'cn' and email instead of 'mail').  This translation
+         * is only needed because LDAP indexes users based on an arbitrary
+         * attribute and the application indexes by extension/context.  In my
+         * environment users are indexed by their 'mail' attribute and others
+         * may index based on 'cn' or 'uid'.  Any time a new $prefs['uid'] needs
+         * to be supported, this function should be checked and possibly
+         * extended to handle that translation.
+         */
+        switch($this->_params['uid']) {
+        case 'cn':
+            $this->_ldapKey = 'cn';
+            $this->_appKey = 'name';
+            break;
+        case 'mail':
+            $this->_ldapKey = 'mail';
+            $this->_appKey = 'email';
+            break;
+        case 'uid':
+            # FIXME Probably a better app key to map here
+            # There is no value that maps uid to LDAP so we can choose to use
+            # either extension or name, or anything really.  I want to
+            # support it since it's a very common DN attribute.
+            # Since it's entirely administrator's preference, I'll
+            # set it to name for now
+            $this->_ldapKey = 'uid';
+            $this->_appKey = 'name';
+            break;
+        case 'voiceMailbox':
+            $this->_ldapKey = 'voiceMailbox';
+            $this->_appKey = 'extension';
+            break;
+        }
     }
     // }}}
 
@@ -155,16 +192,16 @@ class Shout_Driver_ldap extends Shout_Driver
     function checkContextType($context, $type) {
         switch ($type) {
             case "users":
-                $searchfilter = "(objectClass=vofficeCustomer)";
+                $searchfilter = '(objectClass='.SHOUT_CONTEXT_VOICEMAIL_OBJECTCLASS.')';
                 break;
             case "dialplan":
-                $searchfilter = "(objectClass=asteriskExtensions)";
+                $searchfilter = '(objectClass='.SHOUT_CONTEXT_EXTENSIONS_OBJECTCLASS.')';
                 break;
             case "moh":
-                $searchfilter="(objectClass=asteriskMusicOnHold)";
+                $searchfilter='(objectClass='.SHOUT_CONTEXT_MOH_OBJECTCLASS.')';
                 break;
             case "conference":
-                $searchfilter="(objectClass=asteriskMeetMe)";
+                $searchfilter='(objectClass='.SHOUT_CONTEXT_CONFERENCE_OBJECTCLASS.')';
                 break;
             case "all":
             default:
@@ -674,7 +711,7 @@ for $context"));
         $appKey = &$this->_appKey;
 
         $contexts = &$this->getContexts();
-        $domain = $contexts[$context]['domain'];
+//         $domain = $contexts[$context]['domain'];
 
         # Check to ensure the extension is unique within this context
         $filter = '(&(objectClass=asteriskVoiceMailbox)(context='.$context.'))';
@@ -692,18 +729,6 @@ for $context"));
             return PEAR::raiseError('Duplicate extension found.  Not saving changes.');
         }
 
-        $validusers = &$this->getUsers($context);
-        $userId = $validusers[$extension][$appKey];
-
-        $registry = &Registry::singleton();
-        require_once $registry->applicationFilePath('%application%/lib/defines.php', 'congregation');
-        $userModes = $registry->callByPackage('congregation', 'getUserModes',
-            array($domain, $userId));
-        # FIXME Handle error here
-
-        $registry->callByPackage('congregation', 'saveUser',
-            array($domain, $userId, $userModes | CONGREGATION_USER_PHONE, ));
-
         $entry = array(
             'cn' => $userdetails['name'],
             'mail' => $userdetails['email'],
@@ -784,7 +809,6 @@ for $context"));
                     return $limits;
                 }
                 if (count($validusers) >= $limits['asteriskusers']) {
-                    print count($validusers).$limits['asteriskusers'];
                     return PEAR::raiseError('Maximum number of users reached.');
                 }
 

diff --git a/lib/User.php b/lib/User.php
index 2b7f483..6bf9572 100644 (file)
--- a/lib/User.php
+++ b/lib/User.php
@@ -17,16 +17,16 @@ class UserDetailsForm extends Horde_Form {
     {
         global $shout, $notification;
         $context = $vars->get('context');
-        $curexten = $vars->get('curexten');
+        $extension = $vars->get('extension');
 
         $users = &$shout->getUsers($context);
         if (is_a($users, 'PEAR_Error')) {
             $notification->push($users);
         }
-        if (array_key_exists($curexten, $users)) {
+        if (array_key_exists($extension, $users)) {
             # We must be editing an existing user
-            $this->fillUserForm(&$vars, $users[$curexten]);
-            $limits = &$shout->getLimits($context, $curexten);
+            $this->fillUserForm(&$vars, $users[$extension]);
+            $limits = &$shout->getLimits($context, $extension);
             if (is_a($limits, 'PEAR_Error')) {
                 $notification->push($limits);
             }
@@ -44,18 +44,18 @@ class UserDetailsForm extends Horde_Form {
         $this->addHidden('', 'action', 'text', true);
         $vars->set('action', 'save');
         $this->addVariable(_("Full Name"), 'name', 'text', true);
-        $this->addVariable(_("Extension"), 'newexten', 'int', true);
-        $this->addVariable(_("E-Mail Address"), 'email', 'text', true);
-        $this->addVariable(_("Pager E-Mail Address"), 'pageremail', 'text', false);
+        $this->addVariable(_("Extension"), 'newextension', 'int', true);
+        $this->addVariable(_("E-Mail Address"), 'email', 'email', true);
+        $this->addVariable(_("Pager E-Mail Address"), 'pageremail', 'email', false);
         # TODO: Integrate with To-Be-Written user manager and possibly make this
         # TODO: new user also an email account.
         $this->addVariable(_("PIN"), 'pin', 'int', true);
 
+        # FIXME: Make this work if limits don't exist.
         $t = 1;
         while ($t <= $limits['telephonenumbersmax']) {
             $this->addVariable(_("Telephone Number $t:"), "telephone$t",
-'text',
-                false);
+            'cellphone', false);
             $t++;
         }
 
@@ -95,7 +95,7 @@ class UserDetailsForm extends Horde_Form {
         $vars->set('name', $userdetails['name']);
         $vars->set('email', @$userdetails['email']);
         $vars->set('pin', $userdetails['mailboxpin']);
-        $vars->set('newexten', $vars->get('curexten'));
+        $vars->set('newextension', $vars->get('extension'));
 
         $i = 1;
         foreach($userdetails['phonenumbers'] as $number) {

diff --git a/lib/api.php b/lib/api.php
index cfba48b..7df8fe2 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -34,7 +34,7 @@ function _shout_perms()
     $perms['tree']['shout']['superadmin'] = false;
     $perms['title']['shout:superadmin'] = _("Super Administrator");
 
-//     $contexts = $shout->getContexts();
+    $contexts = $GLOBALS['shout']->getContexts();
 
     $perms['tree']['shout']['contexts'] = false;
     $perms['title']['shout:contexts'] = _("Contexts");

diff --git a/lib/base.php b/lib/base.php
index acb58c6..2918ecd 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -7,7 +7,7 @@
  * This file brings in all of the dependencies that every Shout
  * script will need and sets up objects that all scripts use.
  */
- 
+
 
 // Check for a prior definition of HORDE_BASE (perhaps by an
 // auto_prepend_file definition for site customization).
@@ -33,12 +33,15 @@ $conf = &$GLOBALS['conf'];
 @define('SHOUT_BASE', dirname(__FILE__) . '/..');
 
 // Ensure Shout is properly configured before use
-$shout_configured = (@is_readable(SHOUT_BASE . '/config/conf.php') /* &&
-    * @is_readable(SHOUT_BASE . '/config/prefs.php') */);
+$shout_configured = (@is_readable(SHOUT_BASE . '/config/conf.php') &&
+                     @is_readable(SHOUT_BASE . '/config/defines.php') &&
+                     @is_readable(SHOUT_BASE . '/config/applist.xml'));# &&
+                     #@is_readable(SHOUT_BASE . '/config/prefs.php'));
 if (!$shout_configured) {
     require SHOUT_BASE . '/../lib/Test.php';
     Horde_Test::configFilesMissing('Shout', SHOUT_BASE,
-    array('conf.php' /*, 'prefs.php' */));
+        array('conf.php', 'defines.php', 'applist.xml'));
+        #, 'prefs.php'));
 }
 
 // Notification system.
@@ -61,7 +64,6 @@ require_once SHOUT_BASE . '/lib/Driver.php';
 require_once 'Horde/UI/Tabs.php';
 
 $GLOBALS['shout'] = &Shout_Driver::singleton();
-// $shout = $GLOBALS['shout'];
 
 // Horde libraries.
 require_once 'Horde/Help.php';
\ No newline at end of file

diff --git a/templates/users/userlist.inc b/templates/users/userlist.inc
index 67c6718..79881f5 100644 (file)
--- a/templates/users/userlist.inc
+++ b/templates/users/userlist.inc
@@ -18,7 +18,7 @@
                 $url = Util::addParameter($url,
                     array(
                         'context' => $context,
-                        'curexten' => $extension,
+                        'extension' => $extension,
                         'section' => 'users',
                     )
                 );

diff --git a/usermgr/edit.php b/usermgr/edit.php
index 988d9b2..7f56f95 100644 (file)
--- a/usermgr/edit.php
+++ b/usermgr/edit.php
@@ -55,13 +55,13 @@ $notification->notify();
 //     $Form->getInfo($vars, $info);
 //
 //     $name = $info['name'];
-//     $curextension = $info['curextension'];
+//     $extension = $info['extension'];
 //     $newextension = $info['newextension'];
 //     $email = $info['email'];
 //     $pin = $info['pin'];
 //
 //
-//     $limits = $shout->getLimits($context, $curextension);
+//     $limits = $shout->getLimits($context, $extension);
 //
 //     $userdetails = array("newextension" => $newextension,
 //                 "name" => $name,

diff --git a/usermgr/save.php b/usermgr/save.php
index bcc379a..0ea0338 100644 (file)
--- a/usermgr/save.php
+++ b/usermgr/save.php
@@ -30,25 +30,21 @@ if (!$FormValid || !$Form->isSubmitted()) {
     require SHOUT_BASE . '/usermgr/edit.php';
 } else {
     # Form is Valid and Submitted
-    $name = $vars->get('name');
-    $curexten = $vars->get('curexten');
-    $newexten = $vars->get('newexten');
-    $email = $vars->get('email');
-    $pin = $vars->get('pin');
+    $extension = $vars->get('extension');
 
+    $limits = $shout->getLimits($context, $extension);
 
-    $limits = $shout->getLimits($context, $curexten);
-
-    $userdetails = array("newexten" => $newexten,
-                "name" => $name,
-                "pin" => $pin,
-                "email" => $email);
+    $userdetails = array(
+        "newextension" => $vars->get('newextension'),
+        "name" => $vars->get('name'),
+        "pin" => $vars->get('pin'),
+        "email" => $vars->get('email'),
+    );
 
     $i = 1;
     $userdetails['telephonenumbers'] = array();
     while ($i <= $limits['telephonenumbersmax']) {
         $tmp = $vars->get("telephone$i");
-        $notification->push('Number: '.$tmp, 'horde.warning');
         if (!empty($tmp)) {
             $userdetails['telephonenumbers'][] = $tmp;
         }
@@ -65,10 +61,14 @@ if (!$FormValid || !$Form->isSubmitted()) {
     if ($vars->get('eca')) {
         $userdetails['dialopts'][] = 'e';
     }
+    $res = $shout->saveUser($context, $extension, $userdetails);
+    $res = $shout->saveUser($context, $extension, $userdetails);
+    if (is_a($res, 'PEAR_Error')) {
+        $notification->push($res);
+    } else {
+        $notification->push('User information updated.', 'horde.success');
+    }
     $notification->notify();
-    print_r($userdetails);
+
+    require SHOUT_BASE . '/usermgr/edit.php';
 }
-// $res = $shout->saveUser($context, $curexten, $userdetails);
-// if (is_a($res, 'PEAR_Error')) {
-//     $notification->push($res);
-// }
\ No newline at end of file