Changeset 3234219

Timestamp:

02/03/2025 07:26:07 PM (13 months ago)

Author:

fetchdesigns

Message:

Reverted to version 2.2.14

Location:

sign-up-sheets

Files:

• tags/2.3.0 (deleted)
• trunk/build/index.css.map (copied) (copied from sign-up-sheets/tags/2.2.14/build/index.css.map)
• trunk/controller/admin.php (modified) (10 diffs)
• trunk/controller/admin/edit-sheet.php (modified) (2 diffs)
• trunk/controller/admin/edit-signup-page.php (modified) (17 diffs)
• trunk/controller/admin/export.php (modified) (7 diffs)
• trunk/controller/admin/help.php (modified) (7 diffs)
• trunk/controller/admin/manage-signups.php (modified) (9 diffs)
• trunk/controller/admin/meta-box.php (modified) (2 diffs)
• trunk/controller/admin/settings.php (modified) (9 diffs)
• trunk/controller/admin/site-health.php (modified) (2 diffs)
• trunk/controller/ajax.php (modified) (1 diff)
• trunk/controller/base.php (modified) (2 diffs)
• trunk/controller/captcha.php (modified) (5 diffs)
• trunk/controller/mail.php (modified) (2 diffs)
• trunk/controller/migrate.php (modified) (15 diffs)
• trunk/controller/post-type-base.php (modified) (1 diff)
• trunk/controller/privacy.php (modified) (5 diffs)
• trunk/controller/scode/sign-up-form.php (modified) (21 diffs)
• trunk/controller/scode/sign-up-sheet.php (modified) (2 diffs)
• trunk/controller/scode/user-sign-ups.php (modified) (4 diffs)
• trunk/controller/sheet.php (modified) (4 diffs)
• trunk/controller/task-table.php (modified) (18 diffs)
• trunk/css/admin.css (modified) (1 diff)
• trunk/css/admin.css.map (copied) (copied from sign-up-sheets/tags/2.2.14/css/admin.css.map)
• trunk/css/sass/admin.scss (modified) (1 diff)
• trunk/css/sass/style/_common.scss (modified) (1 diff)
• trunk/css/style.css (modified) (1 diff)
• trunk/css/style.css.map (copied) (copied from sign-up-sheets/tags/2.2.14/css/style.css.map)
• trunk/id.php (modified) (6 diffs)
• trunk/images (added)
• trunk/images/admin-icon.png (added)
• trunk/images/dls-sus-content-button.png (added)
• trunk/images/icon-alert.png (added)
• trunk/images/icon-check.gif (added)
• trunk/images/icon-drag-y.png (added)
• trunk/js/dist/main.js (modified) (1 diff)
• trunk/js/dist/main.min.js (modified) (1 diff)
• trunk/js/src/main.js (modified) (1 diff)
• trunk/languages/sign-up-sheets.pot (modified) (36 diffs)
• trunk/lib/dls/meta-boxes/assets/admin.js (modified) (1 diff)
• trunk/lib/dls/meta-boxes/assets/style.css (modified) (1 diff)
• trunk/lib/dls/meta-boxes/meta-boxes.php (modified) (5 diffs)
• trunk/lib/fetch (added)
• trunk/loco.xml (copied) (copied from sign-up-sheets/tags/2.2.14/loco.xml)
• trunk/main.php (modified) (11 diffs)
• trunk/model/base.php (modified) (1 diff)
• trunk/model/db-update.php (modified) (2 diffs)
• trunk/model/meta-boxes.php (modified) (20 diffs)
• trunk/model/settings-meta-boxes.php (modified) (28 diffs)
• trunk/model/settings.php (modified) (5 diffs)
• trunk/model/settings/sheet-order.php (modified) (4 diffs)
• trunk/model/sheet-base.php (modified) (8 diffs)
• trunk/model/sheet-collection.php (modified) (1 diff)
• trunk/model/sheet.php (modified) (1 diff)
• trunk/model/signup-collection.php (modified) (1 diff)
• trunk/model/signup-form-initial-values.php (modified) (2 diffs)
• trunk/model/signup.php (modified) (11 diffs)
• trunk/model/task-base.php (modified) (7 diffs)
• trunk/model/task-table.php (modified) (4 diffs)
• trunk/model/task.php (modified) (1 diff)
• trunk/package.json (modified) (1 diff)
• trunk/readme.txt (modified) (3 diffs)
• trunk/sign-up-sheets.php (modified) (2 diffs)
• trunk/src/block.json (modified) (2 diffs)
• trunk/template-tags.php (modified) (1 diff)
• trunk/theme-files/archive-dlssus_sheet.php (modified) (1 diff)
• trunk/theme-files/content-dlssus_sheet.php (modified) (1 diff)
• trunk/theme-files/fdsus/parts/captcha-simple.php (modified) (1 diff)
• trunk/theme-files/fdsus/sheet-list.php (modified) (4 diffs)
• trunk/theme-files/fdsus/sheet-none.php (modified) (1 diff)
• trunk/theme-files/fdsus/sheet.php (modified) (1 diff)
• trunk/theme-files/fdsus/sign-up-form-header.php (modified) (1 diff)
• trunk/theme-files/fdsus/sign-up-form.php (modified) (11 diffs)
• trunk/theme-files/fdsus/user_sign_ups.php (modified) (3 diffs)

sign-up-sheets/trunk/controller/admin.php

@@ -87 +87 @@
         $status = $migrate->getStatus();
         if (!in_array($status['state'], array('running', 'rerun'))) return;
-        Notice::add('info', esc_html__('Sign-up sheets database upgrade is processing.', 'sign-up-sheets'), false, Id::PREFIX . '-migrate-status');
+        Notice::add('info', esc_html__('Sign-up sheets database upgrade is processing.', 'fdsus'), false, Id::PREFIX . '-migrate-status');
     }
 
@@ -100 +100 @@
         unset($columns['date']);
         return array_merge($columns, array(
-            'task_date' => esc_html__('Sheet Date', 'sign-up-sheets'),
-            'total_tasks' => esc_html__('# of Tasks', 'sign-up-sheets'),
-            'total_spots' => esc_html__('Total Spots', 'sign-up-sheets'),
-            'filled_spots' => esc_html__('Filled Spots', 'sign-up-sheets'))
+            'task_date' => esc_html__('Sheet Date', 'fdsus'),
+            'total_tasks' => esc_html__('# of Tasks', 'fdsus'),
+            'total_spots' => esc_html__('Total Spots', 'fdsus'),
+            'filled_spots' => esc_html__('Filled Spots', 'fdsus'))
         );
     }
@@ -158 +158 @@
 
         if (empty($_GET['sheet_id'])) {
-            wp_die(esc_html__('No sheet ID found.', 'sign-up-sheets'));
+            wp_die(esc_html__('No sheet ID found.', 'fdsus'));
         }
 
         if (!wp_verify_nonce($_GET['_fdsus-nonce'], 'fdsus-copysheet-' . $_GET['sheet_id'])) {
-            wp_die(esc_html__('Copy action failed.  Please try again.', 'sign-up-sheets'));
+            wp_die(esc_html__('Copy action failed.  Please try again.', 'fdsus'));
         }
 
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can($sheetCaps->get('edit_post'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
 
@@ -185 +185 @@
     public function head()
     {
-        // Pull pro or free
-        $pluginPath = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . (Id::isPro() ? Id::PRO_PLUGIN_BASENAME
-                : Id::FREE_PLUGIN_BASENAME);
-
         // Dequeue meta library scripts for now
         if (wp_script_is('dlsmb-main', $list = 'enqueued')) {
@@ -207 +203 @@
             wp_enqueue_style(
                 Id::PREFIX . '-admin',
-                plugins_url('css/admin.css', $pluginPath),
+                plugins_url('css/admin.css', dirname(__FILE__)),
                 array(),
                 Id::version()
@@ -296 +292 @@
 
             $id = array('fdsus-id' => sprintf(
-                '<span class="fdsus-id-value">' . esc_html__('ID', 'sign-up-sheets') . ': %s</span>',
+                '<span class="fdsus-id-value">' . esc_html__('ID', 'fdsus') . ': %s</span>',
                 $post->ID
             ));
@@ -305 +301 @@
                     '<a href="%s" title="" rel="permalink">%s</a>',
                     esc_url(Settings::getManageSignupsPageUrl($post->ID)),
-                    esc_html__('Manage Sign-ups', 'sign-up-sheets')
+                    esc_html__('Manage Sign-ups', 'fdsus')
                 );
 
@@ -324 +320 @@
                             '_fdsus-nonce'
                         )),
-                        esc_html__('Copy', 'sign-up-sheets')
+                        esc_html__('Copy', 'fdsus')
                     );
                 }
@@ -374 +370 @@
         <footer class="fdsus-footer" aria-label="Sign-up Sheet">
             <p>
-                <?php esc_html_e('Made by', 'sign-up-sheets'); ?> Fetch Designs
+                <?php esc_html_e('Made by', 'fdsus'); ?> Fetch Designs
                 <span class="fdsus-footer-getpro"></span>
                 <?php if (!Id::isPro()): ?>
-                    <a href="https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/"><?php esc_html_e('Get Pro', 'sign-up-sheets'); ?></a>
+                    <a href="https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/"><?php esc_html_e('Get Pro', 'fdsus'); ?></a>
                     &nbsp;&nbsp;|&nbsp;&nbsp;
                 <?php endif; ?>
                 <a href="<?php echo esc_url($supportUrl); ?>">
-                    <span><?php esc_html_e('Need help? Get Support &raquo;', 'sign-up-sheets'); ?></span>
+                    <span><?php esc_html_e('Need help? Get Support &raquo;', 'fdsus'); ?></span>
                 </a>
             </p>
@@ -400 +396 @@
         $settingsLink = sprintf( '<a href="%s">%s</a>',
             esc_url($this->data->getSettingsUrl()),
-            esc_html__('Settings', 'sign-up-sheets')
+            esc_html__('Settings', 'fdsus')
         );
         array_unshift($links, $settingsLink);

sign-up-sheets/trunk/controller/admin/edit-sheet.php

@@ -64 +64 @@
 
         $actions['copy'] = array(
-            'title' => esc_html__('Copy Row', 'sign-up-sheets'),
+            'title' => esc_html__('Copy Row', 'fdsus'),
             'icon'  => 'dashicons dashicons-admin-page',
         );
@@ -140 +140 @@
         if ($post->post_type == SheetModel::POST_TYPE && !empty($_GET['action']) && $_GET['action'] === 'edit') {
             ?>
-            <div class="fdsus-edit-quick-info" role="group" aria-label="<?php esc_attr_e('Sheet Quick Info', 'sign-up-sheets') ?>">
-                <span class="quick-info-item quick-info-id"><strong><?php esc_html_e('Sheet ID', 'sign-up-sheets') ?>: </strong> <code><?php echo $post->ID ?></code></span>
+            <div class="fdsus-edit-quick-info" role="group" aria-label="<?php esc_attr_e('Sheet Quick Info', 'fdsus') ?>">
+                <span class="quick-info-item quick-info-id"><strong><?php esc_html_e('Sheet ID', 'fdsus') ?>: </strong> <code><?php echo $post->ID ?></code></span>
                 <?php do_action('fdsus_edit_sheet_quick_info', $post); ?>
             </div>

sign-up-sheets/trunk/controller/admin/edit-signup-page.php

@@ -46 +46 @@
         add_submenu_page(
             '',
-            esc_html__('Edit Sign-up', 'sign-up-sheets'),
+            esc_html__('Edit Sign-up', 'fdsus'),
             '',
             $sheetCaps->get('edit_posts'),
@@ -69 +69 @@
             $signup = new SignupModel($_GET['signup']);
             if (!$signup->isValid()) {
-                wp_die(__('Sign-up invalid', 'sign-up-sheets'));
+                wp_die(__('Sign-up invalid', 'fdsus'));
             }
         }
@@ -75 +75 @@
         $task = new TaskModel(!empty($_GET['task']) ? $_GET['task'] : $signup->post_parent);
         if (!$task->isValid()) {
-            wp_die(__('Task invalid', 'sign-up-sheets'));
+            wp_die(__('Task invalid', 'fdsus'));
         }
 
         $sheet = new SheetModel($task->post_parent);
         if (!$sheet->isValid()) {
-            wp_die(__('Sheet invalid', 'sign-up-sheets'));
+            wp_die(__('Sheet invalid', 'fdsus'));
         }
         ?>
@@ -87 +87 @@
             <h1 class="wp-heading-inline">
                 <?php echo $_GET['action'] === 'add'
-                    ? esc_html__('Add Sign-up', 'sign-up-sheets')
-                    : esc_html__('Edit Sign-up', 'sign-up-sheets');
+                    ? esc_html__('Add Sign-up', 'fdsus')
+                    : esc_html__('Edit Sign-up', 'fdsus');
                 ?>
             </h1>
@@ -108 +108 @@
                 'multi_tag'          => '',
                 'states'             => $states->get(),
-                'submit_button_text' => __('Submit', 'sign-up-sheets'),
+                'submit_button_text' => __('Submit', 'fdsus'),
                 'go_back_url'        => '',
                 'signup_link_hash'   => ''
@@ -119 +119 @@
             <div id="postbox-container-1" class="postbox-container">
                 <div class="fdsus-edit-quick-info" role="group"
-                     aria-label="<?php esc_attr_e('Sheet Quick Info', 'sign-up-sheets') ?>">
+                     aria-label="<?php esc_attr_e('Sheet Quick Info', 'fdsus') ?>">
                     <span class="quick-info-item quick-info-id"><strong><?php esc_html_e(
-                                'Sheet ID', 'sign-up-sheets'
+                                'Sheet ID', 'fdsus'
                             ) ?>: </strong> <code><?php echo $sheet->ID ?></code></span>
                     <?php do_action('fdsus_edit_sheet_quick_info', $sheet->getData()); ?>
@@ -130 +130 @@
                     <div class="inside">
                         <dl>
-                            <dt><?php _e('Sheet', 'sign-up-sheets'); ?>:</dt>
+                            <dt><?php _e('Sheet', 'fdsus'); ?>:</dt>
                             <dd><?php echo wp_kses_post($sheet->post_title); ?></dd>
 
-                            <dt><?php esc_html_e('Date', 'sign-up-sheets'); ?>:</dt>
+                            <dt><?php esc_html_e('Date', 'fdsus'); ?>:</dt>
                             <dd>
                                 <?php echo(empty($sheet->dlssus_date)
-                                    ? esc_html__('N/A', 'sign-up-sheets')
+                                    ? esc_html__('N/A', 'fdsus')
                                     : date(get_option('date_format'), strtotime($sheet->dlssus_date))
                                 ); ?>
                             </dd>
 
-                            <dt><?php _e('Task', 'sign-up-sheets'); ?>:</dt>
+                            <dt><?php _e('Task', 'fdsus'); ?>:</dt>
                             <dd><?php esc_html_e($task->post_title); ?></dd>
                         </dl>
@@ -171 +171 @@
         switch($_GET['notice']) {
             case 'edited':
-                Notice::add('success', esc_html__('Sign-up updated.', 'sign-up-sheets'));
+                Notice::add('success', esc_html__('Sign-up updated.', 'fdsus'));
                 break;
             case 'added':
-                Notice::add('success', esc_html__('Sign-up added.', 'sign-up-sheets'));
+                Notice::add('success', esc_html__('Sign-up added.', 'fdsus'));
                 break;
         }
@@ -195 +195 @@
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can($sheetCaps->get('edit_posts'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
 
         if (empty($_GET['signup'])) {
-            wp_die(esc_html__('Sign-up ID missing', 'sign-up-sheets'));
+            wp_die(esc_html__('Sign-up ID missing', 'fdsus'));
         }
 
@@ -207 +207 @@
                 || !wp_verify_nonce($_POST['signup_nonce'], 'fdsus_signup_submit')
             ) {
-                wp_die(esc_html__('Sign-up nonce not valid.', 'sign-up-sheets'));
+                wp_die(esc_html__('Sign-up nonce not valid.', 'fdsus'));
             }
 
@@ -216 +216 @@
 
             if (!$signup->isValid()) {
-                Notice::add('error', esc_html__('Sign-up not found.', 'sign-up-sheets'));
+                Notice::add('error', esc_html__('Sign-up not found.', 'fdsus'));
                 return;
             }
@@ -231 +231 @@
                         sprintf(
                         /* translators: %s is replaced with a comma separated list of all missing required fields */
-                            esc_html__('Please complete the following required fields: %s', 'sign-up-sheets'),
+                            esc_html__('Please complete the following required fields: %s', 'fdsus'),
                             implode(', ', $missingFieldNames)
                         )
@@ -262 +262 @@
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can($sheetCaps->get('edit_posts'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
 
@@ -268 +268 @@
 
         if (empty($_GET['task'])) {
-            wp_die(esc_html__('Task-up ID missing', 'sign-up-sheets'));
+            wp_die(esc_html__('Task-up ID missing', 'fdsus'));
         }
 
@@ -276 +276 @@
                 || !wp_verify_nonce($_POST['signup_nonce'], 'fdsus_signup_submit')
             ) {
-                wp_die(esc_html__('Sign-up nonce not valid.', 'sign-up-sheets'));
+                wp_die(esc_html__('Sign-up nonce not valid.', 'fdsus'));
             }
 
@@ -293 +293 @@
                         sprintf(
                         /* translators: %s is replaced with a comma separated list of all missing required fields */
-                            esc_html__('Please complete the following required fields: %s', 'sign-up-sheets'),
+                            esc_html__('Please complete the following required fields: %s', 'fdsus'),
                             implode(', ', $missingFieldNames)
                         )
@@ -328 +328 @@
         <p class="fdsus-user">
             <label for="signup_user_id" class="signup_user_id">
-                <?php esc_html_e('Linked User', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Linked User', 'fdsus'); ?>
             </label>
             <select id="signup_user_id" class="signup_user_id" name="signup_user_id">

sign-up-sheets/trunk/controller/admin/export.php

@@ -56 +56 @@
                 )
             )),
-            esc_html__('Export All as CSV', 'sign-up-sheets')
+            esc_html__('Export All as CSV', 'fdsus')
         );
         return $views;
@@ -81 +81 @@
             '<a href="%s" id="dls-sus-export-sheet" class="quick-info-item">%s</a>',
             esc_url($this->getExportUrl($post)),
-            esc_html__('Export as CSV', 'sign-up-sheets')
+            esc_html__('Export as CSV', 'fdsus')
         );
     }
@@ -95 +95 @@
             '<a href="%s" class="add-new-h2 page-title-action"><span class="dashicons dashicons-download"></span> %s</a>',
             esc_url($this->getExportUrl($sheet)),
-            esc_html__('Export as CSV', 'sign-up-sheets')
+            esc_html__('Export as CSV', 'fdsus')
         );
     }
@@ -119 +119 @@
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to export.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to export.', 'fdsus'));
         }
 
         if (isset($_GET['sheet_id']) && !is_numeric($_GET['sheet_id'])) {
-            wp_die(esc_html__('Invalid sheet ID.', 'sign-up-sheets'));
+            wp_die(esc_html__('Invalid sheet ID.', 'fdsus'));
         }
 
@@ -266 +266 @@
 
         $headersArray = array();
-        $headersArray[] = esc_html__('Sheet ID', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Sheet Title', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Sheet Date', 'sign-up-sheets');
+        $headersArray[] = esc_html__('Sheet ID', 'fdsus');
+        $headersArray[] = esc_html__('Sheet Title', 'fdsus');
+        $headersArray[] = esc_html__('Sheet Date', 'fdsus');
 
         /**
@@ -281 +281 @@
         $headersArray = apply_filters('fdsus_export_headers_after_sheet', $headersArray, $sheets);
 
-        $headersArray[] = esc_html__('Task ID', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Task Title', 'sign-up-sheets');
+        $headersArray[] = esc_html__('Task ID', 'fdsus');
+        $headersArray[] = esc_html__('Task Title', 'fdsus');
 
         /**
@@ -295 +295 @@
         $headersArray = apply_filters('fdsus_export_headers_after_task', $headersArray, $sheets);
 
-        $headersArray[] = esc_html__('Sign-up ID', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Sign-up First Name', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Sign-up Last Name', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Sign-up Phone', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Sign-up Email', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Address', 'sign-up-sheets');
-        $headersArray[] = esc_html__('City', 'sign-up-sheets');
-        $headersArray[] = esc_html__('State', 'sign-up-sheets');
-        $headersArray[] = esc_html__('Zip', 'sign-up-sheets');
-        $headersArray[] = esc_html__('User ID', 'sign-up-sheets');
+        $headersArray[] = esc_html__('Sign-up ID', 'fdsus');
+        $headersArray[] = esc_html__('Sign-up First Name', 'fdsus');
+        $headersArray[] = esc_html__('Sign-up Last Name', 'fdsus');
+        $headersArray[] = esc_html__('Sign-up Phone', 'fdsus');
+        $headersArray[] = esc_html__('Sign-up Email', 'fdsus');
+        $headersArray[] = esc_html__('Address', 'fdsus');
+        $headersArray[] = esc_html__('City', 'fdsus');
+        $headersArray[] = esc_html__('State', 'fdsus');
+        $headersArray[] = esc_html__('Zip', 'fdsus');
+        $headersArray[] = esc_html__('User ID', 'fdsus');
 
         /**

sign-up-sheets/trunk/controller/admin/help.php

@@ -40 +40 @@
         add_submenu_page(
             'edit.php?post_type=' . SheetModel::POST_TYPE,
-            esc_html__('Sign-up Sheets Help', 'sign-up-sheets'),
-            esc_html__('Help', 'sign-up-sheets'),
+            esc_html__('Sign-up Sheets Help', 'fdsus'),
+            esc_html__('Help', 'fdsus'),
             $sheetCaps->get('read_post'),
             Id::PREFIX . '-help',
@@ -62 +62 @@
         echo '
             <div class="wrap dls_sus">
-                <h1 class="wp-heading-inline">' . esc_html__('Sign-up Sheets', 'sign-up-sheets') . (Id::isPro() ? ' <sup class="dls-sus-pro">Pro</sup>' : '') . ' ' . esc_html__('Help', 'sign-up-sheets') . '</h1>
+                <h1 class="wp-heading-inline">' . esc_html__('Sign-up Sheets', 'fdsus') . (Id::isPro() ? ' <sup class="dls-sus-pro">Pro</sup>' : '') . ' ' . esc_html__('Help', 'fdsus') . '</h1>
         ';
 
@@ -70 +70 @@
                 . '</p></div>';
         } elseif ($mail_result === true) {
-            echo '<div class="updated"><p>' . esc_html__('Test email successfully sent by WordPress.', 'sign-up-sheets') . '</p></div>';
+            echo '<div class="updated"><p>' . esc_html__('Test email successfully sent by WordPress.', 'fdsus') . '</p></div>';
         }
         ?>
@@ -139 +139 @@
         ?>
 
-        <h3><?php esc_html_e('System Information', 'sign-up-sheets') ?></h3>
+        <h3><?php esc_html_e('System Information', 'fdsus') ?></h3>
         <p><?php echo sprintf('%s <strong><a href="%s">%s</a></strong>',
                 esc_html__(
                     'We may request this information to help us troubleshoot your support request. You can now find this under',
-                    'sign-up-sheets'
+                    'fdsus'
                 ),
                 esc_url(admin_url('site-health.php?tab=debug')),
-                esc_html__('Tools > Site Health > Info', 'sign-up-sheets')
+                esc_html__('Tools > Site Health > Info', 'fdsus')
             ) ?></p>
-        <textarea readonly="readonly" class="dls-sus-system-info" rows="1" onclick="this.focus(); this.select();"><?php esc_html_e('System information has moved to Tools > Site Health > Info', 'sign-up-sheets') ?></textarea>
+        <textarea readonly="readonly" class="dls-sus-system-info" rows="1" onclick="this.focus(); this.select();"><?php esc_html_e('System information has moved to Tools > Site Health > Info', 'fdsus') ?></textarea>
 
         <?php
@@ -156 +156 @@
         }
         ?>
-            <h3><?php esc_html_e('Email Test', 'sign-up-sheets') ?></h3>
-            <p><?php esc_html_e('Having trouble with emails sending on your site? Use this quick for to test your site with sending emails to different recipients.', 'sign-up-sheets') ?></p>
-            <p><?php esc_html_e('If the test email is successfully sent by WordPress, but still not being received...', 'sign-up-sheets') ?></p>
+            <h3><?php esc_html_e('Email Test', 'fdsus') ?></h3>
+            <p><?php esc_html_e('Having trouble with emails sending on your site? Use this quick for to test your site with sending emails to different recipients.', 'fdsus') ?></p>
+            <p><?php esc_html_e('If the test email is successfully sent by WordPress, but still not being received...', 'fdsus') ?></p>
             <ol>
-                <li><?php esc_html_e('Ask the recipient to check their SPAM mailbox or SPAM filters.  Your "From" address may need to be added to their list of safe senders.', 'sign-up-sheets') ?></li>
-                <li><?php esc_html_e('Check with your host to see if they can trace emails being sent from your site.  It is possible your emails are being delayed or blacklisted by your recipient\'s mail host.', 'sign-up-sheets') ?></li>
+                <li><?php esc_html_e('Ask the recipient to check their SPAM mailbox or SPAM filters.  Your "From" address may need to be added to their list of safe senders.', 'fdsus') ?></li>
+                <li><?php esc_html_e('Check with your host to see if they can trace emails being sent from your site.  It is possible your emails are being delayed or blacklisted by your recipient\'s mail host.', 'fdsus') ?></li>
                 <li><?php echo sprintf(
                     /* translators: %s is replaced with a link to an SMTP plugin */
-                        esc_html__('Try sending email via SMTP instead by using a plugin like %s.', 'sign-up-sheets'),
+                        esc_html__('Try sending email via SMTP instead by using a plugin like %s.', 'fdsus'),
                         '<a href="https://wordpress.org/plugins/easy-wp-smtp/">Easy WP SMTP</a>'
                     ) ?></li>
                 <li><?php echo sprintf(
                     /* translators: %1$s is replaced with a link to Mailgun and %2$s is replaced with a link to the Mailgun WordPress plugin */
-                        esc_html__('Try sending email via a 3rd party service like %1$s with the %2$s', 'sign-up-sheets'),
+                        esc_html__('Try sending email via a 3rd party service like %1$s with the %2$s', 'fdsus'),
                         '<a href="https://www.mailgun.com/">Mailgun</a>',
                         '<a href="https://wordpress.org/plugins/mailgun/">Mailgun for WordPress plugin</a>'
@@ -177 +177 @@
                 <fieldset>
                     <p>
-                        <label for="from"><?php esc_html_e('From', 'sign-up-sheets') ?></label><br />
+                        <label for="from"><?php esc_html_e('From', 'fdsus') ?></label><br />
                         <input type="email" name="from" id="from" value="<?php echo esc_attr($from) ?>" />
                     </p>
                     <p>
-                        <label for="recipient"><?php esc_html_e('To', 'sign-up-sheets') ?></label><br />
+                        <label for="recipient"><?php esc_html_e('To', 'fdsus') ?></label><br />
                         <input type="email" name="recipient" id="recipient" value="" />
                     </p>
                     <p>
-                        <label><?php esc_html_e('Message', 'sign-up-sheets') ?></label><br />
-                        <textarea name="message" rows="3"><?php esc_html_e('This is a test email.', 'sign-up-sheets') ?></textarea>
+                        <label><?php esc_html_e('Message', 'fdsus') ?></label><br />
+                        <textarea name="message" rows="3"><?php esc_html_e('This is a test email.', 'fdsus') ?></textarea>
                     </p>
                     <p>
                         <input type="checkbox" name="return_path" id="return_path" value="true" checked="checked" />
-                        <label for="return_path"><?php esc_html_e('Send bounced messages to "From" address', 'sign-up-sheets') ?></label>
+                        <label for="return_path"><?php esc_html_e('Send bounced messages to "From" address', 'fdsus') ?></label>
                     </p>
                     <input type="hidden" name="mode" value="submitted" />
-                    <input type="submit" value="<?php esc_attr_e('Send', 'sign-up-sheets') ?>" class="button" />
+                    <input type="submit" value="<?php esc_attr_e('Send', 'fdsus') ?>" class="button" />
                 </fieldset>
             </form>
@@ -231 +231 @@
             return new WP_Error(
                 Id::PREFIX . 'test_email_error',
-                esc_html__('Error sending email.', 'sign-up-sheets')
+                esc_html__('Error sending email.', 'fdsus')
                 . '.. ' . implode(' --- ', $ts_mail_errors)
             );

sign-up-sheets/trunk/controller/admin/manage-signups.php

@@ -36 +36 @@
         add_submenu_page(
             '',
-            esc_html__('Manage Sign-ups', 'sign-up-sheets'),
-            esc_html__('Manage Sign-ups', 'sign-up-sheets'),
+            esc_html__('Manage Sign-ups', 'fdsus'),
+            esc_html__('Manage Sign-ups', 'fdsus'),
             $sheetCaps->get('read_post'),
             $this->menuSlug,
@@ -51 +51 @@
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can($sheetCaps->get('read_post'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
 
         if (empty($_GET['sheet_id']) || !is_numeric($_GET['sheet_id'])) {
-            wp_die(esc_html__('Missing or invalid sheet ID.', 'sign-up-sheets'));
+            wp_die(esc_html__('Missing or invalid sheet ID.', 'fdsus'));
         }
 
         $sheet = new SheetModel((int)$_GET['sheet_id']);
         if (!is_object($sheet)) {
-            wp_die(esc_html__('No sign-up sheet found.', 'sign-up-sheets'));
+            wp_die(esc_html__('No sign-up sheet found.', 'fdsus'));
         }
         ?>
@@ -66 +66 @@
         <div class="wrap dls_sus">
             <h1>
-                <?php esc_html_e('Manage Sign-ups', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Manage Sign-ups', 'fdsus'); ?>
                 <span class="fdsus-manage-h1-suffix">
-                    <a href="<?php echo esc_attr(get_permalink($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('View Sheet', 'sign-up-sheets'); ?></a>
-                    <a href="<?php echo esc_attr(get_edit_post_link($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('Edit Sheet', 'sign-up-sheets'); ?></a>
+                    <a href="<?php echo esc_attr(get_permalink($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('View Sheet', 'fdsus'); ?></a>
+                    <a href="<?php echo esc_attr(get_edit_post_link($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('Edit Sheet', 'fdsus'); ?></a>
                     <?php do_action('fdsus_manage_signup_h1_suffix', $sheet); ?>
                 </span>
@@ -76 +76 @@
             <h3><?php echo wp_kses_post($sheet->post_title); ?></h3>
             <p>
-                <?php esc_html_e('Date', 'sign-up-sheets'); ?>:
+                <?php esc_html_e('Date', 'fdsus'); ?>:
                 <?php echo(empty($sheet->dlssus_date)
-                    ? esc_html__('N/A', 'sign-up-sheets')
+                    ? esc_html__('N/A', 'fdsus')
                     : date(get_option('date_format'), strtotime($sheet->dlssus_date))
                 ); ?>
@@ -85 +85 @@
             <div class="dls-sus-sheet-details"><?php echo nl2br(wp_kses_post($sheet->post_content)); ?></div>
 
-            <h4><?php esc_html_e('Sign-ups', 'sign-up-sheets'); ?></h4>
+            <h4><?php esc_html_e('Sign-ups', 'fdsus'); ?></h4>
 
             <?php
@@ -133 +133 @@
             ) {
                 Notice::add(
-                    'error', esc_html__('Manage sign-up sheet nonce not valid', 'sign-up-sheets'), false,
+                    'error', esc_html__('Manage sign-up sheet nonce not valid', 'fdsus'), false,
                     Id::PREFIX . '-manage-signup-nonce-invalid'
                 );
@@ -142 +142 @@
         $sheet = new SheetModel($sheetId);
         if (!$sheet->isValid()) {
-            Notice::add('error', esc_html__('Invalid Sheet', 'sign-up-sheets'), false, Id::PREFIX . '-sheet-invalid');
+            Notice::add('error', esc_html__('Invalid Sheet', 'fdsus'), false, Id::PREFIX . '-sheet-invalid');
             return;
         }
@@ -148 +148 @@
         $result = $sheet->deleteSignups($idsToClear);
         if ($result) {
-            Notice::add('success', esc_html__('Spot(s) cleared.', 'sign-up-sheets'), false, Id::PREFIX . '-clear-success');
+            Notice::add('success', esc_html__('Spot(s) cleared.', 'fdsus'), false, Id::PREFIX . '-clear-success');
         } else {
             /* translators: %d is replaced with the sheet ID */
-            Notice::add('success', sprintf(esc_html__('Error clearing a spot (Sheet ID #%d)', 'sign-up-sheets'), $_GET['sheet_id']), false, Id::PREFIX . '-clear-error');
+            Notice::add('success', sprintf(esc_html__('Error clearing a spot (Sheet ID #%d)', 'fdsus'), $_GET['sheet_id']), false, Id::PREFIX . '-clear-error');
         }
     }
@@ -173 +173 @@
                 )
             )),
-            esc_html__('Manage Sign-ups', 'sign-up-sheets')
+            esc_html__('Manage Sign-ups', 'fdsus')
         );
     }

