Code fixed to a working state. Remove unnecessary javascript. Added elements

to the new user form.

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

diff --git a/index.php b/index.php
index b377e9a..2d753d0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -21,7 +21,7 @@ require_once SHOUT_BASE . '/lib/base.php';
 require_once SHOUT_BASE . '/lib/Shout.php';
 
 $context = Util::getFormData("context");
-$section = "users";
+$section = Util::getFormData("section");
 
 $contexts = $shout->getContexts();
 $vars = &Variables::getDefaultVariables();

diff --git a/lib/User.php b/lib/User.php
index 3e7552b..d11b2d1 100644 (file)
--- a/lib/User.php
+++ b/lib/User.php
@@ -8,14 +8,30 @@ class UserDetailsForm extends Horde_Form {
     function UserDetailsForm(&$vars)
     {
         global $shout;
+        $context = $vars->get("context");
+
+        parent::Horde_Form($vars, _("Add User - Context: $context"));
 
-        parent::Horde_Form($vars, _("Add User"));
-        
         $this->preserve($vars);
         $users = $shout->getUsers($context);
-       
-        $this->addVariable(_("Full Name"), 'name', text, true);
-        $this->addVariable(_("Extension"), 'name', int, true);
+
+        $this->addVariable(_("Full Name"), 'name', 'text', true);
+        $this->addVariable(_("Extension"), 'extension', 'int', true);
+        $this->addVariable(_("E-Mail Address"), 'email', 'text', 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);
+        $this->addVariable(_("Telephone Number 1:"), 'telephone1', 'text',
+            false);
+        $this->addVariable(_("Telephone Number 2:"), 'telephone2', 'text',
+            false);
+        $this->addVariable(_("Telephone Number 3:"), 'telephone3', 'text',
+            false);
+        $this->addVariable(_("Telephone Number 4:"), 'telephone4', 'text',
+            false);
+        $this->addVariable(_("Music on Hold while transferring"), 'moh',
+            'radio', true, false, null,
+            array('values' => array(true => 'Yes', false => 'No')));
     }
 }
 // }}}
\ No newline at end of file

diff --git a/shout.webprj b/shout.webprj
index ee1ec3f..ae3c79c 100644 (file)
--- a/shout.webprj
+++ b/shout.webprj
@@ -9,51 +9,51 @@
     <item url="templates/" uploadstatus="2" />
     <item url="lib/" uploadstatus="2" />
     <item url="lib/Driver/" uploadstatus="2" />
-    <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="1121308393" url="index.php" uploadstatus="2" />
+    <item modified_time="1121374073" url="lib/Driver/ldap.php" uploadstatus="2" />
+    <item modified_time="1120792108" url="lib/base.php" uploadstatus="2" />
+    <item modified_time="1120815592" url="lib/Driver.php" uploadstatus="2" />
+    <item modified_time="1121377707" 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="1121308393" url="index.php" />
+        <uploadeditem upload_time="1120648621" url="dialplan.php" />
+        <uploadeditem upload_time="1121377707" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
-        <uploadeditem upload_time="1121306551" url="lib/Driver.php" />
+        <uploadeditem upload_time="1120815592" url="lib/Driver.php" />
         <uploadeditem upload_time="1120022560" url="lib/Driver.php~" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1121313992" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1121374073" url="lib/Driver/ldap.php" />
         <uploadeditem upload_time="1120026921" url="lib/Driver/ldap.php~" />
         <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="1121316518" url="lib/User.php" />
+        <uploadeditem upload_time="1121374073" url="lib/Shout.php" />
+        <uploadeditem upload_time="1120812245" url="lib/System.php" />
+        <uploadeditem upload_time="1121377507" url="lib/User.php" />
         <uploadeditem upload_time="1120279975" url="lib/Users.php" />
-        <uploadeditem upload_time="1120589135" url="lib/base.php" />
+        <uploadeditem upload_time="1120792108" url="lib/base.php" />
         <uploadeditem upload_time="1120073766" url="lib/defines.php" />
-        <uploadeditem upload_time="1120287842" url="moh.php" />
+        <uploadeditem upload_time="1120296517" url="moh.php" />
         <uploadeditem upload_time="1120027019" url="shout.webprj" />
