Changeset 1589766

Timestamp:

02/06/2017 09:03:04 AM (9 years ago)

Author:

zartis

Message:

Stopped empty h3 group name appearing if there are empty

Location:

zartis-job-plugin

Files:

• tags/2.3.3 (added)
• tags/2.3.3/Zartis_Job_Landing.php (added)
• tags/2.3.3/Zartis_Job_Plugin.php (added)
• tags/2.3.3/Zartis_Job_Token.php (added)
• tags/2.3.3/css (added)
• tags/2.3.3/css/hirehive-widget-styles.css (added)
• tags/2.3.3/css/zartis_wp.css (added)
• tags/2.3.3/images (added)
• tags/2.3.3/images/arrow_right_alt1_24x24.png (added)
• tags/2.3.3/images/check_12x10.png (added)
• tags/2.3.3/images/check_alt_16x16.png (added)
• tags/2.3.3/js (added)
• tags/2.3.3/js/jquery-1.6.4.min.js (added)
• tags/2.3.3/js/zartis_functions.js (added)
• tags/2.3.3/js/zartis_functions.min.js (added)
• tags/2.3.3/readme.txt (added)
• tags/2.3.3/screenshot-1.png (added)
• trunk/Zartis_Job_Plugin.php (modified) (13 diffs)
• trunk/readme.txt (modified) (2 diffs)

zartis-job-plugin/trunk/Zartis_Job_Plugin.php

@@ -4 +4 @@
 Plugin URI: http://hirehive.io
 Description: (Formerly Zartis ATS) Easily add your own secure jobs and careers page to your WordPress site. Includes full access to professional candidate management and posting to twitter, facebook and free job aggregation sites.
-Version: 2.3.2
+Version: 2.3.3
 Author: HireHive
 Author URI: http://hirehive.io
@@ -34 +34 @@
     if (!defined('Zartis_Url'))
         define('Zartis_Url', WP_PLUGIN_URL . '/' . HireHive_Folder);
