Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change domain in options #15

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change domain in options #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e66d9ff
Update chartbeat.php
tvvpm Mar 18, 2016
132c726
Correcting regexp for domain validation
tvvpm Mar 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 43 additions & 16 deletions chartbeat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,20 @@ function chartbeat_menu() {
}
add_action('admin_menu', 'chartbeat_menu');

function chartbeat_getdomain() {
if (!$domain = get_option('chartbeat_domain'))
{
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = preg_replace('#^www\.(.+\.)#i', '$1', $domain);
}
return esc_js( $domain );
}

function chartbeat_console() {
if (!current_user_can('edit_posts')) {
wp_die( __('You do not have sufficient permissions to access this page.') );
}
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = chartbeat_getdomain();
?>
<style type="text/css">
#wpbody-content { height:100%; }
Expand All @@ -46,7 +55,7 @@ function chartbeat_console() {
<?php
if (!get_option('chartbeat_enable_newsbeat')) {
$iframe_url = add_query_arg( array(
'url' => chartbeat_get_display_url( $domain ),
'url' => chartbeat_getdomain(),
'k' => get_option( 'chartbeat_apikey' ),
'slim' => 1,
), '//chartbeat.com/dashboard/' );
Expand All @@ -55,7 +64,7 @@ function chartbeat_console() {
<?php
} else {
$iframe_url = add_query_arg( array(
'url' => chartbeat_get_display_url( $domain ),
'url' => chartbeat_getdomain(),
'k' => get_option( 'chartbeat_apikey' ),
'slim' => 1,
), '//chartbeat.com/publishing/dashboard/' );
Expand All @@ -66,7 +75,7 @@ function chartbeat_console() {
}

function chartbeat_options_page() {
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = chartbeat_getdomain();
?>
<div class="wrap">
<h2>Chartbeat</h2>
Expand All @@ -89,6 +98,13 @@ function showSettings() {
value="<?php echo esc_attr( get_option('chartbeat_userid') ); ?>" />
</td>
</tr>

<tr>
<th scope="row">Domain</th>
<td><input size="30" type="text" name="chartbeat_domain"
value="<?php echo esc_attr( get_option('chartbeat_domain') ); ?>" />
</td>
</tr>

<tr>
<th scope="row"><?php _e('Track visits by Site Admins?','chartbeat'); ?><br />
Expand Down Expand Up @@ -150,7 +166,7 @@ function changeLimit(select) {

function renderWidget() {
new CBTopPagesWidget( '<?php echo esc_js(get_option('chartbeat_apikey')) ?>',
{ 'host': '<?php echo esc_js( chartbeat_get_display_url( $domain ) ); ?>',
{ 'host': '<?php echo $domain; ?>',
'background': themes[theme]['bgcolor'],
'border': themes[theme]['border'],
'header_bgcolor': themes[theme]['header_bgcolor'],
Expand Down Expand Up @@ -221,12 +237,25 @@ function buildOptions() {
// Function to register settings and sanitize output. To be called later in add_action
function chartbeat_register_settings() {
register_setting('chartbeat-options','chartbeat_userid', 'intval');
register_setting('chartbeat-options','chartbeat_domain', 'chartbeat_is_validdomain');
register_setting('chartbeat-options','chartbeat_apikey','chartbeat_is_validmd5');
register_setting('chartbeat-options','chartbeat_widgetconfig','chartbeat_is_validjson');
register_setting('chartbeat-options','chartbeat_trackadmins','intval'); // add trackadmin setting
register_setting('chartbeat-options','chartbeat_enable_newsbeat','intval');
}

function chartbeat_is_validdomain($domain)
{
//reg expr validating domain
if( !empty($domain)) {
if (preg_match('/^(([a-zA-Z]{1})|([a-zA-Z]{1}[a-zA-Z]{1})|([a-zA-Z]{1}[0-9]{1})|([0-9]{1}[a-zA-Z]{1})|([a-zA-Z0-9][a-zA-Z0-9-_]{1,61}[a-zA-Z0-9]))\.([a-zA-Z]{2,6}|[a-zA-Z0-9-]{2,30}\.[a-zA-Z]{2,3})$/', $domain) ) {
return $domain;
} else {
add_settings_error( 'chartbeat_domain','invalid_domain','Domain is not correct, please check again', 'error');
}
}
}

function chartbeat_is_validmd5($md5) {
if( !empty($md5) && preg_match('/^[a-f0-9]{32}$/', $md5) ) {
return $md5;
Expand All @@ -245,9 +274,7 @@ function chartbeat_is_validjson($json_str) {
}

function chartbeat_configs() {
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = preg_replace('#^www\.(.+\.)#i', '$1', $domain);
$cb_configs['domain'] = esc_js( $domain );
$cb_configs['domain'] = chartbeat_getdomain();

// Get Author and Sections
// Only add these values on blog posts use the queried object in case there
Expand Down Expand Up @@ -399,10 +426,10 @@ function cbproxy_submit() {
// check nonce
$nonce = $_GET['cbnonce'];
if ( ! wp_verify_nonce( $nonce, 'cbproxy-nonce' ) ) die ( 'cbproxy-nonce failed!');
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = chartbeat_getdomain();
$url = 'http://api.chartbeat.com';
$url .= $_GET['url'];
$url .= '&host=' . chartbeat_get_display_url(esc_js($domain)) .'&apikey=' . get_option('chartbeat_apikey');
$url .= '&host=' . $domain .'&apikey=' . get_option('chartbeat_apikey');
$transient = 'cbproxy_' . md5($url);
header( 'Content-Type: application/json' );
$response = get_transient( $transient );
Expand Down Expand Up @@ -466,7 +493,7 @@ function chartbeat_dashboard_widget_function() {
<?php
$args = array( 'post_type' => array( 'post' ),'post_status' => 'publish', 'orderby' => 'date', 'order' => 'ASC' );
$the_query = new WP_Query( $args );
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = chartbeat_getdomain();
while ( $the_query->have_posts() ) : $the_query->the_post();
$tstamp = get_the_time('Y,n-1,j,G,i');
if ($tstamps[$tstamp])
Expand All @@ -477,7 +504,7 @@ function chartbeat_dashboard_widget_function() {
if($category[0])
$category_link = get_category_link($category[0]->cat_ID );

?>var ev = {domain:'<?php echo esc_js( chartbeat_get_display_url( $domain ) );?>',title:'<?php echo esc_js( get_the_title() ); ?>',
?>var ev = {domain:'<?php echo $domain;?>',title:'<?php echo esc_js( get_the_title() ); ?>',
value:'<?php echo esc_js( chartbeat_get_display_url( $category_link ) ); ?>', group_name:'<?php echo esc_js( chartbeat_get_display_url( get_page_link() ) ); ?>',
t: new Date(<?php echo the_time('Y,n-1,j,G,i'); ?>).getTime()/1000,group_type:'page',num_referrers:10,id:'<?php echo esc_js( get_the_ID() ); ?>',type:'wp',data:{action_type:"create"}};
events.push(ev);
Expand All @@ -499,7 +526,7 @@ function chartbeat_dashboard_widget_function() {
if($category[0])
$category_link = get_category_link($category[0]->cat_ID );

?>var ev = {domain:'<?php echo esc_js( chartbeat_get_display_url( $domain ) ); ?>',title:'<?php echo esc_js( get_the_title() ); ?>',
?>var ev = {domain:'<?php echo $domain; ?>',title:'<?php echo esc_js( get_the_title() ); ?>',
value:'<?php echo esc_js( chartbeat_get_display_url( $category_link ) ); ?>',group_name:'<?php echo esc_js( chartbeat_get_display_url( get_page_link() ) ); ?>',
t: new Date(<?php echo the_time('Y,n-1,j,G,i'); ?>).getTime()/1000,group_type:'page',num_referrers:10,id:'<?php echo esc_js( get_the_ID() ); ?>',type:'wp',data:{action_type:"update"}};
events.push(ev);
Expand All @@ -511,7 +538,7 @@ function chartbeat_dashboard_widget_function() {
?>

function loadChartBeatWidgets(){
new CBDashboard('chartbeatGauge','chartbeatRefsTable','chartbeatHist',200,"<?php echo esc_js( chartbeat_get_display_url( $domain ) ); ?>","<?php echo esc_js( get_option('chartbeat_apikey') ); ?>",events);
new CBDashboard('chartbeatGauge','chartbeatRefsTable','chartbeatHist',200,"<?php echo $domain; ?>","<?php echo esc_js( get_option('chartbeat_apikey') ); ?>",events);
};

var currOnload = window.onload;
Expand Down Expand Up @@ -563,11 +590,11 @@ function chartbeat_columns($defaults) {
add_action('manage_posts_custom_column', 'chartbeat_custom_columns', 10, 2);

function chartbeat_custom_columns($column_name, $id) {
$domain = apply_filters( 'chartbeat_config_domain', chartbeat_get_display_url (get_option('home')) );
$domain = chartbeat_getdomain();
if( $column_name == 'cb_visits' ) {
$post_url = parse_url(get_permalink( $id ));
$json_url = add_query_arg( array(
'host' => chartbeat_get_display_url( $domain ),
'host' => $domain,
'apikey' => get_option('chartbeat_apikey'),
'path' => urlencode( $post_url["path"] ),
), '//api.chartbeat.com/live/quickstats/' );
Expand Down