Changeset 2319500

Timestamp:

06/06/2020 02:24:05 PM (6 years ago)

Author:

mikepsinn

Message:

Deploy to WordPress.org via Jenkins

Location:

quantimodo/trunk

Files:

• includes/admin.php (modified) (2 diffs)
• includes/core.php (modified) (2 diffs)
• includes/embed.php (modified) (3 diffs)
• includes/menus.php (modified) (2 diffs)
• package-lock.json (modified) (1 diff)

quantimodo/trunk/includes/admin.php

@@ -1 +1 @@
 <?php
-
+/**
+ * @return string
+ */
+function quantimodo_get_client_secret_instructions(){
+    return 'Get your client secret from the
+    <a href="https://builder.quantimo.do" target="_blank" title="Open QuantiModo app builder">QuantiModo app builder</a>
+    by clicking SETTINGS -> OAUTH.';
+}
 // Output the options page
 function quantimodo_options_page()
@@ -85 +92 @@
             </tr>
             </table>
-            Get your client secret from the
-            <a href="https://builder.quantimo.do" target="_blank" title="Open QuantiModo app builder">QuantiModo app builder</a>
-            by clicking SETTINGS -> OAUTH.
+            <?php echo quantimodo_get_client_secret_instructions(); ?>
             <?php if ( ! esc_attr( $options['quantimodo_widget_code'] ) ) { ?>
                 <h3>You can find your QuantiModo client id after

quantimodo/trunk/includes/core.php

@@ -27 +27 @@
     // Get options
     $options = get_option('QuantiModo_settings');
-
     // Check to see if QuantiModo is enabled
     $quantimodo_activated = false;
@@ -45 +44 @@
     function send_push_notification( $message ) {
         $apiUrl = "https://app.quantimo.do/api/v1/messages";
-        if(stripos(WP_SITEURL, 'local.quantimo.do') !== false){
-            $apiUrl = "https://local.quantimo.do/api/v1/messages";
-        }
+        if(stripos(WP_SITEURL, 'local.quantimo.do') !== false){$apiUrl = "https://local.quantimo.do/api/v1/messages";}
         $response = wp_remote_post($apiUrl, ['body' => json_encode(['message' => $message])]);
         return $response;
     }
     add_action('messages_message_after_save', 'send_push_notification', 1, 1);
-
     function annointed_admin_bar_remove() {
         global $wp_admin_bar;
-        $wp_admin_bar->remove_menu('wp-logo');
+        if($wp_admin_bar && method_exists($wp_admin_bar, 'remove_menu')){$wp_admin_bar->remove_menu('wp-logo');}
     }
-    add_action('wp_before_admin_bar_render', 'annointed_admin_bar_remove', 0);
-
-    //Hide admin footer from admin
-    function change_footer_admin () {return ' ';}
-    add_filter('admin_footer_text', 'change_footer_admin', 9999);
+    add_action('wp_before_admin_bar_render', 'annointed_admin_bar_remove', 0); // Only done if stripos(WP_SITEURL, '.quantimo.do') !== false
+    function change_footer_admin () {return ' ';} //Hide admin footer from admin
+    add_filter('admin_footer_text', 'change_footer_admin', 9999); // Only done if stripos(WP_SITEURL, '.quantimo.do') !== false
     function change_footer_version() {return ' ';}
-    add_filter( 'update_footer', 'change_footer_version', 9999);
+    add_filter( 'update_footer', 'change_footer_version', 9999); // Only done if stripos(WP_SITEURL, '.quantimo.do') !== false
+    function qm_development_testing_login(){
+        $origin = 'https://' . $_SERVER['HTTP_HOST'];
+        if(!in_array($origin, [
+            "https://staging-wp.quantimo.do",
+            "https://dev-wp.quantimo.do"
+        ])){return;}
+        if(!isset($_GET['log']) || !isset($_GET['pwd'])){return;}
+        add_action('init', function() {
+            $origin =  'https://' . $_SERVER['HTTP_HOST'];
+            $currentUrl = $origin . $_SERVER["REQUEST_URI"];
+            $loginUrl = wp_login_url();
+            $user = get_user_by('login', $_GET['log']);
+            $redirect_to = admin_url();
+            if($currentUrl !== $loginUrl){$redirect_to = explode("?", $currentUrl)[0];}
+            if($user && wp_check_password($_GET['pwd'], $user->data->user_pass, $user->ID)){
+                wp_set_current_user($user->ID, $user->user_login);
+                wp_set_auth_cookie($user->ID, true);
+                do_action('wp_login', $user->user_login);
+                wp_redirect($redirect_to);
+                exit;
+            }
+            wp_redirect(home_url());
+            exit;
+        });
+    }
+    qm_development_testing_login();
 }

