Intermediate commit to fix oopsed filename. Highlights to this commit include more...

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

diff --git a/dialplan.php b/dialplan.php
new file mode 100644 (file)
index 0000000..dc1b574
--- /dev/null
+++ b/dialplan.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * $Horde: shout/dialplan.php,v 0.1 2005/07/17 01:56:48 ben Exp $
+ *
+ * Copyright 2005 Ben Klang <ben@alkaloid.net>
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+@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';
+
+$context = Util::getFormData("context");
+$section = "dialplan";
+$action = Util::getFormData("action");
+$extension = Util::getFormData("extension");
+
+$contexts = $shout->getContexts();
+$vars = &Variables::getDefaultVariables();
+
+if (!isset($context)) {#FIXME || !Shout::checkContext()) {
+    $url = Horde::applicationUrl("index.php");
+    header("Location: $url");
+    exit(0);
+}
+
+
+switch ($action) {
+    case "add":
+        $title = _("Add User");
+        # Treat adds just like an empty edit
+        unset($extension);
+        $action = 'edit';
+        break;
+    case "edit":
+        $title = _("Edit User (Extension") . "$extension)";
+        break;
+    case "save":
+        $title = _("Save User (Extension") . "$extension)";
+        break;
+    case "delete":
+        $title = _("Delete User (Extension") . "$extension)";
+        break;
+    default:
+        $url = Horde::applicationUrl('/');
+        header("Location: $url");
+        exit();
+}
+
+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);
+
+require SHOUT_BASE . "/users/$action.php";
+
+require $registry->get('templates', 'horde') . '/common-footer.inc';
\ No newline at end of file

diff --git a/index.php b/index.php
index 5dbddfa..77088ce 100644 (file)
--- a/index.php
+++ b/index.php
@@ -57,17 +57,29 @@ echo "<br />";
 echo $tabs->render($section);
 switch ($section) {
     case "conference":
+        $title = _('Conferences');
+        break;
     case "dialplan":
+        $title = _('Dial Plan');
+        break;
     case "security":
+        $title = _('Security/Access Control');
+        break;
     case "system":
+        $title = _('System Settings');
+        break;
     case "users":
+        $title = _('Users');
+        break;
     case "moh":
-        require "main/$section.php";
+        $title = _('Music on Hold');
         break;
 
     default:
+        require SHOUT_TEMPLATES . '/common-footer.inc';
+        exit();
         break;
 }
 
-
+require "main/$section.php";
 require $registry->get('templates', 'horde') . '/common-footer.inc';
\ No newline at end of file

diff --git a/lib/Shout.php b/lib/Shout.php
index c771824..2b229fd 100644 (file)
--- a/lib/Shout.php
+++ b/lib/Shout.php
@@ -49,6 +49,27 @@ class Shout
             $menu->add($url, _("$icontitle User"), "add-user.gif");
         }
 
