Merge pull request #52 from max-mi/master

Empty SSO Token Validate & Try to create log file if it does not exist

Author: Jason Smale

src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php

@@ -364,9 +364,14 @@ public function autocompleteAction()
     public function logAction()
     {
         $path = Mage::helper('zendesk/log')->getLogPath();
-        
+
         if(!file_exists($path)) {
-            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('The Zendesk log file has not been created. Check to see if logging has been enabled.'));
+            if (is_writable($path)) {
+                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Creating a Zendesk log file.'));
+                file_put_contents(" ",$path);
+            } else {
+                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Magento logging has been disabled or Magento log folder has incorrect permissions.'));
+            }
         }
 
         if(Mage::helper('zendesk/log')->isLogTooLarge()) {

src/app/code/community/Zendesk/Zendesk/etc/config.xml

@@ -115,6 +115,9 @@
                 <zendesk>
                     <file>zendesk.xml</file>
                 </zendesk>
+                <jstranslate>
+                    <file>jstranslate.xml</file>
+                </jstranslate>
             </updates>
         </layout>
         <translate>

src/app/code/community/Zendesk/Zendesk/etc/jstranslator.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<jstranslator>
+    <validate-zendesk-sso-token translate="message" module="zendesk">
+        <message>Token cannot be empty</message>
+    </validate-zendesk-sso-token>
+    <validate-zendesk-sso-frontend-token translate="message" module="zendesk">
+        <message>Token cannot be empty</message>
+    </validate-zendesk-sso-frontend-token>
+</jstranslator>

src/app/code/community/Zendesk/Zendesk/etc/system.xml

@@ -135,6 +135,7 @@
                             <label>Remote Authentication Token</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>2</sort_order>
+                            <validate>validate-zendesk-sso-token</validate>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
@@ -164,6 +165,7 @@
                             <label>Remote Authentication Token</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>2</sort_order>
+                            <validate>validate-zendesk-sso-frontend-token</validate>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>

src/app/design/adminhtml/default/default/layout/zendesk.xml

@@ -22,6 +22,12 @@
             <action method="addCss">
                 <stylesheet>zendesk/zendesk.css</stylesheet>
             </action>
+            <action method="addJs">
+                <script>zendesk/validation.js</script>
+            </action>
+        </reference>
+        <reference name="content">
+            <block type="core/template" template="zendesk/translations.phtml"></block>
         </reference>
     </adminhtml_system_config_edit>
 

src/app/design/adminhtml/default/default/template/zendesk/translations.phtml

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+?>
+<script>
+    Translator.add('Token cannot be empty', '<?php echo $this->__('Token cannot be empty'); ?>');
+</script>

src/app/locale/en_US/Zendesk_Zendesk.csv

@@ -109,3 +109,4 @@
 "Decide which features you would like turned on in your admin panel.","Decide which features you would like turned on in your admin panel."
 "Show "All" tab on dashboard","Show "All" tab on dashboard"
 "Generate New Token","Generate New Token"
+"Token cannot be empty","Token cannot be empty"

src/js/zendesk/validation.js

@@ -0,0 +1,16 @@
+Validation.addAllThese([
+    ['validate-zendesk-sso-token', 'Token cannot be empty', function (v) {
+        if ($('zendesk_sso_enabled').getValue() === '1') {
+            return !Validation.get('IsEmpty').test(v);
+        } else {
+            return true;
+        }
+    }],
+    ['validate-zendesk-sso-frontend-token', 'Token cannot be empty', function (v) {
+        if ($('zendesk_sso_frontend_enabled').getValue() === '1') {
+            return !Validation.get('IsEmpty').test(v);
+        } else {
+            return true;
+        }
+    }]
+]);