Updated project to match new webserver layout

Removed some unnecessary tests
Began work on some of the FIXMEs
Immediate goal: Get ready for Tuesday demo.  User subsystem MUST be 100%!

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

diff --git a/andrew.webprj b/andrew.webprj
index 33443e0..b55c2db 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -9,11 +9,11 @@
     <item modified_time="1121689003" url="dialplan/edit.php" uploadstatus="1" />
     <item url="lib/" uploadstatus="1" />
     <item url="lib/Driver/" uploadstatus="1" />
-    <item modified_time="1122704475" url="lib/Driver/ldap.php" uploadstatus="1" />
+    <item modified_time="1126200076" url="lib/Driver/ldap.php" uploadstatus="1" />
     <item modified_time="1120648387" url="lib/base.php" uploadstatus="1" />
     <item modified_time="1121689003" url="lib/Dialplan.php" uploadstatus="1" />
     <item modified_time="1120815592" url="lib/Driver.php" uploadstatus="1" />
-    <item modified_time="1122704475" url="lib/Shout.php" uploadstatus="1" />
+    <item modified_time="1129871131" url="lib/Shout.php" uploadstatus="1" />
     <item modified_time="1121689003" url="lib/System.php" uploadstatus="1" />
     <item modified_time="1122529264" url="lib/User.php" uploadstatus="1" />
     <item url="main/" uploadstatus="1" />
@@ -47,19 +47,66 @@
     <item modified_time="1121834514" url="users/edit.php" uploadstatus="1" />
     <item modified_time="1122529264" url="users/save.php" uploadstatus="1" />
     <item modified_time="1121689003" url="dialplan.php" uploadstatus="1" />
-    <item modified_time="1121689003" url="index.php" uploadstatus="1" />
+    <item modified_time="1129871121" url="index.php" uploadstatus="1" />
     <item modified_time="1122704475" url="users.php" uploadstatus="1" />
     <item url="" uploadstatus="1" />
-    <uploadprofiles defaultProfile="Shout" >
+    <uploadprofiles showtreeviews="true" defaultProfile="Shout" >
       <profile remote_host="" remote_port="" remote_path="" remote_protocol="ftp" user="" name="@" />
-      <profile remote_host="picasso.v-office.biz" remote_port="22" remote_path="/srv/vhost/users/aklang/sites/intranet.v-office.biz/shout" remote_protocol="sftp" user="aklang" name="Shout" />
+      <profile remote_host="picasso.v-office.biz" remote_port="22" remote_path="/srv/vhost/users/alkaloid/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="1121689003" url="dialplan.php" />
+        <uploadeditem upload_time="0" url="dialplan/" />
+        <uploadeditem upload_time="1121689003" url="dialplan/edit.php" />
+        <uploadeditem upload_time="1129871121" url="index.php" />
+        <uploadeditem upload_time="0" url="lib/" />
+        <uploadeditem upload_time="1121689003" url="lib/Dialplan.php" />
+        <uploadeditem upload_time="1120815592" url="lib/Driver.php" />
+        <uploadeditem upload_time="0" url="lib/Driver/" />
+        <uploadeditem upload_time="1126200076" url="lib/Driver/ldap.php" />
+        <uploadeditem upload_time="1129871131" url="lib/Shout.php" />
+        <uploadeditem upload_time="1121689003" url="lib/System.php" />
+        <uploadeditem upload_time="1122529264" url="lib/User.php" />
+        <uploadeditem upload_time="1120648387" url="lib/base.php" />
+        <uploadeditem upload_time="0" url="main/" />
+        <uploadeditem upload_time="1121689003" url="main/dialplan.php" />
+        <uploadeditem upload_time="1121401845" url="main/moh.php" />
+        <uploadeditem upload_time="1121401845" url="main/system.php" />
+        <uploadeditem upload_time="1121689003" url="main/users.php" />
+        <uploadeditem upload_time="0" url="templates/" />
+        <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="1120175005" url="templates/context/contextline.inc" />
+        <uploadeditem upload_time="0" url="templates/dialplan/" />
+        <uploadeditem upload_time="1121581526" url="templates/dialplan/dialplanlist.inc" />
+        <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-begin.inc" />
+        <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-end.inc" />
+        <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-line.inc" />
+        <uploadeditem upload_time="1121689003" url="templates/menu.inc" />
+        <uploadeditem upload_time="1121578596" url="templates/table-limiter-begin.inc" />
+        <uploadeditem upload_time="1121578596" url="templates/table-limiter-end.inc" />
+        <uploadeditem upload_time="0" url="templates/users/" />
+        <uploadeditem upload_time="1121581536" url="templates/users/userlist.inc" />
+        <uploadeditem upload_time="0" url="themes/" />
+        <uploadeditem upload_time="0" url="themes/graphics/" />
+        <uploadeditem upload_time="1121581526" url="themes/graphics/add-extension.gif" />
+        <uploadeditem upload_time="1121300828" url="themes/graphics/add-user.gif" />
+        <uploadeditem upload_time="1121578596" url="themes/screen.css" />
+        <uploadeditem upload_time="1122704475" url="users.php" />
+        <uploadeditem upload_time="0" url="users/" />
+        <uploadeditem upload_time="1122704539" url="users/add.php" />
+        <uploadeditem upload_time="1122704539" url="users/delete.php" />
+        <uploadeditem upload_time="1121834514" url="users/edit.php" />
+        <uploadeditem upload_time="1122529264" url="users/save.php" />
+      </profile>
     </uploadprofiles>
