Working toward better compatibility with Congregation

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

diff --git a/andrew.webprj b/andrew.webprj
index 3e4f4a2..47c8598 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -4,51 +4,51 @@
     <upload/>
     <defaultDTD>-//w3c//dtd xhtml 1.0 strict//en</defaultDTD>
     <item url="config/" uploadstatus="1" />
-    <item modified_time="1120073766" url="config/conf.xml" uploadstatus="1" />
+    <item modified_time="1134254292" url="config/conf.xml" uploadstatus="1" />
     <item url="dialplan/" uploadstatus="1" />
-    <item modified_time="1130769960" 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="1131765770" url="lib/Driver/ldap.php" uploadstatus="1" />
-    <item modified_time="1131497449" url="lib/base.php" uploadstatus="1" />
-    <item modified_time="1132126017" url="lib/Dialplan.php" uploadstatus="1" />
-    <item modified_time="1130769960" url="lib/Driver.php" uploadstatus="1" />
-    <item modified_time="1131864412" url="lib/Shout.php" uploadstatus="1" />
-    <item modified_time="1121689003" url="lib/System.php" uploadstatus="1" />
-    <item modified_time="1130769961" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/Driver/ldap.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/base.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/Dialplan.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/Driver.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/System.php" uploadstatus="1" />
+    <item modified_time="1134326322" url="lib/User.php" uploadstatus="1" />
     <item url="main/" uploadstatus="1" />
-    <item modified_time="1131765933" url="main/dialplan.php" uploadstatus="1" />
-    <item modified_time="1121401845" url="main/moh.php" uploadstatus="1" />
-    <item modified_time="1130769962" url="main/system.php" uploadstatus="1" />
-    <item modified_time="1121689003" url="main/users.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="main/dialplan.php" uploadstatus="1" />
+    <item modified_time="1134254291" url="main/moh.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="main/system.php" uploadstatus="1" />
+    <item modified_time="1134254291" url="main/users.php" uploadstatus="1" />
     <item url="templates/" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
-    <item modified_time="1120175005" 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="1131593241" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
-    <item modified_time="1121689030" url="templates/dialplan/priority-form-begin.inc" uploadstatus="1" />
-    <item modified_time="1121689030" url="templates/dialplan/priority-form-end.inc" uploadstatus="1" />
-    <item modified_time="1121689030" 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="1131787996" url="templates/users/userlist.inc" uploadstatus="1" />
-    <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
-    <item modified_time="1120073766" url="templates/content_page" uploadstatus="1" />
-    <item modified_time="1131772201" url="templates/menu.inc" uploadstatus="1" />
-    <item modified_time="1121578596" url="templates/table-limiter-begin.inc" uploadstatus="1" />
-    <item modified_time="1121578596" url="templates/table-limiter-end.inc" uploadstatus="1" />
+    <item modified_time="1134254292" url="templates/users/userlist.inc" uploadstatus="1" />
+    <item modified_time="1134254292" 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="1121581526" url="themes/graphics/add-extension.gif" uploadstatus="1" />
-    <item modified_time="1130861777" url="themes/graphics/add-user.gif" uploadstatus="1" />
-    <item modified_time="1133149658" url="themes/screen.css" 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 url="users/" uploadstatus="1" />
-    <item modified_time="1122704539" url="users/add.php" uploadstatus="1" />
-    <item modified_time="1122704539" url="users/delete.php" uploadstatus="1" />
-    <item modified_time="1130769962" url="users/edit.php" uploadstatus="1" />
-    <item modified_time="1130769962" url="users/save.php" uploadstatus="1" />
-    <item modified_time="1131044239" url="dialplan.php" uploadstatus="1" />
-    <item modified_time="1131593241" url="index.php" uploadstatus="1" />
-    <item modified_time="1122704475" url="users.php" uploadstatus="1" />
+    <item modified_time="1134254291" url="users/add.php" uploadstatus="1" />
+    <item modified_time="1134254291" url="users/delete.php" uploadstatus="1" />
+    <item modified_time="1134324213" url="users/edit.php" uploadstatus="1" />
+    <item modified_time="1134254291" url="users/save.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="dialplan.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="index.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="users.php" uploadstatus="1" />
     <item url="" uploadstatus="1" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
       <profile remote_host="" remote_port="" remote_path="" remote_protocol="ftp" user="" name="@" />
