WordPress.org
Get WordPress

Plugin Directory

Changeset 3133163


Ignore:
Timestamp:
08/09/2024 11:32:22 AM (19 months ago)
Author:
wpfeedback
Message:

updated to version 4.0.3

Location:
atarim-visual-collaboration
Files:
208 added
12 edited

Legend:

Unmodified
Added
Removed

  • atarim-visual-collaboration/trunk/atarim-visual-collaboration.php

    r3124979 r3133163  
    33 * Plugin Name: Atarim: Visual Website Collaboration, Feedback & Workflow Management
    44 * Description: Atarim Visual Collaboration makes it easy and efficient to collaborate on websites with your clients, internal team, contractors…anyone! It’s used by nearly 10,000 agencies and freelancers worldwide on over 120,000 websites.
    5  * Version: 4.0.2
     5 * Version: 4.0.3
    66 * Requires at least: 5.0
    77 * Require PHP: 7.4
    … …  
    3030}
    3131if ( ! defined( 'WPF_VERSION' ) ) {
    32     define( 'WPF_VERSION', '4.0.2' );
     32    define( 'WPF_VERSION', '4.0.3' );
    3333}
    3434
    … …  
    6363        if( ! isset( $_GET['activate-multi'] ) ) {
    6464            delete_option( 'wpf_plugin_do_activation_redirect' );
    65             $url = admin_url( 'admin.php?page=wpfeedback_page_settings' );
     65            $url = admin_url( 'admin.php?page=collaboration_page_settings' );
    6666            wp_redirect( $url );
    6767            exit;
    … …  
    167167    $selected_roles = explode( ',', $selected_roles );
    168168
    169     $main_menu_id = 'wpfeedback_page_tasks';
     169    $main_menu_id = 'collaboration_page_tasks';
    170170
    171171    if ( array_intersect( $current_user->roles, $selected_roles ) || current_user_can( 'administrator' ) ) {
    … …  
    184184        );
    185185        add_submenu_page(
    186             $main_menu_id, __( 'Tasks Center', 'atarim-visual-collaboration' ), __( 'Tasks Center', 'atarim-visual-collaboration' ), 'read', 'wpfeedback_page_tasks', 'wpfeedback_page_tasks'
     186            $main_menu_id, __( 'Tasks Center', 'atarim-visual-collaboration' ), __( 'Tasks Center', 'atarim-visual-collaboration' ), 'read', 'collaboration_page_tasks', 'collaboration_page_tasks'
    187187        );
    188188        if ( $wpf_user_type == 'advisor' || ( $wpf_user_type == '' && current_user_can( 'administrator' ) ) ) {
    189189            add_submenu_page(
    190                 $main_menu_id, __( 'Settings', 'atarim-visual-collaboration' ), __( 'Settings', 'atarim-visual-collaboration' ), 'read', 'wpfeedback_page_settings', 'wpfeedback_page_settings'
     190                $main_menu_id, __( 'Settings', 'atarim-visual-collaboration' ), __( 'Settings', 'atarim-visual-collaboration' ), 'read', 'collaboration_page_settings', 'collaboration_page_settings'
    191191            );
    192192        }
    193193        if ( $wpf_user_type == 'advisor' || ( $wpf_user_type == '' && current_user_can( 'administrator' ) ) ) {
    194194            add_submenu_page(
    195                 $main_menu_id, __( 'Permissions', 'atarim-visual-collaboration' ), __( 'Permissions', 'atarim-visual-collaboration' ), 'read', 'wpfeedback_page_permissions', 'wpfeedback_page_permissions'
     195                $main_menu_id, __( 'Permissions', 'atarim-visual-collaboration' ), __( 'Permissions', 'atarim-visual-collaboration' ), 'read', 'collaboration_page_permissions', 'collaboration_page_permissions'
    196196            );
    197197        }
    198198        if ( $wpf_user_type == 'advisor' ) {
    199199            add_submenu_page(
    200                 $main_menu_id, __( 'Integrations', 'atarim-visual-collaboration' ), __( 'Integrations', 'atarim-visual-collaboration' ), 'read', 'wpfeedback_page_integrate', 'wpfeedback_page_integrate'
     200                $main_menu_id, __( 'Integrations', 'atarim-visual-collaboration' ), __( 'Integrations', 'atarim-visual-collaboration' ), 'read', 'collaboration_page_integrate', 'collaboration_page_integrate'
    201201            );
    202202        }
    … …  
    222222 */
    223223function wpf_setting_action_links( $links ) {
    224     $links[] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=wpfeedback_page_settings&wpf_setting=1' ) ) . '">' . __( 'Settings', 'atarim-visual-collaboration' ) . '</a>';
     224    $links[] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=collaboration_page_settings&wpf_setting=1' ) ) . '">' . __( 'Settings', 'atarim-visual-collaboration' ) . '</a>';
    225225    return $links;
    226226}
    … …  
    232232 * @return NULL
    233233 */
    234 function wpfeedback_page_settings() {
     234function collaboration_page_settings() {
    235235    global $current_user;
    236236    $initial_setup = get_site_data_by_key( 'wpf_initial_setup_complete' );
    … …  
    249249 * @return NULL
    250250 */
    251 function wpfeedback_page_tasks() {
     251function collaboration_page_tasks() {
    252252    global $current_user;
    253253    require_once( WPF_PLUGIN_DIR . 'inc/admin/page-settings.php' );
    … …  
    260260 * @return NULL
    261261 */
    262 function wpfeedback_page_integrate() {
     262function collaboration_page_integrate() {
    263263    global $current_user;
    264264    require_once( WPF_PLUGIN_DIR . 'inc/admin/page-settings.php' );
    … …  
    271271 * @return NULL
    272272 */
    273 function wpfeedback_page_support() {
     273function collaboration_page_support() {
    274274    global $current_user;
    275275    require_once( WPF_PLUGIN_DIR . 'inc/admin/page-settings.php' );
    … …  
    282282 * @return NULL
    283283 */
    284 function wpfeedback_page_permissions() {
     284function collaboration_page_permissions() {
    285285    global $current_user;
    286286    require_once( WPF_PLUGIN_DIR . 'inc/admin/page-settings-permissions.php' );
    … …  
    765765
    766766    if ( isset( $_REQUEST['page'] ) ) {
    767         if ( $_REQUEST['page'] == 'wpfeedback_page_settings' || $_REQUEST['page'] == 'wpfeedback_page_tasks' || $_REQUEST['page'] == 'wpfeedback_page_integrate' || $_REQUEST['page'] == 'wpfeedback_page_upgrade' || $_REQUEST['page'] == 'wpfeedback_page_support' || $_REQUEST['page'] == 'wpfeedback_page_permissions' ) {
     767        if ( $_REQUEST['page'] == 'collaboration_page_settings' || $_REQUEST['page'] == 'collaboration_page_tasks' || $_REQUEST['page'] == 'collaboration_page_integrate' || $_REQUEST['page'] == 'collaboration_page_upgrade' || $_REQUEST['page'] == 'collaboration_page_support' || $_REQUEST['page'] == 'collaboration_page_permissions' ) {
    768768            ?>
    769769            <script type='text/javascript'>
    … …  
    14411441            jQuery(document).ready(function ($) {
    14421442                var wpfeedback_page = getParameterByName('page');
    1443                 if ( wpfeedback_page == "wpfeedback_page_tasks" ) {
     1443                if ( wpfeedback_page == "collaboration_page_tasks" ) {
    14441444                    jQuery("button.wpf_tab_item.wpf_tasks").trigger('click');
    14451445                }
    1446                 if ( wpfeedback_page == "wpfeedback_page_settings" ) {
     1446                if ( wpfeedback_page == "collaboration_page_settings" ) {
    14471447                    jQuery("button.wpf_tab_item.wpf_settings").trigger('click');
    14481448                }
    1449                 if ( wpfeedback_page == "wpfeedback_page_integrate" ) {
     1449                if ( wpfeedback_page == "collaboration_page_integrate" ) {
    14501450                    jQuery("button.wpf_tab_item.wpf_addons").trigger('click');
    14511451                }
    1452                 if ( wpfeedback_page == "wpfeedback_page_support" ) {
     1452                if ( wpfeedback_page == "collaboration_page_support" ) {
    14531453                    jQuery("button.wpf_tab_item.wpf_support").trigger('click');
    14541454                }
    1455                 if ( wpfeedback_page == "wpfeedback_page_permissions" ) {
     1455                if ( wpfeedback_page == "collaboration_page_permissions" ) {
    14561456                    jQuery("button.wpf_tab_item.wpf_misc").trigger('click');
    14571457                }
    … …  
    19721972        <style type="text/css">
    19731973            :root {
    1974                 --main-wpf-color: #<?php echo ( get_site_data_by_key( 'wpfeedback_color' ) != "" ) ? str_replace( '#', '', get_site_data_by_key( 'wpfeedback_color' ) ) : "002157"; ?>;
     1974                --main-wpf-color: #<?php echo ( get_site_data_by_key( 'wpfeedback_color' ) != "" ) ? str_replace( '#', '', get_site_data_by_key( 'wpfeedback_color' ) ) : "6D5DF3"; ?>;
    19751975            }
    19761976        </style>
    … …  
    25852585                <p class="admin_notice_footer"><i>* This notice is shown to you as the Webmaster.</i></p>
    25862586            </div>
    2587             <div class="wpf_admin_notice_button_col"><a class="wpf_admin_notice_button" href="'. admin_url() .'admin.php?page=wpfeedback_page_permissions"><span class="dashicons dashicons dashicons-update"></span> Activate & Connect</a></div>
     2587            <div class="wpf_admin_notice_button_col"><a class="wpf_admin_notice_button" href="'. admin_url() .'admin.php?page=collaboration_page_permissions"><span class="dashicons dashicons dashicons-update"></span> Activate & Connect</a></div>
    25882588        </div>';
    25892589    }
    … …  
    26222622            </div>
    26232623            <div class="wpf_admin_notice_content">
    2624                 Atarim is disabled because this website has been archived on the Agency Dashboard. To re-enable the plugin,
    2625                 please go to the <a href="<?php echo WPF_APP_SITE_URL; ?>/websites" target=_blank >Websites</a> screen in your Agency
     2624                Collaboration is disabled because this website has been archived on the Atarim Dashboard. To re-enable the plugin,
     2625                please go to the <a href="<?php echo WPF_APP_SITE_URL; ?>" target=_blank >Websites</a> screen in your Atarim
    26262626                Dashboard and <strong>unarchive this website</strong>
    26272627                <p class="admin_notice_footer"><i>* This notice is shown to you as the Webmaster.</i></p>

  • atarim-visual-collaboration/trunk/css/admin.css

    r3124979 r3133163  
    22832283
    22842284input:checked + .wpf_switch_slider {
    2285     background-color: #7c6df4;
     2285    background-color: var(--main-wpf-color) !important;
    22862286}
    22872287
    … …  
    28302830 }
    28312831
    2832  .toplevel_page_wpfeedback_page_tasks .wp-menu-image img {
     2832 .toplevel_page_collaboration_page_tasks .wp-menu-image img {
    28332833    padding: 5px 0 0 0 !important;
    28342834    opacity: .6;

  • atarim-visual-collaboration/trunk/css/wpf-common.css

    r3116009 r3133163  
    21672167    height: 100%;
    21682168    width: 50%;
    2169     background-color: #6D5DF3 !important;
     2169    background-color: var(--main-wpf-color) !important;
    21702170    border-radius: 5px;
    21712171    left: 0;
    … …  
    48894889}
    48904890.wpf_bc_switch_slider:not(.active_browse) {
    4891     background-color: #6D5DF3 !important;
     4891    background-color: var(--main-wpf-color) !important;
    48924892}
    48934893.wpf_bc_switch_slider:not(.active_browse):before {
    … …  
    61616161.wpf_total_collab_users {
    61626162    color: #FFFFFF !important;
    6163     background: #6D5DF3 !important;
     6163    background-color: var(--main-wpf-color) !important;
    61646164    border-radius: 18px !important;
    61656165    padding: 0 6px !important;

  • atarim-visual-collaboration/trunk/inc/admin/page-settings-permissions.php

    r3116009 r3133163  
    2828    <!-- ================= TOP TABS ================-->
    2929    <div class="wpf_tabs_container" id="wpf_tabs_container">
    30         <button class="wpf_tab_item wpf_tasks active" onclick="location.href='admin.php?page=wpfeedback_page_tasks'" style="background-color: #efefef;"><?php esc_attr_e( 'Tasks', 'atarim-visual-collaboration' ); ?></button>
     30        <button class="wpf_tab_item wpf_tasks active" onclick="location.href='admin.php?page=collaboration_page_tasks'" style="background-color: #efefef;"><?php esc_attr_e( 'Tasks', 'atarim-visual-collaboration' ); ?></button>
    3131        <?php
    3232        if ( $wpf_user_type == 'advisor' || ( $wpf_user_type == '' && current_user_can( 'administrator' ) ) ) { ?>
    33             <button class="wpf_tab_item wpf_settings" onclick="location.href='admin.php?page=wpfeedback_page_settings'" style="background-color: #efefef;"><?php esc_attr_e( 'Settings', 'atarim-visual-collaboration' ); ?></button>
     33            <button class="wpf_tab_item wpf_settings" onclick="location.href='admin.php?page=collaboration_page_settings'" style="background-color: #efefef;"><?php esc_attr_e( 'Settings', 'atarim-visual-collaboration' ); ?></button>
    3434        <?php }
    3535        if ( $wpf_user_type == 'advisor' || ( $wpf_user_type == '' && current_user_can( 'administrator' ) ) ) { ?>
    … …  
    3737        <?php }
    3838        if ( $wpf_user_type == 'advisor' ) { ?>
    39             <button class="wpf_tab_item wpf_addons" onclick="location.href='admin.php?page=wpfeedback_page_integrate'" style="background-color: #efefef;"><?php esc_attr_e( 'Integrate', 'atarim-visual-collaboration' ); ?></button>
     39            <button class="wpf_tab_item wpf_addons" onclick="location.href='admin.php?page=collaboration_page_integrate'" style="background-color: #efefef;"><?php esc_attr_e( 'Integrate', 'atarim-visual-collaboration' ); ?></button>
    4040        <?php }
    4141        if ( $wpf_user_type == 'advisor' || ( $wpf_user_type == '' && current_user_can( 'administrator' ) ) ) { ?>
    … …  
    6060                    <div class="wpf_settings_sidebar">
    6161                        <div class="wpf_settings_inner_sidebar">
    62                             <a href="#wpf_license_ver"><?php esc_attr_e( 'Agency Dashboard Integration', 'atarim-visual-collaboration' ); ?></a>
     62                            <a href="#wpf_license_ver"><?php esc_attr_e( 'Atarim Dashboard Integration', 'atarim-visual-collaboration' ); ?></a>
    6363                            <a href="#wpf_general_perm"><?php esc_attr_e( 'Permissions Settings', 'atarim-visual-collaboration' ); ?></a>
    6464                            <a href="#wpf_user_custom"><?php esc_attr_e( 'Customisations', 'atarim-visual-collaboration' ); ?></a>
    … …  
    7070                    <div class="wpf_settings_col">
    7171                        <div class="wpf_inner_settings_col">
    72                             <div class="wpf_title_section" id="wpf_license_ver"><?php esc_attr_e( 'Agency Dashboard Integration', 'atarim-visual-collaboration' ); ?></div>
    73                             <p><?php esc_attr_e( 'Click the button to activate and add this website to your Agency Dashboard. If for some reason the connection is not established, please contact support.', 'atarim-visual-collaboration' ); ?></p>
     72                            <div class="wpf_title_section" id="wpf_license_ver"><?php esc_attr_e( 'Atarim Dashboard Integration', 'atarim-visual-collaboration' ); ?></div>
     73                            <p><?php esc_attr_e( 'Click the button to activate and add this website to your Atarim Dashboard. If for some reason the connection is not established, please contact support.', 'atarim-visual-collaboration' ); ?></p>
    7474                            <div class="wpfeedback_licence_key">
    75                                 <div class="wpf_title"><?php esc_attr_e( 'Add this website to your Agency Dashboard account', 'atarim-visual-collaboration' ); ?></div>
     75                                <div class="wpf_title"><?php esc_attr_e( 'Add this website to your Atarim Dashboard account', 'atarim-visual-collaboration' ); ?></div>
    7676                                <span><?php esc_attr_e( 'The Client Interface Plugin will not work unless you click the following button and activate this website.', 'atarim-visual-collaboration' ); ?></span>
    7777                                <div class="wpfeedback_licence_key_field">
    … …  
    8888                                        echo '<input type="submit" class="wpf_deactivate_button" name="wpf_license_deactivate" value="'.__( "Deactivate License", 'atarim-visual-collaboration' ).'"/></div>';
    8989                                    } else {
    90                                         $home_url = WPF_APP_SITE_URL . '?activation_callback='.Base64_encode( WPF_SITE_URL ).'&page_redirect=' . Base64_encode( "wpfeedback_page_settings" ) . '&site_url=' . Base64_encode( WPF_HOME_URL );
     90                                        $home_url = WPF_APP_SITE_URL . '?activation_callback='.Base64_encode( WPF_SITE_URL ).'&page_redirect=' . Base64_encode( "collaboration_page_settings" ) . '&site_url=' . Base64_encode( WPF_HOME_URL );
    9191                                        echo '<a href="'.$home_url.'"><button type="button" class="wpf_activate_btn" name="wpf_activate" access="false" id="ber_page4_save"><span class="dashicons dashicons-update"></span>' . __( 'Activate This Website', 'atarim-visual-collaboration' ) . '</button></a>';
    9292                                    }
    … …  
    163163                                    <div class="at_feat_content">
    164164                                        <div class="wpf_title"><?php esc_attr_e( 'Global Settings', 'atarim-visual-collaboration' ); ?></div>
    165                                         <p><?php esc_attr_e( 'User Permissions are pulled from your Agency dashboard', 'atarim-visual-collaboration' ); ?></p>
     165                                        <p><?php esc_attr_e( 'User Permissions are pulled from your Atarim dashboard', 'atarim-visual-collaboration' ); ?></p>
    166166                                        <p><a href="<?php echo WPF_APP_SITE_URL; ?>/settings" target="_blank"><?php esc_attr_e( 'Edit your global settings', 'atarim-visual-collaboration' ); ?></a></p>
    167167                                    </div>
    … …  
    284284                            <div class="wpf_settings_option wpf_website_developer">
    285285                                <div class="wpf_title"><?php esc_attr_e( 'The website builder', 'atarim-visual-collaboration' ); ?></div>
    286                                 <div class="wpf_description"><?php esc_attr_e( 'The website builder will add this user to all tasks by default, allowing the client to skip the "choose a user" tab when creating a task. It will also be used for the Auto Login option when coming from the Agency Dashboard.', 'atarim-visual-collaboration' ); ?></div>
     286                                <div class="wpf_description"><?php esc_attr_e( 'The website builder will add this user to all tasks by default, allowing the client to skip the "choose a user" tab when creating a task. It will also be used for the Auto Login option when coming from the Atarim Dashboard.', 'atarim-visual-collaboration' ); ?></div>
    287287                                <select name="wpf_website_developer">
    288288                                    <option value="0"><?php esc_attr_e( 'select', 'atarim-visual-collaboration' ); ?></option>

  • atarim-visual-collaboration/trunk/inc/admin/page-settings.php

    r3116009 r3133163  
    8484        <?php }
    8585        if ( $wpf_user_type == 'advisor' || ( $wpf_user_type == '' && current_user_can( 'administrator' ) ) ) { ?>
    86             <button class="wpf_tab_item wpf_misc" onclick="location.href='admin.php?page=wpfeedback_page_permissions'">
     86            <button class="wpf_tab_item wpf_misc" onclick="location.href='admin.php?page=collaboration_page_permissions'">
    8787                <?php esc_attr_e( 'Permissions', 'atarim-visual-collaboration' ); ?>
    8888            </button>
    … …  
    118118                <div class="wpf_welcome_note"><?php esc_attr_e( "It's good to have you here", 'atarim-visual-collaboration' ); ?> <?php esc_attr_e( $wpf_user_name, 'atarim-visual-collaboration' ); ?>! ❤</div>
    119119                <div class="wpf_welcome_image"><img alt="" src="<?php echo WPF_PLUGIN_URL.'images/WPF-welcome_720.png'; ?>"/></div>
    120                 <div class="wpf_welcome_note"><?php esc_attr_e( 'Please click on the', 'atarim-visual-collaboration' ); ?> <u onclick="location.href='admin.php?page=wpfeedback_page_permissions'"><?php esc_attr_e( 'Permissions tab', 'atarim-visual-collaboration' ); ?></u> <?php esc_attr_e( 'and verify your license to start using the plugin', 'atarim-visual-collaboration' ); ?></div>
     120                <div class="wpf_welcome_note"><?php esc_attr_e( 'Please click on the', 'atarim-visual-collaboration' ); ?> <u onclick="location.href='admin.php?page=collaboration_page_permissions'"><?php esc_attr_e( 'Permissions tab', 'atarim-visual-collaboration' ); ?></u> <?php esc_attr_e( 'and verify your license to start using the plugin', 'atarim-visual-collaboration' ); ?></div>
    121121            </div>
    122122        </div>
    … …  
    169169                        </div>
    170170                        <div class="wpf_task_status_title wpf_icon_title"><?php echo get_wpf_status_icon(); ?><?php esc_attr_e( 'Task Status', 'atarim-visual-collaboration' ); ?></div>
    171                         <input type="hidden" name="page" value="wpfeedback_page_settings">
     171                        <input type="hidden" name="page" value="collaboration_page_settings">
    172172                        <div><?php echo wp_feedback_get_texonomy( 'task_status' ); ?></div>
    173173                        <div class="wpf_task_priority_title wpf_icon_title"><?php echo get_wpf_priority_icon(); ?><?php esc_attr_e( 'Task Urgency', 'atarim-visual-collaboration' ); ?></div>
    … …  
    323323            <div id="wpf_global_settings_overlay" <?php if ( get_site_data_by_key( 'wpf_global_settings' ) != 'yes' ) { echo "class='wpf_hide'"; } ?> >
    324324                <div class="wpf_welcome_wrap"><div class="wpf_welcome_title"><?php esc_attr_e( 'Global Settings', 'atarim-visual-collaboration' ); ?></div>
    325                     <p><?php esc_attr_e( 'Update your settings from the Global Settings area within your Agency dashboard.', 'atarim-visual-collaboration' ); ?></p>
     325                    <p><?php esc_attr_e( 'Update your settings from the Global Settings area within your Atarim dashboard.', 'atarim-visual-collaboration' ); ?></p>
    326326                    <div class="wpf_golbalsettings_buttons">
    327327                        <div class="wpf_settings_icon">Local <i class="gg-database"></i></div>
    … …  
    354354                                <div class="wpf_resync_dashboard">
    355355                                    <div class="wpf_title">
    356                                         <input type="button" value="<?php esc_attr_e('Resync the Agency Dashboard', 'atarim-visual-collaboration'); ?>" class="wpf_button" onclick="wpf_resync_dashboard()"/>
     356                                        <input type="button" value="<?php esc_attr_e('Resync the Atarim Dashboard', 'atarim-visual-collaboration'); ?>" class="wpf_button" onclick="wpf_resync_dashboard()"/>
    357357                                            <?php
    358358                                            if ( isset( $_GET['resync_dashboard'] ) && $_GET['resync_dashboard'] == 1 ) {
    … …  
    371371                            <div class="wpf_settings_option wpfeedback_enable_global">
    372372                                <div class="wpf_title"><?php esc_attr_e( 'Enable Global Settings', 'atarim-visual-collaboration' ); ?></div>                           
    373                                 <div class="wpf_description"><?php esc_attr_e( 'Everything you see on this screen can be managed globally from within your Agency Dashboard. Enable this option to pull your General Settings, Branding options and Notification options from the Global Settings panel.', 'atarim-visual-collaboration' ); ?></div>
     373                                <div class="wpf_description"><?php esc_attr_e( 'Everything you see on this screen can be managed globally from within your Atarim Dashboard. Enable this option to pull your General Settings, Branding options and Notification options from the Global Settings panel.', 'atarim-visual-collaboration' ); ?></div>
    374374                                <label class="wpf_switch">
    375375                                    <!--edited by Pratap-->
    … …  
    381381                            <p><?php esc_attr_e( 'On this screen, you can manage different settings of the plugin. You can white label it to match your own branding, control which notifications are sent out to the users of this WordPress website and a few other options below this text.', 'atarim-visual-collaboration' ); ?></p>
    382382                            <p><b><?php esc_attr_e( 'You can also control the permissions of Atarim Client Interface:', 'atarim-visual-collaboration' ); ?></b><?php esc_attr_e( ' you can allow or disallow users to use certain functions, you can even turn on guest mode to allow any visitor to the website to use the tool without needing to login.' , 'atarim-visual-collaboration' ); ?>
    383                                 <a href="admin.php?page=wpfeedback_page_permissions"><?php esc_attr_e( 'To find these settings, go here.', 'atarim-visual-collaboration' ); ?></a><?php esc_attr_e( 'You will also see your license settings on this page.', 'atarim-visual-collaboration' ); ?><br><br>
     383                                <a href="admin.php?page=collaboration_page_permissions"><?php esc_attr_e( 'To find these settings, go here.', 'atarim-visual-collaboration' ); ?></a><?php esc_attr_e( 'You will also see your license settings on this page.', 'atarim-visual-collaboration' ); ?><br><br>
    384384                            </p>
    385385                            <div class="wpf_settings_option enabled_wpfeedback">
    … …  
    419419                                <div class="wpf_title_section" id="wpf_branding"><?php esc_attr_e( 'White Label', 'atarim-visual-collaboration' ); ?></div>
    420420                                <p><?php esc_attr_e( 'Here you can rebrand Atarim Client Interface by changing the main color and the logo.', 'atarim-visual-collaboration' ); ?><br />
    421                                 <?php esc_attr_e( 'You can ', 'atarim-visual-collaboration' ); ?><strong><?php esc_attr_e( 'manage Global Settings across all of your websites', 'atarim-visual-collaboration' ); ?></strong> <?php esc_attr_e( 'where your license is activated by visiting the general settings screen on your', 'atarim-visual-collaboration' ); ?> <a href="<?php echo WPF_APP_SITE_URL; ?>/settings#whitelabel" target="_blank"><?php esc_attr_e( 'Agency Dashboard', 'atarim-visual-collaboration' ); ?></a>.</p>                           
     421                                <?php esc_attr_e( 'You can ', 'atarim-visual-collaboration' ); ?><strong><?php esc_attr_e( 'manage Global Settings across all of your websites', 'atarim-visual-collaboration' ); ?></strong> <?php esc_attr_e( 'where your license is activated by visiting the general settings screen on your', 'atarim-visual-collaboration' ); ?> <a href="<?php echo WPF_APP_SITE_URL; ?>/settings#whitelabel" target="_blank"><?php esc_attr_e( 'Atarim Dashboard', 'atarim-visual-collaboration' ); ?></a>.</p>                           
    422422                                <div class="wpf_settings_option wpfeedback_replace_logo">
    423423                                    <div class="wpf_title"><?php esc_attr_e( 'Replace the Atarim logo', 'atarim-visual-collaboration' ); ?></div>

  • atarim-visual-collaboration/trunk/inc/admin/wpf_admin_function.php

    r3124979 r3133163  
    176176        echo "<script>var fallback_link_check = '', page_type = '', wpf_tab_permission_display_stickers = '$wpf_tab_permission_display_stickers', wpf_tab_permission_display_task_id = '$wpf_tab_permission_display_task_id';</script>";
    177177        require_once( WPF_PLUGIN_DIR . 'inc/wpf_popup_string.php' );
    178         if ( $wpf_active == 1 && $wpf_check_page_builder_active == 0 && $wpf_allow_backend_commenting != 'yes' && $wpf_current_screen != 'settings_page_menu_editor' && $wpf_current_screen != 'collaborate_page_wpfeedback_page_settings' && ( ! $is_site_archived ) ) {
     178        if ( $wpf_active == 1 && $wpf_check_page_builder_active == 0 && $wpf_allow_backend_commenting != 'yes' && $wpf_current_screen != 'settings_page_menu_editor' && $wpf_current_screen != 'collaborate_page_collaboration_page_settings' && ( ! $is_site_archived ) ) {
    179179            echo "<script>var fallback_link_check = '', page_type = '', wpf_reconnect_icon = '$wpf_reconnect_icon', wpf_tag_enter_img = '$wpf_tag_enter_img', disable_for_admin = '$disable_for_admin', wpf_nonce = '$wpf_nonce', wpf_current_screen = '$wpf_current_screen', current_role = '$current_role', wpf_current_role = '$wpf_current_role', current_user_name = '$current_user_name', current_user_id = '$current_user_id', wpf_website_builder = '$wpf_website_builder', wpfb_users = '$wpfb_users',  ajaxurl = '$ajax_url', current_page_url = '$current_page_url', current_page_title = '$current_page_title', current_page_id = '$current_page_id', wpf_screenshot_sound = '$sound_file', plugin_url = '$plugin_url', comment_count = '$comment_count', bubble_comment_count = '$bubble_comment_count', wpf_show_front_stikers = '$wpf_show_front_stikers', wpf_tab_permission_user = '$wpf_tab_permission_user', wpf_tab_permission_priority = '$wpf_tab_permission_priority', wpf_tab_permission_status = '$wpf_tab_permission_status', wpf_tab_permission_screenshot = '$wpf_tab_permission_screenshot', wpf_tab_permission_information = '$wpf_tab_permission_information', wpf_tab_permission_delete_task = '$wpf_tab_permission_delete_task', wpf_tab_permission_auto_screenshot = '$wpf_tab_permission_auto_screenshot', wpf_tab_permission_keyboard_shortcut = '$wpf_tab_permission_keyboard_shortcut', wpf_admin_bar = 1, restrict_plugin = '$restrict_plugin', atarim_server_down = '$atarim_server_down';</script>";
    180180            if ( $disable_for_admin == 0 ) {
    … …  
    283283            wp_enqueue_script( 'wpf_jquery_script' );
    284284
    285             if ( isset( $_GET['page'] ) && $_GET['page'] == "wpfeedback_page_settings" ) {
     285            if ( isset( $_GET['page'] ) && $_GET['page'] == "collaboration_page_settings" ) {
    286286                wp_register_script( 'pickr', WPF_PLUGIN_URL . 'js/pickr.min.js', null, null, true );
    287287                wp_enqueue_script( 'pickr' );
    … …  
    363363            }
    364364
    365             $wpf_exclude_page = array( "wp-feedback_page_wpfeedback_page_tasks", "wp-feedback_page_wpfeedback_page_settings", "wp-feedback_page_wpfeedback_page_permissions", "wp-feedback_page_wpfeedback_page_support" );
     365            $wpf_exclude_page = array( "wp-feedback_page_collaboration_page_tasks", "wp-feedback_page_collaboration_page_settings", "wp-feedback_page_collaboration_page_permissions", "wp-feedback_page_collaboration_page_support" );
    366366            if ( $enabled_wpfeedback == 1 && $wpf_allow_backend_commenting != 'yes' && ( ! $is_site_archived ) ) {
    367367                if ( ! in_array( $wpf_current_screen_id, $wpf_exclude_page ) ) {

  • atarim-visual-collaboration/trunk/inc/admin/wpf_backend_initial_setup.php

    r3090249 r3133163  
    2929                    <input type="hidden" name="action" value="save_wpfeedback_options"/>
    3030                    <?php
    31                         $google_sup = WPF_APP_SITE_URL . '/google-auth?activation_callback='.Base64_encode( WPF_SITE_URL ).'&page_redirect=' . Base64_encode( "wpfeedback_page_settings" ) . '&site_url=' . Base64_encode( WPF_HOME_URL );
     31                        $google_sup = WPF_APP_SITE_URL . '/google-auth?activation_callback='.Base64_encode( WPF_SITE_URL ).'&page_redirect=' . Base64_encode( "collaboration_page_settings" ) . '&site_url=' . Base64_encode( WPF_HOME_URL );
    3232                    ?>
    3333                    <a href="<?php echo $google_sup; ?>" class="supg-btn">
    … …  
    6565                    ?>
    6666                    <?php
    67                         $home_url = WPF_APP_SITE_URL . '?activation_callback=' . Base64_encode( WPF_SITE_URL ) . '&page_redirect=' . Base64_encode( "wpfeedback_page_settings" ) . '&site_url=' . Base64_encode( WPF_HOME_URL );
     67                        $home_url = WPF_APP_SITE_URL . '?activation_callback=' . Base64_encode( WPF_SITE_URL ) . '&page_redirect=' . Base64_encode( "collaboration_page_settings" ) . '&site_url=' . Base64_encode( WPF_HOME_URL );
    6868                        echo '<p class="wpf_has_account" style="width:100%"><a class="wpf_account_link" href="' . $home_url . '">I already have an account (Login)</a></p>';
    6969                    ?>

  • atarim-visual-collaboration/trunk/inc/wpf_ajax_functions.php

    r3124979 r3133163  
    895895        $data['wpf_site_id'] = get_option( 'wpf_site_id' );
    896896        $arg                 = wp_json_encode( $data );
    897         wpf_send_remote_post( $url, $arg );
    898         $args = array(
    899             'task_id'  => sanitize_text_field( $task_info['task_id'] ),
    900             'type'     => 'wp_feedback',
    901             'orderby'  => 'comment_date',
    902             'order'    => 'DESC',
    903         );
    904 
    905         $url           = WPF_CRM_API . 'wp-api/comment/list';
    906         $sendtocloud   = wp_json_encode( $args );
    907         $comments_info = wpf_send_remote_post( $url, $sendtocloud );
    908         if ( $comments_info['status'] == 200 ) {
    909             echo $comments_info['data'][0]['comment_content'];
    910         }
     897        $response = wpf_send_remote_post( $url, $arg );
     898        print_r($response);
    911899        exit;
    912900    }
    … …  
    933921            $data['from_wp']     = 1;
    934922            $data['wpf_site_id'] = get_option( 'wpf_site_id' );
    935             $response            = wp_json_encode( $data );
    936             wpf_send_remote_post( $url, $response );
    937             $args = array(
    938                 'task_id' => sanitize_text_field( $task_info['task_id'] ),
    939                 'type'    => 'wp_feedback',
    940                 'orderby' => 'comment_date',
    941                 'order'   => 'DESC',
    942             );
    943 
    944             $url           = WPF_CRM_API . 'wp-api/comment/list';
    945             $sendtocloud   = wp_json_encode( $args );
    946             $comments_info = wpf_send_remote_post( $url, $sendtocloud );
    947             if ( $comments_info['status'] == 200 ) {
    948                 echo $comments_info['data'][0]['comment_content'];
    949             }
     923            $arg                 = wp_json_encode( $data );
     924            $response = wpf_send_remote_post( $url, $arg );
     925            print_r($response);
    950926            exit;
    951927    }
    … …  
    19941970
    19951971/*
    1996  * This function is used to push the media to the wordpress media library. It is called from Agency dashboard.
     1972 * This function is used to push the media to the wordpress media library. It is called from Atarim dashboard.
    19971973 * URL: DOMAIN/wp-admin/admin-ajax.php?action=app_push_to_media
    19981974 *

  • atarim-visual-collaboration/trunk/inc/wpf_function.php

    r3124979 r3133163  
    143143if ( ! function_exists( 'process_wpfeedback_options' ) ) {
    144144    function process_wpfeedback_options() {
     145        if ( !check_if_allowed_to_save_settings() ) {
     146            wp_die( 'Unauthorized access' );
     147        }
    145148        $options = [];   
    146149        // Check that user has proper security level
    … …  
    208211        }
    209212        update_site_data( $parms );
    210         wp_redirect( add_query_arg( 'page', 'wpfeedback_page_settings&wpf_setting=1', admin_url( 'admin.php' ) ) );
     213        wp_redirect( add_query_arg( 'page', 'collaboration_page_settings&wpf_setting=1', admin_url( 'admin.php' ) ) );
    211214        exit;
    212215    }
    … …  
    222225if ( ! function_exists( 'process_wpfeedback_misc_options' ) ) {
    223226    function process_wpfeedback_misc_options() {   
     227        if ( !check_if_allowed_to_save_settings() ) {
     228            wp_die( 'Unauthorized access' );
     229        }
    224230        $options = [];
    225231        if ( isset( $_POST['wpf_license_deactivate'] ) ) {
    … …  
    334340            }
    335341        }
    336         wp_redirect( add_query_arg( 'page', 'wpfeedback_page_permissions', admin_url( 'admin.php' ) ) );
     342        wp_redirect( add_query_arg( 'page', 'collaboration_page_permissions', admin_url( 'admin.php' ) ) );
    337343        exit;
    338344    }
    339345}
    340346add_action( 'admin_post_save_wpfeedback_misc_options', 'process_wpfeedback_misc_options' );
     347
     348// This function checks if the user is allowed to change the plugin settings or not.
     349function check_if_allowed_to_save_settings() {
     350    // Verify nonce
     351    if ( ! isset( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'wpfeedback' ) ) {
     352        return false;
     353    }
     354    if ( is_user_logged_in() ) {
     355        // Get the current logged-in user ID
     356        $user_id = get_current_user_id();
     357   
     358        // Retrieve the user meta value
     359        $user_meta_value = get_user_meta( $user_id, 'wpf_user_type', true );
     360   
     361        // Check if the user is Webmaster or not.
     362        if ( $user_meta_value === 'advisor' ) {
     363            return true;
     364        }
     365        return false;
     366    }
     367}
    341368
    342369/*
    … …  
    17621789        if ( is_admin() == 1 ) {
    17631790            $approve_btn = "";
    1764         }
    1765 
    1766         $agency_menu_item    = '';
    1767         if ( $wpf_current_role == 'advisor' || ( $wpf_current_role == '' && current_user_can( 'administrator' ) ) ) {
    1768             $agency_menu_item = '<li class="pro"> <a href="' . WPF_APP_SITE_URL . '/login" target="_blank" title="' . __( "Atarim Dashboard", 'atarim-visual-collaboration' ) . '">' . get_wpf_pro_icon() . '<span>' . __( "Agency", 'atarim-visual-collaboration' ) . '</span> </a></li>';
    17691791        }
    17701792
    … …  
    23442366        $wpf_current_screen = get_current_screen();
    23452367        $wpf_current_screen = $wpf_current_screen->id;
    2346         if ( $wpf_current_screen == 'collaborate_page_wpfeedback_page_permissions' || $wpf_current_screen == 'collaborate_page_wpfeedback_page_settings' || $wpf_current_screen == 'toplevel_page_wpfeedback_page_tasks' || $wpf_current_screen == 'collaborate_page_wpfeedback_page_integrate' ) {
     2368        if ( $wpf_current_screen == 'collaborate_page_collaboration_page_permissions' || $wpf_current_screen == 'collaborate_page_collaboration_page_settings' || $wpf_current_screen == 'toplevel_page_collaboration_page_tasks' || $wpf_current_screen == 'collaborate_page_collaboration_page_integrate' ) {
    23472369            return true;
    23482370        }

  • atarim-visual-collaboration/trunk/js/admin.js

    r3124979 r3133163  
    232232            jQuery_WPF('.wpf-uf-popup-image img').attr('src', plugin_url + '/images/global-settings.png');
    233233            jQuery_WPF('.wpf-uf-plan-title').text('Global Settings');
    234             jQuery_WPF('.wpf-uf-plan-detail').html('Save time and make it easy to set up this website by applying settings from your Agency Dashboard with one click, including white labelling, notification settings and permissions.');
     234            jQuery_WPF('.wpf-uf-plan-detail').html('Save time and make it easy to set up this website by applying settings from your Atarim Dashboard with one click, including white labelling, notification settings and permissions.');
    235235            jQuery_WPF('.wpf-uf-plan-link').attr('href', upg_url + '?&feature=global');
    236236            jQuery_WPF('.wpf-uf-pop-wrapper').show();

  • atarim-visual-collaboration/trunk/js/wpf_common_functions.js

    r3116009 r3133163  
    148148// Code to generate new task.
    149149function generate_task(id, internal, note) {
     150    var base64URL = '';
     151    html2canvas(document.body,{
     152        x: window.scrollX,
     153        y: window.scrollY,
     154        width: window.innerWidth,
     155        height: window.innerHeight,
     156        useCORS: true,
     157        proxy: plugin_url+'imagehelper.php',
     158        logging: true,}).then(function(canvas) {
     159            base64URL = canvas.toDataURL('image/jpeg',1);
     160    });
    150161    var wpside = logged_user.wpside;
    151162    var temp_id = Math.floor(100000 + Math.random() * 900000);
    … …  
    360371                var masic_msg = "Awesome! you have just added your first task on the website. Let's start managing it from the dashboard. <a class='wpf_demo_cta' href='https://app.atarim.io/login' target='_blank'>Explore more in the Atarim Dashboard</a>";
    361372                var masic_current_user_name = "Atarim";
    362                 var masic_comment_html= '<li class="wpf_other magic_msg_replied"><level class="task-author">'+masic_current_user_name+' '+wpf_just_now+'</level><div class="meassage_area_main">'+img_dwn_icon+'<div class="chat_text">'+masic_msg+'</div></div></li>';
     373                var masic_comment_html= '<li class="wpf_other magic_msg_replied"><level class="task-author">' + masic_current_user_name + '</level><div class="meassage_area_main">'+img_dwn_icon+'<div class="chat_text">'+masic_msg+'</div></div></li>';
    363374                setTimeout(function(){
    364375                    jQuery_WPF('#task_comments_'+id).append(masic_comment_html);
    … …  
    389400                jQuery_WPF('#wpf_delete_container_' + id + ' .wpf_task_delete').attr('data-taskid', tasks_on_page[id]);
    390401                if(wpf_tab_permission.auto_screenshot == 'yes'){
    391                     new_task_screenshot(id);
     402                    new_task_screenshot(id, base64URL);
    392403                    // hide the red overlay border when task is created
    393404                    if ( old_rendered_box_el !== null ) {
    … …  
    563574                const notify_user_block = jQuery_WPF('#wpf_mark_internal_'+id).parents('.popover-body').find('#wpfbuser-'+id);
    564575                jQuery_WPF(notify_user_block).find('ul').hide();
    565                 jQuery_WPF(notify_user_block).find('ul').before('<span class="wpf_hide_users_for_internal_tasks" id="wpf_success_wpf_share_page_link">Notifications for internal tasks are handled through your Agency Dashboard</span>');
     576                jQuery_WPF(notify_user_block).find('ul').before('<span class="wpf_hide_users_for_internal_tasks" id="wpf_success_wpf_share_page_link">Notifications for internal tasks are handled through your Atarim Dashboard</span>');
    566577
    567578                // show the tag in the sidebar
    … …  
    21562167    jQuery_WPF('#bubble-'+comment_count)[0].click();
    21572168}
    2158 function new_task_screenshot(id){
     2169function new_task_screenshot( id, base64URL ){
    21592170    const rollSound = new Audio(wpf_screenshot_sound);
    21602171    if(tasks_on_page[id] > 0) {
    2161         html2canvas(document.body,{
    2162             x: window.scrollX,
    2163             y: window.scrollY,
    2164             width: window.innerWidth,
    2165             height: window.innerHeight,
    2166             useCORS: true,
    2167             proxy: plugin_url+'imagehelper.php',
    2168             logging: true,}).then(function(canvas) {
    2169                 var base64URL = canvas.toDataURL('image/jpeg',1);
    2170                 task_screenshot['post_id'] = tasks_on_page[id];
    2171                 task_screenshot['task_config_author_name'] = current_user_name;
    2172                 task_screenshot['task_config_author_id'] = current_user_id;
    2173                 var new_task_screenshot_obj = jQuery_WPF.extend({}, task_screenshot);
    2174                 jQuery_WPF.ajax({
    2175                     url: ajaxurl,
    2176                     type: 'POST',
    2177                     data: {action:'wpfb_save_screenshot',wpf_nonce:wpf_nonce,task_screenshot:new_task_screenshot_obj, image: base64URL, autoscreen:1},
    2178                     success: function(data){
    2179                         jQuery_WPF('#screenshot_img_'+id).parent().attr('href', data);
    2180                         jQuery_WPF('#screenshot_img_'+id).attr('src', data);
    2181                         jQuery_WPF('#screenshot_img_'+id).show();
    2182                     }
    2183                 });
    2184             });
     2172        task_screenshot['post_id'] = tasks_on_page[id];
     2173        task_screenshot['task_config_author_name'] = current_user_name;
     2174        task_screenshot['task_config_author_id'] = current_user_id;
     2175        var new_task_screenshot_obj = jQuery_WPF.extend({}, task_screenshot);
     2176        jQuery_WPF.ajax({
     2177            url: ajaxurl,
     2178            type: 'POST',
     2179            data: {action:'wpfb_save_screenshot',wpf_nonce:wpf_nonce,task_screenshot:new_task_screenshot_obj, image: base64URL, autoscreen:1},
     2180            success: function(data){
     2181                jQuery_WPF('#screenshot_img_'+id).parent().attr('href', data);
     2182                jQuery_WPF('#screenshot_img_'+id).attr('src', data);
     2183                jQuery_WPF('#screenshot_img_'+id).show();
     2184            }
     2185        });
    21852186    } else {
    21862187        jQuery_WPF('#wpf_error_'+id).hide();
    … …  
    23852386        },
    23862387        success : function(data) {
    2387            
    23882388        }
    23892389    });

  • atarim-visual-collaboration/trunk/readme.txt

    r3128686 r3133163  
    44Requires at least: 5.0
    55Tested up to: 6.6
    6 Stable tag: 4.0.2
     6Stable tag: 4.0.3
    77Requires PHP: 7.4
    88License: GPLv3 or later
    … …  
    375375
    376376== Changelog ==
     377
     378= 4.0.3 =
     379* **Improved Auto Screenshot Accuracy** - Resolved an issue where the Auto Screenshot feature sometimes failed to highlight the correct section due to mouse movement.
     380* **Fixed White Label Color Display** - Addressed a problem where the white label color was not reflecting correctly on the front side.
     381* **Enhanced Security for Settings** - Strengthened security when saving settings to prevent Cross-Site Request Forgery (CSRF) attacks.
     382* **API Call Optimization** - Reduced the number of API calls to optimize performance for certain actions.
    377383
    378384= 4.0.2 =
Note: See TracChangeset for help on using the changeset viewer.