[Helpmeict-cvs] Helpdesk preferences.php, 1.15, 1.16 sitesandusers.php, 1.18, 1.19

[Scott P. <wht...@us...>]

Update of /cvsroot/helpmeict/Helpdesk
In directory sc8-pr-cvs17:/tmp/cvs-serv4819

Modified Files:
	preferences.php sitesandusers.php 
Log Message:
LDAP authentication frontend/schema changes.


Index: sitesandusers.php
===================================================================
RCS file: /cvsroot/helpmeict/Helpdesk/sitesandusers.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** sitesandusers.php	15 Sep 2007 05:30:30 -0000	1.18
--- sitesandusers.php	15 Sep 2007 08:41:32 -0000	1.19
***************
*** 57,64 ****
    require_once 'system/lang.php';
    require_once 'system/message.php';
    require_once 'system/global_preferences.php';
    require 'header.php';
    
!   global $act, $usertype, $message, $users, $is_pgsql;
    // Language selection
    set_text_domain("sitesandusers");
--- 57,65 ----
    require_once 'system/lang.php';
    require_once 'system/message.php';
+   require_once 'system/user_preferences.php';
    require_once 'system/global_preferences.php';
    require 'header.php';
    
!   global $act, $usertype, $message, $users, $is_pgsql, $iuds, $ldap;
    // Language selection
    set_text_domain("sitesandusers");
***************
*** 128,132 ****
                 'resolve',
                 'email',
!                'oldusername'
                 );
  
--- 129,134 ----
                 'resolve',
                 'email',
!                'oldusername',
!                'ldap'
                 );
  
***************
*** 281,287 ****
      } else {
        if ($available == 'true') { $available = '1'; } else { $available = '0'; }
        // Add user
        $user = db_next_id('tbl_Users_id');
!       db_send("INSERT INTO tbl_Users (id,name,username,pass,available,email) VALUES ($user, '$name','" . strtolower($username) . "','" . md5($password) . "',$available, '$email')");
  
        // Add user to the current domain
--- 283,290 ----
      } else {
        if ($available == 'true') { $available = '1'; } else { $available = '0'; }
+       if ($ldap == 'true') { $ldap = '1'; } else { $ldap = '0'; }
        // Add user
        $user = db_next_id('tbl_Users_id');
!       db_send("INSERT INTO tbl_Users (id,name,username,pass,available,email,ldap) VALUES ($user, '$name','" . strtolower($username) . "','" . md5($password) . "',$available, '$email', '$ldap')");
  
        // Add user to the current domain
***************
*** 330,333 ****
--- 333,347 ----
          <div class="field"><input type="checkbox" name="available" id="available" checked="checked" value="true" /></div>
        </div>
+ <?php
+     $prefs=get_user_prefs($_SESSION['_id']);
+     if ($prefs['ldap-ause'] == 'true') {
+ ?>
+       <div class="labelfieldpair">
+         <div class="name"><label for="ldap"><?php echo gettext('LDAP Account');?></label></div>       
+         <div class="field"><input type="checkbox" name="ldap" id="ldap" value="true" /></div>
+       </div>
+ <?php
+     }
+ ?>
        <div class="buttonpanel">
          <input name="submit" type="submit" id="submit" value="<?php echo gettext('Add User')?>" />
***************
*** 361,365 ****
          $sql = "UPDATE tbl_Users SET name='" . $name . "',username='" . strtolower($username) . "'";
          if ($password <> '') { $sql .= ",pass='" . md5($password) . "'"; }
!         $sql .= ",email='$email' WHERE ID=" . $user;
          db_send($sql);
        
--- 375,380 ----
          $sql = "UPDATE tbl_Users SET name='" . $name . "',username='" . strtolower($username) . "'";
          if ($password <> '') { $sql .= ",pass='" . md5($password) . "'"; }
!         if ($ldap == 'true') { $ldap = '1'; } else { $ldap = '0'; }
!         $sql .= ",email='$email', ldap='$ldap' WHERE ID=" . $user;
          db_send($sql);
        
***************
*** 648,651 ****
--- 663,677 ----
          <div class="field"><input type="text" name="email" id="email" size="20" maxlength="40" value="<?php echo $usersRS[0]['email']?>" /></div>
        </div>
+ <?php
+     $prefs=get_user_prefs($_SESSION['_id']);
+     if ($prefs['ldap-ause'] == 'true') {
+ ?>
+       <div class="labelfieldpair">
+         <div class="name"><label for="ldap"><?php echo gettext('LDAP Account');?></label></div>
+         <div class="field"><input type="checkbox" name="ldap" id="ldap" <?php if (isset($usersRS[0]['ldap'])) {if ($usersRS[0]['ldap'] == '1') {echo 'checked';} }?> value="true" /></div>
+       </div>
+ <?php
+     }
+ ?>
        <div class="buttonpanel">
          <input name="submit" type="submit" id="submit" value="<?php echo gettext('Submit Changes')?>" />

Index: preferences.php
===================================================================
RCS file: /cvsroot/helpmeict/Helpdesk/preferences.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** preferences.php	12 Sep 2007 23:32:13 -0000	1.15
--- preferences.php	15 Sep 2007 08:41:32 -0000	1.16
***************
*** 130,134 ****
        $defprefs = db_recordset("SELECT *, 'default' AS level
                                  FROM tbl_Default_Preferences, tbl_Preference_Descriptions
!                                 WHERE tbl_Default_Preferences.identifier = tbl_Preference_Descriptions.identifier");
        $domprefs = db_recordset("SELECT *, 'domain' AS level
                                  FROM tbl_Domain_Preferences, tbl_Preference_Descriptions
--- 130,135 ----
        $defprefs = db_recordset("SELECT *, 'default' AS level
                                  FROM tbl_Default_Preferences, tbl_Preference_Descriptions
!                                 WHERE tbl_Default_Preferences.identifier = tbl_Preference_Descriptions.identifier
!                                   AND tbl_Default_Preferences.identifier NOT LIKE 'ldap-%'");
        $domprefs = db_recordset("SELECT *, 'domain' AS level
                                  FROM tbl_Domain_Preferences, tbl_Preference_Descriptions