Project

General

Profile

« Previous | Next » 

Revision 1842

Added by Luisehahne almost 13 years ago

  1. fixed output activation conformation
  2. fixed deleting Users awaiting activation
    ! add YYYY-MM-DD in date_formats dropdown

View differences:

branches/2.8.x/CHANGELOG
12 12 
===============================================================================
13 13 

  		




  14
  14
  
    

  		




  
  15
  
    
26 Dez-2012 Build 1842 Dietmar Woellbrink (Luisehahne)


  		




  
  16
  
    
# fixed output activation conformation


  		




  
  17
  
    
# fixed deleting Users awaiting activation


  		




  
  18
  
    
! add YYYY-MM-DD in date_formats dropdown


  		




  15
  19
  
    
23 Dez-2012 Build 1841 Dietmar Woellbrink (Luisehahne)


  		




  16
  20
  
    
# fixed index depth in access files


  		




  17
  21
  
    
23 Dez-2012 Build 1840 Dietmar Woellbrink (Luisehahne)


  		












  

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





  29
  29
  
    

  		




  30
  30
  
    
<!-- BEGIN show_confirmed_activation_block -->


  		




  31
  31
  
    
<h3 class="bold">{DISPLAY_WAITING_ACTIVATION}</h3>


  		




  32
  
  
    
     <select name="user_id_activation_id" class="user-activation" style="width: 500px; margin-left: 34px;">


  		




  
  32
  
    
     <select name="activation_user_id" class="user-activation" style="width: 500px; margin-left: 34px;">


  		




  33
  33
  
    
    <!-- BEGIN list_confirmed_activation_block -->


  		




  34
  34
  
    
    	<option value="{VALUE}" {STATUS}>{NAME}</option>


  		




  35
  35
  
    
    <!-- END list_confirmed_activation_block -->


  		












  

    
      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', '1841');


  		




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


  		




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


  		












  

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





  43
  43
  
    
$DATE_FORMATS['d|M|Y']      = gmdate('d M Y', $actual_time);


  		




  44
  44
  
    
$DATE_FORMATS['M|d|Y']      = gmdate('M d Y', $actual_time);


  		




  45
  45
  
    
$DATE_FORMATS['D|M|d,|Y']   = gmdate('D M d, Y', $actual_time);


  		




  
  46
  
    
$DATE_FORMATS['Y-m-d']      = gmdate('Y-m-d', $actual_time).' (Y-M-D)';


  		




  46
  47
  
    
$DATE_FORMATS['d-m-Y']      = gmdate('d-m-Y', $actual_time).' (D-M-Y)';


  		




  47
  48
  
    
$DATE_FORMATS['m-d-Y']      = gmdate('m-d-Y', $actual_time).' (M-D-Y)';


  		




  48
  49
  
    
$DATE_FORMATS['d.m.Y'] = gmdate('d.m.Y', $actual_time).' (D.M.Y)';


  		












  

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





  132
  132
  
    
        $oTpl->set_block('main_block', 'show_confirmed_activation_block', 'show_confirmed_activation');


  		




  133
  133
  
    
        if($admin->ami_group_member('1')) {


  		




  134
  134
  
    
                $oTpl->set_block('show_confirmed_activation_block', 'list_confirmed_activation_block', 'list_confirmed_activation');


  		




  135
  
  
    
            	$oTpl->set_var('DISPLAY_WAITING_ACTIVATION', 'Users awaiting for activation');


  		




  
  135
  
    
            	$oTpl->set_var('DISPLAY_WAITING_ACTIVATION', 'Users awaiting activation');


  		




  136
  136
  
    
        		$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'users` ';


  		




  137
  137
  
    
        		$sql .= 'WHERE `confirm_timeout` != 0 ';


  		




  138
  138
  
    
                $sql .=   'AND `active` = 0 ';


  		












  

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





  29
  29
  
    
	$database = WbDatabase::getInstance();


  		




  30
  30
  
    
    $aUserID = array();


  		




  31
  31
  
    
    $bRetVal = false;


  		




  32
  
  
    
    if(isset($aActionRequest['user_id']) && !is_array($aActionRequest['user_id'])) {


  		




  33
  
  
    
        $aUserID[] = $aActionRequest['user_id'];


  		




  
  32
  
    
    if(isset($aActionRequest['activation_user_id'])) {


  		




  
  33
  
    
		if(!is_array($aActionRequest['activation_user_id'])) {


  		




  
  34
  
    
	


  		




  
  35
  
    
	        $aUserID[] = $aActionRequest['activation_user_id'];


  		




  
  36
  
    
	    } else {


  		




  
  37
  
    
	        $aUserID = $aActionRequest['activation_user_id'];


  		




  
  38
  
    
	    }


  		




  34
  39
  
    
    } else {


  		




  35
  
  
    
        $aUserID = $aActionRequest['user_id'];


  		




  36
  
  
    
    }


  		




  
  40
  
    
	    if(isset($aActionRequest['user_id'])) {


  		




  
  41
  
    
			if(!is_array($aActionRequest['user_id'])) {


  		




  
  42
  
    
		


  		




  
  43
  
    
		        $aUserID[] = $aActionRequest['user_id'];


  		




  
  44
  
    
		    } else {


  		




  
  45
  
    
		        $aUserID = $aActionRequest['user_id'];


  		




  
  46
  
    
		    }


  		




  
  47
  
    
	    } 


  		




  
  48
  
    
    } 


  		




  37
  49
  
    

  		




  38
  50
  
    
    foreach ( $aUserID AS $key => $value)


  		




  39
  51
  
    
    {


  		












  

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





  51
  51
  
    

  		




  52
  52
  
    
		switch($action) :


  		




  53
  53
  
    
			case 'delete': // delete the user


  		




  
  54
  
    
			case 'delete_outdated': // delete Users awaiting activation


  		




  54
  55
  
    
    			$admin = new admin('Access', 'users_delete',false);


  		




  55
  
  
    

  		




  56
  56
  
    
				include($sAdminPath.'/delete.php');


  		




  57
  57
  
    
    			$output = delete_user($admin,$aActionRequest);


  		




  58
  58
  
    

  		




  59
  59
  
    
        		if( ($msg = msgQueue::getError()) != '')


  		




  60
  60
  
    
        		{


  		




  61
  61
  
    
        		}


  		




  62
  
  
    

  		




  63
  62
  
    
                $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php';


  		




  64
  63
  
    
				$admin = new admin('Access', 'users');


  		




  65
  64
  
    
				include($sAdminPath.'/user_list.php');


  		












  

    
      branches/2.8.x/wb/account/htt/success.htt
    
  





  1
  1
  
    
<!-- BEGIN main_block -->


  		




  2
  
  
    
<div class="msg-box note center">


  		




  
  2
  
    
<div class="msg-box center">


  		




  3
  3
  
    
<!-- BEGIN show_registration_block -->


  		




  4
  4
  
    
	<p>{MESSAGE_VALUE}</p>


  		




  5
  5
  
    
<!-- END show_registration_block -->


  		




  6
  
  
    
	<p>{MESSAGE}</p>


  		




  
  6
  
    
	<p class="note">{MESSAGE}</p>


  		




  7
  7
  
    
<input type="button" name="submit" value="{BACK}" onclick="javascript:window.location='{HTTP_REFERER}';" style="padding: 0 3px;" />


  		




  8
  8
  
    
</div>


  		




  9
  9
  
    
<!-- END main_block -->


  		












  

    
      branches/2.8.x/wb/install/save.php
    
  





  371
  371
  
    
	." (11, 'app_name', 'wb_$session_rand'),"


  		




  372
  372
  
    
	." (12, 'sec_anchor', 'section_'),"


  		




  373
  373
  
    
	." (13, 'default_timezone', '$default_timezone'),"


  		




  374
  
  
    
	." (14, 'default_date_format', 'M d Y'),"


  		




  
  374
  
    
	." (14, 'default_date_format', 'Y-m-d'),"


  		




  375
  375
  
    
	." (15, 'default_time_format', 'h:i A'),"


  		




  376
  376
  
    
	." (16, 'redirect_timer', '1500'),"


  		




  377
  377
  
    
	." (17, 'home_folders', 'true'),"


  		












Also available in:  Unified diff