@@ -19,7 +19,6 @@ discard block |
||
19 | 19 | use Application\Controller\Traits\ControllerTranslatorTrait; |
20 | 20 | use Application\Controller\Traits\ControllerActiontitlesTrait; |
21 | 21 | use Application\Controller\Traits\ControllerToolbarTrait; |
22 | - |
|
23 | 22 | use Admin\Module as AdminModule; |
24 | 23 | use Admin\Form\RequestPasswordResetForm; |
25 | 24 | use Admin\Form\ResetPasswordForm; |
@@ -28,14 +27,11 @@ discard block |
||
28 | 27 | use Admin\Form\UserDataForm; |
29 | 28 | use Admin\Form\UserProfileForm; |
30 | 29 | use Admin\Model\UserProfile; |
31 | - |
|
32 | 30 | use Zend\Crypt\Password\Bcrypt; |
33 | 31 | use Zend\Stdlib\ResponseInterface as Response; |
34 | - |
|
35 | 32 | use Zend\View\Model\ViewModel; |
36 | 33 | use Zend\Mvc\MvcEvent; |
37 | 34 | use Zend\ServiceManager\ServiceLocatorInterface; |
38 | - |
|
39 | 35 | use ZfcUser\Controller\UserController; |
40 | 36 | use ZfcUser\Controller\Plugin\ZfcUserAuthentication; |
41 | 37 |
@@ -15,7 +15,6 @@ |
||
15 | 15 | |
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | -use Zend\Crypt\Password\Bcrypt; |
|
19 | 18 | use Zend\InputFilter\InputFilter; |
20 | 19 | use Zend\InputFilter\Factory as InputFactory; |
21 | 20 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -20,8 +20,6 @@ |
||
20 | 20 | use Zend\InputFilter\Factory as InputFactory; |
21 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
22 | 22 | use Zend\InputFilter\InputFilterInterface; |
23 | -use Zend\ServiceManager\ServiceLocator; |
|
24 | -use Zend\ServiceManager\ServiceLocatorInterface; |
|
25 | 23 | use Zend\ServiceManager\ServiceManager; |
26 | 24 | use Zend\ServiceManager\ServiceManagerInterface; |
27 | 25 | use Zend\ServiceManager\ServiceLocatorAwareInterface; |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -15,16 +15,10 @@ |
||
15 | 15 | |
16 | 16 | namespace UIComponents\View\Helper; |
17 | 17 | |
18 | -use RecursiveIteratorIterator; |
|
19 | -use Zend\EventManager\EventManager; |
|
20 | 18 | use Zend\EventManager\EventManagerAwareInterface; |
21 | -use Zend\EventManager\EventManagerInterface; |
|
22 | 19 | use Zend\I18n\Translator\TranslatorAwareInterface; |
23 | 20 | use Zend\Navigation\Page\AbstractPage; |
24 | -use Zend\Navigation\AbstractContainer; |
|
25 | -use Zend\Permissions\Acl; |
|
26 | 21 | use Zend\ServiceManager\ServiceLocatorAwareInterface; |
27 | -use Zend\ServiceManager\ServiceLocatorInterface; |
|
28 | 22 | use Zend\View; |
29 | 23 | use Zend\View\Exception; |
30 | 24 | use \UIComponents\Translator\TranslatorAwareInterfaceTrait; |
@@ -568,39 +568,39 @@ |
||
568 | 568 | $fields = trim($m[3]); |
569 | 569 | switch($action) |
570 | 570 | { |
571 | - case 'drop': |
|
572 | - if ($type=='primary') { |
|
573 | - $result.= 'DROP PRIMARY KEY'; |
|
574 | - } |
|
575 | - else |
|
576 | - { |
|
577 | - $result.= 'DROP INDEX `'.$name.'`'; |
|
578 | - } |
|
579 | - break; |
|
580 | - case 'add': |
|
581 | - if ($type=='primary') { |
|
582 | - $result.= 'ADD PRIMARY KEY '.$fields; |
|
583 | - } |
|
584 | - elseif ($type=='') { |
|
585 | - $result.= 'ADD INDEX `'.$name.'` '.$fields; |
|
586 | - } |
|
587 | - else |
|
588 | - { |
|
589 | - $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique |
|
590 | - } |
|
591 | - break; |
|
592 | - case 'modify': |
|
593 | - if ($type=='primary') { |
|
594 | - $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields; |
|
595 | - } |
|
596 | - elseif ($type=='') { |
|
597 | - $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields; |
|
598 | - } |
|
599 | - else |
|
600 | - { |
|
601 | - $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique |
|
602 | - } |
|
603 | - break; |
|
571 | + case 'drop': |
|
572 | + if ($type=='primary') { |
|
573 | + $result.= 'DROP PRIMARY KEY'; |
|
574 | + } |
|
575 | + else |
|
576 | + { |
|
577 | + $result.= 'DROP INDEX `'.$name.'`'; |
|
578 | + } |
|
579 | + break; |
|
580 | + case 'add': |
|
581 | + if ($type=='primary') { |
|
582 | + $result.= 'ADD PRIMARY KEY '.$fields; |
|
583 | + } |
|
584 | + elseif ($type=='') { |
|
585 | + $result.= 'ADD INDEX `'.$name.'` '.$fields; |
|
586 | + } |
|
587 | + else |
|
588 | + { |
|
589 | + $result .='ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique |
|
590 | + } |
|
591 | + break; |
|
592 | + case 'modify': |
|
593 | + if ($type=='primary') { |
|
594 | + $result.='DROP PRIMARY KEY, ADD PRIMARY KEY '.$fields; |
|
595 | + } |
|
596 | + elseif ($type=='') { |
|
597 | + $result.='DROP INDEX `'.$name.'`, ADD INDEX `'.$name.'` '.$fields; |
|
598 | + } |
|
599 | + else |
|
600 | + { |
|
601 | + $result.='DROP INDEX `'.$name.'`, ADD '.strtoupper($type).' `'.$name.'` '.$fields;//fulltext or unique |
|
602 | + } |
|
603 | + break; |
|
604 | 604 | |
605 | 605 | } |
606 | 606 | } |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |