tags

composer.json

@@ -15,8 +15,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "dioscouri/f3-lib": "dev-master",
-        "dioscouri/f3-admin": "dev-master"
+        "dioscouri/f3-lib": ">=v0.8",
+        "dioscouri/f3-admin": ">=v0.8"
     },
     "autoload": {
         "psr-0": {

src/Users/Admin/Views/groups/checkboxes.php

@@ -1,7 +1,7 @@
 <?php if (!empty($groups)) { ?>
 
 <div class="max-height-200 list-group-item">
-	<?php $current = \Joomla\Utilities\ArrayHelper::getColumn( (array) $flash->old('groups'), 'id' ); ?>
+	<?php $current = \DscArrayHelper::getColumn( (array) $flash->old('groups'), 'id' ); ?>
     <?php foreach ($groups as $one) { ?>
     <div class="checkbox">
         <label>

src/Users/Admin/Views/users/list.php

@@ -239,7 +239,7 @@
                         <?php if ($item->groups) { ?>
                         <div class="">
                             <label>Groups:</label> 
-                            <span class='label label-default'><?php echo implode("</span> <span class='label label-default'>", \Joomla\Utilities\ArrayHelper::getColumn( (array) $item->groups, 'title' ) ); ?></span>
+                            <span class='label label-default'><?php echo implode("</span> <span class='label label-default'>", \DscArrayHelper::getColumn( (array) $item->groups, 'title' ) ); ?></span>
                         </div>
                         <?php } ?>
 

src/Users/Lib/Auth.php

@@ -235,6 +235,8 @@ public function login( \Users\Models\Users $user , $level = 1)
     public function loginWithToken( $user_id, $token, $post_login_redirect = null )
     {
    		$user = (new \Users\Models\Users)->setState('filter.auto_login_token', $token)->setState('filter.id', $user_id)->getItem();
+
+
    		if (empty($user->id))
    		{
    		    // redirect to /sign-up with post-login-redirect
@@ -251,6 +253,7 @@ public function loginWithToken( $user_id, $token, $post_login_redirect = null )
 
    		if ( $token != $token_user ) 
    		{
+
    		    // redirect to /sign-up with post-login-redirect
    		    if( !empty( $post_login_redirect ) ) {
    		        \Dsc\System::instance()->get( 'session' )->set( 'site.login.redirect', $post_login_redirect );
@@ -269,6 +272,7 @@ public function loginWithToken( $user_id, $token, $post_login_redirect = null )
    				return;
    			}
    		}
+
 
    		$this->login( $user );
     }

src/Users/Models/Users.php

@@ -137,7 +137,7 @@ protected function fetchConditions()
         $filter_auto_login_token = $this->getState( 'filter.auto_login_token' );
         if (strlen($filter_auto_login_token))
         {
-        	$this->setCondition('auto_login.token', (string)$filter_auto_login_token );
+        	$this->setCondition('auto_login.token', (string) $filter_auto_login_token );
         }       
 
         $filter_admin_tags = (array) $this->getState('filter.admin_tags');