Merge pull request #181 from gigya/develop

6.5.0

Author: Ynhockey

GigyaAction.php

@@ -104,13 +104,16 @@ public function init()
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaUserFactory.php';
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaProfile.php';
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaUser.php';
-		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaApiRequest.php';
-		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaAuthRequest.php';
-		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GSApiException.php';
-		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GSFactory.php';
 		require_once GIGYA__PLUGIN_DIR . 'features/GigyaLogger.php';
 
-		GSResponse::init();
+		if ( class_exists( 'Gigya\\PHP\\GSRequest' ) ) {
+			require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaApiRequest.php';
+			require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaAuthRequest.php';
+			require_once GIGYA__PLUGIN_DIR . 'cms_kit/GSApiException.php';
+			require_once GIGYA__PLUGIN_DIR . 'cms_kit/GSFactory.php';
+
+			GSResponse::init();
+		}
 
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaApiHelper.php';
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaCMS.php';
@@ -167,7 +170,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'] ) );
+		wp_localize_script( 'gigya_js', 'gigyaGlobalSettings', [ 'logLevel' => GIGYA__LOG_LEVEL ] );
 
 		/* Checking that we have an API key and Gigya's plugin is turned on */
 		$api_key = GIGYA__API_KEY;

admin/admin.GigyaSettings.php

@@ -81,13 +81,14 @@ public function adminMenu() {
 
 			// Register the sub-menus Gigya setting pages.
 			foreach ( $this->getSections() as $section ) {
-
 				require_once GIGYA__PLUGIN_DIR . 'admin/forms/' . $section['func'] . '.php';
-				add_submenu_page( 'gigya_global_settings', __( $section['title'], $section['title'] ), __( $section['title'], $section['title'] ), GIGYA__PERMISSION_LEVEL, $section['slug'], array(
-					$this,
-					'adminPage'
-				) );
-
+				add_submenu_page( 'gigya_global_settings',
+					__( $section['title'], $section['title'] ),
+					__( $section['title'], $section['title'] ),
+					GIGYA__PERMISSION_LEVEL, $section['slug'], [
+						$this,
+						'adminPage',
+					] );
 			}
 		} elseif ( current_user_can( CUSTOM_GIGYA_EDIT ) ) {
 			// Register the main Gigya setting route page.
@@ -100,11 +101,14 @@ public function adminMenu() {
 			foreach ( $this->getSections() as $section ) {
 
 				require_once GIGYA__PLUGIN_DIR . 'admin/forms/' . $section['func'] . '.php';
-				add_submenu_page( 'gigya_global_settings', __( $section['title'], $section['title'] ), __( $section['title'], $section['title'] ), CUSTOM_GIGYA_EDIT, $section['slug'], array(
-					$this,
-					'adminPage'
-				) );
-
+				add_submenu_page( 'gigya_global_settings',
+					__( $section['title'], $section['title'] ),
+					__( $section['title'], $section['title'] ),
+					CUSTOM_GIGYA_EDIT,
+					$section['slug'], [
+						$this,
+						'adminPage',
+					] );
 			}
 		}
 	}
