User form is now posting. Turns out that wasn't a stupid browser bug but rather

fatigue, coffee, and oversight.  Oh well, the new structure ain't so bad.  If
necessary I can always go back too.

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

diff --git a/index.php b/index.php
index 2d753d0..5dbddfa 100644 (file)
--- a/index.php
+++ b/index.php
@@ -62,7 +62,7 @@ switch ($section) {
     case "system":
     case "users":
     case "moh":
-        require "$section.php";
+        require "main/$section.php";
         break;
 
     default:

diff --git a/lib/User.php b/lib/User.php
index d11b2d1..ea2514a 100644 (file)
--- a/lib/User.php
+++ b/lib/User.php
@@ -12,9 +12,11 @@ class UserDetailsForm extends Horde_Form {
 
         parent::Horde_Form($vars, _("Add User - Context: $context"));
 
-        $this->preserve($vars);
         $users = $shout->getUsers($context);
-
+        
+        $this->addHidden('', 'context', 'text', true);
+        $this->addHidden('', 'action', 'text', true);
+        $vars->set('action', 'save');
         $this->addVariable(_("Full Name"), 'name', 'text', true);
         $this->addVariable(_("Extension"), 'extension', 'int', true);
         $this->addVariable(_("E-Mail Address"), 'email', 'text', false);

diff --git a/shout.webprj b/shout.webprj
index 8b2793d..dd0ba55 100644 (file)
--- a/shout.webprj
+++ b/shout.webprj
@@ -12,14 +12,14 @@
     <item modified_time="1121313992" url="lib/Driver/ldap.php" uploadstatus="2" />
     <item modified_time="1120589135" url="lib/base.php" uploadstatus="2" />
     <item modified_time="1121306551" url="lib/Driver.php" uploadstatus="2" />
-    <item modified_time="1121396278" url="index.php" uploadstatus="2" />
+    <item modified_time="1121401934" url="index.php" uploadstatus="2" />
     <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
       <profile remote_host="picasso.v-office.biz" remote_port="" remote_path="/srv/vhost/users/aklang/sites/intranet.v-office.biz/shout" remote_protocol="sftp" user="aklang" name="Shout" >
         <uploadeditem upload_time="0" url="config/" />
         <uploadeditem upload_time="1120073766" url="config/conf.xml" />
         <uploadeditem upload_time="1120183942" url="contexts.php" />
         <uploadeditem upload_time="1120355053" url="dialplan.php" />
-        <uploadeditem upload_time="1121396278" url="index.php" />
+        <uploadeditem upload_time="1121401934" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
         <uploadeditem upload_time="1121306551" url="lib/Driver.php" />
@@ -30,10 +30,15 @@
         <uploadeditem upload_time="1120288491" url="lib/SelectContext.php" />
         <uploadeditem upload_time="1121317814" url="lib/Shout.php" />
         <uploadeditem upload_time="1120815615" url="lib/System.php" />
-        <uploadeditem upload_time="1121396278" url="lib/User.php" />
+        <uploadeditem upload_time="1121404494" url="lib/User.php" />
         <uploadeditem upload_time="1120279975" url="lib/Users.php" />
         <uploadeditem upload_time="1120589135" url="lib/base.php" />
         <uploadeditem upload_time="1120073766" url="lib/defines.php" />
+        <uploadeditem upload_time="0" url="main/" />
+        <uploadeditem upload_time="1120355053" url="main/dialplan.php" />
+        <uploadeditem upload_time="1120287842" url="main/moh.php" />
+        <uploadeditem upload_time="1120815615" url="main/system.php" />
+        <uploadeditem upload_time="1121306550" url="main/users.php" />
         <uploadeditem upload_time="1120287842" url="moh.php" />
         <uploadeditem upload_time="1120027019" url="shout.webprj" />
         <uploadeditem upload_time="1120815615" url="system.php" />
@@ -50,10 +55,11 @@
         <uploadeditem upload_time="0" url="themes/" />
         <uploadeditem upload_time="0" url="themes/graphics/" />
         <uploadeditem upload_time="1121300828" url="themes/graphics/add-user.gif" />
-        <uploadeditem upload_time="1121306550" url="users.php" />
+        <uploadeditem upload_time="1121404451" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
-        <uploadeditem upload_time="1121401257" url="users/add.php" />
+        <uploadeditem upload_time="1121404120" url="users/add.php" />
         <uploadeditem upload_time="1121396278" url="users/index.php" />
+        <uploadeditem upload_time="1121402549" url="users/save.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -98,14 +104,15 @@
     <item url="themes/graphics/" uploadstatus="1" />
     <item modified_time="1121300828" url="themes/graphics/add-user.gif" uploadstatus="1" />
     <item url="users/" uploadstatus="1" />
-    <item modified_time="1121396278" url="lib/User.php" uploadstatus="1" />
-    <item modified_time="1121401257" url="users/add.php" uploadstatus="1" />
+    <item modified_time="1121404494" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1121404120" url="users/add.php" uploadstatus="1" />
     <item url="main/" />
-    <item url="main/dialplan.php" />
-    <item url="main/moh.php" />
-    <item url="main/system.php" />
-    <item url="main/users.php" />
-    <item url="users.php" />
+    <item modified_time="1120355053" url="main/dialplan.php" />
+    <item modified_time="1120287842" url="main/moh.php" />
+    <item modified_time="1120815615" url="main/system.php" />
+    <item modified_time="1121306550" url="main/users.php" />
+    <item modified_time="1121404451" url="users.php" />
+    <item modified_time="1121402549" url="users/save.php" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="lib" />

diff --git a/users.php b/users.php
index 46fb92a..605c696 100644 (file)
--- a/users.php
+++ b/users.php
@@ -8,7 +8,7 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-@define('SHOUT_BASE', dirname(__FILE__) . "/..");
+@define('SHOUT_BASE', dirname(__FILE__));
 $shout_configured = (@is_readable(SHOUT_BASE . '/config/conf.php'));# &&
     #@is_readable(SHOUT_BASE . '/config/prefs.php'));
 if (!$shout_configured) {
@@ -28,7 +28,7 @@ $contexts = $shout->getContexts();
 $vars = &Variables::getDefaultVariables();
 
 if (!isset($context)) {#FIXME || !Shout::checkContext()) {
-    $url = Horde::applicationUrl("/shout/index.php");
+    $url = Horde::applicationUrl("index.php");
     header("Location: $url");
     exit(0);
 }
@@ -45,6 +45,7 @@ echo $tabs->render($section);
 switch ($action) {
     case "add":
     case "edit":
+    case "save":
     case "delete":
         require SHOUT_BASE . "/users/$action.php";
         break;

diff --git a/users/add.php b/users/add.php
index a314106..2c362b9 100644 (file)
--- a/users/add.php
+++ b/users/add.php
@@ -24,7 +24,7 @@ $title = _("System Settings");
 $UserDetailsForm = &Horde_Form::singleton('UserDetailsForm', $vars);
 $UserDetailsFormValid = $UserDetailsForm->validate($vars, true);
 
-$UserDetailsForm->open($RENDERER, $vars, 'index.php', 'post');
+$UserDetailsForm->open($RENDERER, $vars, 'users.php', 'post');
 $UserDetailsForm->preserveVarByPost($vars, "section");
 $UserDetailsForm->preserve($vars);
 $RENDERER->beginActive($UserDetailsForm->getTitle());