Project

General

Profile

« Previous | Next » 

Revision 1823

Added by Dietmar almost 12 years ago

! update user management, now home folder only will be created
if homefolders in settings are enabledPlugin
add save & back in user modify

View differences:

branches/2.8.x/CHANGELOG
13 13 

  		




  14
  14
  
    

  		




  15
  15
  
    

  		




  
  16
  
    
20 Nov-2012 Build 1823 Dietmar Woellbrink (Luisehahne)


  		




  
  17
  
    
! update user management, now home folder only will be created


  		




  
  18
  
    
  if homefolders in settings are enabledPlugin


  		




  
  19
  
    
  add save & back in user modify


  		




  16
  20
  
    
20 Nov-2012 Build 1822 Dietmar Woellbrink (Luisehahne)


  		




  17
  21
  
    
! update installer, strict difference between table structure and data 


  		




  18
  22
  
    
# fixed wrong constant for settings table


  		












  

    
      branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt
    
  





  14
  14
  
    
<input type="hidden" name="user_id" value="{USER_ID}" />


  		




  15
  15
  
    
<input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />


  		




  16
  16
  
    
<input type="hidden" name="BackLink" value="{BACK_LINK}" />


  		




  
  17
  
    
<input type="hidden" name="cancel_url" value="{{CANCEL_URL}}" />


  		




  17
  18
  
    
{FTAN}


  		




  18
  19
  
    
<table>


  		




  19
  20
  
    
<!-- BEGIN show_modify_loginname_block -->


  		




  ......




  104
  105
  
    
<tr>


  		




  105
  106
  
    
	<td colspan="2" class="center">


  		




  106
  107
  
    
		<input type="submit" name="{SUB_ACTION}" value="{SUBMIT_TITLE}" />


  		




  
  108
  
    
		<span class="{HIDE_SAVE_BACK}"><input type="submit" name="save_back" value="{TEXT_SAVE_BACK}" /></span>


  		




  107
  109
  
    
		<input type="reset" name="reset" value="{TEXT_RESET}" />


  		




  108
  110
  
    
		<input type="button" style="width: 100px; margin-top: 5px;" onclick="javascript:window.location='{CANCEL_URL}';" value="{TEXT_CANCEL}" />


  		




  109
  111
  
    
	</td>


  		












  

    
      branches/2.8.x/wb/admin/interface/version.php
    
  





  51
  51
  
    

  		




  52
  52
  
    
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)


  		




  53
  53
  
    
if(!defined('VERSION')) define('VERSION', '2.8.3');


  		




  54
  
  
    
if(!defined('REVISION')) define('REVISION', '1822');


  		




  
  54
  
    
if(!defined('REVISION')) define('REVISION', '1823');


  		




  55
  55
  
    
if(!defined('SP')) define('SP', '');


  		












  

    
      branches/2.8.x/wb/admin/users/user_list.php
    
  





  173
  173
  
    
        $oTpl->set_file('page', 'users_form.htt');


  		




  174
  174
  
    
        $oTpl->set_block('page', 'main_block', 'main');


  		




  175
  175
  
    
        $oTpl->set_block('main_block', 'show_modify_loginname_block', 'show_modify_loginname');


  		




  
  176
  
    

  		




  176
  177
  
    
        $oTpl->set_block('main_block', 'show_add_loginname_block', 'show_add_loginname');


  		




  177
  
  
    

  		




  178
  178
  
    
		$oTpl->set_block('main_block', 'show_change_group_list_block', 'show_change_group_list');


  		




  179
  179
  
    

  		




  180
  180
  
    
		$oTpl->parse('show_change_group_list', '');


  		




  ......




  193
  193
  
    
    			   'HEADING_MODIFY_USER' => '',


  		




  194
  194
  
    
    			   'DISPLAY_HOME_FOLDERS' => '',


  		




  195
  195
  
    
    			   'SUBMIT_TITLE' => $TEXT['ADD'],


  		




  
  196
  
    
                   'HIDE_SAVE_BACK' => 'hide',


  		




  196
  197
  
    
    			   )


  		




  197
  198
  
    
			);


  		




  198
  199
  
    

  		




  ......




  264
  265
  
    
        }


  		




  265
  266
  
    

  		




  266
  267
  
    
        // Include the WB functions file


  		




  267
  
  
    
        require_once(WB_PATH.'/framework/functions.php');


  		




  
  268
  
    
        if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }


  		




  268
  269
  
    

  		




  269
  270
  
    
        // Add media folders to home folder list


  		




  270
  271
  
    
        $oTpl->set_block('main_block', 'folder_list_block', 'folder_list');


  		












  

    
      branches/2.8.x/wb/admin/users/save.php
    
  





  29
  29
  
    
        // Create a javascript back link


  		




  30
  30
  
    
