From 921f5c938b1c3d7bae3ff46d8a9cd02a6bbd852b Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Fri, 15 Jul 2005 04:30:45 +0000
Subject: [PATCH] Reworking minor directory structure to get around stupid web
 browser pathing bug

git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@57 06cd67b6-e706-0410-b29e-9de616bca6e9
---
 dialplan.php => main/dialplan.php |  0
 moh.php => main/moh.php           |  0
 system.php => main/system.php     |  0
 users.php => main/users.php       |  0
 shout.webprj                      | 78 ++++++++++++++++++++-------------------
 users/index.php                   | 51 -------------------------
 6 files changed, 40 insertions(+), 89 deletions(-)
 rename dialplan.php => main/dialplan.php (100%)
 rename moh.php => main/moh.php (100%)
 rename system.php => main/system.php (100%)
 rename users.php => main/users.php (100%)
 delete mode 100644 users/index.php

diff --git a/dialplan.php b/main/dialplan.php
similarity index 100%
rename from dialplan.php
rename to main/dialplan.php
diff --git a/moh.php b/main/moh.php
similarity index 100%
rename from moh.php
rename to main/moh.php
diff --git a/system.php b/main/system.php
similarity index 100%
rename from system.php
rename to main/system.php
diff --git a/users.php b/main/users.php
similarity index 100%
rename from users.php
rename to main/users.php
diff --git a/shout.webprj b/shout.webprj
index ae3c79cfd..8b2793df2 100644
--- 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="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" />
+    <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" />
     <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="1120648621" url="dialplan.php" />
-        <uploadeditem upload_time="1121377707" url="index.php" />
+        <uploadeditem upload_time="1120355053" url="dialplan.php" />
+        <uploadeditem upload_time="1121396278" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
-        <uploadeditem upload_time="1120815592" url="lib/Driver.php" />
+        <uploadeditem upload_time="1121306551" url="lib/Driver.php" />
         <uploadeditem upload_time="1120022560" url="lib/Driver.php~" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
-        <uploadeditem upload_time="1121374073" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1121313992" 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="1121374073" url="lib/Shout.php" />
-        <uploadeditem upload_time="1120812245" url="lib/System.php" />
-        <uploadeditem upload_time="1121377507" url="lib/User.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="1120279975" url="lib/Users.php" />
-        <uploadeditem upload_time="1120792108" url="lib/base.php" />
+        <uploadeditem upload_time="1120589135" url="lib/base.php" />
         <uploadeditem upload_time="1120073766" url="lib/defines.php" />
-        <uploadeditem upload_time="1120296517" url="moh.php" />
+        <uploadeditem upload_time="1120287842" url="moh.php" />
         <uploadeditem upload_time="1120027019" url="shout.webprj" />
-        <uploadeditem upload_time="1120811068" url="system.php" />
+        <uploadeditem upload_time="1120815615" url="system.php" />
         <uploadeditem upload_time="0" url="templates/" />
-        <uploadeditem upload_time="1120158044" url="templates/common-header.inc" />
+        <uploadeditem upload_time="1120174958" url="templates/common-header.inc" />
         <uploadeditem upload_time="1120073766" url="templates/content_page" />
         <uploadeditem upload_time="0" url="templates/context/" />
-        <uploadeditem upload_time="1120169761" url="templates/context/contextline.inc" />
+        <uploadeditem upload_time="1120175005" url="templates/context/contextline.inc" />
         <uploadeditem upload_time="0" url="templates/dialplan/" />
-        <uploadeditem upload_time="1121377789" url="templates/dialplan/dialplanlist.inc" />
-        <uploadeditem upload_time="1121374537" url="templates/menu.inc" />
+        <uploadeditem upload_time="1121396278" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1121396278" url="templates/menu.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
-        <uploadeditem upload_time="1121377793" url="templates/users/userlist.inc" />
+        <uploadeditem upload_time="1121396278" url="templates/users/userlist.inc" />
         <uploadeditem upload_time="0" url="themes/" />
         <uploadeditem upload_time="0" url="themes/graphics/" />
-        <uploadeditem upload_time="1121295816" url="themes/graphics/add-user.gif" />
-        <uploadeditem upload_time="1121298200" url="users.php" />
+        <uploadeditem upload_time="1121300828" url="themes/graphics/add-user.gif" />
+        <uploadeditem upload_time="1121306550" url="users.php" />
         <uploadeditem upload_time="0" url="users/" />
-        <uploadeditem upload_time="1121374700" url="users/add.php" />
-        <uploadeditem upload_time="1121374767" url="users/index.php" />
+        <uploadeditem upload_time="1121401257" url="users/add.php" />
+        <uploadeditem upload_time="1121396278" url="users/index.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -74,20 +74,16 @@
     <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="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 modified_time="1121317814" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
+    <item modified_time="1121396278" url="templates/menu.inc" uploadstatus="1" />
     <item url="templates/context/" uploadstatus="1" />
-    <item modified_time="1120169761" url="templates/context/contextline.inc" uploadstatus="1" />
-    <item modified_time="1120296517" url="moh.php" uploadstatus="1" />
+    <item modified_time="1120175005" url="templates/context/contextline.inc" uploadstatus="1" />
     <item url="templates/users/" 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 modified_time="1121396278" url="templates/users/userlist.inc" uploadstatus="1" />
+    <item modified_time="1121396278" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
-    <item modified_time="1120811068" url="system.php" uploadstatus="1" />
-    <item modified_time="1120812245" url="lib/System.php" uploadstatus="1" />
+    <item modified_time="1120815615" url="lib/System.php" uploadstatus="1" />
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>Gubed</debuggerclient>
@@ -100,15 +96,21 @@
     <events/>
     <item url="themes/" uploadstatus="1" />
     <item url="themes/graphics/" uploadstatus="1" />
-    <item modified_time="1121295816" url="themes/graphics/add-user.gif" uploadstatus="1" />
-    <item modified_time="1121374767" url="users/index.php" uploadstatus="1" />
+    <item modified_time="1121300828" url="themes/graphics/add-user.gif" 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" />
+    <item modified_time="1121396278" url="lib/User.php" uploadstatus="1" />
+    <item modified_time="1121401257" 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" />
     <treestatus>
       <openfolder url="config" />
       <openfolder url="lib" />
       <openfolder url="lib/Driver" />
+      <openfolder url="main" />
       <openfolder url="templates" />
       <openfolder url="templates/dialplan" />
       <openfolder url="templates/users" />
diff --git a/users/index.php b/users/index.php
deleted file mode 100644
index 46fb92a0a..000000000
--- a/users/index.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * $Horde: shout/users/index.php,v 0.1 2005/07/13 10:01:01 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 = "users";
-$action = Util::getFormData("action");
-
-$contexts = $shout->getContexts();
-$vars = &Variables::getDefaultVariables();
-
-if (!isset($context)) {#FIXME || !Shout::checkContext()) {
-    $url = Horde::applicationUrl("/shout/index.php");
-    header("Location: $url");
-    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":
-    case "edit":
-    case "delete":
-        require SHOUT_BASE . "/users/$action.php";
-        break;
-}
\ No newline at end of file
-- 
2.11.0