fix select all and alert messages

Author: AlbinoGeek

index.php

@@ -3,16 +3,13 @@
     Plugin Name: Accelerator by Membucket.io
     Description: A plugin that improves the performance of WordPress
     Author: Membucket.io, LLC
-    Version: 0.35
+    Version: 0.36
   */
   define( 'MB_PROD_NAME', 'Accelerator by Membucket.io' );
   define( 'MEMBUCKET', true );
 
   global $MB_version;
-  $MB_version = '0.35';
-  
-  // We need access to Membucket's API
-  require( 'mb-common.php' );
+  $MB_version = '0.36';
 
   // Handle "Activate" or plugin update
   require( 'mb-install-wp.php' );
@@ -74,5 +71,6 @@ function MB_diagnostics_page() {
   }
 
   function MB_settings_page() {
+    require( 'mb-common.php' );     // We need access to Membucket's API
     require( 'page-settings.php' );
   }

mb-common.php

@@ -8,6 +8,13 @@
 
   require( 'Well.class.php' );
 
+  $_GLOBALS[ 'mb_checks' ] = [
+    0 => file_exists( '/usr/local/cpanel/version' ),
+    1 => file_exists( '/usr/bin/membucket' ) ||
+         file_exists( '/usr/bin/membucketd' ),
+    2 => MB_Get_User_Key() != ""
+  ];
+  
   function CallAPI( $method = 'GET', $path = '', $data = false ) {
     $curl = curl_init();
     curl_setopt( $curl, CURLOPT_URL, "http://127.0.0.1:9999/wells{$path}" );
@@ -91,9 +98,7 @@ function _RecursiveUpSearch($path, $name) {
    */
   // TODO: Check when supporting Operating Systems outside of CentOS
   function MB_Get_Associations() {
-    // Get script directory without trailing slash
-    $path = realpath( get_home_path() );
-    $path = _RecursiveUpSearch( $path, MB_FILENAME_ASSOCIATE );
+    $path = _RecursiveUpSearch( realpath( get_home_path() ), MB_FILENAME_ASSOCIATE );
 
     if ( ! file_exists( $path ) ||
          4096 < filesize( $path ) ) {
@@ -114,9 +119,7 @@ function MB_Get_Associations() {
   }
 
   function MB_Set_Associations( $well, $roles ) {
-    // Get script directory without trailing slash
-    $path = realpath( get_home_path() );
-    $path = _RecursiveUpSearch( $path, MB_FILENAME_ASSOCIATE );
+    $path = _RecursiveUpSearch( realpath( get_home_path() ), MB_FILENAME_ASSOCIATE );
 
     if ( '' === $path ) {
       $path = realpath( get_home_path() ) . '/' . MB_FILENAME_ASSOCIATE;
@@ -140,19 +143,7 @@ function MB_Set_Associations( $well, $roles ) {
    * @return string access key for this user
    */
   function MB_Get_User_Key() {
-    // Get script directory without trailing slash
-    $path = realpath( get_home_path() );
-    
-    // On CentOS under default (supported) configuration, the home Directory
-    // contains the username, therefore we need the username.
-    $user = _Get_User();
-    
-    // Currently the username must be in the path
-    if ( -1 === strpos( $path, $user ) )
-      return '';
-    
-    // Try at most 10 directories
-    $path = _RecursiveUpSearch( $path, MB_FILENAME_ACCESSKEY );
+    $path = _RecursiveUpSearch( realpath( get_home_path() ), MB_FILENAME_ACCESSKEY );
     if ( $path === '' ) {
       return '';
     }

page-settings.php

@@ -2,14 +2,6 @@
   // Prevent direct script access
   if ( ! defined( 'MEMBUCKET' ) ) exit;
 
-  // Checks
-  $checks = [
-    0 => file_exists( '/usr/local/cpanel/version' ),
-    1 => file_exists( '/usr/bin/membucket' ) ||
-         file_exists( '/usr/bin/membucketd' ),
-    2 => MB_Get_User_Key() != ""
-  ];
-  
   // If we're changing well associations
   if ( ! empty( $_POST ) ) {
     MB_Set_Associations( $_POST[ 'well' ], explode( ',', $_POST[ 'roles' ] ) );
@@ -31,30 +23,32 @@
 
 <h2><?php echo MB_PROD_NAME; ?> Settings</h2>
 
-<?php if ( ! $checks[ 0 ] ): ?>
+<?php if ( ! $_GLOBALS[ 'mb_checks' ][ 0 ] ): ?><p>
   Your hosting control panel is not yet supported!  If you are using cPanel/WHM
   and are seeing this message, ask your hosting provider if there is a jail in
   place.  If there is a jail, you can <a href="?dimiss=0">ignore and dismiss
   this message.</a>
-<?php endif; ?>
+</p><?php endif; ?>
 
-<?php if ( ! $checks[ 1 ] ): ?>
+<?php if ( ! $_GLOBALS[ 'mb_checks' ][ 1 ] ): ?><p>
   Membucket was not found on your system!  Your hosting provider does not
   support Membucket, or has not made it available to your user.
-<?php elseif ( ! $checks[ 2 ] ): ?>
+</p><?php elseif ( ! $_GLOBALS[ 'mb_checks' ][ 2 ] ): ?><p>
   Your account does not have an access key for use with Membucket.  If you
   have access to SSH, please run the command: `membucket generate-key`.
   Otherwise, ask your hosting provider to run this command as your user.
-<?php endif; ?>
+</p><?php endif; ?>
 
+<?php if ( $_GLOBALS[ 'mb_checks' ][ 1 ] &&
+           $_GLOBALS[ 'mb_checks' ][ 2 ] ): ?>
 <p>Here you can assign roles to wells and customize how membucket caches your site.</p>
 
 <div>
   <h3>Wells</h3>
   <p><strong>Step 1)</strong> Select a Well</p>
 <?php
   foreach ( $wells as $well ) {
-    $groups = "Unassigned";
+    $groups = 'Unassigned';
     if ( array_key_exists( $well->ID, $roles ) ) {
       $groups = ucfirst( $roles[ $well->ID ] );
     }
@@ -79,7 +73,9 @@
 <div>
   <h3>Roles</h3>
   <p><strong>Step 2)</strong> Select Roles to assign to <span id="wellName">-</span></p>
-  <p>To accelerate everything, make sure every role is assigned to a Well. If you are unsure what to assign <button id="mbSelectAll">click here</button> to select all.</p>
+  <p>To accelerate everything, make sure every role is assigned to a Well. If
+    you are unsure what to assign, <button id="mb-select-all"
+    >click here</button> to select all.</p>
 
   <div class="mb-role" id="static">
     <h4>Static</h4>
@@ -115,3 +111,4 @@
 
 <?php wp_enqueue_script( 'jquery' ); ?>
 <script src="<?php echo plugins_url( 'script.js', __FILE__ ); ?>"></script>
+<?php endif; ?>

script.coffee

@@ -21,6 +21,23 @@ transformBool = (boolish) ->
   selected = true if boolish == "true"
   return !selected
 
+jQuery '#mb-select-all'
+.on 'click', ->
+  selectedRoles = []
+  jQuery '.mb-role'
+  .each (_) ->
+    ele = jQuery this
+    selected = ele.attr 'data-selected'
+
+    if !selected
+      ele.addClass 'selected'
+      ele.attr 'data-selected', true
+      selectedRoles.push ele.attr 'id'
+    return
+  
+  checkFormValidity()
+  return
+
 domSubmit.on 'click', ->
   return false unless checkFormValidity()
 
@@ -49,6 +66,11 @@ jQuery '.mb-role'
     else
       i = selectedRoles.indexOf id
       selectedRoles.splice i, 1 if i != -1
+    
+    checkFormValidity()
+    return
+  
+  return
 
 jQuery '.mb-well'
 .each (_) ->

script.js

@@ -32,6 +32,21 @@ transformBool = function(boolish) {
   return !selected;
 };
 
+jQuery('#mb-select-all').on('click', function() {
+  selectedRoles = [];
+  jQuery('.mb-role').each(function(_) {
+    var ele, selected;
+    ele = jQuery(this);
+    selected = ele.attr('data-selected');
+    if (!selected) {
+      ele.addClass('selected');
+      ele.attr('data-selected', true);
+      selectedRoles.push(ele.attr('id'));
+    }
+  });
+  checkFormValidity();
+});
+
 domSubmit.on('click', function() {
   if (!checkFormValidity()) {
     return false;
@@ -42,7 +57,7 @@ domSubmit.on('click', function() {
 });
 
 jQuery('.mb-role').each(function(_) {
-  return jQuery(this).on('click', function() {
+  jQuery(this).on('click', function() {
     var ele, i, id, selected;
     ele = jQuery(this);
     selected = transformBool(ele.attr('data-selected'));
@@ -54,13 +69,14 @@ jQuery('.mb-role').each(function(_) {
     ele.attr('data-selected', selected);
     id = ele.attr('id');
     if (selected) {
-      return selectedRoles.push(id);
+      selectedRoles.push(id);
     } else {
       i = selectedRoles.indexOf(id);
       if (i !== -1) {
-        return selectedRoles.splice(i, 1);
+        selectedRoles.splice(i, 1);
       }
     }
+    checkFormValidity();
   });
 });