From 88950ca12234f4cd4f48a62210cd31995e0302fb Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Mon, 17 Nov 2014 15:55:54 -0500 Subject: [PATCH] More refactoring primarily --- ...donate-admin.css => glm-payment-admin.css} | 18 +-- ...te-display.css => glm-payment-display.css} | 24 ++-- ...-thickbox.css => glm-payment-thickbox.css} | 0 ...nate-widget.css => glm-payment-widget.css} | 18 +-- glm-payments.php | 72 +++++----- includes/donate-display_1.php | 38 +++--- ...donate-display.php => payment-display.php} | 38 +++--- ...nate-function.php => payment-function.php} | 12 +- ...donate-options.php => payment-options.php} | 24 ++-- js/{glm-donate.js => glm-payments.js} | 42 +++--- readme.txt | 14 +- wp-donate.php | 124 ------------------ 12 files changed, 150 insertions(+), 274 deletions(-) rename css/{glm-donate-admin.css => glm-payment-admin.css} (92%) rename css/{glm-donate-display.css => glm-payment-display.css} (92%) rename css/{glm-donate-thickbox.css => glm-payment-thickbox.css} (100%) rename css/{glm-donate-widget.css => glm-payment-widget.css} (56%) rename includes/{donate-display.php => payment-display.php} (95%) rename includes/{donate-function.php => payment-function.php} (90%) rename includes/{donate-options.php => payment-options.php} (85%) rename js/{glm-donate.js => glm-payments.js} (55%) delete mode 100755 wp-donate.php diff --git a/css/glm-donate-admin.css b/css/glm-payment-admin.css similarity index 92% rename from css/glm-donate-admin.css rename to css/glm-payment-admin.css index fb7d0b1..2bbeb90 100755 --- a/css/glm-donate-admin.css +++ b/css/glm-payment-admin.css @@ -2,7 +2,7 @@ * glm-payments - Default Stylesheet */ -h1.donate-title { +h1.payment-title { color:#ddd; margin-bottom:20px; } @@ -154,12 +154,12 @@ table.glm-payments-transactions td img.avatar { border-radius: 3px; } -table.glm-payments-transactions td span.donate-name { +table.glm-payments-transactions td span.payment-name { line-height:30px; padding-left:15px; } -table.glm-payments-transactions td.donate-comment { +table.glm-payments-transactions td.payment-comment { font-style:italic; font-family:serif; color:#777; @@ -167,7 +167,7 @@ table.glm-payments-transactions td.donate-comment { line-height:14px; } -table.glm-payments-transactions span.donate-netamount { +table.glm-payments-transactions span.payment-netamount { color:#07DE00; font-weight:bold; font-size:14px; @@ -205,7 +205,7 @@ table.glm-payments-transactions tr td { padding: 10px 15px; } -.dot-donate-live { +.dot-payment-live { margin-right:10px; position:relative; top:2px; @@ -221,7 +221,7 @@ table.glm-payments-transactions tr td { box-shadow: inset 0px 5px 3px 1px rgba(255, 255, 255, 0.2); } -.dot-donate-public { +.dot-payment-public { margin-right:10px; position:relative; top:2px; @@ -237,7 +237,7 @@ table.glm-payments-transactions tr td { box-shadow: inset 0px 5px 3px 1px rgba(255, 255, 255, 0.2); } -.dot-donate-test { +.dot-payment-test { margin-right:10px; position:relative; top:2px; @@ -253,7 +253,7 @@ table.glm-payments-transactions tr td { box-shadow: inset 0px 2px 3px 1px rgba(0,0,0, 0.1); } -.progress-donate-wrap { +.progress-payment-wrap { position:relative; display:block; background:#ddd; @@ -267,7 +267,7 @@ table.glm-payments-transactions tr td { box-shadow: inset 0px 2px 3px 1px rgba(0,0,0, 0.1); } -.progress-donate-value { +.progress-payment-value { margin-right:10px; position:absolute; z-index:50; diff --git a/css/glm-donate-display.css b/css/glm-payment-display.css similarity index 92% rename from css/glm-donate-display.css rename to css/glm-payment-display.css index cebeffb..7335002 100755 --- a/css/glm-donate-display.css +++ b/css/glm-payment-display.css @@ -52,10 +52,10 @@ form#glm-payments-payment-form { display:block; } -.donate-row-right, -.donate-row-left{width:50%;} +.payment-row-right, +.payment-row-left{width:50%;} -form#glm-payments-payment-form h2.donate-header { +form#glm-payments-payment-form h2.payment-header { padding:10px; color:#fff; font-size:14px; @@ -73,7 +73,7 @@ form#glm-payments-payment-form h2.donate-header { border-radius: 5px 5px 0px 0px; } -form#glm-payments-payment-form p.donate-display-comment { +form#glm-payments-payment-form p.payment-display-comment { margin:3px 0; font-size:12px; color:#777; @@ -84,19 +84,19 @@ form#glm-payments-payment-form label { text-transform:uppercase; } -form#glm-payments-payment-form .donate-row { +form#glm-payments-payment-form .payment-row { overflow:visible; clear:both; padding:5px 10px; } -form#glm-payments-payment-form .donate-row-left, -form#glm-payments-payment-form .donate-row-right { +form#glm-payments-payment-form .payment-row-left, +form#glm-payments-payment-form .payment-row-right { float:left; overflow:auto; } -form#glm-payments-payment-form .donate-submit-button { +form#glm-payments-payment-form .payment-invalid-button { position:relative; margin:10px; padding: 8px 15px; @@ -120,7 +120,7 @@ form#glm-payments-payment-form .donate-submit-button { cursor: pointer; cursor: hand; } -.donate-spinner { +.payment-spinner { display:none; margin:10px; padding: 8px 15px; @@ -134,12 +134,12 @@ form#glm-payments-payment-form .donate-submit-button { -webkit-border-radius: 4px; } -.donate-valid { +.payment-valid { color: #638731 !important; background-color:#d9fba8 !important; } -.donate-invalid { +.payment-invalid { color:#873d31 !important; background-color:#fbbcb1 !important; } @@ -238,7 +238,7 @@ input[type=checkbox], input[type=radio] { cursor: pointer; } -.donate-expiry { +.payment-expiry { font-size:12px; letter-spacing:1px; color:#bbb; diff --git a/css/glm-donate-thickbox.css b/css/glm-payment-thickbox.css similarity index 100% rename from css/glm-donate-thickbox.css rename to css/glm-payment-thickbox.css diff --git a/css/glm-donate-widget.css b/css/glm-payment-widget.css similarity index 56% rename from css/glm-donate-widget.css rename to css/glm-payment-widget.css index 17f3b2a..6f6bae3 100755 --- a/css/glm-donate-widget.css +++ b/css/glm-payment-widget.css @@ -2,13 +2,13 @@ } -.glm-payments-recent .donate-item { +.glm-payments-recent .payment-item { min-height:70px; position:relative; margin:5px 0; } -.glm-payments-recent .donate-item img.avatar { +.glm-payments-recent .payment-item img.avatar { position:absolute; top:0; left:0; @@ -19,29 +19,29 @@ border-radius: 5px; } -.glm-payments-recent .donate-item .donate-recent-comment { +.glm-payments-recent .payment-item .payment-recent-comment { padding-left:60px; } -.glm-payments-recent .donate-item .donate-recent-content:before { +.glm-payments-recent .payment-item .payment-recent-content:before { content:'\2018'; } -.glm-payments-recent .donate-item .donate-recent-content:after { +.glm-payments-recent .payment-item .payment-recent-content:after { content:'\2019'; } -.glm-payments-recent .donate-item .donate-recent-name { +.glm-payments-recent .payment-item .payment-recent-name { margin: 0 0 0.5em 0; font-weight:bold; } -.glm-payments-recent .donate-item .donate-recent-content { +.glm-payments-recent .payment-item .payment-recent-content { color:#777; } -.donate_btn_submit +.payment_btn_submit { height: 28px; float: none; @@ -58,5 +58,5 @@ border-radius: 15px; -webkit-border-radius: 15px; -moz-border-radius: 15px; } -.donate_btn_submit:hover { background:#4e7a29; } +.payment_btn_submit:hover { background:#4e7a29; } diff --git a/glm-payments.php b/glm-payments.php index 39f34e3..beeb193 100755 --- a/glm-payments.php +++ b/glm-payments.php @@ -8,47 +8,47 @@ */ session_start(); -@define ( 'WP_DONATE_VERSION', '1.5' ); -@define ( 'WP_DONATE_PATH', WP_PLUGIN_URL . '/' . end( explode( DIRECTORY_SEPARATOR, dirname( __FILE__ ) ) ) ); -include_once('includes/donate-function.php'); -include_once('includes/donate-display.php'); -include_once('includes/donate-options.php'); +@define ( 'glm_payment_VERSION', '1.5' ); +@define ( 'glm_payment_PATH', WP_PLUGIN_URL . '/' . end( explode( DIRECTORY_SEPARATOR, dirname( __FILE__ ) ) ) ); +include_once('includes/payment-function.php'); +include_once('includes/payment-display.php'); +include_once('includes/payment-options.php'); -add_action('wp_print_styles', 'load_wp_donate_css'); -add_action('wp_print_scripts', 'load_wp_donate_js'); -add_action('admin_print_styles', 'load_wp_donate_admin_css'); -add_action('admin_print_scripts', 'load_wp_donate_admin_js'); +add_action('wp_print_styles', 'load_glm_payment_css'); +add_action('wp_print_scripts', 'load_glm_payment_js'); +add_action('admin_print_styles', 'load_glm_payment_admin_css'); +add_action('admin_print_scripts', 'load_glm_payment_admin_js'); -function load_wp_donate_js() +function load_glm_payment_js() { - wp_enqueue_script( 'glm-payments-js', WP_DONATE_PATH . '/js/paymentmethods.js', array('jquery') ); + wp_enqueue_script( 'glm-payments-js', glm_payment_PATH . '/js/paymentmethods.js', array('jquery') ); } -function load_wp_donate_admin_js() +function load_glm_payment_admin_js() { wp_enqueue_script('jquery-ui-core'); wp_enqueue_script('jquery-ui-tabs'); } -function load_wp_donate_css() +function load_glm_payment_css() { - $options = get_option('wp_donate_options'); - if ( $options['donate_css_switch'] ) { - if ( $options['donate_css_switch'] == 'Yes') { - wp_enqueue_style('donate-payment-css', WP_DONATE_PATH . '/css/glm-payments-display.css'); + $options = get_option('glm_payment_options'); + if ( $options['payment_css_switch'] ) { + if ( $options['payment_css_switch'] == 'Yes') { + wp_enqueue_style('glm-payment-css', glm_payment_PATH . '/css/glm-payments-display.css'); } } - wp_enqueue_style('donate-widget-css', WP_DONATE_PATH . '/css/glm-payments-widget.css'); + wp_enqueue_style('payment-widget-css', glm_payment_PATH . '/css/glm-payments-widget.css'); } -function load_wp_donate_admin_css() { - wp_enqueue_style('donate-css', WP_DONATE_PATH . '/css/glm-payments-admin.css'); +function load_glm_payment_admin_css() { + wp_enqueue_style('payment-css', glm_payment_PATH . '/css/glm-payments-admin.css'); } function my_add_menu_items() { - add_menu_page( 'WP Donate', 'WP Donate', 'activate_plugins', 'wp_donate', 'my_render_list_page' ); - add_options_page( 'WP Donate', 'WP Donate', 'manage_options', 'wp_donate', 'wp_donate_options_page' ); + add_menu_page( 'GLM Payment', 'GLM Payment', 'activate_plugins', 'glm_payment', 'my_render_list_page' ); + add_options_page( 'GLM Payment', 'GLM Payment', 'manage_options', 'glm_payment', 'glm_payment_options_page' ); } add_action( 'admin_menu', 'my_add_menu_items' ); @@ -56,26 +56,26 @@ function my_render_list_page() { } -add_shortcode('Display Donate', 'wp_donate_form'); +add_shortcode('Display Payment', 'glm_payment_form'); if(isset($_REQUEST['setting'])) { if($_REQUEST['setting']==1) { - $wpdb->query("INSERT INTO `".$wpdb->prefix."donate_setting` (`id`, `mod`, `api_login`, `key`) VALUES ('1', '', '', '')"); - $wpdb->query("UPDATE `".$wpdb->prefix."donate_setting` SET `mod` = '".$_REQUEST['authnet_mode']."',`api_login` = '".$_REQUEST['x_login']."',`key` = '".$_REQUEST['x_tran_key']."' WHERE `id` =1"); + $wpdb->query("INSERT INTO `".$wpdb->prefix."payment_setting` (`id`, `mod`, `api_login`, `key`) VALUES ('1', '', '', '')"); + $wpdb->query("UPDATE `".$wpdb->prefix."payment_setting` SET `mod` = '".$_REQUEST['authnet_mode']."',`api_login` = '".$_REQUEST['x_login']."',`key` = '".$_REQUEST['x_tran_key']."' WHERE `id` =1"); } } -register_activation_hook( __FILE__, 'donate_install' ); +register_activation_hook( __FILE__, 'payment_install' ); -global $donate_db_version; -$donate_db_version = "1.0"; +global $payment_db_version; +$payment_db_version = "1.0"; -function donate_install() { +function payment_install() { global $wpdb; - global $donate_db_version; + global $payment_db_version; - $table_name = $wpdb->prefix . "donate"; + $table_name = $wpdb->prefix . "payment"; $sql = "CREATE TABLE IF NOT EXISTS `$table_name` ( `id` int(11) NOT NULL AUTO_INCREMENT, `first_name` varchar(255) CHARACTER SET utf8 NOT NULL, @@ -97,8 +97,8 @@ function donate_install() { UNIQUE KEY `id` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1"; -$donate_setting = $wpdb->prefix . "donate_setting"; -$donate_setting_sql = "CREATE TABLE IF NOT EXISTS `$donate_setting` ( +$payment_setting = $wpdb->prefix . "payment_setting"; +$payment_setting_sql = "CREATE TABLE IF NOT EXISTS `$payment_setting` ( `id` int(11) NOT NULL AUTO_INCREMENT, `mod` varchar(255) NOT NULL, `api_login` varchar(255) NOT NULL, @@ -109,12 +109,12 @@ UNIQUE KEY `id` (`id`) require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); dbDelta( $sql ); - dbDelta( $donate_setting_sql ); + dbDelta( $payment_setting_sql ); - add_option( "donate_db_version", $donate_db_version ); + add_option( "payment_db_version", $payment_db_version ); } -function donate_install_data() { +function payment_install_data() { global $wpdb; $welcome_name = "Mr. WordPress"; $welcome_text = "Congratulations, you just completed the installation!"; diff --git a/includes/donate-display_1.php b/includes/donate-display_1.php index 7dd6fb4..40679f2 100644 --- a/includes/donate-display_1.php +++ b/includes/donate-display_1.php @@ -1,8 +1,8 @@ get_results( "SELECT * FROM ".$wpdb->prefix."donate_setting" ); + $mysetting = $wpdb->get_results( "SELECT * FROM ".$wpdb->prefix."payment_setting" ); define("AUTHORIZENET_API_LOGIN_ID",$mysetting[0]->api_login); // Add your API LOGIN ID define("AUTHORIZENET_TRANSACTION_KEY",$mysetting[0]->key); // Add your API transaction key if($mysetting[0]->mod==0){ @@ -56,7 +56,7 @@ $REQUEST = $_REQUEST; if($paypalp = authorizepayment($METHOD_TO_USE,$REQUEST,$address1,$city,$state,$country,$zipcode,$emailaddress,$plan)) { - $sql = "INSERT INTO `".$wpdb->prefix."donate` (`first_name`, `last_name`, `organization`, `address`, `city`, `country`, `state`, `zip`, `phone`, `email`, `donation_type`, `amount`, `comment`, `status`,`date`) + $sql = "INSERT INTO `".$wpdb->prefix."payment` (`first_name`, `last_name`, `organization`, `address`, `city`, `country`, `state`, `zip`, `phone`, `email`, `donation_type`, `amount`, `comment`, `status`,`date`) VALUES ('".$first_name."', '".$last_name."','".$organization."','".$address."','".$city."','".$country."','".$state."','".$zip."','".$phone."','".$email."','".$donation_type."','".$amount."','".$comment."', '1',now());"; $wpdb->query($sql); @@ -75,14 +75,14 @@ } } -function wp_donate_form() { +function glm_payment_form() { ob_start(); global $wpdb; ?> -