* fixing screen-set widget issue.

* small changes at the gigya_raas.js file according to the log level.

Author: shaharzillber

GigyaAction.php

@@ -133,7 +133,6 @@ public function init()
 			'lang'                        => _gigParam( $this->global_options, 'lang', 'en' ),
 			'sessionExpiration'           => $session_expirations['sessionExpiration'],
 			'rememberSessionExpiration'   => $session_expirations['rememberSessionExpiration'],
-			'logLevel'                    => $this->global_options['log_level'],
 		);
 
 		/* Plugins shortcode activation switches */
@@ -168,6 +167,7 @@ public function init()
 
 		/* Load params to be available to client-side script */
 		wp_localize_script( 'gigya_js', 'gigyaParams', $params );
+		wp_localize_script( 'gigya_js', 'gigyaGlobalSettings', array( 'logLevel' => $this->global_options['log_level'] ) );
 
 		/* Checking that we have an API key and Gigya's plugin is turned on */
 		$api_key = GIGYA__API_KEY;

features/raas/GigyaScreenSetWidget.php

@@ -55,12 +55,15 @@ public function widget( $args, $instance ) {
 
 			echo '</div>';
 
-			$screen_set_setting = get_option( GIGYA__SETTINGS_SCREENSETS );
-			$custom_screen_sets = array();
-			if ( array_key_exists( 'custom_screen_sets', $screen_set_setting ) ) {
-				$this->logger->error( 'Screen-Set widget error: The custom screen-set table is empty, Add the screen to "custom screen set" at "Screen-Sets" setting page.' );
-				$custom_screen_sets = $screen_set_setting['custom_screen_sets'];
+			$screen_set_settings = get_option( GIGYA__SETTINGS_SCREENSETS );
+			$custom_screen_sets  = array();
+			if ( array_key_exists( 'custom_screen_sets', $screen_set_settings ) ) {
+				$custom_screen_sets = $screen_set_settings['custom_screen_sets'];
 			}
+			if ( empty( $custom_screen_sets ) ) {
+				$this->logger->debug( 'Screen-set widget error: The custom screen-set table is empty, please add the custom screen-set used in widget ' . $args['widget_id'] . ' to the "Screen-Sets" settings page. ' );
+			}
+
 			foreach ( $custom_screen_sets as $screen_set ) {
 				if ( ( ! empty( $screen_set['id'] ) ) && ( $screen_set['id'] == $instance['screenset_id'] ) ) {
 					$instance['screenset_id']        = $screen_set['desktop'];
@@ -83,9 +86,13 @@ public function form( $instance ) {
 		$select_error                  = array();
 		$screen_sets_list              = array();
 		$selected_screen_set_id        = esc_attr( _gigParam( $instance, 'screenset_id', '' ) );
-		$custom_screen_sets            = get_option( GIGYA__SETTINGS_SCREENSETS )['custom_screen_sets'];
+		$screen_set_option             = get_option( GIGYA__SETTINGS_SCREENSETS );
 		$select_attrs['data-required'] = 'empty-selection';
-
+		if ( array_key_exists( 'custom_screen_sets', $screen_set_option ) ) {
+			$custom_screen_sets = $screen_set_option['custom_screen_sets'];
+		} else {
+			$custom_screen_sets = '';
+		}
 		if ( ! empty( $custom_screen_sets ) ) {
 			foreach ( $custom_screen_sets as $screen_set ) {
 				if ( empty( $screen_set['desktop'] ) ) {
@@ -122,6 +129,7 @@ public function form( $instance ) {
 						'attrs' => array( 'class' => 'invalid-gigya-screen-Set-option', 'selected' => 'true' )
 					)
 				);
+				$this->logger->error( $form_error['error_message'] );
 				echo _gigya_render_tpl( 'admin/tpl/error-message.tpl.php', $form_error );
 			}
 		} else {
@@ -182,7 +190,7 @@ public function form( $instance ) {
 	 */
 	public function update( $input_values, $db_values ) {
 
-		$valid  = true;
+		$valid = true;
 
 		$instance = array();
 		if ( ! empty( $input_values ) and ! empty( $db_values ) ) {

features/raas/gigya_raas.js

@@ -16,7 +16,6 @@
 		/**
 		 * @class    gigyaParams
 		 * @property    {String}  ajaxurl
-		 * @property {string} logLevel
 		 */
 		/**
 		 * @class    gigyaRaasParams
@@ -34,6 +33,11 @@
 		 * @property    raasWebScreen
 		 * @property    raasLang
 		 */
+		/**
+		 * @class gigyaGlobalSettings
+		 * @property {string} logLevel
+
+		 */
 
 		var raasLogout = function () {
 			gigya.accounts.logout({
@@ -117,7 +121,7 @@
 		 * @param eventObj.errorMessage
 		 */
 		var onScreenSetErrorHandler = function (eventObj) {
-			if (gigyaParams.logLevel === 'debug') {
+			if (gigyaGlobalSettings.logLevel === 'debug') {
 				console.log('Error when loading SAP Customer Data Cloud screenset: ');
 				console.log(eventObj.errorCode + " – " + eventObj.errorMessage);
 			}