Still need to merge changes from Mandy

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

diff --git a/index.php b/index.php
index b1e6d0e..47ef0e3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,8 +20,8 @@ if (!$shout_configured) {
 require_once SHOUT_BASE . '/lib/base.php';
 require_once SHOUT_BASE . '/lib/Shout.php';
 #require_once SHOUT_TEMPLATES . '/comment.inc';
-require_once 'Horde/Variables.php';
-require_once 'Horde/Text/Filter.php';
+#require_once 'Horde/Variables.php';
+#require_once 'Horde/Text/Filter.php';
 
 $context = Util::getFormData("context");
 $section = Util::getFormData("section");
@@ -65,14 +65,4 @@ switch ($section) {
 }
 
 
-require $registry->get('templates', 'horde') . '/common-footer.inc';
-
-
-
-
-
-
-
-
-
-#require SHOUT_BASE . '/contexts.php';
\ No newline at end of file
+require $registry->get('templates', 'horde') . '/common-footer.inc';
\ No newline at end of file

diff --git a/lib/base.php b/lib/base.php
index 0e1c3d6..e4deede 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -43,6 +43,10 @@ require_once SHOUT_BASE . '/lib/Driver.php';
 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';
+
 // UI classes.
 require_once 'Horde/UI/Tabs.php';
 

diff --git a/shout.webprj b/shout.webprj
index 5e6292a..873e62f 100644 (file)
--- a/shout.webprj
+++ b/shout.webprj
@@ -10,19 +10,19 @@
     <item url="lib/" uploadstatus="2" />
     <item url="lib/Driver/" uploadstatus="2" />
     <item modified_time="1120357513" url="lib/Driver/ldap.php" uploadstatus="2" />
-    <item modified_time="1120268017" url="lib/base.php" uploadstatus="2" />
-    <item modified_time="1120357486" url="lib/Driver.php" uploadstatus="2" />
-    <item modified_time="1120357642" url="index.php" uploadstatus="2" />
+    <item modified_time="1120589135" url="lib/base.php" uploadstatus="2" />
+    <item modified_time="1120456298" url="lib/Driver.php" uploadstatus="2" />
+    <item modified_time="1120585169" 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="1120357642" url="index.php" />
+        <uploadeditem upload_time="1120585169" url="index.php" />
         <uploadeditem upload_time="1120021874" url="index.php~" />
         <uploadeditem upload_time="0" url="lib/" />
-        <uploadeditem upload_time="1120357486" url="lib/Driver.php" />
+        <uploadeditem upload_time="1120456298" url="lib/Driver.php" />
         <uploadeditem upload_time="1120022560" url="lib/Driver.php~" />
         <uploadeditem upload_time="0" url="lib/Driver/" />
         <uploadeditem upload_time="1120357513" url="lib/Driver/ldap.php" />
@@ -30,7 +30,7 @@
         <uploadeditem upload_time="1120288491" url="lib/SelectContext.php" />
         <uploadeditem upload_time="1120357628" url="lib/Shout.php" />
         <uploadeditem upload_time="1120279975" url="lib/Users.php" />
-        <uploadeditem upload_time="1120268017" url="lib/base.php" />
+        <uploadeditem upload_time="1120589135" url="lib/base.php" />
         <uploadeditem upload_time="1120073766" url="lib/defines.php" />
         <uploadeditem upload_time="1120287842" url="moh.php" />
         <uploadeditem upload_time="1120027019" url="shout.webprj" />
@@ -44,7 +44,7 @@
         <uploadeditem upload_time="1120357382" url="templates/menu.inc" />
         <uploadeditem upload_time="0" url="templates/users/" />
         <uploadeditem upload_time="1120378861" url="templates/users/userlist.inc" />
-        <uploadeditem upload_time="1120355014" url="users.php" />
+        <uploadeditem upload_time="1120456715" url="users.php" />
       </profile>
     </uploadprofiles>
     <debuggers>
@@ -78,7 +78,7 @@
     <events/>
     <item modified_time="1120174958" url="templates/common-header.inc" uploadstatus="1" />
     <item modified_time="1120357382" url="templates/menu.inc" uploadstatus="1" />
-    <item modified_time="1120355014" url="users.php" uploadstatus="1" />
+    <item modified_time="1120456715" 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" />
@@ -88,6 +88,7 @@
     <item modified_time="1120377494" url="templates/dialplan/dialplanlist.inc" uploadstatus="1" />
     <item url="templates/dialplan/" uploadstatus="1" />
     <treestatus>
+      <openfolder url="config" />
       <openfolder url="lib" />
       <openfolder url="lib/Driver" />
       <openfolder url="templates" />

diff --git a/users.php b/users.php
index 8b2b6f4..098d07a 100644 (file)
--- a/users.php
+++ b/users.php
@@ -3,4 +3,4 @@ if (!defined(SHOUT_BASE)) {
     define(SHOUT_BASE, dirname(__FILE__));
 }
 
-require SHOUT_TEMPLATES . "/users/userlist.inc";
\ No newline at end of file
+require SHOUT_TEMPLATES . "/users/userlist.html";
\ No newline at end of file