-        <uploadeditem upload_time="1120815615" url="system.php" />
+        <uploadeditem upload_time="1120811068" url="system.php" />
         <uploadeditem upload_time="0" url="templates/" />
-        <uploadeditem upload_time="1120174958" url="templates/common-header.inc" />
+        <uploadeditem upload_time="1120158044" url="templates/common-header.inc" />
         <uploadeditem upload_time="1120073766" url="templates/content_page" />
         <uploadeditem upload_time="0" url="templates/context/" />
-        <uploadeditem upload_time="1120175005" url="templates/context/contextline.inc" />
+        <uploadeditem upload_time="1120169761" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
-        <uploadeditem upload_time="1120377494" url="templates/dialplan/dialplanlist.inc" />
-        <uploadeditem upload_time="1121306551" url="templates/menu.inc" />
+        <uploadeditem upload_time="1121377789" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1121374537" url="templates/menu.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
-        <uploadeditem upload_time="1121306551" url="templates/users/userlist.inc" />
+        <uploadeditem upload_time="1121377793" url="templates/users/userlist.inc" />
         <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="1121295816" url="themes/graphics/add-user.gif" />
+        <uploadeditem upload_time="1121298200" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
-        <uploadeditem upload_time="1121317899" url="users/add.php" />
-        <uploadeditem upload_time="1121317930" url="users/index.php" />
+        <uploadeditem upload_time="1121374700" url="users/add.php" />
+        <uploadeditem upload_time="1121374767" url="users/index.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -74,20 +74,20 @@
     <defaultDTD>-//w3c//dtd xhtml 1.0 strict//en</defaultDTD>
     <item modified_time="1120073766" url="config/conf.xml" uploadstatus="1" />
     <item url="config/" uploadstatus="1" />
-    <item modified_time="1121317814" url="lib/Shout.php" uploadstatus="1" />
-    <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
-    <item modified_time="1121306551" url="templates/menu.inc" uploadstatus="1" />
-    <item modified_time="1121306550" url="users.php" uploadstatus="1" />
+    <item modified_time="1121374073" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1120158044" url="templates/common-header.inc" uploadstatus="1" />
+    <item modified_time="1121374537" url="templates/menu.inc" uploadstatus="1" />
+    <item modified_time="1121298200" url="users.php" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
-    <item modified_time="1120175005" url="templates/context/contextline.inc" uploadstatus="1" />
-    <item modified_time="1120287842" url="moh.php" uploadstatus="1" />
+    <item modified_time="1120169761" url="templates/context/contextline.inc" uploadstatus="1" />
+    <item modified_time="1120296517" url="moh.php" uploadstatus="1" />
     <item url="templates/users/" uploadstatus="1" />
-    <item modified_time="1121306551" url="templates/users/userlist.inc" uploadstatus="1" />
-    <item modified_time="1120355053" url="dialplan.php" uploadstatus="1" />
-    <item modified_time="1120377494" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
+    <item modified_time="1121377793" url="templates/users/userlist.inc" uploadstatus="1" />
+    <item modified_time="1120648621" url="dialplan.php" uploadstatus="1" />
+    <item modified_time="1121377789" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
-    <item modified_time="1120815615" url="system.php" uploadstatus="1" />
-    <item modified_time="1120815615" url="lib/System.php" uploadstatus="1" />
+    <item modified_time="1120811068" url="system.php" uploadstatus="1" />
+    <item modified_time="1120812245" url="lib/System.php" uploadstatus="1" />
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>Gubed</debuggerclient>
@@ -100,16 +100,17 @@
     <events/>
     <item url="themes/" uploadstatus="1" />
     <item url="themes/graphics/" uploadstatus="1" />
-    <item modified_time="1121300828" url="themes/graphics/add-user.gif" uploadstatus="1" />
-    <item modified_time="1121317930" url="users/index.php" />
-    <item url="users/" />
-    <item modified_time="1121316518" url="lib/User.php" />
-    <item modified_time="1121317899" url="users/add.php" />
+    <item modified_time="1121295816" url="themes/graphics/add-user.gif" uploadstatus="1" />
+    <item modified_time="1121374767" url="users/index.php" uploadstatus="1" />
+    <item url="users/" uploadstatus="1" />
+    <item modified_time="1121377507" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1121374700" url="users/add.php" uploadstatus="1" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="lib" />
       <openfolder url="lib/Driver" />
       <openfolder url="templates" />