@@ -111,22 +111,12 @@
     </uploadprofiles>
     <templates>templates/</templates>
     <toolbars>toolbars/</toolbars>
-    <item modified_time="1131600576" url="lib/api.php" uploadstatus="1" />
-    <item modified_time="1131045729" url="lib/defines.php" uploadstatus="1" />
-    <item modified_time="1131497712" url="security.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/api.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="lib/defines.php" uploadstatus="1" />
+    <item modified_time="1134254292" url="security.php" uploadstatus="1" />
     <item url="templates/javascript/" uploadstatus="1" />
-    <item modified_time="1133151900" url="templates/javascript/dialplan.js" uploadstatus="1" />
-    <item modified_time="1132102884" url="templates/dialplan/manager.inc" uploadstatus="1" />
-    <author>Ben Klang</author>
-    <email>ben@alkaloid.net</email>
-    <debuggerclient>No Debugger</debuggerclient>
-    <exclude cvsignore="true" >*~;CVS;.*~;</exclude>
-    <teamdata>
-      <taskleaders/>
-      <subprojectleaders/>
-      <mailinglist address="" />
-    </teamdata>
-    <events/>
+    <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" />
@@ -138,5 +128,16 @@
       <openfolder url="themes" />
       <openfolder url="users" />
     </treestatus>
+    <annotations/>
+    <author>Ben Klang</author>
+    <email>ben@alkaloid.net</email>
+    <debuggerclient persistentWatches="0" persistentBreakpoints="0" >No Debugger</debuggerclient>
+    <exclude cvsignore="true" >*~;CVS;.*~;</exclude>
+    <teamdata>
+      <taskleaders/>
+      <subprojectleaders/>
+      <mailinglist address="" />
+    </teamdata>
+    <events/>
   </project>
 </webproject>

diff --git a/lib/User.php b/lib/User.php
index d41f7fb..1b5e08a 100644 (file)
--- a/lib/User.php
+++ b/lib/User.php
@@ -36,7 +36,7 @@ class UserDetailsForm extends Horde_Form {
         $this->addHidden('', 'curextension', 'text', true);
         $vars->set('curextension', $extension);
         $this->addHidden('', 'action', 'text', true);
-        $vars->set('action', 'save');
+        $vars->set('action', 'edit');
         $this->addVariable(_("Full Name"), 'name', 'text', true);
         $this->addVariable(_("Extension"), 'newextension', 'int', true);
         $this->addVariable(_("E-Mail Address"), 'email', 'text', true);

diff --git a/lib/base.php b/lib/base.php
index 182dfdb..2b085d7 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -8,6 +8,7 @@
  * 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).
 if (!defined('HORDE_BASE')) {
@@ -31,6 +32,15 @@ $conf = &$GLOBALS['conf'];
 // Find the base file path of Shout.
 @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') */);
+if (!$shout_configured) {
+    require SHOUT_BASE . '/../lib/Test.php';
+    Horde_Test::configFilesMissing('Shout', SHOUT_BASE,
+    array('conf.php' /*, 'prefs.php' */));
+}
+
 // Notification system.
 $notification = &Notification::singleton();
 $notification->attach('status');
@@ -40,8 +50,8 @@ require_once SHOUT_BASE . '/lib/Shout.php';
 require_once SHOUT_BASE . '/lib/Driver.php';
 
 // Form libraries.
-require_once 'Horde/Form.php';
-require_once 'Horde/Form/Renderer.php';
+// require_once 'Horde/Form.php';
+// require_once 'Horde/Form/Renderer.php';
 
 // Variable handling libraries
 require_once 'Horde/Variables.php';

diff --git a/users.php b/users.php
index ea902d7..ac25d91 100644 (file)
--- a/users.php
+++ b/users.php
@@ -9,17 +9,18 @@
  */
 
 @define('SHOUT_BASE', dirname(__FILE__));
-$shout_configured = (@is_readable(SHOUT_BASE . '/config/conf.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', 'prefs.php'));
-}
-
 require_once SHOUT_BASE . '/lib/base.php';
 require_once SHOUT_BASE . '/lib/Shout.php';
 