//        $js_back = ADMIN_URL.'/users/index.php';


  		




  31
  31
  
    
        unset($aActionRequest['save']);


  		




  
  32
  
    

  		




  32
  33
  
    
        $aActionRequest['modify']= 'change';


  		




  33
  34
  
    
		$database = WbDatabase::getInstance();


  		




  34
  35
  
    
        $bRetVal = 0;


  		




  ......




  164
  165
  
    
            	$username_code = '';


  		




  165
  166
  
    
            }


  		




  166
  167
  
    

  		




  167
  
  
    
            // Include the WB functions file


  		




  168
  
  
    
            if(!function_exists('media_filename')) { require(WB_PATH.'/framework/functions.php'); }


  		




  
  168
  
    
            if(defined('HOME_FOLDERS') && HOME_FOLDERS) {


  		




  169
  169
  
    

  		




  170
  
  
    
            // Remove bad characters


  		




  171
  
  
    
            $sHomeFolder = WB_PATH.MEDIA_DIRECTORY.'/home/'.( media_filename($username) );


  		




  172
  
  
    
            if ( sizeof(createFolderProtectFile( $sHomeFolder )) )


  		




  173
  
  
    
            {


  		




  174
  
  
    
//            	msgQueue::add($MESSAGE['MEDIA_DIR_NOT_MADE']);


  		




  
  170
  
    
                // Include the WB functions file


  		




  
  171
  
    
                if(!function_exists('media_filename')) { require(WB_PATH.'/framework/functions.php'); }


  		




  
  172
  
    

  		




  
  173
  
    
                // Remove bad characters


  		




  
  174
  
    
                $sHomeFolder = WB_PATH.MEDIA_DIRECTORY.'/home/'.( media_filename($username) );


  		




  
  175
  
    
                if ( sizeof(createFolderProtectFile( $sHomeFolder )) )


  		




  
  176
  
    
                {


  		




  
  177
  
    
    //            	msgQueue::add($MESSAGE['MEDIA_DIR_NOT_MADE']);


  		




  
  178
  
    
                }


  		




  175
  179
  
    
            }


  		




  176
  180
  
    

  		




  177
  181
  
    
			$sql  = 'UPDATE `'.TABLE_PREFIX.'users` SET ';


  		












  

    
      branches/2.8.x/wb/admin/users/user_form.php
    
  





  171
  171
  
    
		}


  		




  172
  172
  
    

  		




  173
  173
  
    
		// Include the WB functions file


  		




  174
  
  
    
		require_once(WB_PATH.'/framework/functions.php');


  		




  
  174
  
    
        if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); }


  		




  175
  175
  
    

  		




  176
  176
  
    
		// Add media folders to home folder list


  		




  177
  177
  
    
		$oTpl->set_block('main_block', 'folder_list_block', 'folder_list');


  		




  ......




  202
  202
  
    
                    'TEXT_GROUP' => $TEXT['GROUP'],


  		




  203
  203
  
    
                    'TEXT_NONE' => $TEXT['NONE'],


  		




  204
  204
  
    
                    'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],


  		




  
  205
  
    
                    'TEXT_SAVE_BACK' => $TEXT['SAVE'].' &amp; '.$TEXT['BACK'],


  		




  205
  206
  
    
                    'USERNAME_FIELDNAME' => $username_fieldname,


  		




  206
  207
  
    
                    'CHANGING_PASSWORD' => $MESSAGE['USERS_CHANGING_PASSWORD'],


  		




  207
  208
  
    
                    'HEADING_MODIFY_USER' => $HEADING['MODIFY_USER']


  		












  

    
      branches/2.8.x/wb/admin/users/index.php
    
  





  44
  44
  
    
        // Set parameter 'action' as alternative to javascript mechanism


  		




  45
  45
  
    
        $action = (isset($aActionRequest['add'])    ? 'add'    : $action );


  		




  46
  46
  
    
        $action = (isset($aActionRequest['save'])   ? 'save'   : $action );


  		




  
  47
  
    
        $action = (isset($aActionRequest['save_back']) ? 'save'   : $action );


  		




  47
  48
  
    
        $action = (isset($aActionRequest['modify']) ? 'modify' : $action );


  		




  48
  49
  
    
        $action = (isset($aActionRequest['delete']) ? 'delete' : $action );


  		




  49
  50
  
    
        $action = (isset($aActionRequest['delete_outdated']) ? 'delete_outdated' : $action );


  		




  ......




  141
  142
  
    
					$output  = show_userlist($admin, $aActionRequest);


  		




  142
  143
  
    
				}


  		




  143
  144
  
    
		endswitch; // end of switch


  		




  
  145
  
    

  		




  144
  146
  
    
		if( ($msg = msgQueue::getSuccess()) != '')


  		




  145
  147
  
    
		{


  		




  146
  148
  
    
			$output = $admin->format_message($msg, 'ok').$output;


  		




  ......




  149
  151
  
    
		{


  		




  150
  152
  
    
			$output = $admin->format_message($msg, 'error').$output;


  		




  151
  153
  
    
		}


  		




  
  154
  
    

  		




  152
  155
  
    
		print $output;


  		




  
  156
  
    
        if( isset($aActionRequest['BackLink']) && isset($aActionRequest['save_back']) ) {


  		




  
  157
  
    
            $sBackLink = $aActionRequest['BackLink'];


  		




  
  158
  
    
echo "<script type=\"text/javascript\">


  		




  
  159
  
    
<!--


  		




  
  160
  
    
// Get the location object


  		




  
  161
  
    
var locationObj = document.location;


  		




  
  162
  
    
// Set the value of the location object


  		




  
  163
  
    
document.location = '$sBackLink';


  		




  
  164
  
    
-->


  		




  
  165
  
    
</script>";


  		




  
  166
  
    
        }


  		




  153
  167
  
    
		$admin->print_footer();


  		




  
  168
  
    

  		




  154
  169
  
    
    }


  		




  155
  170
  
    

  		




  156
  171
  
    
	if(!defined('WB_URL'))


  		












  

    
      branches/2.8.x/wb/admin/users/add.php
    
  





  142
  142
  
    
            //if user is in administrator-group, get this group else just get the first one


  		




  143
  143
  
    
            if($admin->is_group_match($groups_id,'1')) { $group_id = 1; $groups_id = '1'; }


  		




  144
  144
  
    

  		




  145
  
  
    
            // Include the WB functions file


  		




  146
  
  
    
            if(!function_exists('media_filename')) { require(WB_PATH.'/framework/functions.php'); }


  		




  
  145
  
    
            if(defined('HOME_FOLDERS') && HOME_FOLDERS) {


  		




  
  146
  
    
                // Include the WB functions file


  		




  
  147
  
    
                if(!function_exists('media_filename')) { require(WB_PATH.'/framework/functions.php'); }


  		




  147
  148
  
    

  		




  148
  
  
    
            // Remove bad characters


  		




  149
  
  
    
            $sHomeFolder = WB_PATH.MEDIA_DIRECTORY.'/home/'.( media_filename($username) );


  		




  150
  
  
    
            if ( sizeof(createFolderProtectFile( $sHomeFolder )) )


  		




  151
  
  
    
            {


  		




  152
  
  
    
            	msgQueue::add($MESSAGE['MEDIA_DIR_NOT_MADE'].' ('.basename($sHomeFolder).') ' );


  		




  
  149
  
    
                // Remove bad characters


  		




  
  150
  
    
                $sHomeFolder = WB_PATH.MEDIA_DIRECTORY.'/home/'.( media_filename($username) );


  		




  
  151
  
    
                if ( sizeof(createFolderProtectFile( $sHomeFolder )) )


  		




  
  152
  
    
                {


  		




  
  153
  
    
                	msgQueue::add($MESSAGE['MEDIA_DIR_NOT_MADE'].' ('.basename($sHomeFolder).') ' );


  		




  
  154
  
    
                }


  		




  153
  155
  
    
            }


  		




  154
  156
  
    
            // Inser the user into the database


  		




  155
  157
  
    
			$sql  = 'INSERT INTO `'.TABLE_PREFIX.'users` SET '.


  		












Also available in:  Unified diff