+    <templates>templates/</templates>
+    <toolbars>toolbars/</toolbars>
     <author>Ben Klang</author>
     <email>ben@alkaloid.net</email>
     <debuggerclient>No Debugger</debuggerclient>
     <exclude cvsignore="false" >*~;</exclude>
-    <templates>templates/</templates>
-    <toolbars>toolbars/</toolbars>
     <teamdata>
       <taskleaders/>
       <subprojectleaders/>

diff --git a/lib/Driver/ldap.php b/lib/Driver/ldap.php
index 9447267..9f5830d 100644 (file)
--- a/lib/Driver/ldap.php
+++ b/lib/Driver/ldap.php
@@ -628,9 +628,22 @@ for $context"));
     function saveUser($context, $extension, $userdetails)
     {
         # FIXME: Add test to make sure we aren't duplicating the extension
+        $res = ldap_search($this->_LDAP, SHOUT_USERS_BRANCH.','.$this->_params['basedn'],
+            "(&(objectClass=asteriskUser)(voiceMailbox=".
+                $userdetails['newextension']."))");
+        $res = ldap_get_entries($this->_LDAP, $res);
+        if ($res['count'] > 0) {
+            # The extension already exists.  Do some sanity checking to make
+            # sure we know we're modifying an existing user
+            # FIXME
+        }
         
         # FIXME Access Control/Authorization
-        
+        if (!Shout::checkRights("shout:contexts:$context:users",
+            PERMS_DELETE, 1)) {
+            return PEAR::raiseError("No permission to modify users in this " .
+                "context.");
+        }
         $ldapKey = &$this->_ldapKey;
         $appKey = &$this->_appKey;
         

diff --git a/lib/Shout.php b/lib/Shout.php
index 4955fa8..b8cbd66 100644 (file)
--- a/lib/Shout.php
+++ b/lib/Shout.php
@@ -28,7 +28,7 @@ class Shout
 
         $menu = &new Menu(HORDE_MENU_MASK_ALL);
 
-        if (isset($context) && isset($section) && $section == "users" &&
+        if (isset($context) && $section == "users" &&
             Shout::checkRights("shout:contexts:$context:users",
                 PERMS_EDIT, 1)) {
             $url = Horde::applicationUrl("users.php");
@@ -89,6 +89,7 @@ class Shout
     function &getTabs($context, &$vars)
     {
         global $shout;
+        # FIXME Is this right?
         if (!Auth::isAdmin("shout", PERMS_SHOW|PERMS_READ)) {
             return false;
         }
@@ -99,7 +100,7 @@ class Shout
 
         if (Shout::checkRights("$permprefix:users", null, 1) &&
             $shout->checkContextType($context, "users")) {
-            $tabs->addTab(_("Users"),
+             $tabs->addTab(_("Users"),
                     Horde::applicationUrl("index.php?context=$context"),
                     'users');
         }
@@ -152,7 +153,7 @@ class Shout
      */
     function checkRights($permname, $permmask = null, $numparents = 0)
     {
-        if ($permmask == null) {
+        if ($permmask === null) {
             $permmask = PERMS_SHOW|PERMS_READ;
         }