quantimodo/trunk/includes/embed.php

@@ -1 +1 @@
 <?php
+/**
+ * @param $message
+ */
+function qm_error($message){
+    $pluginLog = plugin_dir_path(__FILE__).'debug.log';
+    error_log($message.PHP_EOL, 3, $pluginLog);
+}
 // Add the QuantiModo Javascript
 add_action('wp_head', 'add_quantimodo');
@@ -13 +20 @@
   if ( esc_attr( $options['quantimodo_enabled'] ) == "on" ){
     $qmClientId = $options['quantimodo_widget_code'];
-    $qmClientSecret = $options['quantimodo_client_secret'];
+    $qmClientSecret = isset($options['quantimodo_client_secret']) ? $options['quantimodo_client_secret'] : null;
     $apiHostName = "https://app.quantimo.do";
-    $env = $_SERVER["HTTP_REFERER"] ?? getenv('APP_HOST_NAME');
+    $env = (isset($_SERVER["HTTP_REFERER"])) ? $_SERVER["HTTP_REFERER"] : getenv('APP_HOST_NAME');
     if(!$env){$env = "https://".$_SERVER["HTTP_HOST"];}
     if(stripos($env, "https://utopia.quantimo.do") === 0 || stripos($env, "https://local.quantimo.do") === 0){
@@ -33 +40 @@
                 'body' => ['clientUser' => $wpUser->data]
             ];
-            $url = $apiHostName.'/api/v1/user?qmClientId='.$qmClientId.
-                '&clientSecret='.$qmClientSecret.'&clientUserId='.$wpUserId;
+            $url = $apiHostName.'/api/v1/user?qmClientId='.$qmClientId.'&clientUserId='.$wpUserId;
+            if($qmClientSecret){
+                $url .= '&clientSecret='.$qmClientSecret;
+            }else {
+//                add_settings_error('no_quantimodo_client_secret', 'no_quantimodo_client_secret',
+//                    quantimodo_get_client_secret_instructions(), 'error');
+                qm_error('Cannot get quantimodo user because no_quantimodo_client_secret! '.quantimodo_get_client_secret_instructions());
+                return;
+            }
             $response = wp_remote_post( $url, $args );
+            if(!$response instanceof WP_Error){
+//                add_settings_error('get_quantimodo_user_failed', 'get_quantimodo_user_failed',
+//                    $response->get_error_message(), 'error');
+                qm_error($response->get_error_message());
+                return;
+            }
             $body = json_decode($response['body'], false);
             if(isset($body->user)){

quantimodo/trunk/includes/menus.php

@@ -11 +11 @@
 {
   global $wp_version;
-  global $wp_admin_bar;
+    global /** @var WP_Admin_Bar $wp_admin_bar */
+    $wp_admin_bar;
 
   $quantimodo_icon = '<img src="' . QUANTIMODO_4f050d29b8BB9_PATH . '/assets-wp-repo/quantimodo-icon-16x16-white.png' . '">';
@@ -26 +27 @@
 }
 
-// Hook in the options page functionå
+// Hook in the options page
 function add_quantimodo_option_page()
 {

quantimodo/trunk/package-lock.json

@@ -7 +7 @@
     "wp-shuttle": {
       "version": "github:wpsh/wpsh#45b647c6354d8102aa0ef319ed96aaec4e9d5959",
+      "from": "github:wpsh/wpsh",
       "dev": true
     }