+        if (isset($context) && isset($section) && $section == "dialplan" &&
+            Shout::checkRights("shout:contexts:$context:dialplan",
+                PERMS_EDIT, 1)) {
+            $url = Horde::applicationUrl("dialplan.php");
+            $url = Util::addParameter($url, array('context' => $context,
+                                                  'section' => $section,
+                                                  'action' => 'add'));
+            
+            # Goofy hack to make the icon make a little sense
+            # when editing/deleting users
+            if (!isset($action)) {
+                $icontitle = "Add";
+            } else {
+                $icontitle = $action;
+                $icontitle[0] = strtoupper($action[0]);
+            }
+            # End goofy hack
+
+            $menu->add($url, _("$icontitle Extension"), "add-extension.gif");
+        }
+        
         if ($returnType == 'object') {
             return $menu;
         } else {

diff --git a/shout.webprj b/shout.webprj
index 92f4188..d2c1d4f 100644 (file)
--- a/shout.webprj
+++ b/shout.webprj
@@ -12,14 +12,14 @@
     <item modified_time="1121576093" 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="1121401934" url="index.php" uploadstatus="2" />
+    <item modified_time="1121579328" 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="1121401934" url="index.php" />
+        <uploadeditem upload_time="1121579932" url="dialplan.php" />
+        <uploadeditem upload_time="1121579328" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
         <uploadeditem upload_time="1121306551" url="lib/Driver.php" />
@@ -28,7 +28,7 @@
         <uploadeditem upload_time="1121576093" 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="1121576654" url="lib/Shout.php" />
+        <uploadeditem upload_time="1121580048" url="lib/Shout.php" />
         <uploadeditem upload_time="1120815615" url="lib/System.php" />
         <uploadeditem upload_time="1121578306" url="lib/User.php" />
         <uploadeditem upload_time="1120279975" url="lib/Users.php" />
@@ -48,22 +48,23 @@
         <uploadeditem upload_time="0" url="templates/context/" />
         <uploadeditem upload_time="1120175005" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
-        <uploadeditem upload_time="1121573859" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1121579774" url="templates/dialplan/dialplanlist.inc" />
         <uploadeditem upload_time="1121486161" url="templates/menu.inc" />
-        <uploadeditem upload_time="1121575269" url="templates/table-limiter-begin.inc" />
-        <uploadeditem upload_time="1121575075" url="templates/table-limiter-end.inc" />
+        <uploadeditem upload_time="1121578573" url="templates/table-limiter-begin.inc" />
+        <uploadeditem upload_time="1121578576" url="templates/table-limiter-end.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
         <uploadeditem upload_time="1121576381" url="templates/users/userlist.inc" />
         <uploadeditem upload_time="0" url="themes/" />
         <uploadeditem upload_time="0" url="themes/graphics/" />
+        <uploadeditem upload_time="1121580098" url="themes/graphics/add-dialplan.gif" />
         <uploadeditem upload_time="1121300828" url="themes/graphics/add-user.gif" />
         <uploadeditem upload_time="1121574328" url="themes/screen.css" />
-        <uploadeditem upload_time="1121574626" url="users.php" />
+        <uploadeditem upload_time="1121579644" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
         <uploadeditem upload_time="1121404120" url="users/add.php" />
         <uploadeditem upload_time="1121575287" url="users/edit.php" />
         <uploadeditem upload_time="1121396278" url="users/index.php" />
-        <uploadeditem upload_time="1121402549" url="users/save.php" />
+        <uploadeditem upload_time="1121579127" url="users/save.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -84,14 +85,14 @@
     <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="1121576654" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1121580048" url="lib/Shout.php" uploadstatus="1" />
     <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
     <item modified_time="1121486161" url="templates/menu.inc" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
     <item modified_time="1120175005" url="templates/context/contextline.inc" uploadstatus="1" />
     <item url="templates/users/" uploadstatus="1" />
     <item modified_time="1121576381" url="templates/users/userlist.inc" uploadstatus="1" />
-    <item modified_time="1121573859" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
+    <item modified_time="1121579774" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
     <item modified_time="1120815615" url="lib/System.php" uploadstatus="1" />
     <author>Ben Klang</author>
@@ -114,12 +115,14 @@
     <item modified_time="1120287842" url="main/moh.php" uploadstatus="1" />
     <item modified_time="1120815615" url="main/system.php" uploadstatus="1" />
     <item modified_time="1121306550" url="main/users.php" uploadstatus="1" />
-    <item modified_time="1121574626" url="users.php" uploadstatus="1" />
-    <item modified_time="1121402549" url="users/save.php" uploadstatus="1" />
+    <item modified_time="1121579644" url="users.php" uploadstatus="1" />
+    <item modified_time="1121579127" url="users/save.php" uploadstatus="1" />
     <item modified_time="1121574328" url="themes/screen.css" />
     <item modified_time="1121575287" url="users/edit.php" />
-    <item modified_time="1121575269" url="templates/table-limiter-begin.inc" />
-    <item modified_time="1121575075" url="templates/table-limiter-end.inc" />
+    <item modified_time="1121578573" url="templates/table-limiter-begin.inc" />
+    <item modified_time="1121578576" url="templates/table-limiter-end.inc" />
+    <item modified_time="1121579932" url="dialplan.php" />
+    <item modified_time="1121580098" url="themes/graphics/add-dialplan.gif" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="lib" />

diff --git a/templates/dialplan/dialplanlist.inc b/templates/dialplan/dialplanlist.inc
index ed09b0c..a8ac3f8 100644 (file)
--- a/templates/dialplan/dialplanlist.inc
+++ b/templates/dialplan/dialplanlist.inc
@@ -47,7 +47,7 @@
                 $editurl = Util::addParameter($editurl, "section=dialplan");
                 $editurl = Util::addParameter($editurl, "extension=$extension");
                 ?>&nbsp;<a class="lighthint" href="<?php
-                    echo editurl;
+                    echo $editurl;
                 ?>">edit</a>
               </th>
             </tr>

diff --git a/themes/graphics/add-dialplan.gif b/themes/graphics/add-dialplan.gif
new file mode 100644 (file)
index 0000000..c343e4b
Binary files /dev/null and b/themes/graphics/add-dialplan.gif differ

diff --git a/users.php b/users.php
index d746f46..0c6cbbf 100644 (file)
--- a/users.php
+++ b/users.php
@@ -23,6 +23,7 @@ require_once SHOUT_BASE . '/lib/Shout.php';
 $context = Util::getFormData("context");
 $section = "users";
 $action = Util::getFormData("action");
+$extension = Util::getFormData("extension");
 
 $contexts = $shout->getContexts();
 $vars = &Variables::getDefaultVariables();
@@ -33,23 +34,38 @@ 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":
+        $title = _("Add User");
         # Treat adds just like an empty edit
         unset($extension);
         $action = 'edit';
+        break;
     case "edit":
+        $title = _("Edit User (Extension") . "$extension)";
+        break;
     case "save":
+        $title = _("Save User (Extension") . "$extension)";
+        break;
     case "delete":
-        require SHOUT_BASE . "/users/$action.php";
+        $title = _("Delete User (Extension") . "$extension)";
         break;
-}
\ No newline at end of file
+    default:
+        $url = Horde::applicationUrl('/');
+        header("Location: $url");
+        exit();
+}
+
+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);
+
+require SHOUT_BASE . "/users/$action.php";
+
+require $registry->get('templates', 'horde') . '/common-footer.inc';
\ No newline at end of file

diff --git a/users/save.php b/users/save.php
index 36c04bb..b2abc97 100644 (file)
--- a/users/save.php
+++ b/users/save.php
@@ -18,7 +18,10 @@ $wereerrors = 0;
 $vars = &Variables::getDefaultVariables();
 $formname = $vars->get('formname');
 print_r($vars);
-$title = _("System Settings");
 
 $UserDetailsForm = &Horde_Form::singleton('UserDetailsForm', $vars);
-$UserDetailsFormValid = $UserDetailsForm->validate($vars, true);
\ No newline at end of file
+$UserDetailsFormValid = $UserDetailsForm->validate($vars, true);
+if (!$UserDetailsFormValid) {
+    # FIXME Handle invalid forms gracefully
+}
+