+// Form libraries.
+require_once 'Horde/Form.php';
+require_once 'Horde/Form/Renderer.php';
+
+// Variable handling libraries
+require_once 'Horde/Variables.php';
+require_once 'Horde/Text/Filter.php';
+
+
 $context = Util::getFormData("context");
 $section = "users";
 $action = Util::getFormData("action");

diff --git a/users/edit.php b/users/edit.php
index 0d920ea..cee2022 100644 (file)
--- a/users/edit.php
+++ b/users/edit.php
@@ -8,27 +8,71 @@
  * did not receive this file, see http://www.horde.org/licenses/gpl.php.
  */
 @define('SHOUT_BASE', dirname(__FILE__) . '/..');
+require_once SHOUT_BASE . '/lib/base.php';
 require_once SHOUT_BASE . '/lib/User.php';
 require_once 'Horde/Variables.php';
 
 $RENDERER = &new Horde_Form_Renderer();
 
 $empty = '';
+$beendone = 0;
+$wereerrors = 0;
 
 $vars = &Variables::getDefaultVariables($empty);
 $formname = $vars->get('formname');
 
+$title = _("FIXME " . __FILE__.":".__LINE__);
+
 $UserDetailsForm = &Horde_Form::singleton('UserDetailsForm', $vars);
+
 $UserDetailsFormValid = $UserDetailsForm->validate($vars, true);
 
-$UserDetailsForm->open($RENDERER, $vars, 'users.php', 'post');
-$vars->set('section', $section);
-$UserDetailsForm->preserveVarByPost($vars, "section");
-// $UserDetailsForm->preserve($vars);
-require SHOUT_TEMPLATES . '/table-limiter-begin.inc';
-$RENDERER->beginActive($UserDetailsForm->getTitle());
-$RENDERER->renderFormActive($UserDetailsForm, $vars);
-$RENDERER->submit();
-$RENDERER->end();
-$UserDetailsForm->close($RENDERER);
-require SHOUT_TEMPLATES . '/table-limiter-end.inc';
\ No newline at end of file
+if (!$UserDetailsFormValid) {
+    $UserDetailsForm->open($RENDERER, $vars, 'users.php', 'post');
+    $vars->set('section', $section);
+    $UserDetailsForm->preserveVarByPost($vars, "section");
+    // $UserDetailsForm->preserve($vars);
+    $RENDERER->beginActive($UserDetailsForm->getTitle());
+    $RENDERER->renderFormActive($UserDetailsForm, $vars);
+    $RENDERER->submit();
+    $RENDERER->end();
+    $UserDetailsForm->close($RENDERER);
+} else {
+
+//     require WHUPS_TEMPLATES . '/common-header.inc';
+//     require WHUPS_TEMPLATES . '/menu.inc';
+    $info = array();
+    $UserDetailsForm->getInfo($vars, $info);
+
+    $name = $info['name'];
+    $curextension = $info['curextension'];
+    $newextension = $info['newextension'];
+    $email = $info['email'];
+    $pin = $info['pin'];
+
+
+    $limits = $shout->getLimits($context, $curextension);
+
+    $userdetails = array("newextension" => $newextension,
+                "name" => $name,
+                "pin" => $pin,
+                "email" => $email);
+
+    $i = 1;
+    $userdetails['telephonenumbers'] = array();
+    while ($i <= $limits['telephonenumbersmax']) {
+        $tmp = $info['telephone'.$i];
+        if (!empty($tmp)) {
+            $userdetails['telephonenumbers'][] = $tmp;
+        }
+        $i++;
+    }
+
+    $userdetails['dialopts'] = array();
+    if ($info['moh']) {
+        $userdetails['dialopts'][] = 'm';
+    }
+    if ($info['transfer']) {
+        $userdetails['dialopts'][] = 't';
+    }
+}
\ No newline at end of file