sign-up-sheets/trunk/controller/admin/meta-box.php

@@ -14 +14 @@
  * $metabox->add(array(
  *      'id' => 'sheet',
- *      'title' => esc_html__('Sign-up Sheet', 'sign-up-sheets'),
+ *      'title' => esc_html__('Sign-up Sheet', 'fdsus'),
  *      'order' => 10,
  *      'options' => array(
@@ -29 +29 @@
  *      'aria-labelledby' => 'my-label-id', // Default is '<name>-label' so only need to set this to change it or set to `false` to unset the aria-labelledby
  *      'aria-describedby' => 'my-description-id', // Default is not set
- *      'note'    => '<span id="my-description-id">' . esc_html__('Some description', 'sign-up-sheets') . '</span>',
+ *      'note'    => '<span id="my-description-id">' . esc_html__('Some description', 'fdsus') . '</span>',
  *      'pro'     => true
  * ));

sign-up-sheets/trunk/controller/admin/settings.php

@@ -49 +49 @@
         add_submenu_page(
             'edit.php?post_type=' . SheetModel::POST_TYPE,
-            esc_html__('Sign-up Sheets Settings', 'sign-up-sheets'),
-            esc_html__('Settings', 'sign-up-sheets'),
+            esc_html__('Sign-up Sheets Settings', 'fdsus'),
+            esc_html__('Settings', 'fdsus'),
             'manage_options',
             SettingsModel::$menuSlug,
@@ -64 +64 @@
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
         ?>
         <div class="wrap dls_sus metabox-holder">
             <h1 class="wp-heading-inline">
-                <?php esc_html_e('Sign-up Sheets', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Sign-up Sheets', 'fdsus'); ?>
                 <?php if (Id::isPro()): ?><sup class="dls-sus-pro">Pro</sup><?php endif; ?>
-                <?php esc_html_e('Settings', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Settings', 'fdsus'); ?>
             </h1>
-            <p style="text-align: right;"><a href="#" class="dls-sus-expand-all-postbox"><?php esc_html_e('+ Expand All', 'sign-up-sheets'); ?></a></p>
+            <p style="text-align: right;"><a href="#" class="dls-sus-expand-all-postbox"><?php esc_html_e('+ Expand All', 'fdsus'); ?></a></p>
             <form name="dls-sus-form" class="dls-sus-settings" method="post" action="<?php echo esc_url($this->data->getSettingsUrl()) ?>">
 
@@ -93 +93 @@
                     ?>
                     <input type="hidden" name="<?php echo esc_attr($this->hiddenFieldName); ?>" value="<?php echo esc_attr($this->hiddenFieldValue) ?>">
-                    <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes', 'sign-up-sheets'); ?>" />
+                    <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes', 'fdsus'); ?>" />
                 </p>
 
@@ -117 +117 @@
             if (FDSUS_DISABLE_MIGRATE_2_0_to_2_1) {
                 Notice::add(
-                    'warning', esc_html__('Sorry, I cannot rerun migration.  The migration logic is currently disabled with the FDSUS_DISABLE_MIGRATE_2_0_to_2_1 configuration.', 'sign-up-sheets'), false,
+                    'warning', esc_html__('Sorry, I cannot rerun migration.  The migration logic is currently disabled with the FDSUS_DISABLE_MIGRATE_2_0_to_2_1 configuration.', 'fdsus'), false,
                     'dlssus-migrate-disabled'
                 );
@@ -132 +132 @@
 
             Notice::add(
-                'info', esc_html__('Sign-up Sheets database upgrade has been triggered.', 'sign-up-sheets'), false,
+                'info', esc_html__('Sign-up Sheets database upgrade has been triggered.', 'fdsus'), false,
                 'dlssus-migrate-status'
             );
@@ -150 +150 @@
 
         if (!isset($_GET['_fdsus-nonce']) || !wp_verify_nonce($_GET['_fdsus-nonce'], 'fdsus-settings-reset')) {
-            wp_die(esc_html__('Invalid request.', 'sign-up-sheets'));
+            wp_die(esc_html__('Invalid request.', 'fdsus'));
         }
 
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
 
@@ -206 +206 @@
                     Notice::add(
                         'success',
-                        esc_html__('Sign-up Sheet settings have been successfully reset to default values.', 'sign-up-sheets')
+                        esc_html__('Sign-up Sheet settings have been successfully reset to default values.', 'fdsus')
                     );
                 }
@@ -227 +227 @@
 
         if (!isset($_POST['_fdsus-nonce']) || !wp_verify_nonce($_POST['_fdsus-nonce'], 'fdsus-settings-update')) {
-            wp_die(esc_html__('Invalid request.', 'sign-up-sheets'));
+            wp_die(esc_html__('Invalid request.', 'fdsus'));
         }
 
         $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
         if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
-            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
+            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
         }
 
@@ -283 +283 @@
 
                 if ($numberSaved === 1) {
-                    Notice::add('success', esc_html__('Settings saved.', 'sign-up-sheets'));
+                    Notice::add('success', esc_html__('Settings saved.', 'fdsus'));
                 }
             }

sign-up-sheets/trunk/controller/admin/site-health.php

@@ -28 +28 @@
     {
         $info['wp-core']['fields']['fdsus_date_format'] = array(
-            'label' => esc_html__('Date Format', 'sign-up-sheets'),
+            'label' => esc_html__('Date Format', 'fdsus'),
             'value' => esc_html(get_option('date_format')),
         );
         $info['wp-core']['fields']['fdsus_time_format'] = array(
-            'label' => esc_html__('Time Format', 'sign-up-sheets'),
+            'label' => esc_html__('Time Format', 'fdsus'),
             'value' => esc_html(get_option('time_format')),
         );
         $info['wp-core']['fields']['fdsus_admin_email'] = array(
-            'label' => esc_html__('Admin Email', 'sign-up-sheets'),
+            'label' => esc_html__('Admin Email', 'fdsus'),
             'value' => esc_html(get_option('admin_email')),
         );
         $info['wp-server']['fields']['fdsus_server_max_execution_time'] = array(
-            'label' => esc_html__('Max Execution Time', 'sign-up-sheets'),
+            'label' => esc_html__('Max Execution Time', 'fdsus'),
             'value' => ini_get('max_execution_time') . ' seconds',
         );
         $info['wp-server']['fields']['fdsus_user_agent_string'] = array(
-            'label' => esc_html__('User Agent String', 'sign-up-sheets'),
+            'label' => esc_html__('User Agent String', 'fdsus'),
             'value' => $_SERVER['HTTP_USER_AGENT'],
         );
         $info['sign-up-sheets'] = array(
-            'label'  => esc_html__('Sign-up Sheets', 'sign-up-sheets'),
+            'label'  => esc_html__('Sign-up Sheets', 'fdsus'),
             'fields' => $this->getFields(),
         );
@@ -67 +67 @@
         $dataPrimary = array(
             'version'            => array(
-                'label' => esc_html__('Version', 'sign-up-sheets'),
+                'label' => esc_html__('Version', 'fdsus'),
                 'value' => Id::version(),
             ),
             'db_version_type'    => array(
-                'label' => esc_html__('Version Type', 'sign-up-sheets'),
+                'label' => esc_html__('Version Type', 'fdsus'),
                 'value' => $allOptions['dls_sus_db_version_type'],
             ),
             'primary_db_version' => array(
-                'label' => esc_html__('DB Version', 'sign-up-sheets'),
+                'label' => esc_html__('DB Version', 'fdsus'),
                 'value' => $allOptions['dls_sus_db_version'],
             ),

sign-up-sheets/trunk/controller/ajax.php

@@ -52 +52 @@
         $restartButton = sprintf(' <a href="%s" class="button">%s</a>',
             esc_url(add_query_arg('migrate', 'rerun-2.1', $this->data->getSettingsUrl())),
-            esc_html__('Restart Upgrade', 'sign-up-sheets')
+            esc_html__('Restart Upgrade', 'fdsus')
         );
         if ($status['state'] == 'complete') {

sign-up-sheets/trunk/controller/base.php

@@ -47 +47 @@
             $templateName = str_replace('/', DIRECTORY_SEPARATOR, $templateName);
 
-            $stylesheetPathFile = get_stylesheet_directory() . DIRECTORY_SEPARATOR . $templateName; // child
-            $templatePathFile = get_template_directory() . DIRECTORY_SEPARATOR . $templateName; // parent
-            $proPluginFile = Id::isPro()
-                ? FDSUS_PRO_PLUGIN_DIR_PATH . $this->themeFilesDir . DIRECTORY_SEPARATOR . $templateName
-                : '';
-            $freePluginFile = FDSUS_FREE_PLUGIN_DIR_PATH . $this->themeFilesDir . DIRECTORY_SEPARATOR . $templateName;
+            $stylesheetPathFile = STYLESHEETPATH . DIRECTORY_SEPARATOR . $templateName; // child
+            $templatePathFile = TEMPLATEPATH . DIRECTORY_SEPARATOR . $templateName; // parent
+            $pluginFile = Id::getPluginPath() . $this->themeFilesDir . DIRECTORY_SEPARATOR . $templateName; // plugin
 
             if (file_exists($stylesheetPathFile)) {
@@ -60 +57 @@
                 $located = $templatePathFile;
                 break;
-            } elseif (file_exists($proPluginFile)) {
-                $located = $proPluginFile;
-                break;
-            } elseif (file_exists($freePluginFile)) {
-                $located = $freePluginFile;
+            } elseif (file_exists($pluginFile)) {
+                $located = $pluginFile;
                 break;
             }
         }
 
-        if ((true === $load) && !empty($located)) {
+        if ((true == $load) && !empty($located)) {
             load_template($located, $requireOnce, $args);
         }

sign-up-sheets/trunk/controller/captcha.php

@@ -9 +9 @@
 use FDSUS\Model\Settings;
 use FDSUS\Lib\ReCaptcha\ReCaptcha;
-use FDSUS\Model\Sheet as SheetModel;
 use WP_Error;
 
@@ -22 +21 @@
             add_action('fdsus_enqueue_scripts_styles_on_signup', array(&$this, 'enqueue'), 10, 0);
             add_filter('fdsus_error_before_add_signup', array(&$this, 'signupValidation'), 10, 3);
-            add_filter('fdsus_sign_up_form_errors_required_fields', array(&$this, 'updateRequiredFields'), 10, 3);
         }
 
@@ -45 +43 @@
             wp_enqueue_script('fdsus-recaptcha');
         }
-    }
-
-    /**
-     * Adjust required fields
-     *
-     * @param array      $missingFieldNames
-     * @param SheetModel $sheet
-     * @param array      $fields
-     *
-     * @return array
-     */
-    public function updateRequiredFields($missingFieldNames, $sheet, $fields)
-    {
-        if (!is_admin()
-            && !Settings::isAllCaptchaDisabled()
-            && !Settings::isRecaptchaEnabled()
-            && empty($fields['spam_check'])
-        ) {
-            $missingFieldNames['simple_captcha'] = esc_html__('Math Question', 'sign-up-sheets');
-        }
-
-        return $missingFieldNames;
     }
 
@@ -95 +71 @@
                 return new WP_Error(
                     'fdsus-captcha-error',
-                    __('Please check that the reCAPTCHA field is valid.', 'sign-up-sheets')
+                    __('Please check that the reCAPTCHA field is valid.', 'fdsus')
                 );
             }
@@ -105 +81 @@
                 'fdsus-captcha-error', sprintf(
                 /* translators: %s is replaced with the users response to the simple captcha */
-                    esc_html__('Oh dear, 7 + 1 does not equal %s. Please try again.', 'sign-up-sheets'),
+                    esc_html__('Oh dear, 7 + 1 does not equal %s. Please try again.', 'fdsus'),
                     esc_attr($_POST['spam_check'])
                 )

sign-up-sheets/trunk/controller/mail.php

@@ -128 +128 @@
             return new WP_Error(
                 'fdsus_mail_send',
-                esc_html__('Error sending email.', 'sign-up-sheets')
+                esc_html__('Error sending email.', 'fdsus')
                 . (Settings::isDetailedErrors() ? '.. ' . implode(' --- ', $ts_mail_errors) : '')
             );
@@ -172 +172 @@
 
         // Build initial signup details
-        $signupDetails = (!empty($signupDate) ? esc_html__('Date', 'sign-up-sheets') . ': ' . date(get_option('date_format'), strtotime($signupDate)) . PHP_EOL : null)
-            . esc_html__('Event', 'sign-up-sheets') . ': ' . wp_kses_post($args['sheet']->post_title) . PHP_EOL
+        $signupDetails = (!empty($signupDate) ? esc_html__('Date', 'fdsus') . ': ' . date(get_option('date_format'), strtotime($signupDate)) . PHP_EOL : null)
+            . esc_html__('Event', 'fdsus') . ': ' . wp_kses_post($args['sheet']->post_title) . PHP_EOL
             . esc_html(Settings::$text['task_title_label']['value'])
             . ': ' . wp_kses_post($args['task']->post_title);

sign-up-sheets/trunk/controller/migrate.php

@@ -21 +21 @@
 
 if (Id::isPro()) {
-    class MigrateParent extends \FDSUSPRO\Controller\Pro\Migrate {}
+    class MigrateParent extends Pro\Migrate {}
 } else {
     class MigrateParent extends Base {}
@@ -79 +79 @@
             $output = sprintf(
                 /* translators: %1$s is replaced with the URL to retry */
-                esc_html__('Migration has already been completed. <a href="%1$s" class="button">Run Migration Again</a>', 'sign-up-sheets'),
+                esc_html__('Migration has already been completed. <a href="%1$s" class="button">Run Migration Again</a>', 'fdsus'),
                 esc_url(add_query_arg('retry', 'true', $this->data->getCurrentUrl()))
             );
@@ -603 +603 @@
                 'group' => 'settings',
                 'options' => null,
-                'note' => esc_html__('(comma-separated list of emails to be copied on sign-up confirmations/removals for this sheet)', 'sign-up-sheets'),
+                'note' => esc_html__('(comma-separated list of emails to be copied on sign-up confirmations/removals for this sheet)', 'fdsus'),
             ),
             array(
@@ -611 +611 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -619 +619 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -627 +627 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -635 +635 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -643 +643 @@
                 'group' => 'settings',
                 'options' => array(
-                    ''      => esc_html__('Global', 'sign-up-sheets'),
-                    'false' => esc_html__('Disabled', 'sign-up-sheets'),
-                    'true'  => esc_html__('Enabled', 'sign-up-sheets'),
-                    'semi'  => esc_html__('Semi-Compact', 'sign-up-sheets'),
+                    ''      => esc_html__('Global', 'fdsus'),
+                    'false' => esc_html__('Disabled', 'fdsus'),
+                    'true'  => esc_html__('Enabled', 'fdsus'),
+                    'semi'  => esc_html__('Semi-Compact', 'fdsus'),
                 ),
-                'note' => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'sign-up-sheets'),
+                'note' => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'fdsus'),
             ),
             array(
@@ -664 +664 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -672 +672 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -680 +680 @@
                 'group' => 'settings',
                 'options' => $true_false,
-                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
+                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
             ),
             array(
@@ -687 +687 @@
                 'type' => 'text',
                 'group' => 'settings',
-                'note' => '<br><em>' . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'sign-up-sheets') . ' <code>1</code> ' . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'sign-up-sheets') . '</em>',
+                'note' => '<br><em>' . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'fdsus') . ' <code>1</code> ' . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'fdsus') . '</em>',
                 'options' => null,
             ),
@@ -695 +695 @@
                 'type' => 'textarea',
                 'group' => 'settings',
-                'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
+                'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
                 'options' => null,
             ),
@@ -703 +703 @@
                 'type' => 'textarea',
                 'group' => 'settings',
-                'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
+                'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
                 'options' => null,
             ),
@@ -809 +809 @@
         }
 
-        return new WP_Error(Id::PREFIX . '_migrate_timeout', esc_html__('Sign-up Sheets migration timed out.', 'sign-up-sheets'));
+        return new WP_Error(Id::PREFIX . '_migrate_timeout', esc_html__('Sign-up Sheets migration timed out.', 'fdsus'));
     }
 

sign-up-sheets/trunk/controller/post-type-base.php

@@ -90 +90 @@
             'name'               => $plural,
             'singular_name'      => $singular,
-            'all_items'          => __('All', 'sign-up-sheets') . ' '  . $plural,
-            'add_new'            => __('Add New', 'sign-up-sheets'),
-            'add_new_item'       => __('Add New', 'sign-up-sheets') . ' ' . $singular,
-            'edit_item'          => __('Edit', 'sign-up-sheets') . ' ' . $singular,
-            'new_item'           => __('New', 'sign-up-sheets') . ' ' . $singular,
-            'view_item'          => __('View', 'sign-up-sheets') . ' ' . $singular,
-            'search_items'       => __('Search', 'sign-up-sheets') . ' ' . $plural,
+            'all_items'          => __('All', 'fdsus') . ' '  . $plural,
+            'add_new'            => __('Add New', 'fdsus'),
+            'add_new_item'       => __('Add New', 'fdsus') . ' ' . $singular,
+            'edit_item'          => __('Edit', 'fdsus') . ' ' . $singular,
+            'new_item'           => __('New', 'fdsus') . ' ' . $singular,
+            'view_item'          => __('View', 'fdsus') . ' ' . $singular,
+            'search_items'       => __('Search', 'fdsus') . ' ' . $plural,
             /* translators: %s is replaced with the plural post type name */
-            'not_found'          => sprintf(__('No %s found', 'sign-up-sheets'), $plural),
+            'not_found'          => sprintf(__('No %s found', 'fdsus'), $plural),
             /* translators: %s is replaced with the plural post type name */
-            'not_found_in_trash' => sprintf(__('No %s found in Trash', 'sign-up-sheets'), $plural),
+            'not_found_in_trash' => sprintf(__('No %s found in Trash', 'fdsus'), $plural),
             /* translators: %s is replaced with the singluar post type name */
-            'parent_item_colon'  => sprintf(__('Parent %s Record:', 'sign-up-sheets'), $singular),
+            'parent_item_colon'  => sprintf(__('Parent %s Record:', 'fdsus'), $singular),
             'menu_name'          => $plural,
         );

sign-up-sheets/trunk/controller/privacy.php