-
+    
     // Add jquery core and our css styles
     if (is_admin()) {
@@ -40 +40 @@
         wp_enqueue_style('zartis_wp', Zartis_Url . '/css/zartis_wp.css');
         wp_enqueue_script('zartis_functions', Zartis_Url . '/js/zartis_functions.js');
-
+        
         // The styles for the widget
         wp_enqueue_style('hirehive_wp_widget', Zartis_Url . '/css/hirehive-widget-styles.css');
@@ -83 +83 @@
     global $wpdb;
     $zartis_page_ID = get_option('Zartis_Page_ID');
-
+    
     // Clean up DB fields
     HireHive_CleanUp_DB();
-
+    
     //  the id of our page...
     $page_ID = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE ID = '" . $zartis_page_ID . "'");
@@ -114 +114 @@
     add_action('admin_menu', 'Add_HireHive_Admin_Menu');
     $Zartis_Notice = get_option('Zartis_Notice');
-
+    
     //checks if this is an activation and then displays the zartis message
     if ($Zartis_Notice == "False") {
@@ -133 +133 @@
 function Display_HireHive_Widget( $atts ) {
     $category = '';
-
+    
     if( isset( $atts['category'] ) && $atts['category']) {
         $category = $atts['category'];
     }
-
+    
     $Company_Zartis_ID = get_option('Zartis_Unique_ID');
-
+    
     $Zartis_Group = get_option('Zartis_Group');
-
+    
     if ($Zartis_Group == null){
         $Zartis_Group = 1;
     }
-
+    
     if ($Company_Zartis_ID != "False") {
         try {
-
+            
             if ($category !=null){
                 $url = 'https://my.hirehive.io/api/v2/public/search?cname='.$Company_Zartis_ID.'&groupBy='.$Zartis_Group.'&category='.$category;
@@ -155 +155 @@
                 $url = 'https://my.hirehive.io/api/v2/public/search?cname='.$Company_Zartis_ID.'&groupBy='.$Zartis_Group;
             }
-
+            
             $jsondata = file_get_contents($url);
-
+            
             if (strlen($jsondata) == 0){
                 throw new Exception('file_get_contents returned nothing');
             }
-
+            
             $groups = json_decode($jsondata, true);
-
+            
             if (strlen($groups) == 0){
                 throw new Exception('json_decode returned nothing');
             }
-
+            
             $decodeError = '';
             switch (json_last_error()) {
-
+                
                 case JSON_ERROR_NONE:
                     break;
@@ -192 +192 @@
                     break;
         }
-
+        
         if (strlen($decodeError) > 0) {
             $emailBody = "JSON Decode failed: " .$Company_Zartis_ID;
@@ -201 +201 @@
             $emailBody .= '<br><br>';
             $emailBody .= '<pre>' .print_r($decodeError, 1). '</pre>';
-
+            
             $headers = 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
-
+            
             error_log($emailBody, 1, '[email protected]', $headers);
-
+            
             throw new Exception('JSON version failed, fallback to JS widget');
         }
-
+        
         $jobTemplate = '<a class="hh-list-row" href="{{Link}}"><span class="hh-list-title">{{Title}}</span> <span class="hh-list-location">{{Location}}, {{Country}}</span> <span class="hh-list-type">{{Type}}</span></a>';
-
+        
         $jobsHTML = "<div id='jobs_iframe' class='hh-list'>";
         $jobsHTML .= '<!-- Jobs for - ' .$Company_Zartis_ID. ' -->';
-        $jobsHTML .= '<!-- Chosen group - ' .$Zartis_Group. ' -->';
+            $jobsHTML .= '<!-- Chosen group - ' .$Zartis_Group. ' -->';
         $jobsHTML .= '<!-- Category - ' .$category. ' -->';
-
+        
         foreach ($groups as $group) {
             if ($Zartis_Group > 1){
-                $jobsHTML .= '<h3 class="hh-list-cat">'.$group["name"].'</h3>';
-            }
-
+                if (strlen($group["name"]) > 0){
+                    $jobsHTML .= '<h3 class="hh-list-cat">'.$group["name"].'</h3>';
+                }
+            }
+            
             if ($category !=null){
                 $jobsHTML .= Compile_Job_Template($jobTemplate, $group);
@@ -230 +232 @@
             }
         }
-
+        
         $jobsHTML .= "</div>";
-
+        
         return $jobsHTML;
     }
@@ -238 +240 @@
         // If we have an exception using the API to get the jobs then we fallback to the old JS Version
         $script = '<script type="text/javascript"src="https://my.hirehive.io/' . $Company_Zartis_ID . '/getwidget"></script><script type="text/javascript"charset="utf-8">function getParam(name){name=name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");var regexS="[\\?&]"+name+"=([^&#]*)";var regex=new RegExp(regexS);var results=regex.exec(window.location.href);if(results==null)return"";else return results[1];}function updateIFrame(height){var iframe=document.getElementById("jobs_iframe");iframe.setAttribute("height",height);}var height=getParam("height");if(height==""){var zartis_options={};zartis_options.display="iframe";zartis_options.company="' . $Company_Zartis_ID . '";zartis_options.placement="left";zartis_options.type="widget";zartis_options.color="#222";zartis_options.width="' . $Zartis_Width . '%";zartis_options.style="idea";zartis_options.url=document.URL;var zartis_widget=new ZARTIS.jobs_widget(zartis_options);}else{window.top.updateIFrame(height);}</script>';
-
+        
         $script .= '<!-- Jobs for - ' .$Company_Zartis_ID. ' -->';
-        $script .= '<!-- Chosen group - ' .$Zartis_Group. ' -->';
+            $script .= '<!-- Chosen group - ' .$Zartis_Group. ' -->';
         $script .= '<!-- Category - ' .$category. ' -->';
         $script .= '<!--' .$e.message. '-->';
-
+        
         return $script;
     }
-
+    
 } else {
     return false;
@@ -253 +255 @@
 
 function Compile_Job_Template($template, &$job){
-
+    
     $template = str_replace("{{Title}}",$job["title"],$template);
     $template = str_replace("{{Link}}",$job["jobUrl"],$template);
@@ -259 +261 @@
     $template = str_replace("{{Country}}",$job["countryName"],$template);
     $template = str_replace("{{Type}}",$job["type"],$template);
-
+    
     return $template;
 }

zartis-job-plugin/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.9
 Tested up to: 4.7.2
-Stable tag: 2.3.2
+Stable tag: 2.3.3
 
 Easily add job listings and secure candidate management to your Wordpress site.
@@ -105 +105 @@
 = 2.3.2
 * Added a fallback for file_get_contents not working
+
+= 2.3.3
+* Check if group name is not empty before adding the h3 tag