@@ -156,10 +160,16 @@ public static function adminPage() {
 		$page   = $_GET['page'];
 		$render = '';
 
+		$are_dependencies_installed = class_exists('Gigya\\PHP\\GSRequest');
+		$dependencies_missing_message = __('Fatal error: SAP Customer Data Cloud PHP SDK has not been installed. The plugin will not work. Please install Composer dependencies before proceeding.');
+
 		echo _gigya_render_tpl( 'admin/tpl/adminPage-wrapper.tpl.php', array(
 			'sections' => self::getSections(),
 			'page'     => $page,
 		) );
+		if (!$are_dependencies_installed) {
+			add_settings_error($page, 'dependencies-not-installed-error', $dependencies_missing_message, 'error');
+		}
 		settings_errors();
 
 		echo '<form class="gigya-settings" action="options.php" method="post">' . PHP_EOL;
@@ -168,8 +178,13 @@ public static function adminPage() {
 		wp_nonce_field( 'update-options', 'update_options_nonce' );
 		wp_nonce_field( 'wp_rest', 'wp_rest_nonce' );
 		settings_fields( $page . '-group' );
-		do_settings_sections( $page );
-		submit_button();
+
+		if ($are_dependencies_installed) {
+			do_settings_sections( $page );
+			submit_button();
+		} else {
+			echo '<h4>' . $dependencies_missing_message . '</h4>';
+		}
 
 		echo '</form>';
 

admin/forms/globalSettingsForm.php

@@ -166,16 +166,16 @@ function globalSettingsForm() {
 		'label'   => __( 'Log Level' ),
 	);
 
-	$file_size   = filesize( GIGYA__LOG_FILE );
 	$end_of_desc = '';
-	if ( $file_size !== false ) {
+	if ( file_exists( GIGYA__LOG_FILE ) and ( $file_size = filesize( GIGYA__LOG_FILE ) ) !== false ) {
 		if ( $file_size < 1024 * 1024 ) {
 			$file_size = round( $file_size / 1024, 1 ) . __( ' KB.' );
 		} else {
 			$file_size = round( $file_size / ( 1024 * 1024 ), 1 ) . __( ' MB.' );
 
 		}
-		$end_of_desc = '<br>' . __( 'The path to the file: ' ) . '<a class="gigya-debug-log" href="#">' . GIGYA__LOG_FILE . '</a>' . ( ( $file_size !== false ) ? ( __( ' and the size is: ' ) . $file_size ) : '' );
+		$end_of_desc = '<br>' . __( 'The path to the file: ' ) . '<a class="gigya-debug-log" href="#">' . GIGYA__LOG_FILE . '</a>' . ( ( $file_size !== false )
+				? ( __( ' and the size is: ' ) . $file_size ) : '' );
 	}
 
 	//$end_of_desc        .= '<br>' . __( 'for more information click ' ) . '<a href="">here.</a>'; un comment when there is a new documentation link for this feature.

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "gigya/wordpress",
+  "name": "gigya/gigya-wordpress",
   "description": "Integrate your WordPress site with SAP Customer Data Cloud",
   "type": "wordpress-plugin",
   "license": "Apache 2.0",

gigya.php

@@ -3,7 +3,7 @@
  * Plugin Name: SAP Customer Data Cloud
  * Plugin URI: https://www.sap.com/products/crm/customer-data-management.html
  * Description: Allows sites to utilize the SAP Customer Data Cloud API for authentication and social network updates.
- * Version: 6.4.0
+ * Version: 6.5.0
  * Author: SAP SE
  * Author URI: https://www.sap.com/products/crm/customer-data-management.html
  * License: Apache v2.0
@@ -20,7 +20,7 @@
  */
 define( 'GIGYA__MINIMUM_WP_VERSION', '4.7' );
 define( 'GIGYA__MINIMUM_PHP_VERSION', '7.0' );
-define( 'GIGYA__VERSION', '6.4.0' );
+define( 'GIGYA__VERSION', '6.5.0' );
 define( 'GIGYA__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'GIGYA__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'GIGYA__LOG_FILE', GIGYA__PLUGIN_DIR . 'log/sap_cdc.log' );
@@ -53,7 +53,7 @@
 define( 'GIGYA__OFFLINE_SYNC_MAX_USERS', 1000 );
 define( 'GIGYA__OFFLINE_SYNC_UPDATE_DELAY', 10 );
 
-/**  get out of sync users */
+/** Get out of sync user constants */
 define( 'GIGYA__ACCOUNT_SEARCH_NUMBER_OF_PAGES', 5 );
 define( 'GIGYA__SYNC_REPORT_MAX_PAGE_SIZE', 2000 );
 define( 'GIGYA__SEARCH_MAX_QUERY_LENGTH', 30000 );//This number was tested.

readme.txt

@@ -3,8 +3,8 @@
 Contributors: SAP SE/gigya.com konforti, luciodiri, ynhockey, shaharzillber.
 Tags: CIAM, CIM, Registration, Social Login, Oauth, OpenSocial, Graph API, Facebook Connect, Linkedin, Twitter, authentication, OpenID,  newsfeed, tweet, status update, registration, social APIs, sharing, plugin, social bookmark, social network, Facebook, community, comments, reactions, game mechanics, register, SAP Customer Data Cloud, Social Infrastructure, feed
 Requires at least: 4.2
-Tested up to: 4.9
-Stable tag: 6.4.0
+Tested up to: 5.8
+Stable tag: 6.5.0
 License: Apache v2.0
 
 Integrate your WordPress site with SAP Customer Data Cloud.
@@ -221,6 +221,10 @@ For question about installations or configuration, please contact your account m
 = 6.4.0 =
 * It is now possible to control internal SAP CDC plugin logging, regardless of the debug level set in WordPress. Logs are written to a separate internal log file.
 
+= 6.5.0 =
+* Changed package name to gigya/gigya-wordpress (!) for more practical automated installation
+* Graceful failure when Composer dependencies have not been installed
+
 == FAQ ==
 
 Can I configure the design of the SAP Customer Data Cloud component?