@@ -17 +17 @@
     {
         $this->fields = array(
-            'dlssus_email'     => __('Email', 'sign-up-sheets'),
-            'dlssus_firstname' => __('First Name', 'sign-up-sheets'),
-            'dlssus_lastname'  => __('Last Name', 'sign-up-sheets'),
-            'dlssus_phone'     => __('Phone', 'sign-up-sheets'),
-            'dlssus_address'   => __('Address', 'sign-up-sheets'),
-            'dlssus_city'      => __('City', 'sign-up-sheets'),
-            'dlssus_state'     => __('State', 'sign-up-sheets'),
-            'dlssus_zip'       => __('Zip', 'sign-up-sheets'),
+            'dlssus_email'     => __('Email', 'fdsus'),
+            'dlssus_firstname' => __('First Name', 'fdsus'),
+            'dlssus_lastname'  => __('Last Name', 'fdsus'),
+            'dlssus_phone'     => __('Phone', 'fdsus'),
+            'dlssus_address'   => __('Address', 'fdsus'),
+            'dlssus_city'      => __('City', 'fdsus'),
+            'dlssus_state'     => __('State', 'fdsus'),
+            'dlssus_zip'       => __('Zip', 'fdsus'),
         );
 
@@ -42 +42 @@
     {
         $exporters['sign-up-sheets'] = array(
-            'exporter_friendly_name' => __('Sign-up Sheets Plugin', 'sign-up-sheets'),
+            'exporter_friendly_name' => __('Sign-up Sheets Plugin', 'fdsus'),
             'callback'               => array(&$this, 'exportUserDataByEmail'),
         );
@@ -58 +58 @@
     {
         $erasers['sign-up-sheets'] = array(
-            'eraser_friendly_name' => __('Sign-up Sheets Plugin', 'sign-up-sheets'),
+            'eraser_friendly_name' => __('Sign-up Sheets Plugin', 'fdsus'),
             'callback'             => array(&$this, 'removeUserDataByEmail'),
         );
@@ -79 +79 @@
         $exportItems = array();
 
-        $fields = array('ID' => __('Sign-up ID', 'sign-up-sheets')) + $this->fields;
+        $fields = array('ID' => __('Sign-up ID', 'fdsus')) + $this->fields;
 
         $signupCollection = new SignupCollection();
@@ -94 +94 @@
             $itemId = SignupModel::POST_TYPE . '-' . $signup->ID;
             $groupId = 'fdsus-signups';
-            $groupLabel = __('Sign-ups', 'sign-up-sheets');
+            $groupLabel = __('Sign-ups', 'fdsus');
 
             foreach ($fields as $key => $name) {

sign-up-sheets/trunk/controller/scode/sign-up-form.php

@@ -82 +82 @@
 
         if (empty($task_id)) {
-            echo '<p>' . esc_html__('Task not found.', 'sign-up-sheets') . '</p>';
+            echo '<p>' . esc_html__('Task not found.', 'fdsus') . '</p>';
             return ob_get_clean();
         }
@@ -88 +88 @@
         $task = new TaskModel($task_id);
         if (empty($task) || empty($task->post_parent)) {
-            echo '<p>' . esc_html__('No Sign-up Form Found.', 'sign-up-sheets') . '</p>';
+            echo '<p>' . esc_html__('No Sign-up Form Found.', 'fdsus') . '</p>';
             return ob_get_clean();
         }
@@ -94 +94 @@
         $sheet = $task->getSheet();
         if (empty($sheet)) {
-            echo '<p>' . esc_html__('No Sign-up Sheet Found.', 'sign-up-sheets') . '</p>';
+            echo '<p>' . esc_html__('No Sign-up Sheet Found.', 'fdsus') . '</p>';
             return ob_get_clean();
         }
@@ -121 +121 @@
                     $date_display = null;
                     if ($date = $task->getDate()) {
-                        $date_display = ' ' . esc_html__('on', 'sign-up-sheets')
+                        $date_display = ' ' . esc_html__('on', 'fdsus')
                             . sprintf(' <em class="dls-sus-task-date">%s</em>',
                                 date(get_option('date_format'), strtotime($date))
@@ -133 +133 @@
         } else { // no task checkbox
             if ($date = $task->getDate()) {
-                $date_display = ' ' . esc_html__('on', 'sign-up-sheets')
+                $date_display = ' ' . esc_html__('on', 'fdsus')
                     . sprintf(
                         ' <em class="dls-sus-task-date">%s</em>',
@@ -178 +178 @@
         $states = new StatesModel;
 
-        $submitButtonText = __('Sign me up!', 'sign-up-sheets');
+        $submitButtonText = __('Sign me up!', 'fdsus');
         /**
          * Filter for submit button text on sign-up form
@@ -235 +235 @@
             || !wp_verify_nonce($_POST['signup_nonce'], 'fdsus_signup_submit')
         ) {
-            Notice::add('error', esc_html__('Sign-up nonce not valid.', 'sign-up-sheets'), false, Id::PREFIX . '-signup-nonce-invalid');
+            Notice::add('error', esc_html__('Sign-up nonce not valid.', 'fdsus'), false, Id::PREFIX . '-signup-nonce-invalid');
             return false;
         }
@@ -248 +248 @@
             if (!$task->isValid()) {
                 Notice::add(
-                    'error', esc_html__('Hmm... we could not find the task for this sign-up.', 'sign-up-sheets'),
+                    'error', esc_html__('Hmm... we could not find the task for this sign-up.', 'fdsus'),
                     true, 'fdsus-task-invalid'
                 );
@@ -257 +257 @@
             if ($task->isExpired()) {
                 Notice::add(
-                    'error', esc_html__('Sign-ups on this sheet can no longer be edited.', 'sign-up-sheets'),
+                    'error', esc_html__('Sign-ups on this sheet can no longer be edited.', 'fdsus'),
                     true, 'fdsus-sheet-expired'
                 );
@@ -268 +268 @@
                 if ($sheet->isExpired()) {
                     Notice::add(
-                        'error', esc_html__('Sign-ups on this task can no longer be edited.', 'sign-up-sheets'),
+                        'error', esc_html__('Sign-ups on this task can no longer be edited.', 'fdsus'),
                         true, 'fdsus-task-expired'
                     );
@@ -276 +276 @@
                 if (!$sheet->dlssus_is_active) {
                     Notice::add(
-                        'error', esc_html__('Sign-ups are no longer being accepted for this sheet.', 'sign-up-sheets'),
+                        'error', esc_html__('Sign-ups are no longer being accepted for this sheet.', 'fdsus'),
                         true, 'fdsus-signup-sheet-inactive'
                     );
@@ -283 +283 @@
             } else if ($sheet->ID != $task->post_parent) {
                 Notice::add(
-                    'error', esc_html__('Signing up for more than one sheet is not currently supported.', 'sign-up-sheets'),
+                    'error', esc_html__('Signing up for more than one sheet is not currently supported.', 'fdsus'),
                     true, 'fdsus-multiple-sheet-signups-not-support'
                 );
@@ -291 +291 @@
             if (!$sheet->isValid()) {
                 Notice::add(
-                    'error', esc_html__('Hmm... we could not find the sheet for this sign-up.', 'sign-up-sheets'),
+                    'error', esc_html__('Hmm... we could not find the sheet for this sign-up.', 'fdsus'),
                     true, 'fdsus-sheet-invalid'
                 );
@@ -299 +299 @@
             if (!$task->dlssus_is_active) {
                 Notice::add(
-                    'error', esc_html__('Sign-ups are no longer being accepted for this task.', 'sign-up-sheets'),
+                    'error', esc_html__('Sign-ups are no longer being accepted for this task.', 'fdsus'),
                     true, 'fdsus-signup-task-inactive'
                 );
@@ -309 +309 @@
         if (empty($tasks)) {
             Notice::add(
-                'error', esc_html__('No valid task was found for this sign-up.', 'sign-up-sheets'),
+                'error', esc_html__('No valid task was found for this sign-up.', 'fdsus'),
                 true, 'fdsus-all-tasks-invalid'
             );
@@ -320 +320 @@
                 'warn', sprintf(
                     /* translators: %s is replaced with a comma separated list of all missing required fields */
-                    esc_html__('Please complete the following required fields: %s', 'sign-up-sheets'),
+                    esc_html__('Please complete the following required fields: %s', 'fdsus'),
                     implode(', ', $missingFieldNames)
                 ), false, 'fdsus-missing-fields'
@@ -327 +327 @@
         }
 
-        if ($sheet->showEmail() && !empty($_POST['signup_email']) && Settings::isEmailValidationEnabled() && (!filter_var($_POST['signup_email'], FILTER_VALIDATE_EMAIL))) {
+        if (Settings::isEmailValidationEnabled() && (!filter_var($_POST['signup_email'], FILTER_VALIDATE_EMAIL))) {
             Notice::add(
-                'warn', esc_html__('Please check that your email address is properly formatted', 'sign-up-sheets'),
+                'warn', esc_html__('Please check that your email address is properly formatted', 'fdsus'),
                 false, 'fdsus-invalid-email'
             );
@@ -335 +335 @@
         }
 
-        if ($sheet->showEmail() && !empty($_POST['signup_email']) && Settings::isEmailValidationEnabled()
+        if (Settings::isEmailValidationEnabled()
             && !checkdnsrr(
                 substr($_POST['signup_email'], strpos($_POST['signup_email'], '@') + 1), 'MX'
@@ -341 +341 @@
         ) {
             Notice::add(
-                'warn', esc_html__('Whoops, it looks like your email domain may not be valid.', 'sign-up-sheets'),
+                'warn', esc_html__('Whoops, it looks like your email domain may not be valid.', 'fdsus'),
                 false, 'fdsus-email-checkdnsrr'
             );
@@ -349 +349 @@
         if ($this->data->is_honeypot_enabled() && !empty($_POST['website'])) {
             Notice::add(
-                'warn', esc_html__('Sorry, your submission has been blocked.', 'sign-up-sheets'),
+                'warn', esc_html__('Sorry, your submission has been blocked.', 'fdsus'),
                 false, 'fdsus-signup-form-honeypot'
             );
@@ -446 +446 @@
                     );
 
-                    if (!empty($_POST['signup_email']) && $sendSignupConfirmationEmail) {
+                    if ($sendSignupConfirmationEmail) {
                         $this->mail->send($_POST['signup_email'], $sheet, $task, $signupId, 'signup');
                     }

sign-up-sheets/trunk/controller/scode/sign-up-sheet.php

@@ -68 +68 @@
                 array(
                     'id'                     => false,
-                    'list_title'             => esc_html__('Current Sign-up Sheets', 'sign-up-sheets'),
+                    'list_title'             => esc_html__('Current Sign-up Sheets', 'fdsus'),
                     'category_id'            => false, // Pro only - deprecated as of v2.1
                     'category_slug'          => false, // Pro only - allows comma-separated string
@@ -79 +79 @@
         $dbVersion = get_option('dls_sus_db_version');
         if (strpos($dbVersion, '1.0') === 0 || strpos($dbVersion, '2.0') === 0) {
-            Notice::add('info', esc_html__('No sheet found, please contact the webmaster.', 'sign-up-sheets'), true);
+            Notice::add('info', esc_html__('No sheet found, please contact the webmaster.', 'fdsus'), true);
         }
 

sign-up-sheets/trunk/controller/scode/user-sign-ups.php

@@ -69 +69 @@
         $user = wp_get_current_user();
         if (!$user->exists()) {
-            Notice::add('info', esc_html__('You must be logged in to view your sign-ups.', 'sign-up-sheets'), true);
+            Notice::add('info', esc_html__('You must be logged in to view your sign-ups.', 'fdsus'), true);
             return apply_filters(Id::PREFIX . '_notices', null);
         }
@@ -127 +127 @@
             if ($sheet->showEmail()) {
                 $row['signup_additional']['email'] = array(
-                    'label' => __('Email', 'sign-up-sheets'),
+                    'label' => __('Email', 'fdsus'),
                     'value' => $signup->dlssus_email,
                 );
@@ -134 +134 @@
             if ($sheet->showPhone()) {
                 $row['signup_additional']['phone'] = array(
-                    'label' => __('Phone', 'sign-up-sheets'),
+                    'label' => __('Phone', 'fdsus'),
                     'value' => $signup->dlssus_phone,
                 );
@@ -141 +141 @@
             if ($sheet->showAddress()) {
                 $row['signup_additional']['phone'] = array(
-                    'label' => __('Address', 'sign-up-sheets'),
+                    'label' => __('Address', 'fdsus'),
                     'value' => $signup->dlssus_address . ', ' . $signup->dlssus_city . ', ' . $signup->dlssus_state
                         . ' ' . $signup->dlssus_zip,

sign-up-sheets/trunk/controller/sheet.php

@@ -151 +151 @@
                                 sprintf(
                                     /* translators: %1$s is replaced with task name, %2$d is replaced with the current number of signups on that task, %3$s is replaced with "person" or "people" depending on the number of signups  */
-                                    esc_html__('The number of spots for task "%1$s" cannot be set below %2$d because it currently has %2$d %3$s signed up. Please clear some spots first before updating this task.', 'sign-up-sheets'),
+                                    esc_html__('The number of spots for task "%1$s" cannot be set below %2$d because it currently has %2$d %3$s signed up. Please clear some spots first before updating this task.', 'fdsus'),
                                     esc_html($data['title']),
                                     $signupCount,
@@ -178 +178 @@
                                 sprintf(
                                     /* translators: %1$s is replaced with task name, %2$d is replaced with the current number of signups on that task, %3$s is replaced with "person" or "people" depending on the number of signups  */
-                                    esc_html__('The task "%1$s" cannot be removed because it has %2$d %3$s signed up.  Please clear all spots first before removing this task.', 'sign-up-sheets'),
+                                    esc_html__('The task "%1$s" cannot be removed because it has %2$d %3$s signed up.  Please clear all spots first before removing this task.', 'fdsus'),
                                     $task->post_title,
                                     $signupCount,
@@ -330 +330 @@
     function modifyTheContent($content)
     {
-        if (post_password_required(get_the_ID())
-            || !is_singular()
-            || !is_main_query()
-            || get_post_type() !== SheetModel::POST_TYPE
-        ) {
-            return $content;
-        }
-
-        // Before
-        ob_start();
-        fdsus_the_signup_form_response();
-        if (dlssus_has_sheet_date() && empty($_GET['task_id'])): ?>
-            <p class="dls-sus-sheet-date">
-                <?php esc_html_e('Date', 'sign-up-sheets'); ?>:
-                <?php echo dlssus_field('date'); ?>
-            </p>
-        <?php endif;
-        $before = ob_get_clean();
-
-        // After
-        ob_start();
-        dlssus_get_template_part('content');
-        $after = ob_get_clean();
-
-        // Hide normal sheet page content if displaying signup
-        if (!empty($_GET['task_id'])) {
-            $content = '';
-        }
-
+        $before = '';
+        $after = '';
+
+        if (is_singular() && is_main_query() && get_post_type() === SheetModel::POST_TYPE) {
+            // Before
+            ob_start();
+            fdsus_the_signup_form_response();
+            if (dlssus_has_sheet_date() && empty($_GET['task_id'])): ?>
+                <p class="dls-sus-sheet-date">
+                    <?php esc_html_e('Date', 'fdsus'); ?>:
+                    <?php echo dlssus_field('date'); ?>
+                </p>
+            <?php endif;
+            $before = ob_get_clean();
+
+            // After
+            ob_start();
+            dlssus_get_template_part('content');
+            $after = ob_get_clean();
+
+            // Hide normal sheet page content if displaying signup
+            if (!empty($_GET['task_id'])) {
+                $content = '';
+            }
+        }
         return $before . $content . $after;
     }
@@ -422 +418 @@
                 $successMsg = sprintf(
                     /* translators: %s is replaced with the task title */
-                    esc_html__('You have been signed up for %s!', 'sign-up-sheets'),
+                    esc_html__('You have been signed up for %s!', 'fdsus'),
                     '<em>' . wp_kses_post($task->post_title) . '</em>'
                 );

sign-up-sheets/trunk/controller/task-table.php

@@ -50 +50 @@
         /**
          * @var bool $showSignupLink
-         * @var bool $emailSimplified
          */
         extract(shortcode_atts(array(
             'showSignupLink' => false,
-            'emailSimplified' => false,
         ), $atts));
         $this->config['showSignupLink'] = $showSignupLink;
-        $this->config['emailSimplified'] = $emailSimplified;
 
         $this->tasks = $this->sheet->getTasks();
-        $this->table = new TaskTableModel($sheet, $this->config);
-
-        $this->setVariables($atts);
+        $this->table = new TaskTableModel($sheet);
 
         parent::__construct();
@@ -70 +65 @@
      * Set variables
      */
-    private function setVariables($excludedAtts = array())
-    {
-        $this->config['isFullCompact'] = $this->sheet->isFullCompact() && !is_admin() && !$this->config['emailSimplified'];
-        $this->config['displayAll'] = Settings::isDisplayAllSignupDataEnabled() || is_admin() || $this->config['emailSimplified'];
+    private function setVariables()
+    {
+        $this->config['isFullCompact'] = $this->sheet->isFullCompact() && !is_admin();
+        $this->config['displayAll'] = Settings::isDisplayAllSignupDataEnabled() || is_admin();
 
         /**
@@ -115 +110 @@
         $out = '';
         foreach ($this->table->rows as $row) {
-            $out .= sprintf(
-                '<tr class="%s" %s>',
-                $row->class ? $row->class : '',
-                $this->config['emailSimplified'] ? 'valign="top" align="left"' : ''
-            );
+            $out .= sprintf('<tr class="%s">', $row->class ? $row->class : '');
             foreach ($row->cells as $cell) {
                 $scope = '';
@@ -150 +141 @@
         // Remaining empty spots
         if ($this->config['displayAll'] && !$this->config['isFullCompact']) {
-            $this->config['emptySignupColspan'] += 6;
-            if ($this->sheet->showEmail()) {
-                $this->config['emptySignupColspan']++;
-            }
+            $this->config['emptySignupColspan'] += 7;
             if ($this->sheet->showPhone()) {
                 $this->config['emptySignupColspan']++;
@@ -192 +180 @@
         $this->table = apply_filters('fdsus_tasktable-table-header_data_after_task_title', $this->table, $this->sheet, $this->config);
 
-        $this->table->addHeaderCell('name', esc_html__('Name', 'sign-up-sheets'));
+        $this->table->addHeaderCell('name', esc_html__('Name', 'fdsus'));
 
         if ($this->config['displayAll']) {
-            if ($this->sheet->showEmail()) {
-                $this->table->addHeaderCell('email', esc_html__('E-mail', 'sign-up-sheets'));
-            }
+            $this->table->addHeaderCell('email', esc_html__('E-mail', 'fdsus'));
             if ($this->sheet->showPhone()) {
-                $this->table->addHeaderCell('phone', esc_html__('Phone', 'sign-up-sheets'));
+                $this->table->addHeaderCell('phone', esc_html__('Phone', 'fdsus'));
             }
             if ($this->sheet->showAddress()) {
-                $this->table->addHeaderCell('address', esc_html__('Address', 'sign-up-sheets'));
-                $this->table->addHeaderCell('city', esc_html__('City', 'sign-up-sheets'));
-                $this->table->addHeaderCell('state', esc_html__('State', 'sign-up-sheets'));
-                $this->table->addHeaderCell('zip', esc_html__('Zip', 'sign-up-sheets'));
+                $this->table->addHeaderCell('address', esc_html__('Address', 'fdsus'));
+                $this->table->addHeaderCell('city', esc_html__('City', 'fdsus'));
+                $this->table->addHeaderCell('state', esc_html__('State', 'fdsus'));
+                $this->table->addHeaderCell('zip', esc_html__('Zip', 'fdsus'));
             }
         }
@@ -226 +212 @@
                     'clear-checkbox',
                     '<label>
-                        <span class="screen-reader-text">' . esc_html__('Select all spots to Clear', 'sign-up-sheets') . '</span>
+                        <span class="sr-only">' . __('Select all spots to Clear', 'fdsus') . '</span>
                         <input type="checkbox" value="" id="select-all-clear">
                     </label>
-                    <input name="multi_submit" type="submit" class="button" value="' . esc_html__('Clear Selected', 'sign-up-sheets') . '" onclick="return confirm(\'' . esc_html__('This will permanently remove all selected sign-ups for this sheet.', 'sign-up-sheets') . '\');">',
+                    <input name="multi_submit" type="submit" class="button" value="' . esc_html__('Clear Selected', 'fdsus') . '" onclick="return confirm(\'' . esc_html__('This will permanently remove all selected sign-ups for this sheet.', 'fdsus') . '\');">',
                     'fdsus-col-clear'
                 );
@@ -298 +284 @@
 
             $signupIndex = 0;
-            if (!$this->config['isFullCompact'] || $this->config['emailSimplified']) {
+            if (!$this->config['isFullCompact']) {
                 if (!empty($signups) && is_array($signups)) {
                     foreach ($signups AS $signup) {
@@ -375 +361 @@
                             '<span class="dls-sus-spot-num">%s</span> <span>%s</span>',
                             /* translators: %d is replaced with the spot number */
-                            sprintf(esc_html__('#%d:', 'sign-up-sheets'), (int)$this->config['spotIndex']),
+                            sprintf(esc_html__('#%d:', 'fdsus'), (int)$this->config['spotIndex']),
                             $name
                         );
@@ -381 +367 @@
 
                         if ($this->config['displayAll']) {
-                            if ($this->sheet->showEmail()) {
-                                $this->table->addRowCell('auto', 'email', esc_html($signup->dlssus_email));
-                            }
+                            $this->table->addRowCell('auto', 'email', esc_html($signup->dlssus_email));
                             if ($this->sheet->showPhone()) {
                                 $this->table->addRowCell('auto', 'phone', esc_html($signup->dlssus_phone));
@@ -424 +408 @@
                                 <span class="delete">
                                     <label>
-                                        <span class="screen-reader-text">'
+                                        <span class="sr-only">'
                                             .  /* translators: %s is replaced with the index of the spot within the current task */
-                                            sprintf(__('Select spot #%s to clear', 'sign-up-sheets'), (int)$this->config['spotIndex']) . '</span>
+                                            sprintf(__('Select spot #%s to clear', 'fdsus'), (int)$this->config['spotIndex']) . '</span>
                                         <input type="checkbox" name="clear[]" value="' . (int)$signup->ID . '" class="clear-checkbox">
                                     </label>
@@ -434 +418 @@
                                 </span>
                                 <a href="' . esc_url(Settings::getAdminEditSignupPageUrl($signup->ID, $_GET['sheet_id'])) . '">
-                                    <span class="screen-reader-text">' . esc_html__('Edit', 'sign-up-sheets') . '</span>
+                                    <span class="sr-only">' . __('Edit', 'fdsus') . '</span>
                                     <i class="dashicons dashicons-edit" aria-hidden="true"></i>
                                 </a>
@@ -441 +425 @@
                                         id="fdsus-signup-metadata-control-' . (int)$signup->ID . '"
                                         aria-controls="fdsus-signup-metadata-detail-' . (int)$signup->ID . '">
-                                        <span class="screen-reader-text">' . esc_html__('Additional Details', 'sign-up-sheets') . '</span>
+                                        <span class="sr-only">' . __('Additional Details', 'fdsus') . '</span>
                                         <i class="dashicons dashicons-info" aria-hidden="true"></i>
                                     </a>
@@ -448 +432 @@
                                         aria-labelledby="fdsus-signup-metadata-control-' . (int)$signup->ID . '">
                                         <ul class="fdsus-signup-metadata">
-                                            <li>' . esc_html__('Added', 'sign-up-sheets') . ': %3$s</li>
-                                            <li>' . esc_html__('Updated', 'sign-up-sheets') . ': %4$s</li>
-                                            <li>' . esc_html__('Linked user', 'sign-up-sheets') . ':  %5$s</li>
+                                            <li>' . __('Added', 'fdsus') . ': %3$s</li>
+                                            <li>' . __('Updated', 'fdsus') . ': %4$s</li>
+                                            <li>' . __('Linked user', 'fdsus') . ':  %5$s</li>
                                         </ul>
                                     </div>
                                 </div>
                                 ',
-                                esc_html__('Clear Spot Now', 'sign-up-sheets'),
-                                'onclick="return confirm(\'' . esc_html__('This will permanently remove this sign-up.', 'sign-up-sheets') . '\');"',
+                                esc_html__('Clear Spot Now', 'fdsus'),
+                                'onclick="return confirm(\'' . esc_html__('This will permanently remove this sign-up.', 'fdsus') . '\');"',
                                 date('Y-m-d ' . get_option('time_format'), strtotime($signup->post_date)),
                                 date('Y-m-d ' . get_option('time_format'), strtotime($signup->post_modified)),
@@ -526 +510 @@
                         $signupLink = $task->getSignupLink();
                     } else {
-                        $signupLink = esc_html__('(empty)', 'sign-up-sheets');
+                        $signupLink = esc_html__('(empty)', 'fdsus');
                         if (is_admin()) {
                             $signupLink .= '
                                 <a href="' . esc_url(Settings::getAdminEditSignupPageUrl($task->ID, $_GET['sheet_id'], 'add')) . '">
-                                    <span class="screen-reader-text">' . esc_html__('Add Sign-up', 'sign-up-sheets') . '</span>
+                                    <span class="sr-only">' . __('Add Sign-up', 'fdsus') . '</span>
                                     <i class="dashicons dashicons-plus" aria-hidden="true"></i>
                                 </a>';
@@ -536 +520 @@
                     }
                     if ($this->sheet->isExpired() || $task->isExpired()) {
-                        $signupLink .= esc_html__(' - sign-ups closed', 'sign-up-sheets');
+                        $signupLink .= esc_html__(' - sign-ups closed', 'fdsus');
                     }
 
@@ -564 +548 @@
     /**
      * Get display code for tasks table (back and front-end)
-     *
-     * @param bool $echo
-     * @param bool $emailSimplified
-     *
-     * @return string|void
-     */
-    public function output($echo = true, $emailSimplified = false)
-    {
-        ob_start();
-
+     */
+    public function output()
+    {
         if (empty($this->tasks)) : ?>
-            <p><?php esc_html_e('No tasks were found.', 'sign-up-sheets'); ?></p>
+            <p><?php esc_html_e('No tasks were found.', 'fdsus'); ?></p>
             <?php
-            if ($echo) {
-                echo ob_get_clean();
-                return;
-            }
-            return ob_get_clean();
+            return;
         endif;
+
+        $this->setVariables();
 
         // Header
@@ -600 +575 @@
         // Build Table
         ?>
-        <?php if (!$emailSimplified) : ?><form action="<?php echo esc_url($formUrl); ?>" method="post" id="sus_form" class="fdsus-form"><?php endif; ?>
-            <table class="dls-sus-tasks <?php echo is_admin() ? 'wp-list-table widefat' : null; ?>" <?php if ($emailSimplified) : ?>cellspacing="0" cellpadding="5" border="1"<?php endif; ?>>
+        <form action="<?php echo esc_url($formUrl); ?>" method="post" id="sus_form" class="fdsus-form">
+            <table class="dls-sus-tasks <?php echo is_admin() ? 'wp-list-table widefat' : null; ?>">
                 <thead><?php echo $header; ?></thead>
-                <?php if (!$emailSimplified) : ?><tfoot><?php echo $header; ?></tfoot><?php endif; ?>
+                <tfoot><?php echo $header; ?></tfoot>
                 <tbody><?php echo $body; ?></tbody>
             </table>
@@ -611 +586 @@
              *
              * @param SheetModel $sheet
-             * @param array      $config
              *
              * @since 2.2
              */
-            do_action('fdsus_tasktable_after_table', $this->sheet, $this->config);
+            do_action('fdsus_tasktable_after_table', $this->sheet);
 
             wp_nonce_field('clear-multiple-signups', 'manage_signup_nonce', true, false);
             ?>
-        <?php if (!$emailSimplified) : ?></form><?php endif; ?>
+        </form>
         <?php
-
-        if ($echo) {
-            echo ob_get_clean();
-            return;
-        }
-        return ob_get_clean();
     }
 

sign-up-sheets/trunk/css/admin.css

@@ -1 @@
-@font-face{font-family:"fdsus";src:url("font/fdsus/fonts/fdsus.ttf?jfroy1") format("truetype"),url("font/fdsus/fonts/fdsus.woff?jfroy1") format("woff"),url("font/fdsus/fonts/fdsus.svg?jfroy1#fdsus") format("svg");font-weight:normal;font-style:normal;font-display:block}[class^=fdsus-icon-],[class*=" fdsus-icon-"]{font-family:"fdsus" !important;speak:never;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fdsus-icon-cursor-move:before{content:""}.fdsus-icon-arrow-horizontal:before{content:""}.fdsus-icon-arrow-vertical:before{content:""}.fdsus-icon-cursor-move-two:before{content:""}.fdsus-icon-plus:before{content:""}.fdsus-icon-remove:before{content:""}.fdsus-icon-star:before{content:""}.fdsus-icon-checkbox:before{content:""}.fdsus-icon-clipboard-notes:before{content:""}.fdsus-icon-clipboard:before{content:""}.fdsus-icon-sus:before{content:""}.wp-list-table .fdsus-id-value{color:#50575e}.post-type-dlssus_sheet .fdsus-edit-quick-info{margin-bottom:1em;text-align:center}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-item{display:inline-block;margin:0 .6em .6em}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-id{display:block}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .dls-sus-pro{font-size:.8em}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .fdsus-pro-setting{padding:1%}.post-type-dlssus_sheet .dlsmb-main-label{margin-bottom:2px}@media screen and (min-width: 601px){#dlssus_sheet-settings-meta .inside{display:flex;flex-wrap:wrap;gap:3%}#dlssus_sheet-settings-meta .dlsmb-field{width:31.33%}#dlssus_sheet-settings-meta .dlsmb-field.fdsus-pro-setting{width:29.33%}#dlssus_sheet-settings-meta .dlsmb-field-col-6{width:48.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-6.fdsus-pro-setting{width:46.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-12{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-col-12.fdsus-pro-setting{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes{display:flex;flex-wrap:wrap;gap:.6em}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes .dlsmb-main-label{width:100%}}@media screen and (max-width: 600px){#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes label:not(.dlsmb-main-label){line-height:2.4}}.dlssus_sheet_page_fdsus-manage .page-title-action .dashicons{vertical-align:middle}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip{display:inline-block;position:relative}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a::after{content:"";font-family:"dashicons";vertical-align:middle;margin-left:-4px}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true]::after{content:""}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true] .dashicons{background:#fff;border:1px solid #c3c4c7;border-radius:2em 2em 0 0;border-bottom-color:#fff;margin-top:-1px;margin-left:-1px;position:relative;z-index:20}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip div[role=region]{background:#fff;border:1px solid #c3c4c7;margin-top:-1px;min-width:13em;padding:1em;position:absolute;right:0;z-index:10}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata{font-size:.8em;list-style-type:none;margin:0;padding:0}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata li{margin:0;padding:0}.dlssus_sheet_page_fdsus-manage #select-all-clear{margin-right:.6em}.dlssus_sheet_page_fdsus-manage .button{vertical-align:middle}.fdsus-pro-setting{background-color:#ebf9f6;background:-o-repeating-linear-gradient(left, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px);background:repeating-linear-gradient(90deg, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px)}.fdsus-pro-setting th{padding-left:10px}.fdsus-pro-setting .dls-sus-pro{font-size:.8em}.dls_sus .dls-sus-settings .dls-sus-pro{font-size:.8em}.dls-sus-signup-form label{display:block}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email]{width:100%}.dls-sus-pro{background-color:#47c9af;color:#fff;font-size:.4em;font-weight:bold;padding:.2em .6em;-webkit-border-radius:1em;border-radius:1em}.dls-sus-repeater td{vertical-align:top}.dls-sus-repeater textarea{height:60px}.js .dls_sus .postbox H3{cursor:pointer}.dls_sus .postbox H3.hndle{padding:8px 12px;margin:0}.dls_sus form.dls-sus-settings{margin-top:1em}.dls-sus-system-info,.dls-sus-system-info[readonly=readonly]{width:100%;overflow:auto;background:#222;color:#bbb;padding:1em;white-space:pre;font-family:Menlo,Monaco,monospace}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}.dlssus_tasks-row .add-task-after,.dlssus_tasks-row .remove-task{display:inline-block;border:2px solid #fff;color:#fff;width:1.4em;height:1.4em;line-height:1.4em;text-align:center;text-decoration:none;-webkit-border-radius:999em;-moz-border-radius:999em;border-radius:999em}.dlssus_tasks-row .add-task-after{background-color:#6f9f44}.dlssus_tasks-row .remove-task{background-color:#bf212e}.dlsmb-repeater-dlssus_tasks-row .dlsmb-field-key-textarea-filled_spots .dlsmb-field-element{line-height:2;margin:0;padding:0 8px;vertical-align:middle}.dlsmb-field-key-textarea-dlssus_sheet_email_conf_message textarea{height:11.5em}.dlsmb-field-key-textarea-dlssus_sheet_email_message textarea{height:11.5em}.dls-sus-task-header-row .dashicons{width:auto;height:auto;line-height:1.6em}.dlsmb-field-type-hidden{display:none}@media only screen and (max-width: 760px){#dlssus_sheet-tasks-meta table,#dlssus_sheet-tasks-meta thead,#dlssus_sheet-tasks-meta tbody,#dlssus_sheet-tasks-meta td,#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row,#dlssus_sheet-tasks-meta th{display:block}#dlssus_sheet-tasks-meta tr.dlsmb-blank-repeater,#dlssus_sheet-tasks-meta thead tr{display:none}#dlssus_sheet-tasks-meta tr{margin:0 0 1rem 0}#dlssus_sheet-tasks-meta td{border:none;border-bottom:1px solid #eee;position:relative;padding-left:5%}#dlssus_sheet-tasks-meta td{border:0}#dlssus_sheet-tasks-meta td:nth-of-type(1){min-height:30px}#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row td .dlsmb-main-label-mobile{display:block !important;margin-bottom:10px;font-weight:bold}.dlsmb-field-type-repeater LABEL.dlsmb-main-label{display:block;font-weight:bold;margin-bottom:.6em}}.dlssus-email-test fieldset{background-color:#e2e2e2;padding:2em;max-width:40em}.dlssus-email-test fieldset input[type=email],.dlssus-email-test fieldset textarea{width:100%}.dlssus-email-test fieldset p:first-child{margin-right:2%}.dlssus-email-test fieldset p:first-child,.dlssus-email-test fieldset p:nth-child(2){margin-top:0;width:49%;float:left}.dlssus-email-test fieldset p:nth-child(2){margin-top:0}.dlssus-email-test fieldset p:nth-child(3){clear:both}.dlssus-email-test fieldset p:last-child{margin-bottom:0}.fdsus-footer{text-align:center}.fdsus-footer hr{margin:2em 0 1em}.fdsus-footer-getpro{display:inline-block;text-decoration:none;vertical-align:middle}.fdsus-footer-getpro::before{font-family:"fdsus";content:"";vertical-align:middle;margin:0 .5em;font-size:1.4em}.fdsus-footer-getpro span{text-decoration:underline}.post-type-dlssus_sheet #wpbody-content,.post-type-dlssus_task #wpbody-content,.post-type-dlssus_signup #wpbody-content{padding-bottom:7rem}#dashboard_right_now li.dlssus_sheet-count a:before{content:"";font-family:"fdsus"}/*# sourceMappingURL=admin.css.map */
+@font-face{font-family:"fdsus";src:url("font/fdsus/fonts/fdsus.ttf?jfroy1") format("truetype"),url("font/fdsus/fonts/fdsus.woff?jfroy1") format("woff"),url("font/fdsus/fonts/fdsus.svg?jfroy1#fdsus") format("svg");font-weight:normal;font-style:normal;font-display:block}[class^=fdsus-icon-],[class*=" fdsus-icon-"]{font-family:"fdsus" !important;speak:never;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fdsus-icon-cursor-move:before{content:""}.fdsus-icon-arrow-horizontal:before{content:""}.fdsus-icon-arrow-vertical:before{content:""}.fdsus-icon-cursor-move-two:before{content:""}.fdsus-icon-plus:before{content:""}.fdsus-icon-remove:before{content:""}.fdsus-icon-star:before{content:""}.fdsus-icon-checkbox:before{content:""}.fdsus-icon-clipboard-notes:before{content:""}.fdsus-icon-clipboard:before{content:""}.fdsus-icon-sus:before{content:""}.wp-list-table .fdsus-id-value{color:#50575e}.post-type-dlssus_sheet .fdsus-edit-quick-info{margin-bottom:1em;text-align:center}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-item{display:inline-block;margin:0 .6em .6em}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-id{display:block}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .dls-sus-pro{font-size:.8em}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .fdsus-pro-setting{padding:1%}.post-type-dlssus_sheet .dlsmb-main-label{margin-bottom:2px}@media screen and (min-width: 601px){#dlssus_sheet-settings-meta .inside{display:flex;flex-wrap:wrap;gap:3%}#dlssus_sheet-settings-meta .dlsmb-field{width:31.33%}#dlssus_sheet-settings-meta .dlsmb-field.fdsus-pro-setting{width:29.33%}#dlssus_sheet-settings-meta .dlsmb-field-col-6{width:48.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-6.fdsus-pro-setting{width:46.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-12{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-col-12.fdsus-pro-setting{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes{display:flex;flex-wrap:wrap;gap:.6em}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes .dlsmb-main-label{width:100%}}@media screen and (max-width: 600px){#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes label:not(.dlsmb-main-label){line-height:2.4}}.dlssus_sheet_page_fdsus-manage .page-title-action .dashicons{vertical-align:middle}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip{display:inline-block;position:relative}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a::after{content:"";font-family:"dashicons";vertical-align:middle;margin-left:-4px}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true]::after{content:""}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true] .dashicons{background:#fff;border:1px solid #c3c4c7;border-radius:2em 2em 0 0;border-bottom-color:#fff;margin-top:-1px;margin-left:-1px;position:relative;z-index:20}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip div[role=region]{background:#fff;border:1px solid #c3c4c7;margin-top:-1px;min-width:13em;padding:1em;position:absolute;right:0;z-index:10}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata{font-size:.8em;list-style-type:none;margin:0;padding:0}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata li{margin:0;padding:0}.dlssus_sheet_page_fdsus-manage #select-all-clear{margin-right:.6em}.dlssus_sheet_page_fdsus-manage .button{vertical-align:middle}.fdsus-pro-setting{background-color:#ebf9f6;background:-o-repeating-linear-gradient(left, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px);background:repeating-linear-gradient(90deg, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px)}.fdsus-pro-setting th{padding-left:10px}.fdsus-pro-setting .dls-sus-pro{font-size:.8em}.dls_sus .dls-sus-settings .dls-sus-pro{font-size:.8em}.dls-sus-signup-form label{display:block}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email]{width:100%}.dls_sus .sr-only:not(:focus):not(:active){clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.dls_sus .dashicons-trash:before{color:#e22f2e}.dls_sus a:hover .dashicons-trash:before,.dls_sus a:focus .dashicons-trash:before{color:#ff5348}.dls_sus .fixed .column-task_num,.dls_sus .fixed .column-spot_num,.dls_sus .fixed .column-filled_spot_num{width:10%}.dls_sus .fixed .column-id{width:5%}.dls_sus .tasks{margin-bottom:3em}.dls_sus .tasks LI{background:rgba(0,0,0,0) url("../images/icon-drag-y.png") no-repeat scroll left center;padding-left:16px;min-height:20px}.dls_sus .tasks LI:hover{cursor:move}.dls_sus .tasks LI.ui-sortable-helper{cursor:move}.dls_sus .tasks .add-task-after,.dls_sus .tasks .remove-task{display:inline-block;border:2px solid #fff;color:#fff;width:1.4em;height:1.4em;line-height:1.4em;text-align:center;text-decoration:none;-webkit-border-radius:999em;-moz-border-radius:999em;border-radius:999em}.dls_sus .tasks .add-task-after{background-color:#6f9f44}.dls_sus .tasks .remove-task{background-color:#bf212e}.dls_sus .dls-sus-tasks tfoot .fdsus-col-clear *{display:none}.dls_sus .dls-sus-tasks .fdsus-col-clear input[type=checkbox]{margin-left:0}.dls-sus-tasks tbody th{vertical-align:top}.dls-sus-pro{background-color:#47c9af;color:#fff;font-size:.4em;font-weight:bold;padding:.2em .6em;-webkit-border-radius:1em;border-radius:1em}.dls-sus-repeater td{vertical-align:top}.dls-sus-repeater textarea{height:60px}.js .dls_sus .postbox H3{cursor:pointer}.dls_sus .postbox H3.hndle{padding:8px 12px;margin:0}.dls_sus form.dls-sus-settings{margin-top:1em}.dls-sus-system-info,.dls-sus-system-info[readonly=readonly]{width:100%;overflow:auto;background:#222;color:#bbb;padding:1em;white-space:pre;font-family:Menlo,Monaco,monospace}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}.dlssus_tasks-row .add-task-after,.dlssus_tasks-row .remove-task{display:inline-block;border:2px solid #fff;color:#fff;width:1.4em;height:1.4em;line-height:1.4em;text-align:center;text-decoration:none;-webkit-border-radius:999em;-moz-border-radius:999em;border-radius:999em}.dlssus_tasks-row .add-task-after{background-color:#6f9f44}.dlssus_tasks-row .remove-task{background-color:#bf212e}.dlsmb-repeater-dlssus_tasks-row .dlsmb-field-key-textarea-filled_spots .dlsmb-field-element{line-height:2;margin:0;padding:0 8px;vertical-align:middle}.dlsmb-field-key-textarea-dlssus_sheet_email_conf_message textarea{height:11.5em}.dlsmb-field-key-textarea-dlssus_sheet_email_message textarea{height:11.5em}.dls-sus-task-header-row .dashicons{width:auto;height:auto;line-height:1.6em}.dlsmb-field-type-hidden{display:none}@media only screen and (max-width: 760px){#dlssus_sheet-tasks-meta table,#dlssus_sheet-tasks-meta thead,#dlssus_sheet-tasks-meta tbody,#dlssus_sheet-tasks-meta td,#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row,#dlssus_sheet-tasks-meta th{display:block}#dlssus_sheet-tasks-meta tr.dlsmb-blank-repeater,#dlssus_sheet-tasks-meta thead tr{display:none}#dlssus_sheet-tasks-meta tr{margin:0 0 1rem 0}#dlssus_sheet-tasks-meta td{border:none;border-bottom:1px solid #eee;position:relative;padding-left:5%}#dlssus_sheet-tasks-meta td{border:0}#dlssus_sheet-tasks-meta td:nth-of-type(1){min-height:30px}#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row td .dlsmb-main-label-mobile{display:block !important;margin-bottom:10px;font-weight:bold}.dlsmb-field-type-repeater LABEL.dlsmb-main-label{display:block;font-weight:bold;margin-bottom:.6em}}.dlssus-email-test fieldset{background-color:#e2e2e2;padding:2em;max-width:40em}.dlssus-email-test fieldset input[type=email],.dlssus-email-test fieldset textarea{width:100%}.dlssus-email-test fieldset p:first-child{margin-right:2%}.dlssus-email-test fieldset p:first-child,.dlssus-email-test fieldset p:nth-child(2){margin-top:0;width:49%;float:left}.dlssus-email-test fieldset p:nth-child(2){margin-top:0}.dlssus-email-test fieldset p:nth-child(3){clear:both}.dlssus-email-test fieldset p:last-child{margin-bottom:0}.fdsus-footer{text-align:center}.fdsus-footer hr{margin:2em 0 1em}.fdsus-footer-getpro{display:inline-block;text-decoration:none;vertical-align:middle}.fdsus-footer-getpro::before{font-family:"fdsus";content:"";vertical-align:middle;margin:0 .5em;font-size:1.4em}.fdsus-footer-getpro span{text-decoration:underline}.post-type-dlssus_sheet #wpbody-content,.post-type-dlssus_task #wpbody-content,.post-type-dlssus_signup #wpbody-content{padding-bottom:7rem}#dashboard_right_now li.dlssus_sheet-count a:before{content:"";font-family:"fdsus"}/*# sourceMappingURL=admin.css.map */

sign-up-sheets/trunk/css/sass/admin.scss

@@ -5 +5 @@
 @import "admin/settings-page";
 @import "admin/signup-edit";
+
+.dls_sus {
+    .sr-only:not(:focus):not(:active) {
+        clip: rect(0 0 0 0);
+        clip-path: inset(50%);
+        height: 1px;
+        overflow: hidden;
+        position: absolute;
+        white-space: nowrap;
+        width: 1px;
+    }
+
+    .dashicons-trash:before {
+        color: #e22f2e;
+    }
+
+    a:hover,
+    a:focus {
+        .dashicons-trash:before {
+            color: #ff5348;
+        }
+    }
+}
+
+.dls_sus .fixed .column-task_num,
+.dls_sus .fixed .column-spot_num,
+.dls_sus .fixed .column-filled_spot_num {
+    width: 10%;
+}
+.dls_sus .fixed .column-id {
+    width: 5%;
+}
+.dls_sus .tasks {
+    margin-bottom: 3em;
+}
+.dls_sus .tasks LI {
+    background: transparent url("../images/icon-drag-y.png") no-repeat scroll left center;
+    padding-left: 16px;
+    min-height: 20px;
+}
+.dls_sus .tasks LI:hover {
+    cursor: move;
+}
+.dls_sus .tasks LI.ui-sortable-helper{
+    cursor: move;
+}
+.dls_sus .tasks .add-task-after,
+.dls_sus .tasks .remove-task {
+    display: inline-block;
+    border: 2px solid #fff;
+    color: #fff;
+    width: 1.4em;
+    height: 1.4em;
+    line-height: 1.4em;
+    text-align: center;
+    text-decoration: none;
+    -webkit-border-radius: 999em;
+    -moz-border-radius: 999em;
+    border-radius: 999em;
+}
+.dls_sus .tasks .add-task-after {
+    background-color: #6f9f44;
+}
+.dls_sus .tasks .remove-task {
+    background-color: #bf212e;
+}
+
+.dls_sus .dls-sus-tasks tfoot .fdsus-col-clear * {
+    display: none;
+}
+
+.dls_sus .dls-sus-tasks .fdsus-col-clear input[type=checkbox] {
+   margin-left: 0;
+}
+
+.dls-sus-tasks {
+    tbody th {
+        vertical-align: top;
+    }
+}
 
 .dls-sus-pro {

sign-up-sheets/trunk/css/sass/style/_common.scss

@@ -1 +1 @@
 .dls-sus-sheets,
 .dls-sus-sheet {
-    .screen-reader-text:not(:focus):not(:active) {
+    .sr-only:not(:focus):not(:active) {
         clip: rect(0 0 0 0);
         clip-path: inset(50%);

sign-up-sheets/trunk/css/style.css

@@ -1 @@
-:root{--fdsus-filled--background: #eee;--fdsus-filled--color: #4f4f4f;--fdsus-expired--background: var(--fdsus-filled--background);--fdsus-expired--color: var(--fdsus-filled--color)}.dls-sus-sheets .screen-reader-text:not(:focus):not(:active),.dls-sus-sheet .screen-reader-text:not(:focus):not(:active){clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.dls-sus-sheet .fdsus-form{overflow-x:auto}table.dls-sus-tasks,table.dls-sus-sheets,.fdsus-user-sign-ups-table{border-collapse:collapse}table.dls-sus-tasks td,table.dls-sus-tasks th,table.dls-sus-sheets td,table.dls-sus-sheets th,.fdsus-user-sign-ups-table td,.fdsus-user-sign-ups-table th{border-bottom:1px solid #ccc;padding:.2em .6em;text-align:left;vertical-align:top}table.dls-sus-sheets{width:100%}table.dls-sus-sheets tr.filled{background:var(--fdsus-filled--background);color:var(--fdsus-filled--color)}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-view_link a::after{display:inline-block;margin-left:.2em}@supports(content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»"/""}}@supports not (content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»";alt:""}}@media(min-width: 400px){table.dls-sus-sheets .column-view_link{white-space:nowrap}}table.dls-sus-tasks{border-bottom:1px solid #ccc}table.dls-sus-tasks td,table.dls-sus-tasks th{border-bottom:0}table.dls-sus-tasks tbody th{font-weight:normal}table.dls-sus-tasks .fdsus-task-first-row th,table.dls-sus-tasks .fdsus-task-first-row td{border-top:1px solid #ccc}table.dls-sus-tasks tfoot{display:none}table.dls-sus-tasks .dls-sus-task-expired th,table.dls-sus-tasks .dls-sus-task-expired td{background:#f2f2f2;color:#000}table.dls-sus-tasks .fdsus-name{font-style:italic}.fdsus-signup-availability{font-size:.8em}.fdsus-user-sign-ups-table dl{font-size:.8em}.fdsus-user-sign-ups-table dd{margin:0;display:inline}.fdsus-user-sign-ups-table dt{display:inline-block;margin:0 .4em 0 0}.fdsus-user-sign-ups-table dd:after{content:"\a";white-space:pre}.fdsus-user-sign-ups-table .dls-sus-task-expired th,.fdsus-user-sign-ups-table .dls-sus-task-expired td{background:var(--fdsus-expired--background);color:var(--fdsus-expired--color)}.fdsus-user-sign-ups-table .fdsus-task-date,.fdsus-user-sign-ups-table .fdsus-signups-closed{font-size:.8em}.fdsus-user-sign-ups-table .fdsus-actions{float:right}tr.dls-sus-row-header td{font-size:larger;font-weight:bolder}.dlsntc-notice{display:block;padding:0;background-color:#f2f2f2;color:#000;margin:1em auto}.dlsntc-notice svg{display:inline-block;vertical-align:middle;margin-right:.4em}.dlsntc-notice svg path{fill:#000}.dlsntc-notice p,.dlsntc-notice .dlsntc-message{border-bottom:1px solid #fff;margin:0;padding:.4em .8em}.dlsntc-notice .fdsus-receipt{border:1px dashed;padding:1em;margin:.4em 0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-title{margin-top:0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-signed-up-date{text-align:center;display:block;margin-top:1em;font-size:.9em}.dlsntc-notice .fdsus-receipt dl{margin:0}.dlsntc-notice .fdsus-receipt dd+dt,.dlsntc-notice .fdsus-receipt dt+dd{margin-top:0;margin-left:0}.dlsntc-notice .fdsus-receipt dt{float:left;clear:left;margin-right:.6em}.dlsntc-notice .fdsus-receipt dt:after{content:":"}.dlsntc-error{background-color:#ffbaba;color:#470004}.dlsntc-error svg path{fill:#470004}.dlsntc-warn{background-color:#feefb3;color:#523100}.dlsntc-warn svg path{fill:#523100}.dlsntc-info{background-color:#bde5f8;color:#002e57}.dlsntc-info svg path{fill:#223b07}.dlsntc-success{background-color:#dff2c0;color:#223b07}.dlsntc-success svg path{fill:#223b07}.dls-sus-signup-form p{margin:0 0 1em 0}.dls-sus-signup-form label{display:block}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email],.dls-sus-signup-form input[type=date],.dls-sus-signup-form select{width:98%}.dls-sus-signup-form .dls-sus-city,.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:inline-block;vertical-align:top;margin-right:2%}.dls-sus-signup-form .dls-sus-city label,.dls-sus-signup-form .dls-sus-state label,.dls-sus-signup-form .dls-sus-zip label{white-space:nowrap}.dls-sus-signup-form .dls-sus-city{width:50%}.dls-sus-signup-form .dls-sus-state{width:20%}.dls-sus-signup-form .dls-sus-zip{width:22%;margin-right:0}.dls-sus-signup-form .dls-sus-remember label{display:inline}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form .dls-sus-note{font-style:italic;font-size:.8em;display:block}.dls-sus-signup-form #dls-sus-website{display:none}@media(max-width: 400px){.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:block;width:50%}}#dls-sus-mailcheck-suggestion{margin:0;padding:0}#dls-sus-mailcheck-suggestion::before{display:none}tr.dls-sus-header-row td{border-top:1px solid #ccc;font-size:larger;font-weight:bolder}.single-dlssus_sheet .pagination-single,.single-dlssus_sheet .post-meta-wrapper,.single-dlssus_sheet .post-meta{display:none}
+:root{--fdsus-filled--background: #eee;--fdsus-filled--color: #4f4f4f;--fdsus-expired--background: var(--fdsus-filled--background);--fdsus-expired--color: var(--fdsus-filled--color)}.dls-sus-sheets .sr-only:not(:focus):not(:active),.dls-sus-sheet .sr-only:not(:focus):not(:active){clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.dls-sus-sheet .fdsus-form{overflow-x:auto}table.dls-sus-tasks,table.dls-sus-sheets,.fdsus-user-sign-ups-table{border-collapse:collapse}table.dls-sus-tasks td,table.dls-sus-tasks th,table.dls-sus-sheets td,table.dls-sus-sheets th,.fdsus-user-sign-ups-table td,.fdsus-user-sign-ups-table th{border-bottom:1px solid #ccc;padding:.2em .6em;text-align:left;vertical-align:top}table.dls-sus-sheets{width:100%}table.dls-sus-sheets tr.filled{background:var(--fdsus-filled--background);color:var(--fdsus-filled--color)}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-view_link a::after{display:inline-block;margin-left:.2em}@supports(content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»"/""}}@supports not (content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»";alt:""}}@media(min-width: 400px){table.dls-sus-sheets .column-view_link{white-space:nowrap}}table.dls-sus-tasks{border-bottom:1px solid #ccc}table.dls-sus-tasks td,table.dls-sus-tasks th{border-bottom:0}table.dls-sus-tasks tbody th{font-weight:normal}table.dls-sus-tasks .fdsus-task-first-row th,table.dls-sus-tasks .fdsus-task-first-row td{border-top:1px solid #ccc}table.dls-sus-tasks tfoot{display:none}table.dls-sus-tasks .dls-sus-task-expired th,table.dls-sus-tasks .dls-sus-task-expired td{background:#f2f2f2;color:#000}table.dls-sus-tasks .fdsus-name{font-style:italic}.fdsus-signup-availability{font-size:.8em}.fdsus-user-sign-ups-table dl{font-size:.8em}.fdsus-user-sign-ups-table dd{margin:0;display:inline}.fdsus-user-sign-ups-table dt{display:inline-block;margin:0 .4em 0 0}.fdsus-user-sign-ups-table dd:after{content:"\a";white-space:pre}.fdsus-user-sign-ups-table .dls-sus-task-expired th,.fdsus-user-sign-ups-table .dls-sus-task-expired td{background:var(--fdsus-expired--background);color:var(--fdsus-expired--color)}.fdsus-user-sign-ups-table .fdsus-task-date,.fdsus-user-sign-ups-table .fdsus-signups-closed{font-size:.8em}.fdsus-user-sign-ups-table .fdsus-actions{float:right}tr.dls-sus-row-header td{font-size:larger;font-weight:bolder}.dlsntc-notice{display:block;padding:0;background-color:#f2f2f2;color:#000;margin:1em auto}.dlsntc-notice svg{display:inline-block;vertical-align:middle;margin-right:.4em}.dlsntc-notice svg path{fill:#000}.dlsntc-notice p,.dlsntc-notice .dlsntc-message{border-bottom:1px solid #fff;margin:0;padding:.4em .8em}.dlsntc-notice .fdsus-receipt{border:1px dashed;padding:1em;margin:.4em 0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-title{margin-top:0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-signed-up-date{text-align:center;display:block;margin-top:1em;font-size:.9em}.dlsntc-notice .fdsus-receipt dl{margin:0}.dlsntc-notice .fdsus-receipt dd+dt,.dlsntc-notice .fdsus-receipt dt+dd{margin-top:0;margin-left:0}.dlsntc-notice .fdsus-receipt dt{float:left;clear:left;margin-right:.6em}.dlsntc-notice .fdsus-receipt dt:after{content:":"}.dlsntc-error{background-color:#ffbaba;color:#470004}.dlsntc-error svg path{fill:#470004}.dlsntc-warn{background-color:#feefb3;color:#523100}.dlsntc-warn svg path{fill:#523100}.dlsntc-info{background-color:#bde5f8;color:#002e57}.dlsntc-info svg path{fill:#223b07}.dlsntc-success{background-color:#dff2c0;color:#223b07}.dlsntc-success svg path{fill:#223b07}.dls-sus-signup-form p{margin:0 0 1em 0}.dls-sus-signup-form label{display:block}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email],.dls-sus-signup-form input[type=date],.dls-sus-signup-form select{width:98%}.dls-sus-signup-form .dls-sus-city,.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:inline-block;vertical-align:top;margin-right:2%}.dls-sus-signup-form .dls-sus-city label,.dls-sus-signup-form .dls-sus-state label,.dls-sus-signup-form .dls-sus-zip label{white-space:nowrap}.dls-sus-signup-form .dls-sus-city{width:50%}.dls-sus-signup-form .dls-sus-state{width:20%}.dls-sus-signup-form .dls-sus-zip{width:22%;margin-right:0}.dls-sus-signup-form .dls-sus-remember label{display:inline}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form .dls-sus-note{font-style:italic;font-size:.8em;display:block}.dls-sus-signup-form #dls-sus-website{display:none}@media(max-width: 400px){.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:block;width:50%}}#dls-sus-mailcheck-suggestion{margin:0;padding:0}#dls-sus-mailcheck-suggestion::before{display:none}.fdsus-removal-link a,.fdsus-edit-link a{margin-left:.4em}.fdsus-removal-link a svg,.fdsus-edit-link a svg{display:inline-block;fill:currentColor;margin-bottom:-0.15em}tr.dls-sus-header-row td{border-top:1px solid #ccc;font-size:larger;font-weight:bolder}.single-dlssus_sheet .pagination-single,.single-dlssus_sheet .post-meta-wrapper,.single-dlssus_sheet .post-meta{display:none}

sign-up-sheets/trunk/id.php

@@ -2 +2 @@
 
 namespace FDSUS;
-
-use function is_plugin_active;
-
-if (!function_exists('is_plugin_active')) {
-    require_once(ABSPATH . 'wp-admin/includes/plugin.php');
-}
 
 if (!class_exists('\\' . __NAMESPACE__ . '\Id')):
@@ -13 +7 @@
     class Id
     {
+
         const PREFIX = 'dlssus';
         const NAME = 'Sign-up Sheets - WordPress Plugin';
@@ -31 +26 @@
          * Get version from main PHP file `Version:` comment header
          *
-         * @param string $type 'pro', 'free' (not fallback) or '' for the current type
-         *
          * @return string version number
          */
-        public static function version($type = '')
+        public static function version()
         {
             if (!function_exists('get_plugin_data')) {
-                require_once(ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'plugin.php');
+                require_once(ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR
+                    . 'plugin.php');
             }
 
-            switch ($type) {
-                case 'pro':
-                    $pluginBasename = self::PRO_PLUGIN_BASENAME;
-                    break;
-                case 'free':
-                    $pluginBasename = self::FREE_PLUGIN_BASENAME;
-                    break;
-                default:
-                    $pluginBasename = self::isPro() ? self::PRO_PLUGIN_BASENAME : self::FREE_PLUGIN_BASENAME;
-            }
-
-            if (!file_exists(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $pluginBasename)) {
-                return '';
-            }
-
-            $pluginData = get_plugin_data(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $pluginBasename, false, false);
+            $baseName = self::isPro() ? self::PRO_PLUGIN_BASENAME : self::FREE_PLUGIN_BASENAME;
+            $pluginData = get_plugin_data(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $baseName, false);
 
             return $pluginData && $pluginData['Version'] ? $pluginData['Version'] : '';
@@ -64 +44 @@
          * Log
          *
-         * @param string      $msg
+         * @param string $msg
          * @param string|null $filename
-         * @param string      $emailSubject Leave blank to prevent email from sending
+         * @param string $emailSubject Leave blank to prevent email from sending
          */
         public static function log($msg, $filename = null, $emailSubject = '')
@@ -167 +147 @@
         public static function getPluginPath()
         {
-            return dirname(__FILE__) . DIRECTORY_SEPARATOR;
+            return dirname(__FILE__) . '/';
         }
 
@@ -175 +155 @@
         public static function isPro()
         {
-            if (self::isProActivating()) {
-                return true;
-            }
-
-            return is_plugin_active(self::PRO_PLUGIN_BASENAME);
+            return is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pro.php');
         }
 
-        /**
-         * Is the pro version currently activating?
-         *
-         * @return bool
-         */
-        public static function isProActivating()
-        {
-            if (!empty($_GET['action']) && $_GET['action'] === 'activate'
-                && !empty($_GET['plugin'])
-                && $_GET['plugin'] === Id::PRO_PLUGIN_BASENAME
-            ) {
-                return true;
-            }
-
-            return false;
-        }
     }
 

sign-up-sheets/trunk/js/dist/main.js

@@ -37 +37 @@
                     // Standard general format check
                     function fdsusValidateEmail(email) {
-                        if (email === '') return true;
                         const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
                         return re.test(String(email).toLowerCase());

sign-up-sheets/trunk/js/dist/main.min.js

@@ -1 +1 @@
 /*! main.min.js file */
-function fdsusExistsInQueryString(e,t){return new RegExp("[?&]"+e).test(t)}function fdsusRemoveUrlParam(t,e){let s=e.split("?")[0],i=[],n=-1!==e.indexOf("?")?e.split("?")[1]:"";if(""!==n){for(let e=(i=n.split("&")).length-1;0<=e;--e)i[e].split("=")[0]===t&&i.splice(e,1);i.length&&(s=s+"?"+i.join("&"))}return s}function fdsusIsValidDate(e){var t,s;return!(!e.match(/^\d{4}-\d{2}-\d{2}$/)||!(s=(t=new Date(e)).getTime())&&0!==s||t.toISOString().slice(0,10)!==e)}function fdsusSignupFormSubmit(e){document.getElementById("fdsus-signup-form").submit()}jQuery(document).ready(function(t){t.extend({getUrlVars:function(){for(var e,t=[],s=window.location.href.split("#")[0].slice(window.location.href.indexOf("?")+1).split("&"),i=0;i<s.length;i++)e=s[i].split("="),t.push(e[0]),t[e[0]]=e[1];return t},getUrlVar:function(e){return t.getUrlVars()[e]}}),FDSUS.dlssus_validate_email.disable||t(".dls-sus-signup-form #signup_email").on("blur",function(e){let s='<div role="alertdialog" class="dlsntc-notice dlsntc-warn"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> ',i="</p></div>",n=t(".dls-sus-signup-form #dls-sus-mailcheck-suggestion");t(this).mailcheck({suggested:function(e,t){n.html(s+"Did you mean <b><i>"+t.full+"</b></i>?"+i)},empty:function(e){var t;n.html(""),""===(t=document.getElementById("signup_email").value)||/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(String(t).toLowerCase())?n.html(""):n.html(s+"Please make sure your email is valid"+i)}})}),t(".dls-sus-signup-form input[type=date]").on("blur",function(e){t(".fdsus-date-check").remove(),t(this).val()&&!fdsusIsValidDate(t(this).val())&&t(this).after('<div role="alertdialog" class="dlsntc-notice dlsntc-warn fdsus-date-check"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> Please make sure date is in <strong>YYYY-MM-DD</strong> format</p></div>')})}),document.addEventListener("DOMContentLoaded",function(){let n=document.getElementById("fdsus-signup-form");if(null!==n){let i=!1;n.addEventListener("submit",e=>{let t=n.querySelector("[type=submit]");var s;i||(i=!0,t.disabled=!0,setTimeout(()=>{i=!1,t.disabled=!1},3e3)),"v2-checkbox"===FDSUS.dls_sus_recaptcha_version&&null!==(s=document.querySelector("#fdsus-signup-form #g-recaptcha-response"))&&""===s.value&&(e.preventDefault(),alert("Please check the reCAPTCHA to submit the form."))})}var t=window.location.toString();if(0<t.indexOf("?")){let e=t;(fdsusExistsInQueryString("action=removed",e)||fdsusExistsInQueryString("action=signup",e)||fdsusExistsInQueryString("action=updated",e))&&fdsusExistsInQueryString("status=success",e)&&(e=fdsusRemoveUrlParam("action",e),e=fdsusRemoveUrlParam("status",e)),e!==t&&window.history.replaceState({},document.title,e)}},!1);
+function fdsusExistsInQueryString(e,t){return new RegExp("[?&]"+e).test(t)}function fdsusRemoveUrlParam(t,e){let s=e.split("?")[0],i=[],n=-1!==e.indexOf("?")?e.split("?")[1]:"";if(""!==n){for(let e=(i=n.split("&")).length-1;0<=e;--e)i[e].split("=")[0]===t&&i.splice(e,1);i.length&&(s=s+"?"+i.join("&"))}return s}function fdsusIsValidDate(e){var t,s;return!(!e.match(/^\d{4}-\d{2}-\d{2}$/)||!(s=(t=new Date(e)).getTime())&&0!==s||t.toISOString().slice(0,10)!==e)}function fdsusSignupFormSubmit(e){document.getElementById("fdsus-signup-form").submit()}jQuery(document).ready(function(t){t.extend({getUrlVars:function(){for(var e,t=[],s=window.location.href.split("#")[0].slice(window.location.href.indexOf("?")+1).split("&"),i=0;i<s.length;i++)e=s[i].split("="),t.push(e[0]),t[e[0]]=e[1];return t},getUrlVar:function(e){return t.getUrlVars()[e]}}),FDSUS.dlssus_validate_email.disable||t(".dls-sus-signup-form #signup_email").on("blur",function(e){let s='<div role="alertdialog" class="dlsntc-notice dlsntc-warn"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> ',i="</p></div>",n=t(".dls-sus-signup-form #dls-sus-mailcheck-suggestion");t(this).mailcheck({suggested:function(e,t){n.html(s+"Did you mean <b><i>"+t.full+"</b></i>?"+i)},empty:function(e){var t;n.html(""),t=document.getElementById("signup_email").value,/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(String(t).toLowerCase())?n.html(""):n.html(s+"Please make sure your email is valid"+i)}})}),t(".dls-sus-signup-form input[type=date]").on("blur",function(e){t(".fdsus-date-check").remove(),t(this).val()&&!fdsusIsValidDate(t(this).val())&&t(this).after('<div role="alertdialog" class="dlsntc-notice dlsntc-warn fdsus-date-check"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> Please make sure date is in <strong>YYYY-MM-DD</strong> format</p></div>')})}),document.addEventListener("DOMContentLoaded",function(){let n=document.getElementById("fdsus-signup-form");if(null!==n){let i=!1;n.addEventListener("submit",e=>{let t=n.querySelector("[type=submit]");var s;i||(i=!0,t.disabled=!0,setTimeout(()=>{i=!1,t.disabled=!1},3e3)),"v2-checkbox"===FDSUS.dls_sus_recaptcha_version&&null!==(s=document.querySelector("#fdsus-signup-form #g-recaptcha-response"))&&""===s.value&&(e.preventDefault(),alert("Please check the reCAPTCHA to submit the form."))})}var t=window.location.toString();if(0<t.indexOf("?")){let e=t;(fdsusExistsInQueryString("action=removed",e)||fdsusExistsInQueryString("action=signup",e)||fdsusExistsInQueryString("action=updated",e))&&fdsusExistsInQueryString("status=success",e)&&(e=fdsusRemoveUrlParam("action",e),e=fdsusRemoveUrlParam("status",e)),e!==t&&window.history.replaceState({},document.title,e)}},!1);

sign-up-sheets/trunk/js/src/main.js

@@ -37 +37 @@
                     // Standard general format check
                     function fdsusValidateEmail(email) {
-                        if (email === '') return true;
                         const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
                         return re.test(String(email).toLowerCase());

sign-up-sheets/trunk/languages/sign-up-sheets.pot

@@ -1 @@
-# Copyright (C) 2025 Fetch Designs
+# Copyright (C) 2024 Fetch Designs
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Sign-up Sheets 2.3.0\n"
+"Project-Id-Version: Sign-up Sheets 2.2.14\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/sign-up-sheets\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-02-02T21:36:59+00:00\n"
+"POT-Creation-Date: 2024-10-08T02:01:29+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.11.0\n"
-"X-Domain: sign-up-sheets\n"
+"X-Generator: WP-CLI 2.6.0\n"
+"X-Domain: fdsus\n"
 
 #. Plugin Name of the plugin
-#: sign-up-sheets.php
 #: controller/admin/help.php:64
 #: controller/admin/settings.php:71
 #: controller/admin/site-health.php:50
-#: model/sheet-base.php:211
+#: model/sheet-base.php:210
 msgid "Sign-up Sheets"
 msgstr ""
 
 #. Plugin URI of the plugin
-#: sign-up-sheets.php
 msgid "https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/"
 msgstr ""
 
 #. Description of the plugin
-#: sign-up-sheets.php
 msgid "An online sign-up sheet manager where your users/volunteers can sign up for tasks"
 msgstr ""
 
 #. Author of the plugin
-#: sign-up-sheets.php
 msgid "Fetch Designs"
 msgstr ""
 
 #. Author URI of the plugin
-#: sign-up-sheets.php
 msgid "https://www.fetchdesigns.com/"
 msgstr ""
@@ -83 +78 @@
 msgstr ""
 
-#: controller/admin.php:298
+#: controller/admin.php:294
 msgid "ID"
 msgstr ""
 
-#: controller/admin.php:307
+#: controller/admin.php:303
 #: controller/admin/manage-signups.php:38
 #: controller/admin/manage-signups.php:39
@@ -95 +90 @@
 msgstr ""
 
-#: controller/admin.php:326
+#: controller/admin.php:322
 msgid "Copy"
 msgstr ""
 
-#: controller/admin.php:376
+#: controller/admin.php:372
 msgid "Made by"
 msgstr ""
 
+#: controller/admin.php:375
+msgid "Get Pro"
+msgstr ""
+
 #: controller/admin.php:379
-msgid "Get Pro"
-msgstr ""
-
-#: controller/admin.php:383
 msgid "Need help? Get Support &raquo;"
 msgstr ""
 
-#: controller/admin.php:402
+#: controller/admin.php:398
 #: controller/admin/settings.php:52
 #: controller/admin/settings.php:73
@@ -150 +145 @@
 
 #: controller/admin/edit-signup-page.php:89
-#: controller/task-table.php:532
+#: controller/task-table.php:516
 msgid "Add Sign-up"
 msgstr ""
@@ -165 +160 @@
 #: controller/admin/manage-signups.php:78
 #: controller/mail.php:174
-#: controller/sheet.php:345
+#: controller/sheet.php:341
 #: model/meta-boxes.php:42
 #: theme-files/fdsus/sheet-list.php:35
@@ -179 +174 @@
 
 #: controller/admin/edit-signup-page.php:143
-#: model/task-base.php:92
+#: model/task-base.php:94
 msgid "Task"
 msgstr ""
@@ -273 +268 @@
 #: controller/privacy.php:23
 #: controller/scode/user-sign-ups.php:143
-#: controller/task-table.php:204
-#: model/signup.php:529
-#: theme-files/fdsus/sign-up-form.php:87
+#: controller/task-table.php:190
+#: model/signup.php:530
+#: theme-files/fdsus/sign-up-form.php:85
 msgid "Address"
 msgstr ""
@@ -281 +276 @@
 #: controller/admin/export.php:303
 #: controller/privacy.php:24
-#: controller/task-table.php:205
-#: theme-files/fdsus/sign-up-form.php:99
+#: controller/task-table.php:191
+#: theme-files/fdsus/sign-up-form.php:97
 msgid "City"
 msgstr ""
@@ -288 +283 @@
 #: controller/admin/export.php:304
 #: controller/privacy.php:25
-#: controller/task-table.php:206
-#: theme-files/fdsus/sign-up-form.php:111
+#: controller/task-table.php:192
+#: theme-files/fdsus/sign-up-form.php:109
 msgid "State"
 msgstr ""
@@ -295 +290 @@
 #: controller/admin/export.php:305
 #: controller/privacy.php:26
-#: controller/task-table.php:207
-#: theme-files/fdsus/sign-up-form.php:128
+#: controller/task-table.php:193
+#: theme-files/fdsus/sign-up-form.php:126
 msgid "Zip"
 msgstr ""
@@ -372 +367 @@
 
 #: controller/admin/help.php:187
-#: model/settings-meta-boxes.php:396
-#: model/settings-meta-boxes.php:437
-#: model/settings-meta-boxes.php:515
+#: model/settings-meta-boxes.php:390
+#: model/settings-meta-boxes.php:431
+#: model/settings-meta-boxes.php:509
 msgid "Message"
 msgstr ""
@@ -413 +408 @@
 #: controller/admin/manage-signups.php:87
 #: controller/privacy.php:96
-#: model/signup.php:103
+#: model/signup.php:105
 msgid "Sign-ups"
 msgstr ""
@@ -503 +498 @@
 msgstr ""
 
-#: controller/captcha.php:65
-msgid "Math Question"
-msgstr ""
-
-#: controller/captcha.php:97
+#: controller/captcha.php:73
 msgid "Please check that the reCAPTCHA field is valid."
 msgstr ""
 
 #. translators: %s is replaced with the users response to the simple captcha
-#: controller/captcha.php:107
+#: controller/captcha.php:83
 msgid "Oh dear, 7 + 1 does not equal %s. Please try again."
 msgstr ""
@@ -541 +532 @@
 #: controller/migrate.php:645
 #: model/meta-boxes.php:26
-#: model/meta-boxes.php:169
+#: model/meta-boxes.php:162
 msgid "Global"
 msgstr ""
 
 #: controller/migrate.php:646
-#: model/meta-boxes.php:170
+#: model/meta-boxes.php:163
 #: model/settings-meta-boxes.php:138
 msgid "Disabled"
@@ -552 +543 @@
 
 #: controller/migrate.php:647
-#: model/meta-boxes.php:171
+#: model/meta-boxes.php:164
 #: model/settings-meta-boxes.php:139
 msgid "Enabled"
@@ -558 +549 @@
 
 #: controller/migrate.php:648
-#: model/meta-boxes.php:172
+#: model/meta-boxes.php:165
 #: model/settings-meta-boxes.php:140
 msgid "Semi-Compact"
@@ -564 +555 @@
 
 #: controller/migrate.php:650
-#: model/meta-boxes.php:174
+#: model/meta-boxes.php:167
 #: model/settings-meta-boxes.php:136
 msgid "Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming \"Front-end Display Names\" is not set to \"anonymous\""
@@ -570 +561 @@
 
 #: controller/migrate.php:689
-#: model/meta-boxes.php:156
-#: model/settings-meta-boxes.php:489
+#: model/meta-boxes.php:149
+#: model/settings-meta-boxes.php:483
 msgid "Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use..."
 msgstr ""
 
 #: controller/migrate.php:689
-#: model/meta-boxes.php:158
+#: model/meta-boxes.php:151
 msgid "(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)"
 msgstr ""
@@ -582 +573 @@
 #: controller/migrate.php:697
 #: controller/migrate.php:705
-#: model/meta-boxes.php:219
-#: model/meta-boxes.php:228
+#: model/meta-boxes.php:212
+#: model/meta-boxes.php:221
 msgid "Global setting in Settings > Sign-up Sheets"
 msgstr ""
@@ -602 +593 @@
 
 #: controller/post-type-base.php:95
-#: controller/task-table.php:436
+#: controller/task-table.php:420
 #: lib/dls/meta-boxes/meta-boxes.php:775
 msgid "Edit"
@@ -640 +631 @@
 
 #: controller/privacy.php:20
-#: model/signup.php:512
+#: model/signup.php:513
 #: theme-files/fdsus/sign-up-form.php:33
 msgid "First Name"
@@ -646 +637 @@
 
 #: controller/privacy.php:21
-#: model/signup.php:515
+#: model/signup.php:516
 #: theme-files/fdsus/sign-up-form.php:43
 msgid "Last Name"
@@ -653 +644 @@
 #: controller/privacy.php:22
 #: controller/scode/user-sign-ups.php:136
-#: controller/task-table.php:201
-#: model/signup.php:521
-#: theme-files/fdsus/sign-up-form.php:72
+#: controller/task-table.php:187
+#: model/signup.php:522
+#: theme-files/fdsus/sign-up-form.php:70
 msgid "Phone"
 msgstr ""
@@ -752 +743 @@
 
 #. translators: %s is replaced with the task title
-#: controller/sheet.php:424
+#: controller/sheet.php:420
 msgid "You have been signed up for %s!"
 msgstr ""
 
-#: controller/task-table.php:194
+#: controller/task-table.php:182
 msgid "Name"
 msgstr ""
 
-#: controller/task-table.php:198
-#: model/signup.php:518
+#: controller/task-table.php:185
+#: model/signup.php:519
 #: theme-files/fdsus/sign-up-form.php:54
 msgid "E-mail"
 msgstr ""
 
-#: controller/task-table.php:228
+#: controller/task-table.php:214
 msgid "Select all spots to Clear"
 msgstr ""
 
-#: controller/task-table.php:231
+#: controller/task-table.php:217
 msgid "Clear Selected"
 msgstr ""
 
-#: controller/task-table.php:231
+#: controller/task-table.php:217
 msgid "This will permanently remove all selected sign-ups for this sheet."
 msgstr ""
 
 #. translators: %d is replaced with the spot number
-#: controller/task-table.php:377
+#: controller/task-table.php:363
 msgid "#%d:"
 msgstr ""
 
 #. translators: %s is replaced with the index of the spot within the current task
-#: controller/task-table.php:428
+#: controller/task-table.php:412
 msgid "Select spot #%s to clear"
 msgstr ""
 
-#: controller/task-table.php:443
+#: controller/task-table.php:427
 msgid "Additional Details"
 msgstr ""
 
-#: controller/task-table.php:450
+#: controller/task-table.php:434
 msgid "Added"
 msgstr ""
 
-#: controller/task-table.php:451
+#: controller/task-table.php:435
 msgid "Updated"
 msgstr ""
 
-#: controller/task-table.php:452
+#: controller/task-table.php:436
 msgid "Linked user"
 msgstr ""
 
-#: controller/task-table.php:457
+#: controller/task-table.php:441
 msgid "Clear Spot Now"
 msgstr ""
 
-#: controller/task-table.php:458
+#: controller/task-table.php:442
 msgid "This will permanently remove this sign-up."
 msgstr ""
 
-#: controller/task-table.php:528
+#: controller/task-table.php:512
 msgid "(empty)"
 msgstr ""
 
-#: controller/task-table.php:538
+#: controller/task-table.php:522
 msgid " - sign-ups closed"
 msgstr ""
 
-#: controller/task-table.php:577
+#: controller/task-table.php:554
 msgid "No tasks were found."
 msgstr ""
@@ -849 +840 @@
 msgstr ""
 
+#. translators: %1$s is replaced with the pro plugin version number, %2$s is replaced with the free plugin version number
+#: main.php:272
+msgid "The <strong>Sign-up Sheets Pro</strong> plugin version (%1$s) does not match the version number of the main <strong>Sign-up Sheets</strong> plugin (%2$s).  Please update so both version numbers match to prevent possible conflicts."
+msgstr ""
+
 #: model/base.php:305
 msgid "Sunday"
@@ -886 +882 @@
 
 #: model/meta-boxes.php:53
-#: model/task-base.php:92
+#: model/task-base.php:94
 msgid "Tasks"
 msgstr ""
@@ -910 +906 @@
 
 #: model/meta-boxes.php:115
-#: model/settings-meta-boxes.php:265
-msgid "Set Email as Optional"
-msgstr ""
-
-#: model/meta-boxes.php:122
 #: model/settings-meta-boxes.php:271
 msgid "Hide Phone Field"
 msgstr ""
 
-#: model/meta-boxes.php:129
+#: model/meta-boxes.php:122
 #: model/settings-meta-boxes.php:277
 msgid "Hide Address Fields"
 msgstr ""
 
+#: model/meta-boxes.php:129
+#: model/settings-meta-boxes.php:265
+msgid "Hide Email Field"
+msgstr ""
+
 #: model/meta-boxes.php:136
-#: model/settings-meta-boxes.php:283
-msgid "Hide Email Field"
-msgstr ""
-
-#: model/meta-boxes.php:143
 msgid "Sheet Specific BCC"
 msgstr ""
 
-#: model/meta-boxes.php:146
+#: model/meta-boxes.php:139
 msgid "Comma-separated list of emails to be copied on confirmations/removals"
 msgstr ""
 
-#: model/meta-boxes.php:152
-#: model/settings-meta-boxes.php:486
+#: model/meta-boxes.php:145
+#: model/settings-meta-boxes.php:480
 msgid "Reminder Schedule"
 msgstr ""
 
-#: model/meta-boxes.php:165
+#: model/meta-boxes.php:158
 #: model/settings-meta-boxes.php:133
 msgid "Compact Sign-up Mode"
 msgstr ""
 
-#: model/meta-boxes.php:180
+#: model/meta-boxes.php:173
 #: model/settings-meta-boxes.php:162
 msgid "Enable Task Checkboxes"
 msgstr ""
 
-#: model/meta-boxes.php:188
+#: model/meta-boxes.php:181
 #: model/settings-meta-boxes.php:146
 msgid "Enable task sign-up limit"
 msgstr ""
 
-#: model/meta-boxes.php:196
+#: model/meta-boxes.php:189
 #: model/settings-meta-boxes.php:154
 msgid "Enable contiguous task sign-up limit"
 msgstr ""
 
-#: model/meta-boxes.php:204
+#: model/meta-boxes.php:197
 msgid "Auto-clear Schedule"
 msgstr ""
 
+#: model/meta-boxes.php:202
+msgid "Auto-clear is not currently allowed globally under \"Sign-up Sheets > Settings\". Enable it for this setting to take effect."
+msgstr ""
+
 #: model/meta-boxes.php:209
-msgid "Auto-clear is not currently allowed globally under \"Sign-up Sheets > Settings\". Enable it for this setting to take effect."
-msgstr ""
-
-#: model/meta-boxes.php:216
 msgid "Confirmation Email Message"
 msgstr ""
 
-#: model/meta-boxes.php:225
+#: model/meta-boxes.php:218
 msgid "Reminder Email Message"
 msgstr ""
 
 #: model/settings-meta-boxes.php:84
-#: model/sheet-base.php:211
+#: model/sheet-base.php:210
 msgid "Sign-up Sheet"
 msgstr ""
@@ -1081 +1072 @@
 #. translators: %s is replaced with the timestamp of the next cron scheduled
 #: model/settings-meta-boxes.php:207
-#: model/settings-meta-boxes.php:473
+#: model/settings-meta-boxes.php:467
 msgid "Next scheduled check: %s"
 msgstr ""
@@ -1094 +1085 @@
 
 #: model/settings-meta-boxes.php:214
-#: model/settings-meta-boxes.php:478
+#: model/settings-meta-boxes.php:472
 msgid "WordPress Cron"
 msgstr ""
 
 #: model/settings-meta-boxes.php:216
-#: model/settings-meta-boxes.php:480
+#: model/settings-meta-boxes.php:474
 msgid "If you just enabled/disabled this, you may need to refresh this page to see the updated \"Next scheduled check\""
 msgstr ""
@@ -1115 +1106 @@
 msgstr ""
 
-#: model/settings-meta-boxes.php:289
+#: model/settings-meta-boxes.php:283
 msgid "Disable User Auto-populate"
 msgstr ""
 
-#: model/settings-meta-boxes.php:292
+#: model/settings-meta-boxes.php:286
 msgid "By default, for users that are logged in, their name and email auto-populates on sign-up form when available. This option disables that behavior."
 msgstr ""
 
-#: model/settings-meta-boxes.php:296
+#: model/settings-meta-boxes.php:290
 msgid "Disable Mail Check Validation"
 msgstr ""
 
-#: model/settings-meta-boxes.php:299
+#: model/settings-meta-boxes.php:293
 msgid "Validation includes a JS check for standard email formatting, possible incorrect domains with suggestions as well as an MX record check on the domain to confirm it is setup to receive emails"
 msgstr ""
 
-#: model/settings-meta-boxes.php:303
+#: model/settings-meta-boxes.php:297
 msgid "Disable sign-up link auto-scroll to sheet (hash in sign-up link)"
 msgstr ""
 
-#: model/settings-meta-boxes.php:306
+#: model/settings-meta-boxes.php:300
 msgid "The hash on the sign-up link is useful especially on longer pages where sheets are embedded further down the page or where the sheet description is longer.  When the feature is enabled and the user clicks the sign-up link, it includes a `#` hash to and ID pointing to that same location where the sign-up form will appear on the next page."
 msgstr ""
 
-#: model/settings-meta-boxes.php:310
+#: model/settings-meta-boxes.php:304
 msgid "Sign-up Success Message Receipt"
 msgstr ""
 
-#: model/settings-meta-boxes.php:313
+#: model/settings-meta-boxes.php:307
 msgid "Displays a receipt below the sign-up success message which includes a copy of all the task details and all fields they entered in the sign-up form. Default: `unchecked`"
 msgstr ""
 
-#: model/settings-meta-boxes.php:318
+#: model/settings-meta-boxes.php:312
 msgid "Custom Sign-up Fields"
 msgstr ""
 
-#: model/settings-meta-boxes.php:339
+#: model/settings-meta-boxes.php:333
 msgid "Captcha and Spam Prevention"
 msgstr ""
 
+#: model/settings-meta-boxes.php:337
+msgid "Disable honeypot"
+msgstr ""
+
+#: model/settings-meta-boxes.php:340
+msgid "A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha."
+msgstr ""
+
 #: model/settings-meta-boxes.php:343
-msgid "Disable honeypot"
+msgid "Disable all Captcha"
+msgstr ""
+
+#: model/settings-meta-boxes.php:345
+msgid "Will disable all captcha even if you have reCAPTCHA enabled below"
 msgstr ""
 
 #: model/settings-meta-boxes.php:346
-msgid "A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha."
-msgstr ""
-
-#: model/settings-meta-boxes.php:349
-msgid "Disable all Captcha"
-msgstr ""
-
-#: model/settings-meta-boxes.php:351
-msgid "Will disable all captcha even if you have reCAPTCHA enabled below"
-msgstr ""
-
-#: model/settings-meta-boxes.php:352
 msgid "Will replace the default simple captcha validation"
 msgstr ""
 
-#: model/settings-meta-boxes.php:353
-#: model/settings-meta-boxes.php:354
+#: model/settings-meta-boxes.php:347
+#: model/settings-meta-boxes.php:348
 msgid "From your account at https://www.google.com/recaptcha/"
 msgstr ""
 
-#: model/settings-meta-boxes.php:361
+#: model/settings-meta-boxes.php:355
 msgid "Confirmation E-mail"
 msgstr ""
 
-#: model/settings-meta-boxes.php:365
-#: model/settings-meta-boxes.php:429
+#: model/settings-meta-boxes.php:359
+#: model/settings-meta-boxes.php:423
 msgid "Enable"
 msgstr ""
 
-#: model/settings-meta-boxes.php:373
-#: model/settings-meta-boxes.php:493
-#: model/settings-meta-boxes.php:552
+#: model/settings-meta-boxes.php:367
+#: model/settings-meta-boxes.php:487
+#: model/settings-meta-boxes.php:546
 msgid "Subject"
 msgstr ""
 
 #. translators: %s is replaced with the default subject
-#: model/settings-meta-boxes.php:377
-#: model/settings-meta-boxes.php:497
-#: model/settings-meta-boxes.php:556
+#: model/settings-meta-boxes.php:371
+#: model/settings-meta-boxes.php:491
+#: model/settings-meta-boxes.php:550
 msgid "If blank, defaults to... \"%s\""
 msgstr ""
 
-#: model/settings-meta-boxes.php:381
-#: model/settings-meta-boxes.php:501
-#: model/settings-meta-boxes.php:560
+#: model/settings-meta-boxes.php:375
+#: model/settings-meta-boxes.php:495
+#: model/settings-meta-boxes.php:554
 msgid "From E-mail Address"
 msgstr ""
 
-#: model/settings-meta-boxes.php:384
-#: model/settings-meta-boxes.php:504
-#: model/settings-meta-boxes.php:563
+#: model/settings-meta-boxes.php:378
+#: model/settings-meta-boxes.php:498
+#: model/settings-meta-boxes.php:557
 msgid "If blank, defaults to WordPress email on file under Settings > General"
 msgstr ""
 
-#: model/settings-meta-boxes.php:388
-#: model/settings-meta-boxes.php:508
+#: model/settings-meta-boxes.php:382
+#: model/settings-meta-boxes.php:502
 msgid "BCC"
 msgstr ""
 
-#: model/settings-meta-boxes.php:391
-#: model/settings-meta-boxes.php:511
+#: model/settings-meta-boxes.php:385
+#: model/settings-meta-boxes.php:505
 msgid "Comma separate for multiple email addresses"
+msgstr ""
+
+#: model/settings-meta-boxes.php:402
+#: model/settings-meta-boxes.php:442
+#: model/settings-meta-boxes.php:520
+msgid "Variables that can be used in template..."
+msgstr ""
+
+#: model/settings-meta-boxes.php:403
+#: model/settings-meta-boxes.php:443
+#: model/settings-meta-boxes.php:521
+msgid "Multi-line list of sign-up details such as date, sheet title, task title"
+msgstr ""
+
+#: model/settings-meta-boxes.php:404
+#: model/settings-meta-boxes.php:444
+#: model/settings-meta-boxes.php:522
+msgid "First name of user that signed up"
+msgstr ""
+
+#: model/settings-meta-boxes.php:405
+#: model/settings-meta-boxes.php:445
+#: model/settings-meta-boxes.php:523
+msgid "Last name of user that signed up"
+msgstr ""
+
+#: model/settings-meta-boxes.php:406
+#: model/settings-meta-boxes.php:446
+#: model/settings-meta-boxes.php:524
+msgid "Email of user that signed up"
+msgstr ""
+
+#: model/settings-meta-boxes.php:407
+#: model/settings-meta-boxes.php:447
+#: model/settings-meta-boxes.php:525
+msgid "Name of site as defined in Settings > General > Site Title"
 msgstr ""
 
@@ -1227 +1254 @@
 #: model/settings-meta-boxes.php:448
 #: model/settings-meta-boxes.php:526
-msgid "Variables that can be used in template..."
+msgid "URL of site"
 msgstr ""
 
 #: model/settings-meta-boxes.php:409
-#: model/settings-meta-boxes.php:449
-#: model/settings-meta-boxes.php:527
-msgid "Multi-line list of sign-up details such as date, sheet title, task title"
-msgstr ""
-
-#: model/settings-meta-boxes.php:410
-#: model/settings-meta-boxes.php:450
-#: model/settings-meta-boxes.php:528
-msgid "First name of user that signed up"
-msgstr ""
-
-#: model/settings-meta-boxes.php:411
-#: model/settings-meta-boxes.php:451
-#: model/settings-meta-boxes.php:529
-msgid "Last name of user that signed up"
-msgstr ""
-
-#: model/settings-meta-boxes.php:412
-#: model/settings-meta-boxes.php:452
-#: model/settings-meta-boxes.php:530
-msgid "Email of user that signed up"
-msgstr ""
-
-#: model/settings-meta-boxes.php:413
-#: model/settings-meta-boxes.php:453
-#: model/settings-meta-boxes.php:531
-msgid "Name of site as defined in Settings > General > Site Title"
-msgstr ""
-
-#: model/settings-meta-boxes.php:414
-#: model/settings-meta-boxes.php:454
-#: model/settings-meta-boxes.php:532
-msgid "URL of site"
-msgstr ""
-
-#: model/settings-meta-boxes.php:415
 msgid "Link to remove sign-up"
 msgstr ""
 
-#: model/settings-meta-boxes.php:425
+#: model/settings-meta-boxes.php:419
 msgid "Removal Confirmation E-mail"
 msgstr ""
 
-#: model/settings-meta-boxes.php:464
+#: model/settings-meta-boxes.php:458
 msgid "Reminder E-mail"
 msgstr ""
 
-#: model/settings-meta-boxes.php:464
+#: model/settings-meta-boxes.php:458
 msgid "Pro Feature"
 msgstr ""
 
-#: model/settings-meta-boxes.php:464
+#: model/settings-meta-boxes.php:458
 msgid "Pro"
 msgstr ""
 
-#: model/settings-meta-boxes.php:468
+#: model/settings-meta-boxes.php:462
 msgid "Enable Reminders"
 msgstr ""
 
-#: model/settings-meta-boxes.php:477
+#: model/settings-meta-boxes.php:471
 msgid "Your site will check hourly to see if there are reminders that need to be sent using the"
 msgstr ""
 
-#: model/settings-meta-boxes.php:489
+#: model/settings-meta-boxes.php:483
 msgid "This field is required."
 msgstr ""
 
-#: model/settings-meta-boxes.php:541
+#: model/settings-meta-boxes.php:535
 msgid "Status E-mail"
 msgstr ""
 
-#: model/settings-meta-boxes.php:545
+#: model/settings-meta-boxes.php:539
 msgid "Enable Status E-mail"
 msgstr ""
 
-#: model/settings-meta-boxes.php:548
+#: model/settings-meta-boxes.php:542
 msgid "Shows all signups for a sheet.  Sent when a user adds or removes a signup from the frontend."
 msgstr ""
 
-#: model/settings-meta-boxes.php:567
+#: model/settings-meta-boxes.php:561
 msgid "Send to main admin emails"
 msgstr ""
 
-#: model/settings-meta-boxes.php:570
+#: model/settings-meta-boxes.php:564
 msgid "E-mail address specified under Settings > General"
 msgstr ""
 
-#: model/settings-meta-boxes.php:574
+#: model/settings-meta-boxes.php:568
 msgid "Send to \"Sheet BCC\" recipients"
 msgstr ""
 
-#: model/settings-meta-boxes.php:577
+#: model/settings-meta-boxes.php:571
 msgid "These addresses will be added as a recipient only for sheets on which they are assigned."
 msgstr ""
 
-#: model/settings-meta-boxes.php:585
+#: model/settings-meta-boxes.php:579
 msgid "Advanced"
 msgstr ""
 
-#: model/settings-meta-boxes.php:594
+#: model/settings-meta-boxes.php:588
 msgid "Reset All Settings"
 msgstr ""
 
+#: model/settings-meta-boxes.php:591
 #: model/settings-meta-boxes.php:597
-#: model/settings-meta-boxes.php:603
 msgid "This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone."
 msgstr ""
 
-#: model/settings-meta-boxes.php:602
+#: model/settings-meta-boxes.php:596
 msgid "Are you sure?"
 msgstr ""
 
-#: model/settings-meta-boxes.php:612
+#: model/settings-meta-boxes.php:606
 msgid "Text Overrides"
 msgstr ""
@@ -1387 +1378 @@
 msgstr ""
 
-#: model/sheet-base.php:281
+#: model/sheet-base.php:280
 msgid " (Copy)"
 msgstr ""
 
-#: model/signup.php:103
+#: model/signup.php:105
 msgid "Sign-up"
 msgstr ""
 
 #. translators: %1$s is replaced with task title and %2$s is replaced with optional detailed errors if enabled
-#: model/signup.php:148
+#: model/signup.php:150
 msgid "Error adding signup for %1$s.  All spots are filled. %2$s"
 msgstr ""
 
-#: model/signup.php:183
+#: model/signup.php:184
 msgid "You have already signed up for this task.  Do you want to sign up again?"
 msgstr ""
 
-#: model/signup.php:208
+#: model/signup.php:209
 msgid "Yes, sign me up"
 msgstr ""
 
-#: model/signup.php:209
+#: model/signup.php:210
 msgid "No, thanks"
 msgstr ""
 
 #. translators: %s is replaced with the sign-up email
-#: model/signup.php:236
-#: model/signup.php:343
+#: model/signup.php:237
+#: model/signup.php:344
 msgid "Error adding the sign-up for \"%s\""
 msgstr ""
 
+#: model/signup.php:546
+msgid "Math Question"
+msgstr ""
+
 #. translators: %s is replaced with the task title
-#: model/task-base.php:155
+#: model/task-base.php:157
 msgid "Error adding the task \"%s\""
 msgstr ""
 
-#: model/task-base.php:190
+#: model/task-base.php:192
 msgid "Error adding additional fields to task."
 msgstr ""
 
 #. translators: %s is replaced with the task title
-#: model/task-base.php:239
+#: model/task-base.php:241
 msgid "Error updating the task \"%s\""
 msgstr ""
 
-#: model/task-base.php:283
+#: model/task-base.php:285
 msgid "Error deleting task."
 msgstr ""
 
-#: model/task-base.php:495
+#: model/task-base.php:497
 msgid "Sign up &raquo;"
 msgstr ""
@@ -1493 +1488 @@
 msgstr ""
 
-#: theme-files/fdsus/sign-up-form.php:147
+#: theme-files/fdsus/sign-up-form.php:145
 msgid "required"
 msgstr ""
 
+#: theme-files/fdsus/sign-up-form.php:161
+msgid "or"
+msgstr ""
+
 #: theme-files/fdsus/sign-up-form.php:163
-msgid "or"
-msgstr ""
-
-#: theme-files/fdsus/sign-up-form.php:165
 msgid "&laquo; go back to the Sign-Up Sheet"
 msgstr ""
@@ -1517 +1512 @@
 msgstr ""
 
+#: build/block.json
 #: src/block.json
 msgctxt "block title"
@@ -1522 +1518 @@
 msgstr ""
 
+#: build/block.json
 #: src/block.json
 msgctxt "block description"

sign-up-sheets/trunk/lib/dls/meta-boxes/assets/admin.js

@@ -155 +155 @@
         });
 
-        $('.dlsmb-field-type-repeater TBODY').sortable({
+        $('.dlsmb-field-type-repeater TABLE').sortable({
             distance: 5,
             opacity: 0.6,
             cursor: 'move',
-            handle: '.dlsmb-sort',
-            items: 'tr'
+            toleranceElement: '.dlsmb-sort',
+            items: 'tbody > tr'
         });
 

sign-up-sheets/trunk/lib/dls/meta-boxes/assets/style.css

@@ -183 +183 @@
 }
 
-.dlsmb-field-type-repeater TBODY .dlsmb-sort:hover {
+.dlsmb-field-type-repeater TBODY TR:hover {
     cursor: move;
 }

sign-up-sheets/trunk/lib/dls/meta-boxes/meta-boxes.php

@@ -259 +259 @@
                 </li>
                 <li class="hide-if-no-js">
-                    <a href="#<?php echo esc_url($taxonomy); ?>-pop" tabindex="3"><?php esc_html_e('Most Used', 'sign-up-sheets'); ?></a>
+                    <a href="#<?php echo esc_url($taxonomy); ?>-pop" tabindex="3"><?php esc_html_e('Most Used', 'fdsus'); ?></a>
                 </li>
             </ul>
@@ -722 +722 @@
             case 'checkbox':
                 $checked = ($value === 'true') ? ' checked="checked"' : null;
-                $boxLabel = empty($field['box_label_override']) ? esc_html__('True', 'sign-up-sheets') : $field['box_label_override'];
+                $boxLabel = empty($field['box_label_override']) ? esc_html__('True', 'fdsus') : $field['box_label_override'];
                 echo '<input type="checkbox" name="' . $field_name . '" value="true" class="dlsmb-field-element" id="' . $id . '"' . $checked . '> <label for="' . $id . '" class="dlsmb-checkbox">' . $boxLabel . '</label><br />';
                 break;
@@ -773 +773 @@
                             <div class="dlsmb-image-hover">
                                 <ul>
-                                    <li class="dlsmb-image-hover-icon dlsmb-image-hover-edit"><a href="#" title="' . esc_html__('Edit', 'sign-up-sheets') . '"></a></li>
-                                    <li class="dlsmb-image-hover-icon dlsmb-image-hover-remove"><a href="#" title="' . esc_html__('Remove', 'sign-up-sheets') . '"></a></li>
+                                    <li class="dlsmb-image-hover-icon dlsmb-image-hover-edit"><a href="#" title="' . esc_html__('Edit', 'fdsus') . '"></a></li>
+                                    <li class="dlsmb-image-hover-icon dlsmb-image-hover-remove"><a href="#" title="' . esc_html__('Remove', 'fdsus') . '"></a></li>
                                 </ul>
                             </div>
@@ -924 +924 @@
                 if (empty($field['map_api_key'])) {
                     $error_class = 'map-not-loaded';
-                    $msg = '<p>' .esc_html__('Map not loaded. Check your api key.', 'sign-up-sheets') . '</p>';
+                    $msg = '<p>' .esc_html__('Map not loaded. Check your api key.', 'fdsus') . '</p>';
                 } else {
                     $error_class = '';
@@ -961 +961 @@
         $actions = array(
             'add' => array(
-                'title' => esc_html__('Add Row', 'sign-up-sheets'),
+                'title' => esc_html__('Add Row', 'fdsus'),
                 'icon' => 'dashicons dashicons-plus-alt',
             ),
             'remove' => array(
-                'title' => esc_html__('Delete Row', 'sign-up-sheets'),
+                'title' => esc_html__('Delete Row', 'fdsus'),
                 'icon' => 'dashicons dashicons-trash',
             ),

sign-up-sheets/trunk/main.php

@@ -22 +22 @@
     function fdsusAutoloader($className)
     {
-        $classesDir = '';
-        $classFile = '';
-
-        if (0 === strpos($className, __NAMESPACE__ . '\\') && !in_array($className, array(__NAMESPACE__ . '\Main'))) {
+        if (false !== strpos($className, __NAMESPACE__) && !in_array($className, array(__NAMESPACE__ . '\Main'))) {
             $classesDir = realpath(plugin_dir_path(__FILE__)) . DIRECTORY_SEPARATOR;
             $classFile = str_replace(__NAMESPACE__ . '/', '', str_replace('\\', '/', $className)) . '.php';
             $classFile = strtolower(preg_replace('/\B([A-Z])/', '-$1', $classFile)); // add hyphen before uppercase classes then convert to all lowercase
-        } elseif (0 === strpos($className,  'FDSUSPRO\\') && Id::isProActivating()) {
-            // Autoload Pro if it's in the process of activating
-            $classesDir = dirname(realpath(plugin_dir_path(__FILE__))) . DIRECTORY_SEPARATOR . dirname(Id::PRO_PLUGIN_BASENAME) . DIRECTORY_SEPARATOR;
-            $classFile = str_replace('FDSUSPRO/', '', str_replace('\\', '/', $className)) . '.php';
-            $classFile = strtolower(preg_replace('/\B([A-Z])/', '-$1', $classFile)); // add hyphen before uppercase classes then convert to all lowercase
-        }
-
-        if ($classesDir && $classFile) {
-            if (!file_exists($classesDir . $classFile)) {
-                error_log('Autoloader tried to load a file that did not exist... ' . $classesDir . $classFile);
-                return;
-            }
             require_once $classesDir . $classFile;
         }
@@ -48 +33 @@
 endif;
 
-if (!function_exists('\FDSUS\fdsusIsFallbackPlugin')):
-    function fdsusIsFallbackPlugin()
-    {
-        return dirname(__FILE__) !== dirname(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . Id::FREE_PLUGIN_BASENAME);
-    }
-endif;
-
-Notice::instance(array('frontendFilter' => Id::PREFIX . '_notices'));
-Settings::instance();
-
-if (
-    (
-        fdsusIsFallbackPlugin()
-        || (!empty(Id::version('free')) && !empty(Id::version('pro'))
-            && version_compare(Id::version('free'), Id::version('pro'), '==')
-            && !class_exists('\FDSUS\Main')
-        )
-    )
-    && !class_exists('\FDSUS\Main')
-):
+if (!class_exists('\FDSUS\Main')):
 
     class Main {
@@ -98 +64 @@
 
             global $wpdb;
+            Notice::instance(array('frontendFilter' => Id::PREFIX . '_notices'));
+            Settings::instance();
             $this->wpdb = $wpdb;
             $this->data = new Data();
@@ -133 +101 @@
             }
 
-            register_activation_hook(FDSUS_FREE_PLUGIN_BASENAME, array(&$this, 'activate'));
-            register_deactivation_hook(FDSUS_FREE_PLUGIN_BASENAME, array(&$this, 'deactivate'));
+            register_activation_hook(Settings::getCurrentPluginBasename(), array(&$this, 'activate'));
+            register_deactivation_hook(Settings::getCurrentPluginBasename(), array(&$this, 'deactivate'));
 
             add_action('wp_enqueue_scripts', array(&$this, 'add_css_and_js_to_frontend'));
             add_action('init', array(&$this, 'setDefaultOptions'), 0);
             add_action('init', array(&$this, 'flushIfNeeded'), 0);
+            add_action('admin_init', array(&$this, 'dupPluginVersionCheck'));
 
             add_filter('rewrite_rules_array', array(&$this, 'add_rewrite_rules'));
@@ -177 +146 @@
         function add_css_and_js_to_frontend()
         {
-            // Pull pro or free
-            $pluginPath = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . (Id::isPro() ? Id::PRO_PLUGIN_BASENAME
-                    : Id::FREE_PLUGIN_BASENAME);
-
             wp_enqueue_script('jquery');
 
@@ -186 +151 @@
                 wp_register_script(
                     Id::PREFIX . '-mailcheck',
-                    plugins_url('js/mailcheck.min.js', __FILE__),
+                    esc_url(plugins_url('js/mailcheck.min.js', __FILE__)),
                     array(),
                     '1.1.2'
@@ -194 +159 @@
             wp_register_style(
                 Id::PREFIX . '-style',
-                plugins_url('css/style.css', $pluginPath),
+                plugins_url('css/style.css', __FILE__),
                 array(),
                 Id::version()
@@ -207 +172 @@
             wp_register_script(
                 'dlssus-js',
-                plugins_url('js/dist/main.min.js', $pluginPath),
+                plugins_url('js/dist/main.min.js', __FILE__),
                 $mainSusDeps,
                 Id::version()
@@ -273 +238 @@
 
         /**
+         * Duplicate plugin version check
+         */
+        public function dupPluginVersionCheck()
+        {
+            if ((Id::isPro() && is_plugin_active(Id::FREE_PLUGIN_BASENAME))
+                || (!Id::isPro() && is_plugin_active(Id::PRO_PLUGIN_BASENAME))
+            ) {
+                $pluginFileRequire = ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR
+                    . 'plugin.php';
+                if (!function_exists('get_plugins')) {
+                    require_once($pluginFileRequire);
+                }
+
+                $plugins = get_plugins();
+
+                if ($plugins[Id::FREE_PLUGIN_BASENAME]['Version']
+                    <> $plugins[Id::PRO_PLUGIN_BASENAME]['Version']
+                ) {
+                    if (!function_exists('get_plugins')) {
+                        require_once($pluginFileRequire);
+                    }
+                    $plugins = get_plugins();
+                    $versionFree = $plugins[Id::FREE_PLUGIN_BASENAME]['Version'];
+                    $versionPro = $plugins[Id::PRO_PLUGIN_BASENAME]['Version'];
+                    $allowedHtml = array(
+                        'strong' => array(),
+                    );
+
+                    Notice::add(
+                        'error', sprintf(
+                            wp_kses(
+                            /* translators: %1$s is replaced with the pro plugin version number, %2$s is replaced with the free plugin version number */
+                                __(
+                                    'The <strong>Sign-up Sheets Pro</strong> plugin version (%1$s) does not match the version number of the main <strong>Sign-up Sheets</strong> plugin (%2$s).  Please update so both version numbers match to prevent possible conflicts.',
+                                    'fdsus'
+                                ),
+                                $allowedHtml
+                            ),
+                            esc_html($versionPro), esc_html($versionFree)
+                        )
+                    );
+                }
+            }
+        }
+
+        /**
          * Check if we need to flush rewrites (like if slug was changed in Settings)
          */
@@ -318 +329 @@
 
             // Crons
-            wp_clear_scheduled_hook('fdsus_dbupdate_action');
+            wp_clear_scheduled_hook(Id::PREFIX . '_dbupdate_action');
 
             /**
@@ -330 +341 @@
     $fdsus = new Main();
     require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'template-tags.php';
+    is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pro.php') and include 'pro.php';
 
 endif;

sign-up-sheets/trunk/model/base.php

@@ -303 +303 @@
     {
         return array(
-            '0' => __('Sunday', 'sign-up-sheets'),
-            '1' => __('Monday', 'sign-up-sheets'),
-            '2' => __('Tuesday', 'sign-up-sheets'),
-            '3' => __('Wednesday', 'sign-up-sheets'),
-            '4' => __('Thursday', 'sign-up-sheets'),
-            '5' => __('Friday', 'sign-up-sheets'),
-            '6' => __('Saturday', 'sign-up-sheets'),
+            '0' => __('Sunday', 'fdsus'),
+            '1' => __('Monday', 'fdsus'),
+            '2' => __('Tuesday', 'fdsus'),
+            '3' => __('Wednesday', 'fdsus'),
+            '4' => __('Thursday', 'fdsus'),
+            '5' => __('Friday', 'fdsus'),
+            '6' => __('Saturday', 'fdsus'),
         );
     }

sign-up-sheets/trunk/model/db-update.php

@@ -28 +28 @@
         $this->data = new Data();
 
-        add_action('wp_loaded', array(&$this, 'check'));
-        add_action('fdsus_dbupdate_action', array(&$this, 'asyncUpdate'));
+        add_action('init', array(&$this, 'check'));
+        add_action(Id::PREFIX . '_dbupdate_action', array(&$this, 'asyncUpdate'));
     }
 
@@ -49 +49 @@
     public function scheduleAsyncUpdate()
     {
-        wp_schedule_single_event(time(), 'fdsus_dbupdate_action');
+        wp_schedule_single_event(time(), Id::PREFIX . '_dbupdate_action');
     }
 

sign-up-sheets/trunk/model/meta-boxes.php

@@ -24 +24 @@
     {
         $trueFalse = array(
-            ''      => esc_html__('Global', 'sign-up-sheets'),
-            'true'  => esc_html__('True', 'sign-up-sheets'),
-            'false' => esc_html__('False', 'sign-up-sheets'),
+            ''      => esc_html__('Global', 'fdsus'),
+            'true'  => esc_html__('True', 'fdsus'),
+            'false' => esc_html__('False', 'fdsus'),
         );
 
@@ -34 +34 @@
             'general' => array(
                 'id'        => SheetModel::POST_TYPE . '-general-meta',
-                'title'     => esc_html__('General', 'sign-up-sheets'),
+                'title'     => esc_html__('General', 'fdsus'),
                 'post_type' => SheetModel::POST_TYPE,
                 'context'   => 'normal',
@@ -40 +40 @@
                 'fields'    => array(
                     array(
-                        'label' => esc_html__('Date', 'sign-up-sheets'),
+                        'label' => esc_html__('Date', 'fdsus'),
                         'key'   => 'dlssus_date',
                         'type'  => 'datepicker',
@@ -51 +51 @@
             'tasks' => array(
                 'id'        => SheetModel::POST_TYPE . '-tasks-meta',
-                'title'     => esc_html__('Tasks', 'sign-up-sheets'),
+                'title'     => esc_html__('Tasks', 'fdsus'),
                 'post_type' => SheetModel::POST_TYPE,
                 'context'   => 'normal',
@@ -62 +62 @@
                         'fields' => array(
                             array(
-                                'label' => esc_html__('What', 'sign-up-sheets'),
+                                'label' => esc_html__('What', 'fdsus'),
                                 'key'   => 'title',
                                 'type'  => 'text',
@@ -68 +68 @@
                             ),
                             array(
-                                'label' => esc_html__('# of Spots', 'sign-up-sheets'),
+                                'label' => esc_html__('# of Spots', 'fdsus'),
                                 'key'   => 'qty',
                                 'type'  => 'text',
@@ -99 +99 @@
                 'fields'    => array(
                     array(
-                        'label'   => esc_html__('Set Phone as Optional', 'sign-up-sheets'),
+                        'label'   => esc_html__('Set Phone as Optional', 'fdsus'),
                         'key'     => Id::PREFIX . '_optional_phone',
                         'type'    => 'select',
@@ -106 +106 @@
                     ),
                     array(
-                        'label'   => esc_html__('Set Address as Optional', 'sign-up-sheets'),
+                        'label'   => esc_html__('Set Address as Optional', 'fdsus'),
                         'key'     => Id::PREFIX . '_optional_address',
                         'type'    => 'select',
@@ -113 +113 @@
                     ),
                     array(
-                        'label'   => esc_html__('Set Email as Optional', 'sign-up-sheets'),
-                        'key'     => 'fdsus_optional_email',
-                        'type'    => 'select',
-                        'options' => $trueFalse,
-                        'order'   => 22,
-                    ),
-                    array(
-                        'label'   => esc_html__('Hide Phone Field', 'sign-up-sheets'),
+                        'label'   => esc_html__('Hide Phone Field', 'fdsus'),
                         'key'     => Id::PREFIX . '_hide_phone',
                         'type'    => 'select',
@@ -127 +120 @@
                     ),
                     array(
-                        'label'   => esc_html__('Hide Address Fields', 'sign-up-sheets'),
+                        'label'   => esc_html__('Hide Address Fields', 'fdsus'),
                         'key'     => Id::PREFIX . '_hide_address',
                         'type'    => 'select',
@@ -134 +127 @@
                     ),
                     array(
-                        'label'   => esc_html__('Hide Email Field', 'sign-up-sheets'),
+                        'label'   => esc_html__('Hide Email Field', 'fdsus'),
                         'key'     => Id::PREFIX . '_hide_email',
                         'type'    => 'select',
@@ -141 +134 @@
                     ),
                     array(
-                        'label'  => esc_html__('Sheet Specific BCC', 'sign-up-sheets'),
+                        'label'  => esc_html__('Sheet Specific BCC', 'fdsus'),
                         'key'    => Id::PREFIX . '_sheet_bcc',
                         'type'   => 'text',
-                        'append' => ' <em>' . esc_html__('Comma-separated list of emails to be copied on confirmations/removals', 'sign-up-sheets') . '</em>',
+                        'append' => ' <em>' . esc_html__('Comma-separated list of emails to be copied on confirmations/removals', 'fdsus') . '</em>',
                         'order'  => 50,
                         'wrap_class' => 'dlsmb-field-col-12',
@@ -150 +143 @@
                     ),
                     array(
-                        'label'  => esc_html__('Reminder Schedule', 'sign-up-sheets'),
+                        'label'  => esc_html__('Reminder Schedule', 'fdsus'),
                         'key'    => Id::PREFIX . '_sheet_reminder_days',
                         'type'   => 'text',
                         'append' => ' <br><em>'
-                            . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'sign-up-sheets')
+                            . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'fdsus')
                             . ' <code>1</code> '
-                            . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'sign-up-sheets')
+                            . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'fdsus')
                             . '</em>',
                         'order'  => 60,
@@ -163 +156 @@
                     ),
                     array(
-                        'label'   => esc_html__('Compact Sign-up Mode', 'sign-up-sheets'),
+                        'label'   => esc_html__('Compact Sign-up Mode', 'fdsus'),
                         'key'     => Id::PREFIX . '_compact_signups',
                         'type'    => 'select',
                         'options' => array(
-                            ''      => esc_html__('Global', 'sign-up-sheets'),
-                            'false' => esc_html__('Disabled', 'sign-up-sheets'),
-                            'true'  => esc_html__('Enabled', 'sign-up-sheets'),
-                            'semi'  => esc_html__('Semi-Compact', 'sign-up-sheets'),
+                            ''      => esc_html__('Global', 'fdsus'),
+                            'false' => esc_html__('Disabled', 'fdsus'),
+                            'true'  => esc_html__('Enabled', 'fdsus'),
+                            'semi'  => esc_html__('Semi-Compact', 'fdsus'),
                         ),
-                        'append'  => ' <em>' . esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'sign-up-sheets') . '</em>',
+                        'append'  => ' <em>' . esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'fdsus') . '</em>',
                         'order'   => 70,
                         'wrap_class' => 'dlsmb-field-col-12',
@@ -178 +171 @@
                     ),
                     array(
-                        'label'   => esc_html__('Enable Task Checkboxes', 'sign-up-sheets'),
+                        'label'   => esc_html__('Enable Task Checkboxes', 'fdsus'),
                         'key'     => Id::PREFIX . '_use_task_checkboxes',
                         'type'    => 'select',
@@ -186 +179 @@
                     ),
                     array(
-                        'label'   => esc_html__('Enable task sign-up limit', 'sign-up-sheets'),
+                        'label'   => esc_html__('Enable task sign-up limit', 'fdsus'),
                         'key'     => Id::PREFIX . '_task_signup_limit',
                         'type'    => 'select',
@@ -194 +187 @@
                     ),
                     array(
-                        'label'   => esc_html__('Enable contiguous task sign-up limit', 'sign-up-sheets'),
+                        'label'   => esc_html__('Enable contiguous task sign-up limit', 'fdsus'),
                         'key'     => Id::PREFIX . '_contiguous_task_signup_limit',
                         'type'    => 'select',
@@ -202 +195 @@
                     ),
                     array(
-                        'label'   => esc_html__('Auto-clear Schedule', 'sign-up-sheets'),
+                        'label'   => esc_html__('Auto-clear Schedule', 'fdsus'),
                         'key'     => 'fdsus_autoclear',
                         'type'    => 'checkboxes',
                         'options' => $this->getDaysOfWeekArray(),
                         'append' => Id::isPro() && !Settings::isAutoclearSignupsAllowed()
-                            ? ' <em>' . esc_html__('Auto-clear is not currently allowed globally under "Sign-up Sheets > Settings". Enable it for this setting to take effect.', 'sign-up-sheets') . '</em>'
+                            ? ' <em>' . esc_html__('Auto-clear is not currently allowed globally under "Sign-up Sheets > Settings". Enable it for this setting to take effect.', 'fdsus') . '</em>'
                             : '',
                         'order'   => 110,
@@ -214 +207 @@
                     ),
                     array(
-                        'label'      => esc_html__('Confirmation Email Message', 'sign-up-sheets'),
+                        'label'      => esc_html__('Confirmation Email Message', 'fdsus'),
                         'key'        => Id::PREFIX . '_sheet_email_conf_message',
                         'type'       => 'textarea',
-                        'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
+                        'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
                         'order'      => 130,
                         'wrap_class' => 'dlsmb-field-col-6',
@@ -223 +216 @@
                     ),
                     array(
-                        'label'      => esc_html__('Reminder Email Message', 'sign-up-sheets'),
+                        'label'      => esc_html__('Reminder Email Message', 'fdsus'),
                         'key'        => Id::PREFIX . '_sheet_email_message',
                         'type'       => 'textarea',
-                        'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
+                        'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
                         'order'      => 140,
                         'wrap_class' => 'dlsmb-field-col-6',

sign-up-sheets/trunk/model/settings-meta-boxes.php

@@ -28 +28 @@
      * $options = array(
      *     'id'      => 'sheet',
-     *     'title'   => esc_html__('Sign-up Sheet', 'sign-up-sheets'),
+     *     'title'   => esc_html__('Sign-up Sheet', 'fdsus'),
      *     'order'   => 10,
      *     'options' => array(
@@ -55 +55 @@
 
         // Sheets Listing
-        $sheetSelection = array('' => esc_html__('All', 'sign-up-sheets'));
+        $sheetSelection = array('' => esc_html__('All', 'fdsus'));
         if (Id::isPro()) {
             $sheetCollection = new SheetCollectionModel();
@@ -82 +82 @@
         $options['sheet'] = array(
             'id'      => 'sheet',
-            'title'   => esc_html__('Sign-up Sheet', 'sign-up-sheets'),
+            'title'   => esc_html__('Sign-up Sheet', 'fdsus'),
             'order'   => 10,
             'options' => array(
                 array(
-                    'label'   => esc_html__('Sheet order on Front-end', 'sign-up-sheets'),
+                    'label'   => esc_html__('Sheet order on Front-end', 'fdsus'),
                     'name'    => 'dls_sus_sheet_order',
                     'type'    => 'dropdown',
@@ -93 +93 @@
                 ),
                 array(
-                    'label' => esc_html__('Show All Sign-up Data Fields on Front-end', 'sign-up-sheets'),
+                    'label' => esc_html__('Show All Sign-up Data Fields on Front-end', 'fdsus'),
                     'name'  => 'dls_sus_display_all',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('WARNING: Sign-up sheet table will appear much like the table when sign-ups are viewed via the admin. This option will potentially display personal user information on the frontend like email address and phone.  This option is best used if you are using the [sign_up_sheet] short code within a password protected area. (This also overrides the "Front-end Display Names" option and displays all as full names.)', 'sign-up-sheets'),
+                    'note'  => esc_html__('WARNING: Sign-up sheet table will appear much like the table when sign-ups are viewed via the admin. This option will potentially display personal user information on the frontend like email address and phone.  This option is best used if you are using the [sign_up_sheet] short code within a password protected area. (This also overrides the "Front-end Display Names" option and displays all as full names.)', 'fdsus'),
                     'order' => 20
                 ),
                 array(
-                    'label'   => esc_html__('Front-end Display Names', 'sign-up-sheets'),
+                    'label'   => esc_html__('Front-end Display Names', 'fdsus'),
                     'name'    => 'dls_sus_display_name',
                     'type'    => 'dropdown',
-                    'note'    => esc_html__('How the user\'s name should be displayed on the front-end after they sign-up', 'sign-up-sheets'),
+                    'note'    => esc_html__('How the user\'s name should be displayed on the front-end after they sign-up', 'fdsus'),
                     'options' => array(
                         'default'   => '"John S." - first name plus first letter of last name',
                         'full'      => '"John Smith" - full name',
-                        'anonymous' => '"' . esc_html__('Filled', 'sign-up-sheets') . '" - ' . esc_html__('anonymous', 'sign-up-sheets'),
+                        'anonymous' => '"' . esc_html__('Filled', 'fdsus') . '" - ' . esc_html__('anonymous', 'fdsus'),
                     ),
                     'th-rowspan' => 2,
@@ -118 +118 @@
                     'type'    => 'dropdown',
                     'note'    => '<span id="fdsus_display_name_username_override-label">' . esc_html__(
-                        'For logged in users, override the Front-end Display Name with their WP username on their sign-ups.', 'sign-up-sheets'
+                        'For logged in users, override the Front-end Display Name with their WP username on their sign-ups.', 'fdsus'
                     ) . '</span>',
                     'options' => array(
-                        ''             => esc_html__('Not Enabled', 'sign-up-sheets'),
-                        'display_name' => esc_html__('Public Display Name', 'sign-up-sheets'),
-                        'nickname'     => esc_html__('Nickname', 'sign-up-sheets'),
-                        'user_login'   => esc_html__('Username', 'sign-up-sheets'),
+                        ''             => esc_html__('Not Enabled', 'fdsus'),
+                        'display_name' => esc_html__('Public Display Name', 'fdsus'),
+                        'nickname'     => esc_html__('Nickname', 'fdsus'),
+                        'user_login'   => esc_html__('Username', 'fdsus'),
                     ),
                     'aria-labelledby' => 'fdsus_display_name_username_override-label',
@@ -131 +131 @@
                 ),
                 array(
-                    'label' => esc_html__('Compact Sign-up Mode', 'sign-up-sheets'),
+                    'label' => esc_html__('Compact Sign-up Mode', 'fdsus'),
                     'name'  => 'dls_sus_compact_signups',
                     'type'  => 'dropdown',
-                    'note'  => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'sign-up-sheets'),
+                    'note'  => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'fdsus'),
                     'options' => array(
-                        'false' => esc_html__('Disabled', 'sign-up-sheets'),
-                        'true'  => esc_html__('Enabled', 'sign-up-sheets'),
-                        'semi'  => esc_html__('Semi-Compact', 'sign-up-sheets'),
+                        'false' => esc_html__('Disabled', 'fdsus'),
+                        'true'  => esc_html__('Enabled', 'fdsus'),
+                        'semi'  => esc_html__('Semi-Compact', 'fdsus'),
                     ),
                     'order' => 40,
@@ -144 +144 @@
                 ),
                 array(
-                    'label' => esc_html__('Enable task sign-up limit', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable task sign-up limit', 'fdsus'),
                     'name'  => 'dls_sus_task_signup_limit',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Prevent users from being able to sign-up for a task more than once.  This is checked by email address.', 'sign-up-sheets'),
+                    'note'  => esc_html__('Prevent users from being able to sign-up for a task more than once.  This is checked by email address.', 'fdsus'),
                     'order' => 50,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Enable contiguous task sign-up limit', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable contiguous task sign-up limit', 'fdsus'),
                     'name'  => 'dls_sus_contiguous_task_signup_limit',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Prevent users from being able to sign-up for a task directly before or after a task for which they have already signed up.  This is checked by email address.', 'sign-up-sheets'),
+                    'note'  => esc_html__('Prevent users from being able to sign-up for a task directly before or after a task for which they have already signed up.  This is checked by email address.', 'fdsus'),
                     'order' => 60,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Enable Task Checkboxes', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable Task Checkboxes', 'fdsus'),
                     'name'  => 'dls_sus_enable_task_checkbox',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Allow check boxes on signup line items that allow user to sign up for multiple tasks.', 'sign-up-sheets'),
+                    'note'  => esc_html__('Allow check boxes on signup line items that allow user to sign up for multiple tasks.', 'fdsus'),
                     'order' => 70,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Enable Spot Lock', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable Spot Lock', 'fdsus'),
                     'name'  => 'dls_sus_spot_lock',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Spot will be locked and held for current user for 3 minutes when they access the sign-up form page.  Spot Lock is available when signing up for a single task at a time.', 'sign-up-sheets'),
+                    'note'  => esc_html__('Spot will be locked and held for current user for 3 minutes when they access the sign-up form page.  Spot Lock is available when signing up for a single task at a time.', 'fdsus'),
                     'order' => 80,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Hide self-removal from Sign-up Sheet', 'sign-up-sheets'),
+                    'label' => esc_html__('Hide self-removal from Sign-up Sheet', 'fdsus'),
                     'name'  => 'dls_sus_hide_removal',
                     'type'  => 'checkbox',
-                    'note' => esc_html__('Hides the "Remove" link from the sign-up form if users were logged in when they signed up. This is always hidden if "Front-end Display Names" is set to "anonymous".', 'sign-up-sheets'),
+                    'note' => esc_html__('Hides the "Remove" link from the sign-up form if users were logged in when they signed up. This is always hidden if "Front-end Display Names" is set to "anonymous".', 'fdsus'),
                     'order' => 85,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Number of days before sheet/task date to allow users to edit their own sign-ups', 'sign-up-sheets'),
+                    'label' => esc_html__('Number of days before sheet/task date to allow users to edit their own sign-ups', 'fdsus'),
                     'name'  => 'fdsus_user_editable_signups',
                     'type'  => 'number',
-                    'note'  => esc_html__('Leave blank to disable the user edit feature. Number entered will calculate based on the task date, if set, otherwise it will use the sheet date.  If no sheet and task date is set, editing will be allowed indefinitely.  Use negative numbers to allow editing after the date has passed', 'sign-up-sheets'),
+                    'note'  => esc_html__('Leave blank to disable the user edit feature. Number entered will calculate based on the task date, if set, otherwise it will use the sheet date.  If no sheet and task date is set, editing will be allowed indefinitely.  Use negative numbers to allow editing after the date has passed', 'fdsus'),
                     'order' => 88,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Show Filled Spots in Admin Edit Sheet', 'sign-up-sheets'),
+                    'label' => esc_html__('Show Filled Spots in Admin Edit Sheet', 'fdsus'),
                     'name'  => 'dls_sus_show_filled_spots_admin_edit',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Show names and count of filled spots in the admin Edit Sheet screen.', 'sign-up-sheets'),
+                    'note'  => esc_html__('Show names and count of filled spots in the admin Edit Sheet screen.', 'fdsus'),
                     'order' => 90,
                     'pro'   => true
                 ),
                 array(
-                    'label' => esc_html__('Allow Auto-Clearing Sign-ups Per Sheet', 'sign-up-sheets'),
+                    'label' => esc_html__('Allow Auto-Clearing Sign-ups Per Sheet', 'fdsus'),
                     'name'  => 'fdsus_allow_autoclear_signups',
                     'type'  => 'checkbox',
                     'note'  =>
                         /* translators: %s is replaced with the timestamp of the next cron scheduled */
-                        sprintf(esc_html__('Next scheduled check: %s', 'sign-up-sheets'),
+                        sprintf(esc_html__('Next scheduled check: %s', 'fdsus'),
                             Settings::getNextScheduledCronCheck('fdsus_autoclear'))
                         . '<ul>'
                             . '<li>'
-                                . esc_html__('Enabling this activates the optional setting on each Sheet under "Additional Settings" which provides the ability auto-clear all sign-ups for that sheet on a schedule.', 'sign-up-sheets')
+                                . esc_html__('Enabling this activates the optional setting on each Sheet under "Additional Settings" which provides the ability auto-clear all sign-ups for that sheet on a schedule.', 'fdsus')
                             . '</li><li>'
-                                . esc_html__('Your site will check if there are sheets that need to be cleared that need to be sent using the', 'sign-up-sheets')
-                                . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'sign-up-sheets') . '</a>'
+                                . esc_html__('Your site will check if there are sheets that need to be cleared that need to be sent using the', 'fdsus')
+                                . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'fdsus') . '</a>'
                             . '</li><li>'
-                                . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'sign-up-sheets')
+                                . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'fdsus')
                             . '</li>'
                         . '</ul>',
@@ -221 +221 @@
                 ),
                 array(
-                    'label'   => esc_html__('Custom Task Fields', 'sign-up-sheets'),
+                    'label'   => esc_html__('Custom Task Fields', 'fdsus'),
                     'name'    => 'dls_sus_custom_task_fields',
                     'type'    => 'repeater',
@@ -240 +240 @@
         $options['form'] = array(
             'id'      => 'form',
-            'title'   => esc_html__('Sign-up Form', 'sign-up-sheets'),
+            'title'   => esc_html__('Sign-up Form', 'fdsus'),
             'order'   => 20,
             'options' => array(
                 array(
-                    'label' => esc_html__('Show "Remember Me" checkbox', 'sign-up-sheets'),
+                    'label' => esc_html__('Show "Remember Me" checkbox', 'fdsus'),
                     'name'  => 'dls_sus_remember',
                     'type'  => 'checkbox',
@@ -251 +251 @@
                 ),
                 array(
-                    'label' => esc_html__('Set Phone as Optional', 'sign-up-sheets'),
+                    'label' => esc_html__('Set Phone as Optional', 'fdsus'),
                     'name'  => 'dls_sus_optional_phone',
                     'type'  => 'checkbox',
@@ -257 +257 @@
                 ),
                 array(
-                    'label' => esc_html__('Set Address as Optional', 'sign-up-sheets'),
+                    'label' => esc_html__('Set Address as Optional', 'fdsus'),
                     'name' => 'dls_sus_optional_address',
                     'type' => 'checkbox',
@@ -263 +263 @@
                 ),
                 array(
-                    'label' => esc_html__('Set Email as Optional', 'sign-up-sheets'),
-                    'name' => 'fdsus_optional_email',
-                    'type' => 'checkbox',
-                    'order' => 22
-                ),
-                array(
-                    'label' => esc_html__('Hide Phone Field', 'sign-up-sheets'),
+                    'label' => esc_html__('Hide Email Field', 'fdsus'),
+                    'name'  => 'dls_sus_hide_email',
+                    'type'  => 'checkbox',
+                    'order' => 30
+                ),
+                array(
+                    'label' => esc_html__('Hide Phone Field', 'fdsus'),
                     'name'  => 'dls_sus_hide_phone',
                     'type'  => 'checkbox',
@@ -275 +275 @@
                 ),
                 array(
-                    'label' => esc_html__('Hide Address Fields', 'sign-up-sheets'),
+                    'label' => esc_html__('Hide Address Fields', 'fdsus'),
                     'name'  => 'dls_sus_hide_address',
                     'type'  => 'checkbox',
@@ -281 +281 @@
                 ),
                 array(
-                    'label' => esc_html__('Hide Email Field', 'sign-up-sheets'),
-                    'name'  => 'dls_sus_hide_email',
-                    'type'  => 'checkbox',
-                    'order' => 42
-                ),
-                array(
-                    'label' => esc_html__('Disable User Auto-populate', 'sign-up-sheets'),
+                    'label' => esc_html__('Disable User Auto-populate', 'fdsus'),
                     'name'  => 'dls_sus_disable_user_autopopulate',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('By default, for users that are logged in, their name and email auto-populates on sign-up form when available. This option disables that behavior.', 'sign-up-sheets'),
+                    'note'  => esc_html__('By default, for users that are logged in, their name and email auto-populates on sign-up form when available. This option disables that behavior.', 'fdsus'),
                     'order' => 45
                 ),
                 array(
-                    'label' => esc_html__('Disable Mail Check Validation', 'sign-up-sheets'),
+                    'label' => esc_html__('Disable Mail Check Validation', 'fdsus'),
                     'name'  => 'dls_sus_deactivate_email_validation',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Validation includes a JS check for standard email formatting, possible incorrect domains with suggestions as well as an MX record check on the domain to confirm it is setup to receive emails', 'sign-up-sheets'),
+                    'note'  => esc_html__('Validation includes a JS check for standard email formatting, possible incorrect domains with suggestions as well as an MX record check on the domain to confirm it is setup to receive emails', 'fdsus'),
                     'order' => 50
                 ),
                 array(
-                    'label' => esc_html__('Disable sign-up link auto-scroll to sheet (hash in sign-up link)', 'sign-up-sheets'),
+                    'label' => esc_html__('Disable sign-up link auto-scroll to sheet (hash in sign-up link)', 'fdsus'),
                     'name'  => 'fdsus_disable_signup_link_hash',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('The hash on the sign-up link is useful especially on longer pages where sheets are embedded further down the page or where the sheet description is longer.  When the feature is enabled and the user clicks the sign-up link, it includes a `#` hash to and ID pointing to that same location where the sign-up form will appear on the next page.', 'sign-up-sheets'),
+                    'note'  => esc_html__('The hash on the sign-up link is useful especially on longer pages where sheets are embedded further down the page or where the sheet description is longer.  When the feature is enabled and the user clicks the sign-up link, it includes a `#` hash to and ID pointing to that same location where the sign-up form will appear on the next page.', 'fdsus'),
                     'order' => 55
                 ),
                 array(
-                    'label' => esc_html__('Sign-up Success Message Receipt', 'sign-up-sheets'),
+                    'label' => esc_html__('Sign-up Success Message Receipt', 'fdsus'),
                     'name'  => 'dls_sus_signup_receipt',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Displays a receipt below the sign-up success message which includes a copy of all the task details and all fields they entered in the sign-up form. Default: `unchecked`', 'sign-up-sheets'),
+                    'note'  => esc_html__('Displays a receipt below the sign-up success message which includes a copy of all the task details and all fields they entered in the sign-up form. Default: `unchecked`', 'fdsus'),
                     'order' => 60,
                     'pro'   => true
                 ),
                 array(
-                    'label'   => esc_html__('Custom Sign-up Fields', 'sign-up-sheets'),
+                    'label'   => esc_html__('Custom Sign-up Fields', 'fdsus'),
                     'name'    => 'dls_sus_custom_fields',
                     'type'    => 'repeater',
@@ -337 +331 @@
         $options['spam'] = array(
             'id'      => 'spam',
-            'title'   => esc_html__('Captcha and Spam Prevention', 'sign-up-sheets'),
+            'title'   => esc_html__('Captcha and Spam Prevention', 'fdsus'),
             'order'   => 30,
             'options' => array(
                 array(
-                    'label' => esc_html__('Disable honeypot', 'sign-up-sheets'),
+                    'label' => esc_html__('Disable honeypot', 'fdsus'),
                     'name'  => 'dls_sus_disable_honeypot',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha.', 'sign-up-sheets')
-                ),
-                array(
-                    'label' => esc_html__('Disable all Captcha', 'sign-up-sheets'),
+                    'note'  => esc_html__('A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha.', 'fdsus')
+                ),
+                array(
+                    'label' => esc_html__('Disable all Captcha', 'fdsus'),
                     'name'  => 'dls_sus_disable_captcha',
-                    'type' => 'checkbox', esc_html__('Will disable all captcha even if you have reCAPTCHA enabled below', 'sign-up-sheets')),
-                array('Use reCAPTCHA', 'dls_sus_recaptcha', 'checkbox', esc_html__('Will replace the default simple captcha validation', 'sign-up-sheets')),
-                array('reCAPTCHA Public Key', 'dls_sus_recaptcha_public_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'sign-up-sheets')),
-                array('reCAPTCHA Private Key', 'dls_sus_recaptcha_private_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'sign-up-sheets')),
+                    'type' => 'checkbox', esc_html__('Will disable all captcha even if you have reCAPTCHA enabled below', 'fdsus')),
+                array('Use reCAPTCHA', 'dls_sus_recaptcha', 'checkbox', esc_html__('Will replace the default simple captcha validation', 'fdsus')),
+                array('reCAPTCHA Public Key', 'dls_sus_recaptcha_public_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'fdsus')),
+                array('reCAPTCHA Private Key', 'dls_sus_recaptcha_private_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'fdsus')),
                 array('reCAPTCHA Version', 'dls_sus_recaptcha_version', 'dropdown', '', array('v3' => 'v3', 'v2-checkbox' => 'v2 Checkbox', 'v2-invisible' => 'v2 Invisible')),
             )
@@ -359 +353 @@
         $options['confirmation_email'] = array(
             'id'      => 'confirmation_email',
-            'title'   => esc_html__('Confirmation E-mail', 'sign-up-sheets'),
+            'title'   => esc_html__('Confirmation E-mail', 'fdsus'),
             'order'   => 40,
             'options' => array(
                 array(
-                    'label' => esc_html__('Enable', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable', 'fdsus'),
                     'name'  => 'fdsus_enable_confirmation_email',
                     'type'  => 'checkbox',
@@ -371 +365 @@
                 ),
                 array(
-                    'label' => esc_html__('Subject', 'sign-up-sheets'),
+                    'label' => esc_html__('Subject', 'fdsus'),
                     'name'  => 'dls_sus_email_subject',
                     'type'  => 'text',
                     /* translators: %s is replaced with the default subject */
-                    'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'sign-up-sheets'), Settings::$defaultMailSubjects['signup'])),
+                    'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'fdsus'), Settings::$defaultMailSubjects['signup'])),
                     'order' => 20
                 ),
                 array(
-                    'label' => esc_html__('From E-mail Address', 'sign-up-sheets'),
+                    'label' => esc_html__('From E-mail Address', 'fdsus'),
                     'name'  => 'dls_sus_email_from',
                     'type'  => 'text',
-                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'sign-up-sheets'),
+                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'fdsus'),
                     'order' => 30
                 ),
                 array(
-                    'label'    => esc_html__('BCC', 'sign-up-sheets'),
+                    'label'    => esc_html__('BCC', 'fdsus'),
                     'name'     => 'dls_sus_email_bcc',
                     'type'     => 'text',
-                    'note'     => esc_html__('Comma separate for multiple email addresses', 'sign-up-sheets'),
+                    'note'     => esc_html__('Comma separate for multiple email addresses', 'fdsus'),
                     'order'    => 40,
                     'pro'      => true
                 ),
                 array(
-                    'label'    => esc_html__('Message', 'sign-up-sheets'),
+                    'label'    => esc_html__('Message', 'fdsus'),
                     'name'     => 'dls_sus_email_message',
                     'type'     => 'textarea',
@@ -406 +400 @@
                             <code>{site_url}</code> - %s<br>
                             <code>{removal_link}</code> - %s',
-                        esc_html__('Variables that can be used in template...', 'sign-up-sheets'),
-                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'sign-up-sheets'),
-                        esc_html__('First name of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Last name of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Email of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Name of site as defined in Settings > General > Site Title', 'sign-up-sheets'),
-                        esc_html__('URL of site', 'sign-up-sheets'),
-                        esc_html__('Link to remove sign-up', 'sign-up-sheets')
+                        esc_html__('Variables that can be used in template...', 'fdsus'),
+                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'fdsus'),
+                        esc_html__('First name of user that signed up', 'fdsus'),
+                        esc_html__('Last name of user that signed up', 'fdsus'),
+                        esc_html__('Email of user that signed up', 'fdsus'),
+                        esc_html__('Name of site as defined in Settings > General > Site Title', 'fdsus'),
+                        esc_html__('URL of site', 'fdsus'),
+                        esc_html__('Link to remove sign-up', 'fdsus')
                     ),
                     'order'    => 50,
@@ -423 +417 @@
         $options['removal_confirmation_email'] = array(
             'id'      => 'removal_confirmation_email',
-            'title'   => esc_html__('Removal Confirmation E-mail', 'sign-up-sheets') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
+            'title'   => esc_html__('Removal Confirmation E-mail', 'fdsus') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
             'order'   => 50,
             'options' => array(
                 array(
-                    'label' => esc_html__('Enable', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable', 'fdsus'),
                     'name'  => 'fdsus_enable_removal_confirmation_email',
                     'type'  => 'checkbox',
@@ -435 +429 @@
                 ),
                 array(
-                    'label' => esc_html__('Message', 'sign-up-sheets'),
+                    'label' => esc_html__('Message', 'fdsus'),
                     'name'  => 'dls_sus_removed_email_message',
                     'type'  => 'textarea',
@@ -446 +440 @@
                             <code>{site_name}</code> - %s<br>
                             <code>{site_url}</code> - %s',
-                        esc_html__('Variables that can be used in template...', 'sign-up-sheets'),
-                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'sign-up-sheets'),
-                        esc_html__('First name of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Last name of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Email of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Name of site as defined in Settings > General > Site Title', 'sign-up-sheets'),
-                        esc_html__('URL of site', 'sign-up-sheets')
+                        esc_html__('Variables that can be used in template...', 'fdsus'),
+                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'fdsus'),
+                        esc_html__('First name of user that signed up', 'fdsus'),
+                        esc_html__('Last name of user that signed up', 'fdsus'),
+                        esc_html__('Email of user that signed up', 'fdsus'),
+                        esc_html__('Name of site as defined in Settings > General > Site Title', 'fdsus'),
+                        esc_html__('URL of site', 'fdsus')
                     ),
                     'order' => 20,
@@ -462 +456 @@
         $options['reminder_email'] = array(
             'id'      => 'reminder_email',
-            'title'   => esc_html__('Reminder E-mail', 'sign-up-sheets') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="' . esc_html__('Pro Feature', 'sign-up-sheets') . '">' . esc_html__('Pro', 'sign-up-sheets') . '</span>' : ''),
+            'title'   => esc_html__('Reminder E-mail', 'fdsus') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="' . esc_html__('Pro Feature', 'fdsus') . '">' . esc_html__('Pro', 'fdsus') . '</span>' : ''),
             'order'   => 60,
             'options' => array(
                 array(
-                    'label' => esc_html__('Enable Reminders', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable Reminders', 'fdsus'),
                     'name'  => 'dls_sus_reminder_email',
                     'type'  => 'checkbox',
                     'note'  =>
                         /* translators: %s is replaced with the timestamp of the next cron scheduled */
-                        sprintf(esc_html__('Next scheduled check: %s', 'sign-up-sheets'),
+                        sprintf(esc_html__('Next scheduled check: %s', 'fdsus'),
                             Settings::getNextScheduledCronCheck('dls_sus_send_reminders'))
                         . '<ul>'
                             . '<li>'
-                                . esc_html__('Your site will check hourly to see if there are reminders that need to be sent using the', 'sign-up-sheets')
-                                . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'sign-up-sheets') . '</a>'
+                                . esc_html__('Your site will check hourly to see if there are reminders that need to be sent using the', 'fdsus')
+                                . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'fdsus') . '</a>'
                             . '</li><li>'
-                                . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'sign-up-sheets')
+                                . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'fdsus')
                             . '</li>'
                         . '</ul>',
@@ -484 +478 @@
                 ),
                 array(
-                    'label' => esc_html__('Reminder Schedule', 'sign-up-sheets'),
+                    'label' => esc_html__('Reminder Schedule', 'fdsus'),
                     'name'  => 'dls_sus_reminder_email_days_before',
                     'type'  => 'text',
-                    'note'  => esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'sign-up-sheets') . ' <code>1</code> ' . esc_html__('This field is required.', 'sign-up-sheets'),
+                    'note'  => esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'fdsus') . ' <code>1</code> ' . esc_html__('This field is required.', 'fdsus'),
                     'pro' => true
                 ),
                 array(
-                    'label' => esc_html__('Subject', 'sign-up-sheets'),
+                    'label' => esc_html__('Subject', 'fdsus'),
                     'name'  => 'dls_sus_reminder_email_subject',
                     'type'  => 'text',
                     /* translators: %s is replaced with the default subject */
-                    'note' => esc_html(sprintf(__('If blank, defaults to... "%s"', 'sign-up-sheets'), Settings::$defaultMailSubjects['reminder'])),
+                    'note' => esc_html(sprintf(__('If blank, defaults to... "%s"', 'fdsus'), Settings::$defaultMailSubjects['reminder'])),
                     'pro' => true
                 ),
                 array(
-                    'label' => esc_html__('From E-mail Address', 'sign-up-sheets'),
+                    'label' => esc_html__('From E-mail Address', 'fdsus'),
                     'name'  => 'dls_sus_reminder_email_from',
                     'type'  => 'text',
-                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'sign-up-sheets'),
+                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'fdsus'),
                     'pro' => true
                 ),
                 array(
-                    'label' => esc_html__('BCC', 'sign-up-sheets'),
+                    'label' => esc_html__('BCC', 'fdsus'),
                     'name'  => 'dls_sus_reminder_email_bcc',
                     'type'  => 'text',
-                    'note'  => esc_html__('Comma separate for multiple email addresses', 'sign-up-sheets'),
+                    'note'  => esc_html__('Comma separate for multiple email addresses', 'fdsus'),
                     'pro' => true
                 ),
                 array(
-                    'label' => esc_html__('Message', 'sign-up-sheets'),
+                    'label' => esc_html__('Message', 'fdsus'),
                     'name'  => 'dls_sus_reminder_email_message',
                     'type'  => 'textarea',
@@ -524 +518 @@
                             <code>{site_name}</code> - %s<br>
                             <code>{site_url}</code> - %s',
-                        esc_html__('Variables that can be used in template...', 'sign-up-sheets'),
-                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'sign-up-sheets'),
-                        esc_html__('First name of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Last name of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Email of user that signed up', 'sign-up-sheets'),
-                        esc_html__('Name of site as defined in Settings > General > Site Title', 'sign-up-sheets'),
-                        esc_html__('URL of site', 'sign-up-sheets')
+                        esc_html__('Variables that can be used in template...', 'fdsus'),
+                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'fdsus'),
+                        esc_html__('First name of user that signed up', 'fdsus'),
+                        esc_html__('Last name of user that signed up', 'fdsus'),
+                        esc_html__('Email of user that signed up', 'fdsus'),
+                        esc_html__('Name of site as defined in Settings > General > Site Title', 'fdsus'),
+                        esc_html__('URL of site', 'fdsus')
                     ),
                     'pro' => true
@@ -539 +533 @@
         $options['status_email'] = array(
             'id'      => 'status_email',
-            'title'   => esc_html__('Status E-mail', 'sign-up-sheets') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
+            'title'   => esc_html__('Status E-mail', 'fdsus') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
             'order'   => 70,
             'options' => array(
                 array(
-                    'label' => esc_html__('Enable Status E-mail', 'sign-up-sheets'),
+                    'label' => esc_html__('Enable Status E-mail', 'fdsus'),
                     'name'  => 'dls_sus_status_email',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('Shows all signups for a sheet.  Sent when a user adds or removes a signup from the frontend.', 'sign-up-sheets'),
-                    'pro'   => true
-                ),
-                array(
-                    'label' => esc_html__('Subject', 'sign-up-sheets'),
+                    'note'  => esc_html__('Shows all signups for a sheet.  Sent when a user adds or removes a signup from the frontend.', 'fdsus'),
+                    'pro'   => true
+                ),
+                array(
+                    'label' => esc_html__('Subject', 'fdsus'),
                     'name'  => 'dls_sus_status_email_subject',
                     'type'  => 'text',
                     /* translators: %s is replaced with the default subject */
-                    'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'sign-up-sheets'), Settings::$defaultMailSubjects['status'])),
-                    'pro'   => true
-                ),
-                array(
-                    'label' => esc_html__('From E-mail Address', 'sign-up-sheets'),
+                    'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'fdsus'), Settings::$defaultMailSubjects['status'])),
+                    'pro'   => true
+                ),
+                array(
+                    'label' => esc_html__('From E-mail Address', 'fdsus'),
                     'name'  => 'dls_sus_status_email_from',
                     'type'  => 'text',
-                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'sign-up-sheets'),
-                    'pro'   => true
-                ),
-                array(
-                    'label' => esc_html__('Send to main admin emails', 'sign-up-sheets'),
+                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'fdsus'),
+                    'pro'   => true
+                ),
+                array(
+                    'label' => esc_html__('Send to main admin emails', 'fdsus'),
                     'name'  => 'dls_sus_status_to_admin',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('E-mail address specified under Settings > General', 'sign-up-sheets'),
-                    'pro'   => true
-                ),
-                array(
-                    'label' => esc_html__('Send to "Sheet BCC" recipients', 'sign-up-sheets'),
+                    'note'  => esc_html__('E-mail address specified under Settings > General', 'fdsus'),
+                    'pro'   => true
+                ),
+                array(
+                    'label' => esc_html__('Send to "Sheet BCC" recipients', 'fdsus'),
                     'name'  => 'dls_sus_status_to_sheet_bcc',
                     'type'  => 'checkbox',
-                    'note'  => esc_html__('These addresses will be added as a recipient only for sheets on which they are assigned.', 'sign-up-sheets'),
+                    'note'  => esc_html__('These addresses will be added as a recipient only for sheets on which they are assigned.', 'fdsus'),
                     'pro'   => true
                 ),
@@ -583 +577 @@
         $options['advanced'] = array(
             'id'      => 'advanced',
-            'title'   => esc_html__('Advanced', 'sign-up-sheets'),
+            'title'   => esc_html__('Advanced', 'fdsus'),
             'order'   => 80,
             'options' => array(
@@ -592 +586 @@
                 array('Display Detailed Errors', 'dls_sus_detailed_errors', 'checkbox', '(Not recommended for production sites)'),
                 array(
-                    'label' => esc_html__('Reset All Settings', 'sign-up-sheets'),
+                    'label' => esc_html__('Reset All Settings', 'fdsus'),
                     'name' => 'fdsus_reset',
                     'type' => 'button',
-                    'note' => '<span id="fdsus-reset"></span><p>' . esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'sign-up-sheets') . '</p>',
+                    'note' => '<span id="fdsus-reset"></span><p>' . esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'fdsus') . '</p>',
                     'options' => array(
                         'href' => add_query_arg('fdsus-reset', 'all',
                             wp_nonce_url($this->data->getSettingsUrl(), 'fdsus-settings-reset', '_fdsus-nonce')),
                         'onclick' => sprintf('return confirm(`%s %s`)',
-                            esc_html__('Are you sure?', 'sign-up-sheets'),
-                            esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'sign-up-sheets')
+                            esc_html__('Are you sure?', 'fdsus'),
+                            esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'fdsus')
                         ),
                     )
@@ -610 +604 @@
         $options['text_overrides'] = array(
             'id'      => 'text_overrides',
-            'title'   => esc_html__('Text Overrides', 'sign-up-sheets'),
+            'title'   => esc_html__('Text Overrides', 'fdsus'),
             'order'   => 90,
             'options' => array()

sign-up-sheets/trunk/model/settings.php

@@ -13 +13 @@
 
 if (Id::isPro()) {
-    class SettingsParent extends \FDSUSPRO\Model\Pro\Settings {}
+    class SettingsParent extends Pro\Settings {}
 } else {
     class SettingsParent {}
@@ -41 +41 @@
     {
         self::$defaultMailSubjects = array(
-            'signup'   => esc_html__('Thank you for signing up!', 'sign-up-sheets'),
-            'remove'   => esc_html__('Sign-up has been removed', 'sign-up-sheets'),
-            'reminder' => esc_html__('Sign-up Reminder', 'sign-up-sheets'),
-            'status'   => esc_html__('Sign-up Status Report', 'sign-up-sheets'),
+            'signup'   => esc_html__('Thank you for signing up!', 'fdsus'),
+            'remove'   => esc_html__('Sign-up has been removed', 'fdsus'),
+            'reminder' => esc_html__('Sign-up Reminder', 'fdsus'),
+            'status'   => esc_html__('Sign-up Status Report', 'fdsus'),
         );
 
@@ -80 +80 @@
         self::$text = array(
             'task_title_label' => array(
-                'label'   => esc_html__('Task Title Label', 'sign-up-sheets'),
-                'default' => esc_html__('What', 'sign-up-sheets'),
+                'label'   => esc_html__('Task Title Label', 'fdsus'),
+                'default' => esc_html__('What', 'fdsus'),
             ),
         );
@@ -211 +211 @@
 
     /**
-     * Get current plugin basename depending on if we are running the pro or free version
+     * Get current plugin basename depending on if we are in the pro or free version
      *
      * @return string
@@ -300 +300 @@
         $checkUtcTimestamp = wp_next_scheduled($cronHook);
         if (is_null($defaultText)) {
-            $defaultText = esc_html__('Not Scheduled', 'sign-up-sheets');
+            $defaultText = esc_html__('Not Scheduled', 'fdsus');
         }
         $displayCheckTime = $defaultText;

sign-up-sheets/trunk/model/settings/sheet-order.php

@@ -21 +21 @@
         $this->options = array(
             'date_asc'  => array(
-                'label'            => esc_html__('Date (ASC)', 'sign-up-sheets'),
+                'label'            => esc_html__('Date (ASC)', 'fdsus'),
                 'direction'        => 'ASC',
                 'sort_by'          => 'dlssus_end_date',
@@ -27 +27 @@
             ),
             'date_desc' => array(
-                'label'            => esc_html__('Date (DESC)', 'sign-up-sheets'),
+                'label'            => esc_html__('Date (DESC)', 'fdsus'),
                 'direction'        => 'DESC',
                 'sort_by'          => 'dlssus_end_date',
@@ -33 +33 @@
             ),
             'id_asc'    => array(
-                'label'            => esc_html__('Sheet ID (ASC)', 'sign-up-sheets'),
+                'label'            => esc_html__('Sheet ID (ASC)', 'fdsus'),
                 'direction'        => 'ASC',
                 'sort_by'          => false,
@@ -39 +39 @@
             ),
             'id_desc'   => array(
-                'label'            => esc_html__('Sheet ID (DESC)', 'sign-up-sheets'),
+                'label'            => esc_html__('Sheet ID (DESC)', 'fdsus'),
                 'direction'        => 'DESC',
                 'sort_by'          => false,

sign-up-sheets/trunk/model/sheet-base.php

@@ -25 +25 @@
  * @property string dlssus_start_date
  * @property string dlssus_end_date
- * @property string dlssus_optional_phone
- * @property string dlssus_optional_address
- * @property string fdsus_optional_email
+ * @property string dlssus_hide_email
  * @property string dlssus_hide_phone
  * @property string dlssus_hide_address
- * @property string dlssus_hide_email
  * @property string dlssus_use_task_checkboxes
  * @property bool   dlssus_is_active
@@ -41 +38 @@
  * @property array  fdsus_autoclear
  * @property string fdsus_last_autoclear
+ *
+ * @package FDSUS\Model
  */
 class SheetBase extends Base
@@ -209 +208 @@
     public static function getName($singular = false)
     {
-        return $singular ? __('Sign-up Sheet', 'sign-up-sheets') : __('Sign-up Sheets', 'sign-up-sheets');
+        return $singular ? __('Sign-up Sheet', 'fdsus') : __('Sign-up Sheets', 'fdsus');
     }
 
@@ -279 +278 @@
         $sheetArray = $this->objectToArray($this->getData());
         $this->cleanBeforeCopy($sheetArray);
-        $sheetArray['post_title'] .= esc_html__(' (Copy)', 'sign-up-sheets');
+        $sheetArray['post_title'] .= esc_html__(' (Copy)', 'fdsus');
 
         // Copy sheet
@@ -508 +507 @@
 
     /**
-     * Should the phone be required on the sheet?
+     * Should the phone be displayed on the sheet?
      *
      * @return bool
@@ -514 +513 @@
     public function isPhoneRequired()
     {
-        if (!$this->showPhone()) {
-            return false;
-        }
         return (isset($this->dlssus_optional_phone) && $this->dlssus_optional_phone === 'false')
             || (empty($this->dlssus_optional_phone) && get_option('dls_sus_optional_phone') !== 'true');
@@ -522 +518 @@
 
     /**
-     * Should the address be required on the sheet?
+     * Should the address be displayed on the sheet?
      *
      * @return bool
@@ -528 +524 @@
     public function isAddressRequired()
     {
-        if (!$this->showAddress()) {
-            return false;
-        }
         return (isset($this->dlssus_optional_address) && $this->dlssus_optional_address === 'false')
             || (empty($this->dlssus_optional_address) && get_option('dls_sus_optional_address') !== 'true');
-    }
-
-    /**
-     * Should the email be displayed on the sheet?
-     *
-     * @return bool
-     */
-    public function isEmailRequired()
-    {
-        if (!$this->showEmail()) {
-            return false;
-        }
-        return (isset($this->fdsus_optional_email) && $this->fdsus_optional_email === 'false')
-            || (empty($this->fdsus_optional_email) && get_option('fdsus_optional_email') !== 'true');
     }
 

sign-up-sheets/trunk/model/sheet-collection.php

@@ -13 +13 @@
 
 if (Id::isPro()) {
-    class SheetCollectionParent extends \FDSUSPRO\Model\Pro\SheetCollection {}
+    class SheetCollectionParent extends Pro\SheetCollection {}
 } else {
     class SheetCollectionParent extends Base {}

sign-up-sheets/trunk/model/sheet.php

@@ -10 +10 @@
 
 if (Id::isPro()) {
-    class SheetParent extends \FDSUSPRO\Model\Pro\Sheet {}
+    class SheetParent extends Pro\Sheet {}
 } else {
     class SheetParent extends SheetBase {}

sign-up-sheets/trunk/model/signup-collection.php

@@ -13 +13 @@
 
 if (Id::isPro()) {
-    class SignupCollectionParent extends \FDSUSPRO\Model\Pro\SignupCollection {}
+    class SignupCollectionParent extends Pro\SignupCollection {}
 } else {
     class SignupCollectionParent extends Base {}

sign-up-sheets/trunk/model/signup-form-initial-values.php

@@ -15 +15 @@
 /**
  * Class SignupFormInitialValues
+ *
+ * @package FDSUS\Model
  */
 class SignupFormInitialValues
@@ -89 +91 @@
 
         // If not set, but logged in, pull from user
-        if (!$this->signup && !is_admin() && !Settings::isUserAutopopulateDisabled()) {
+        if (!is_admin() && !Settings::isUserAutopopulateDisabled()) {
             $currentUser = wp_get_current_user();
             if (($currentUser instanceof WP_User)) {

sign-up-sheets/trunk/model/signup.php

@@ -15 +15 @@
 
 if (Id::isPro()) {
-    class SignupParent extends \FDSUSPRO\Model\Pro\Signup {}
+    class SignupParent extends Pro\Signup {}
 } else {
     class SignupParent extends SignupBase {}
@@ -38 +38 @@
  * @property string dlssus_removal_token
  * @property string dlssus_reminded
+ *
+ * @package FDSUS\Model
  */
 class Signup extends SignupParent
@@ -101 +103 @@
     public static function getName($singular = false)
     {
-        return $singular ? __('Sign-up', 'sign-up-sheets') : __('Sign-ups', 'sign-up-sheets');
+        return $singular ? __('Sign-up', 'fdsus') : __('Sign-ups', 'fdsus');
     }
 
@@ -146 +148 @@
                 sprintf(
                     /* translators: %1$s is replaced with task title and %2$s is replaced with optional detailed errors if enabled */
-                    esc_html__('Error adding signup for %1$s.  All spots are filled. %2$s', 'sign-up-sheets'),
+                    esc_html__('Error adding signup for %1$s.  All spots are filled. %2$s', 'fdsus'),
                     '<em>' . wp_kses_post($task->post_title) . '</em>',
                     Settings::isDetailedErrors()
@@ -178 +180 @@
             && empty($fields['double_signup'])
             && $sheet->showEmail()
-            && !empty($fields['signup_email'])
             && $task->isEmailOnTask($fields['signup_email'])
         ) {
-            $msg = esc_html__('You have already signed up for this task.  Do you want to sign up again?', 'sign-up-sheets') . '
+            $msg = esc_html__('You have already signed up for this task.  Do you want to sign up again?', 'fdsus') . '
                 <form method="post" action="' . esc_url($this->getCurrentUrl(true) . Settings::maybeGetSignUpLinkHash($sheet->ID)) . '">';
 
@@ -206 +207 @@
                     <input type="hidden" name="double_signup" value="1" />
                     <input type="hidden" name="action" value="signup-confirmed" />
-                    <input type="submit" name="Submit" class="button-primary wp-block-button__link wp-element-button dls-sus-double-signup-confirm-button" value="' . esc_html__('Yes, sign me up', 'sign-up-sheets') . '" />
-                    <a href="' . esc_url(fdsus_back_to_sheet_url($task->ID)) . '">' . esc_html__('No, thanks', 'sign-up-sheets') . '</a>
+                    <input type="submit" name="Submit" class="button-primary wp-block-button__link wp-element-button dls-sus-double-signup-confirm-button" value="' . esc_html__('Yes, sign me up', 'fdsus') . '" />
+                    <a href="' . esc_url(fdsus_back_to_sheet_url($task->ID)) . '">' . esc_html__('No, thanks', 'fdsus') . '</a>
                 </form>
             ';
@@ -234 +235 @@
                 sprintf(
                     /* translators: %s is replaced with the sign-up email */
-                    esc_html__('Error adding the sign-up for "%s"', 'sign-up-sheets'), esc_attr($cleanFields['email']))
+                    esc_html__('Error adding the sign-up for "%s"', 'fdsus'), esc_attr($cleanFields['email']))
                 . (($this->detailed_errors === true) ? '.. ' . print_r($signupId->get_error_message(), true) : '')
             );
@@ -341 +342 @@
                 sprintf(
                 /* translators: %s is replaced with the sign-up email */
-                    esc_html__('Error adding the sign-up for "%s"', 'sign-up-sheets'), esc_attr($cleanFields['email'])
+                    esc_html__('Error adding the sign-up for "%s"', 'fdsus'), esc_attr($cleanFields['email'])
                 )
                 . (($this->detailed_errors === true && is_wp_error($signupId)) ? '.. ' . print_r($signupId->get_error_message(), true) : '')
@@ -510 +511 @@
         $missingFieldNames = array();
         if (empty($fields['signup_firstname'])) {
-            $missingFieldNames['firstname'] = esc_html__('First Name', 'sign-up-sheets');
+            $missingFieldNames[] = esc_html__('First Name', 'fdsus');
         }
         if (empty($fields['signup_lastname'])) {
-            $missingFieldNames['lastname'] = esc_html__('Last Name', 'sign-up-sheets');
-        }
-        if ($sheet->isEmailRequired() && empty($fields['signup_email'])) {
-            $missingFieldNames['email'] = esc_html__('E-mail', 'sign-up-sheets');
-        }
-        if ($sheet->isPhoneRequired() && empty($fields['signup_phone'])) {
-            $missingFieldNames['phone'] = esc_html__('Phone', 'sign-up-sheets');
-        }
-        if ($sheet->isAddressRequired()
+            $missingFieldNames[] = esc_html__('Last Name', 'fdsus');
+        }
+        if ($sheet->showEmail() && empty($fields['signup_email'])) {
+            $missingFieldNames[] = esc_html__('E-mail', 'fdsus');
+        }
+        if ($sheet->isPhoneRequired() && $sheet->showPhone() && empty($fields['signup_phone'])) {
+            $missingFieldNames[] = esc_html__('Phone', 'fdsus');
+        }
+        if ($sheet->isAddressRequired() && $sheet->showAddress()
             && (empty($fields['signup_address'])
                 || empty($fields['signup_city'])
@@ -527 +528 @@
                 || empty($fields['signup_zip']))
         ) {
-            $missingFieldNames[] = esc_html__('Address', 'sign-up-sheets');
+            $missingFieldNames[] = esc_html__('Address', 'fdsus');
         }
 
@@ -535 +536 @@
          * @param array      $missingFieldNames
          * @param SheetModel $sheet
-         * @param array      $fields
          *
          * @return array
          * @since 2.2
          */
-        $missingFieldNames = apply_filters('fdsus_sign_up_form_errors_required_fields', $missingFieldNames, $sheet, $fields);
+        $missingFieldNames = apply_filters('fdsus_sign_up_form_errors_required_fields', $missingFieldNames, $sheet);
+
+        // TODO CAPTCHA - move to Captcha class
+        if (!is_admin() && !Settings::isAllCaptchaDisabled() && !Settings::isRecaptchaEnabled() && empty($fields['spam_check'])) {
+            $missingFieldNames[] = esc_html__('Math Question', 'fdsus');
+        }
 
         return $missingFieldNames ? $missingFieldNames : true;

sign-up-sheets/trunk/model/task-base.php

@@ -24 +24 @@
  * @property string dlssus_task_row_type
  * @property bool   dlssus_is_active
+ *
+ * @package FDSUS\Model
  */
 class TaskBase extends Base
@@ -90 +92 @@
     public static function getName($singular = false)
     {
-        return $singular ? __('Task', 'sign-up-sheets') : __('Tasks', 'sign-up-sheets');
+        return $singular ? __('Task', 'fdsus') : __('Tasks', 'fdsus');
     }
 
@@ -153 +155 @@
                 sprintf(
                     /* translators: %s is replaced with the task title */
-                    esc_html__('Error adding the task "%s"', 'sign-up-sheets'),
+                    esc_html__('Error adding the task "%s"', 'fdsus'),
                     $cleanFields['title']
                 )
@@ -188 +190 @@
         foreach ($meta as $k => $v) {
             if (update_post_meta($taskId, $k, maybe_unserialize($v)) === false) {
-                return new WP_Error('add_task_additional_err', esc_html__('Error adding additional fields to task.', 'sign-up-sheets'));
+                return new WP_Error('add_task_additional_err', esc_html__('Error adding additional fields to task.', 'fdsus'));
             }
             $i++;
@@ -237 +239 @@
                 sprintf(
                     /* translators: %s is replaced with the task title */
-                    esc_html__('Error updating the task "%s"', 'sign-up-sheets'),
+                    esc_html__('Error updating the task "%s"', 'fdsus'),
                     $cleanFields['title']
                 ) . (Settings::isDetailedErrors() ? '.. ' . print_r($task_id->get_error_message(), true) : '')
@@ -281 +283 @@
         $result = wp_delete_post($id, true);
         if ($result === false) {
-            return new WP_Error('task_delete_err', esc_html__('Error deleting task.', 'sign-up-sheets'));
+            return new WP_Error('task_delete_err', esc_html__('Error deleting task.', 'fdsus'));
         }
 
@@ -493 +495 @@
     public function getSignupLink($linkText = '') {
         if (empty($linkText)) {
-            $linkText = esc_html__('Sign up »', 'sign-up-sheets');
+            $linkText = esc_html__('Sign up »', 'fdsus');
         }
 

sign-up-sheets/trunk/model/task-table.php

@@ -20 +20 @@
     protected $sheet;
 
-    /** @var array */
-    public $config;
-
     /**
      * Constructor
@@ -28 +25 @@
      * @param SheetModel $sheet
      */
-    public function __construct($sheet, $config)
+    public function __construct($sheet)
     {
         $this->sheet = $sheet;
-        $this->config = $config;
 
         return $this;
@@ -77 +73 @@
          * @param SheetModel $sheet
          * @param string     $class
-         * @param array      $config
          *
          * @return string
          * @since 2.2
          */
-        $slug = apply_filters('fdsus_tasktable_task_cell_slug', $slug, $value, $this->sheet, $class, $this->config);
+        $slug = apply_filters('fdsus_tasktable_task_cell_slug', $slug, $value, $this->sheet, $class);
 
         /**
@@ -118 +113 @@
          * @param SheetModel $sheet
          * @param string     $class
-         * @param array      $config
          *
          * @return string
          * @since 2.2
          */
-        $slug = apply_filters('fdsus_tasktable_header_cell_slug', $slug, $value, $this->sheet, $class, $this->config);
+        $slug = apply_filters('fdsus_tasktable_header_cell_slug', $slug, $value, $this->sheet, $class);
 
         if ($slug !== false) {

sign-up-sheets/trunk/model/task.php

@@ -11 +11 @@
 
 if (Id::isPro()) {
-    class TaskParent extends \FDSUSPRO\Model\Pro\Task {}
+    class TaskParent extends Pro\Task {}
 } else {
     class TaskParent extends TaskBase {}

sign-up-sheets/trunk/package.json

@@ -1 +1 @@
 {
     "name": "sign-up-sheets",
-    "version": "2.3.0",
+    "version": "2.2.1",
     "description": "An online sign-up sheet manager where your users/volunteers can sign up for tasks.",
     "author": "fetchdesigns",

sign-up-sheets/trunk/readme.txt

@@ -3 +3 @@
 Tags: sign up, volunteer, non-profit, signup, sign-up
 Tested up to: 6.7
-Stable tag: 2.3.0
+Stable tag: 2.2.14
 License: GPLv2 or later
 
@@ -115 +115 @@
 == Upgrade Notice ==
 
-= 2.3.0 | 2025-02-02 =
-* Added ability to mark email field as optional.
-* Updated translation textdomain to better match WordPress standard of 'sign-up-sheets'. [⚠️Breaking Change]
-* Updated .sr-only class to use .screen-reader-text to be more consistent with WP core.
-* Fixed missing escaping around translations on tasks table.
-* Fixed sheets with the hidden email set so that the column doesn't show up in the admin and status email task tables.
-* Fixed password-protected sheets to prevent displaying sheet content prior to password being entered.
-* Fixed WP 6.7 notice being thrown of "Function _load_textdomain_just_in_time was called incorrectly."
-* Fixed bug preventing editing of new tasks on mobile devices.
-
 = 2.2.14 | 2024-10-07 =
 * Added setting to clear cache on specific post IDs when a sign-up occurs.
@@ -189 +179 @@
 
 == Changelog ==
-
-= 2.3.0 | 2025-02-02 =
-* Added ability to mark email field as optional.
-* Updated translation textdomain to better match WordPress standard of 'sign-up-sheets'. [⚠️Breaking Change]
-* Updated .sr-only class to use .screen-reader-text to be more consistent with WP core.
-* Fixed missing escaping around translations on tasks table.
-* Fixed sheets with the hidden email set so that the column doesn't show up in the admin and status email task tables.
-* Fixed password-protected sheets to prevent displaying sheet content prior to password being entered.
-* Fixed WP 6.7 notice being thrown of "Function _load_textdomain_just_in_time was called incorrectly."
-* Fixed bug preventing editing of new tasks on mobile devices.
 
 = 2.2.14 | 2024-10-07 =

sign-up-sheets/trunk/sign-up-sheets.php

@@ -4 +4 @@
 Plugin URI: https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/
 Description: An online sign-up sheet manager where your users/volunteers can sign up for tasks
-Version: 2.3.0
+Version: 2.2.14
 Requires PHP: 5.5
 Requires at least: 5.5
 Author: Fetch Designs
 Author URI: https://www.fetchdesigns.com/
-Text Domain: sign-up-sheets
-Domain Path: /languages
+Text Domain: fdsus
+Domain Path: /languages/
 License: GPL2
 */
@@ -30 +30 @@
 */
 
-if (!defined('FDSUS_FREE_PLUGIN_DIR_PATH')) {
-    define('FDSUS_FREE_PLUGIN_DIR_PATH', plugin_dir_path(__FILE__));
-}
-
-if (!defined('FDSUS_FREE_PLUGIN_BASENAME')) {
-    define('FDSUS_FREE_PLUGIN_BASENAME', plugin_basename(__FILE__));
-}
-
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'main.php';

sign-up-sheets/trunk/src/block.json

@@ -3 +3 @@
     "apiVersion": 2,
     "name": "sign-up-sheets/sheet",
-    "version": "2.3.0",
+    "version": "2.2.11",
     "title": "Sign-up Sheets",
     "category": "widgets",
@@ -11 +11 @@
         "html": false
     },
-    "textdomain": "sign-up-sheets",
+    "textdomain": "fdsus",
     "editorScript": "file:./index.js",
     "editorStyle": "file:./index.css",

sign-up-sheets/trunk/template-tags.php

@@ -522 +522 @@
     }
 }
-
-if (!function_exists('fdsus_scode_user_sign_ups_actions')) {
-    /**
-     * Call do_action for customizing the user sign-ups after the additional fields output
-     *
-     * @param array $row
-     *
-     * @return void
-     */
-    function fdsus_scode_user_sign_ups_actions($row)
-    {
-        /**
-         * [user_sign_ups] shortcode - after signup name is output
-         *
-         * @param SheetModel  $sheet
-         * @param TaskModel   $task
-         * @param SignupModel $signup
-         *
-         * @since todo user-signups
-         */
-        do_action('fdsus_scode_user_sign_ups_actions', $row['sheet'], $row['task'], $row['signup']);
-    }
-}

sign-up-sheets/trunk/theme-files/archive-dlssus_sheet.php

@@ -32 +32 @@
                 <?php echo do_shortcode('[sign_up_sheet]'); ?>
             <?php else: ?>
-                <p><?php esc_attr_e('No sign-up sheets found.', 'sign-up-sheets'); ?></p>
+                <p><?php esc_attr_e('No sign-up sheets found.', 'fdsus'); ?></p>
             <?php endif; ?>
 

sign-up-sheets/trunk/theme-files/content-dlssus_sheet.php

@@ -17 +17 @@
 <div class="<?php echo esc_attr(fdsus_template_classes_sign_up_sheet()) ?>" id="<?php echo get_the_ID() ? 'dls-sus-sheet-' . get_the_ID() : '' ?>">
 
-    <h3><?php esc_attr_e('Sign up below...', 'sign-up-sheets'); ?></h3>
+    <h3><?php esc_attr_e('Sign up below...', 'fdsus'); ?></h3>
 
     <?php dlssus_the_tasks_table(); ?>

sign-up-sheets/trunk/theme-files/fdsus/parts/captcha-simple.php

@@ -14 +14 @@
 <p>
     <label for="spam_check" class="spam_check">
-        <?php esc_html_e('Answer the following: 7 + 1 = __', 'sign-up-sheets'); ?>
+        <?php esc_html_e('Answer the following: 7 + 1 = __', 'fdsus'); ?>
         <span class="dls-sus-required-icon">*</span>
     </label>

sign-up-sheets/trunk/theme-files/fdsus/sheet-list.php

@@ -23 +23 @@
 <?php if (empty($args['sheets'])) : ?>
 
-    <p><?php esc_html_e('No sheets available at this time.', 'sign-up-sheets'); ?></p>
+    <p><?php esc_html_e('No sheets available at this time.', 'fdsus'); ?></p>
 
 <?php else: ?>
@@ -32 +32 @@
         <thead>
             <tr>
-                <th class="column-title"><?php esc_html_e('Title', 'sign-up-sheets'); ?></th>
-                <th class="column-date"><?php esc_html_e('Date', 'sign-up-sheets'); ?></th>
-                <th class="column-open_spots"><?php esc_html_e('Open Spots', 'sign-up-sheets'); ?></th>
+                <th class="column-title"><?php esc_html_e('Title', 'fdsus'); ?></th>
+                <th class="column-date"><?php esc_html_e('Date', 'fdsus'); ?></th>
+                <th class="column-open_spots"><?php esc_html_e('Open Spots', 'fdsus'); ?></th>
                 <th class="column-view_link">&nbsp;</th>
             </tr>
@@ -45 +45 @@
                 $endDate = null;
                 if (empty($sheet->dlssus_end_date)) {
-                    $displayDate = esc_html__('N/A', 'sign-up-sheets');
+                    $displayDate = esc_html__('N/A', 'fdsus');
                 } else {
                     $displayDate = (($sheet->dlssus_start_date == $sheet->dlssus_end_date) ? null : date(get_option('date_format'), strtotime($sheet->dlssus_start_date)) . ' - ');
@@ -61 +61 @@
                     <td class="column-view_link">
                         <?php if ($openSpots > 0): ?>
-                            <a href="<?php echo esc_url(get_the_permalink($sheet->ID)); ?>" class="fdsus-signup-cta"><?php esc_html_e('View &amp; sign-up', 'sign-up-sheets'); ?><span class="screen-reader-text"> <?php
+                            <a href="<?php echo esc_url(get_the_permalink($sheet->ID)); ?>" class="fdsus-signup-cta"><?php esc_html_e('View &amp; sign-up', 'fdsus'); ?><span class="sr-only"> <?php
                                 /* translators: %s is replaced with the sheet title */
-                                echo esc_html(sprintf(__('for %s', 'sign-up-sheets'), $sheet->post_title)); ?></span></a>
+                                echo esc_html(sprintf(__('for %s', 'fdsus'), $sheet->post_title)); ?></span></a>
                         <?php else: ?>
-                            <?php esc_html_e('&#10004; Filled', 'sign-up-sheets'); ?>
+                            <?php esc_html_e('&#10004; Filled', 'fdsus'); ?>
                         <?php endif; ?>
                     </td>

sign-up-sheets/trunk/theme-files/fdsus/sheet-none.php

@@ -13 +13 @@
 ?>
 
-<p><?php esc_attr_e('Sign-up sheet not found.', 'sign-up-sheets'); ?></p>
+<p><?php esc_attr_e('Sign-up sheet not found.', 'fdsus'); ?></p>

sign-up-sheets/trunk/theme-files/fdsus/sheet.php

@@ -20 +20 @@
     <p class="dls-sus-backlink">
         <a href="<?php echo esc_url(remove_query_arg(array('sheet_id', 'task_id'), $_SERVER['REQUEST_URI'])); ?>">
-            <?php esc_attr_e('&laquo; View all', 'sign-up-sheets'); ?>
+            <?php esc_attr_e('&laquo; View all', 'fdsus'); ?>
         </a>
     </p>

sign-up-sheets/trunk/theme-files/fdsus/sign-up-form-header.php

@@ -18 +18 @@
 
 if (!is_admin()): ?>
-    <h3><?php esc_html_e('Sign-up below', 'sign-up-sheets'); ?></h3>
+    <h3><?php esc_html_e('Sign-up below', 'fdsus'); ?></h3>
     <p>
-        <?php esc_html_e('You are signing up for...', 'sign-up-sheets'); ?>
+        <?php esc_html_e('You are signing up for...', 'fdsus'); ?>
         <em class="dls-sus-task-title"><?php echo wp_kses_post($signup_titles_str); ?></em>
     </p>

sign-up-sheets/trunk/theme-files/fdsus/sign-up-form.php

@@ -9 +9 @@
  * @see         https://www.fetchdesigns.com/sign-up-sheets-pro-overriding-templates-in-your-theme/
  * @since       2.2 (plugin version)
- * @version     1.3.0 (template file version)
+ * @version     1.2.0 (template file version)
  */
 
@@ -31 +31 @@
     <p>
         <label for="signup_firstname" class="signup_firstname">
-            <?php esc_html_e('First Name', 'sign-up-sheets'); ?>
+            <?php esc_html_e('First Name', 'fdsus'); ?>
             <span class="dls-sus-required-icon">*</span>
         </label>
@@ -41 +41 @@
     <p>
         <label for="signup_lastname" class="signup_lastname">
-            <?php esc_html_e('Last Name', 'sign-up-sheets'); ?>
+            <?php esc_html_e('Last Name', 'fdsus'); ?>
             <span class="dls-sus-required-icon">*</span>
         </label>
@@ -52 +52 @@
         <p>
             <label for="signup_email" class="signup_email">
-                <?php esc_html_e('E-mail', 'sign-up-sheets'); ?>
-                <?php if ($sheet->isEmailRequired()): ?>
-                    <span class="dls-sus-required-icon">*</span>
-                <?php endif; ?>
+                <?php esc_html_e('E-mail', 'fdsus'); ?>
+                <span class="dls-sus-required-icon">*</span>
             </label>
             <input type="email" id="signup_email" class="signup_email" name="signup_email"
-                   maxlength="100" <?php if ($sheet->isEmailRequired()) echo 'required aria-required="true"'; ?> autocomplete="email"
+                   maxlength="100" required aria-required="true" autocomplete="email"
                    value="<?php echo esc_attr($initial['email']); ?>"/>
         </p>
@@ -70 +68 @@
         <p>
             <label for="signup_phone" class="signup_phone">
-                <?php esc_html_e('Phone', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Phone', 'fdsus'); ?>
                 <?php if ($sheet->isPhoneRequired()): ?>
                     <span class="dls-sus-required-icon">*</span>
@@ -85 +83 @@
         <p>
             <label for="signup_address" class="signup_address">
-                <?php esc_html_e('Address', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Address', 'fdsus'); ?>
                 <?php if ($sheet->isAddressRequired()): ?>
                     <span class="dls-sus-required-icon">*</span>
@@ -97 +95 @@
         <p class="dls-sus-city">
             <label for="signup_city" class="signup_city">
-                <?php esc_html_e('City', 'sign-up-sheets'); ?>
+                <?php esc_html_e('City', 'fdsus'); ?>
                 <?php if ($sheet->isAddressRequired()): ?>
                     <span class="dls-sus-required-icon">*</span>
@@ -109 +107 @@
         <p class="dls-sus-state">
             <label for="signup_state" class="signup_state">
-                <?php esc_html_e('State', 'sign-up-sheets'); ?>
+                <?php esc_html_e('State', 'fdsus'); ?>
                 <?php if ($sheet->isAddressRequired()): ?>
                     <span class="dls-sus-required-icon">*</span>
@@ -126 +124 @@
         <p class="dls-sus-zip">
             <label for="signup_zip" class="signup_zip">
-                <?php esc_html_e('Zip', 'sign-up-sheets'); ?>
+                <?php esc_html_e('Zip', 'fdsus'); ?>
                 <?php if ($sheet->isAddressRequired()): ?>
                     <span class="dls-sus-required-icon">*</span>
@@ -145 +143 @@
     ?>
 
-    <p><span class="dls-sus-required-icon">*</span> = <?php esc_html_e('required', 'sign-up-sheets'); ?></p>
+    <p><span class="dls-sus-required-icon">*</span> = <?php esc_html_e('required', 'fdsus'); ?></p>
 
     <p class="submit">
@@ -161 +159 @@
                value="<?php echo esc_html($submit_button_text); ?>"/>
         <?php if (!is_admin() && !empty($go_back_url)): ?>
-            <?php esc_html_e('or', 'sign-up-sheets'); ?>
+            <?php esc_html_e('or', 'fdsus'); ?>
             <a href="<?php echo esc_url($go_back_url); ?>" class="dls-sus-backlink-from-task">
-                <?php esc_html_e('&laquo; go back to the Sign-Up Sheet', 'sign-up-sheets'); ?>
+                <?php esc_html_e('&laquo; go back to the Sign-Up Sheet', 'fdsus'); ?>
             </a>
         <?php endif; ?>

sign-up-sheets/trunk/theme-files/fdsus/user_sign_ups.php

@@ -25 +25 @@
     <thead>
     <tr>
-        <th class="fdssus-column-date"><?php esc_html_e('Date Added', 'sign-up-sheets') ?></th>
+        <th class="fdssus-column-date"><?php echo __('Date Added', 'fdsus') ?></th>
         <th class="fdssus-column-sheet-task">
             <?php echo esc_html($taskTitleLabel) ?>
         </th>
-        <th class="fdssus-column-signup"><?php esc_html_e('Sign-up Details', 'sign-up-sheets') ?></th>
+        <th class="fdssus-column-signup"><?php echo __('Sign-up Details', 'fdsus') ?></th>
     </tr>
     </thead>
@@ -38 +38 @@
                 <?php echo $row['date_added']
                     ? date(get_option('date_format'), strtotime($row['date_added']))
-                    : esc_html__('N/A', 'sign-up-sheets') ?>
+                    : __('N/A', 'fdsus') ?>
             </td>
             <td class="fdsus-col-sheet">
@@ -88 +88 @@
 
                 <?php if ($row['sheet']->isExpired() || $row['task']->isExpired()): ?>
-                    <span class="fdsus-signups-closed"><?php _e('Sign-ups Closed', 'sign-up-sheets') ?></span>
+                    <span class="fdsus-signups-closed"><?php _e('Sign-ups Closed', 'fdsus') ?></span>
                 <?php endif; ?>
             </td>