+      <openfolder url="templates/dialplan" />
       <openfolder url="templates/users" />
       <openfolder url="themes" />
       <openfolder url="themes/graphics" />

diff --git a/templates/dialplan/dialplanlist.inc b/templates/dialplan/dialplanlist.inc
index a630d0d..227c7f4 100644 (file)
--- a/templates/dialplan/dialplanlist.inc
+++ b/templates/dialplan/dialplanlist.inc
@@ -1,9 +1,19 @@
+<table width="95%" border="0" cellpadding="0" cellspacing="0" class="header">
+  <tr valign="bottom">
+    <td width="61"><div align="center"><font size="1">
+      &nbsp;
+    </td>
+    <td width="148"><div align="center"></div></td>
+    <td width="332">&nbsp;</td>
+    <td width="202"><font size="3">Context: <?php echo $context; ?></font></td>
+  </tr>
+</table>
 <table class="item">
     <tbody>
         <?php
         $line = 0;
         $dialplan = $shout->getDialplan($context);
-        if (isset($dialplan['extensions']) && 
+        if (isset($dialplan['extensions']) &&
             (count($dialplan['extensions']) > 0)) {
             foreach ($dialplan['extensions'] as $extension => $priorities) {
                 foreach ($priorities as $priority => $application) {

diff --git a/templates/menu.inc b/templates/menu.inc
index a34f44e..ae483d2 100644 (file)
--- a/templates/menu.inc
+++ b/templates/menu.inc
@@ -51,62 +51,5 @@ function contextSubmit(clear)
         }
     }
 }
-
-
-var last_adduser_win;
-
-function open_adduser_win(args)
-{
-    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/users/add.php' , 'shout')) ?>";
-    if (url.indexOf('?') == -1) {
-        var glue = '?';
-    } else {
-        var glue = '&';
-    }
-    var now = new Date();
-    var name = "adduser_windows_" + now.getTime();
-    if (args != "") {
-        url = url + glue + args + "&uniq=" + now.getTime();
-    } else {
-        url = url + glue + "uniq=" + now.getTime();
-    }
-    var width = screen.width;
-    if (width > 775) {
-        width = 700;
-    } else {
-        width -= 75;
-    }
-    var height = screen.height;
-    if (height > 725) {
-        height = 650;
-    } else {
-        height -= 75;
-    }
-    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + width + ",height=" + height + ",left=0,top=0";
-    name = window.open(url, name, param);
-    if (!name) {
-        alert("<?php echo addslashes(_("The compose window can't be opened.  Perhaps you have set your browser to block popup windows?")) ?>");
-    } else {
-        if (!eval("name.opener")) {
-            name.opener = self;
-        }
-
-        last_adduser_win = name;
-    }
-}
-
-function focus_adduser_win(adduser_win)
-{
-    if (!adduser_win) {
-        adduser_win = last_adduser_win;
-    }
-
-    if (!adduser_win) {
-        return;
-    }
-
-    adduser_win.focus();
-}
-
 // -->
 </script>

diff --git a/templates/users/userlist.inc b/templates/users/userlist.inc
index d4baf88..0e0f8d5 100644 (file)
--- a/templates/users/userlist.inc
+++ b/templates/users/userlist.inc
@@ -1,46 +1,3 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-function open_user_win(args, useraction)
-{
-    var url = "<?php echo Horde::applicationUrl("/users/") ?>"
-        + useraction + ".php";
-    if (url.indexOf('?') == -1) {
-        var glue = '?';
-    } else {
-        var glue = '&';
-    }
-    var name = useraction + "_user_window";
-    if (args != "") {
-        url = url + glue + args;
-    }
-    var width = screen.width;
-    if (width > 775) {
-        width = 700;
-    } else {
-        width -= 75;
-    }
-    var height = screen.height;
-    if (height > 725) {
-        height = 650;
-    } else {
-        height -= 75;
-    }
-    param =
-"toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + width + ",height=" + height + ",left=0,top=0";
-    name = window.open(url, name, param);
-    if (!name) {
-        alert("<?php echo addslashes(_("The compose window can't be opened.  Perhaps you have set your browser to block popup windows?")) ?>");
-    } else {
-        if (!eval("name.opener")) {
-            name.opener = self;
-        }
-    }
-}
-
-// -->
-</script>
-
-<link href="/screen_002.css" rel="stylesheet" type="text/css">
 <table width="95%" border="0" cellpadding="0" cellspacing="0" class="header">
   <tr valign="bottom">
     <td width="61"><div align="center"><font size="1">
@@ -68,26 +25,36 @@ function open_user_win(args, useraction)
             $line++;
     ?>
     <tr class="item<?php echo $rowcolor; ?>">
-        <td width="7%"><?php echo Horde::link("#", '', '', '',
-"open_user_win('context=$context&amp;extension=$extension', 'edit')");?>
+        <td width="7%"><?php
+                $url = Horde::applicationUrl("users/edit.php");
+                $url = Util::addParameter($url, "context=$context");
+                $url = Util::addParameter($url, "extension=$extension");
+                echo Horde::link($url);
+            ?>
             <?php echo $extension; ?></a>
         </td>
-        <td><?php echo Horde::link("#", '', '', '',
-"open_user_win('context=$context&amp;extension=$extension', 'edit')");?>
+        <td><?php
+                $url = Horde::applicationUrl("users/edit.php");
+                $url = Util::addParameter($url, "context=$context");
+                $url = Util::addParameter($url, "extension=$extension");
+                echo Horde::link($url);?>
             <?php echo $user['name'];?></a>
         </td>
         <td width="100">
             <div align="center">
                 <?php
-                echo Horde::link("#", '', '', '',
-"open_user_win('context=$context&amp;extension=$extension', 'edit')");
-                ?><font size="1">edit</font></a>
+                $url = Horde::applicationUrl("users/edit.php");
+                $url = Util::addParameter($url, "context=$context");
+                $url = Util::addParameter($url, "extension=$extension");
+                echo Horde::link($url); ?>
+                <font size="1">edit</font></a>
                 &nbsp;&nbsp;|&nbsp;&nbsp;
                 <?php
-                echo Horde::link("#", '', '', '',
-
-"open_user_win('context=$context&amp;extension=$extension', 'delete')");
-                ?><font size="1">delete</font></a>
+$url = Horde::applicationUrl("users/delete.php");
+                $url = Util::addParameter($url, "context=$context");
+                $url = Util::addParameter($url, "extension=$extension");
+                echo Horde::link($url); ?>
+                <font size="1">delete</font></a>
             </div>
             <div align="center"></div>
         </td>

diff --git a/users/add.php b/users/add.php
index 2e6c4be..a314106 100644 (file)
--- a/users/add.php
+++ b/users/add.php
@@ -27,8 +27,8 @@ $UserDetailsFormValid = $UserDetailsForm->validate($vars, true);
 $UserDetailsForm->open($RENDERER, $vars, 'index.php', 'post');
 $UserDetailsForm->preserveVarByPost($vars, "section");
 $UserDetailsForm->preserve($vars);
-$RENDERER->beginActive($ContextForm->getTitle());
-$RENDERER->renderFormActive($ContextForm, $vars);
+$RENDERER->beginActive($UserDetailsForm->getTitle());
+$RENDERER->renderFormActive($UserDetailsForm, $vars);
 $RENDERER->submit();
 $RENDERER->end();
-$ContextForm->close($RENDERER);
\ No newline at end of file
+$UserDetailsForm->close($RENDERER);
\ No newline at end of file

diff --git a/users/index.php b/users/index.php
index 627ae37..46fb92a 100644 (file)
--- a/users/index.php
+++ b/users/index.php
@@ -33,8 +33,14 @@ if (!isset($context)) {#FIXME || !Shout::checkContext()) {
     exit(0);
 }
 
+require SHOUT_TEMPLATES . '/common-header.inc';
+require SHOUT_TEMPLATES . '/menu.inc';
+
+echo "<br />";
+
 $tabs = &Shout::getTabs($context, $vars);
 $tabs->preserve('context', $context);
+echo $tabs->render($section);
 
 switch ($action) {
     case "add":