Skip to content

Commit

Permalink
Merge pull request #4 from belkincapital/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
Jason Jersey committed Apr 18, 2015
2 parents 129ef0e + eb7de18 commit 0569723
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 27 deletions.
30 changes: 11 additions & 19 deletions welcome_widget.php
View file
Expand Up @@ -221,14 +221,6 @@ function drawChart() {
<div id="main_content">
<section>

<?php if ( get_option( 'wordpress_api_key' ) == FALSE ) { ?>
<div style="padding: 5px; border: 1px solid #e5e5e5;-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.04);box-shadow: 0 1px 1px rgba(0,0,0,.04);background:#faf4b1;margin-bottom: 20px">If you are recieving spam comments on your PSMU blog, please <a href="options-general.php?page=akismet-key-config"><b><u>activate Akismet</u></b></a> now. All you need is the <b>free plan</b> since there is no exchange of money on our blogs.</div>
<?php } ?>

<!--<div style="padding: 5px; border: 1px solid #e5e5e5;-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.04);box-shadow: 0 1px 1px rgba(0,0,0,.04);background:#45aab8;color:#fff;margin-bottom: 20px">Starting April 21st, <a style="color:#faf4b1" target="_blank" href="http://googlewebmastercentral.blogspot.com/2015/02/finding-more-mobile-friendly-search.html"><b><u>Google announced</u></b></a> they'll start ranking your site based on if it's mobile friendly or not. Please <a style="color:#faf4b1" href="admin.php?page=wptouch-admin-touchboard"><b><u>activate WPtouch Pro</u></b></a> now to make your site mobile friendly.</div>-->

<!--<div style="padding: 5px; border: 1px solid #e5e5e5;-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.04);box-shadow: 0 1px 1px rgba(0,0,0,.04);background:#ff4486;color:#fff;margin-bottom: 20px">Maintenance: On ____ at 12am until 1am Pacific we will be under scheduled maintenance. No downtime is expected.</div>-->

<div class="row">

<div class="one_five">
Expand Down Expand Up @@ -310,14 +302,14 @@ function drawChart() {
<table>
<tr>
<td class="td_width">PageSpeed:</td>
<td>On <a class="button thickbox" id="td_thick" style="float:right" href="http://psmutheme.com/docs/pagespeed?TB_iframe=true">info</a></td>
<td>N/A <a class="button thickbox" id="td_thick" style="float:right" href="http://psmutheme.com/docs/pagespeed?TB_iframe=true">info</a></td>
</tr>
</table>
<div class="line_break"></div>
<table>
<tr>
<td class="td_width">SuperCache:</td>
<td>On <a class="button thickbox" id="td_thick" style="float:right" href="http://psmutheme.com/docs/supercache?TB_iframe=true">info</a></td>
<td>N/A <a class="button thickbox" id="td_thick" style="float:right" href="http://psmutheme.com/docs/supercache?TB_iframe=true">info</a></td>
</tr>
</table>
</div>
Expand All @@ -328,7 +320,7 @@ function drawChart() {
<table>
<tr>
<td class="td_width">Server OS:</td>
<td>RedHat <?php echo PHP_OS ?></td>
<td><?php echo PHP_OS ?></td>
</tr>
</table>
<div class="line_break"></div>
Expand All @@ -341,29 +333,29 @@ function drawChart() {
<div class="line_break"></div>
<table>
<tr>
<td class="td_width">MySQL DB:</td>
<td><?php echo $wpdb->db_version() ?></td>
<td class="td_width">RAM Usage:</td>
<td><?php echo convert(memory_get_usage(true)); ?> MB</td>
</tr>
</table>
<div class="line_break"></div>
<table>
<tr>
<td class="td_width">WordPress:</td>
<td><?php echo $wp_version ?></td>
<td class="td_width">RAM Avail:</td>
<td><?php echo convert(ini_get('memory_limit')); ?> MB</td>
</tr>
</table>
<div class="line_break"></div>
<table>
<tr>
<td class="td_width">Processors:</td>
<td>24 Intel Xeon's</td>
<td class="td_width">MySQL DB:</td>
<td><?php echo $wpdb->db_version() ?></td>
</tr>
</table>
<div class="line_break"></div>
<table>
<tr>
<td class="td_width">Total RAM:</td>
<td>128 GB</td>
<td class="td_width">WordPress:</td>
<td><?php echo $wp_version ?></td>
</tr>
</table>
</div>
Expand Down
19 changes: 11 additions & 8 deletions wp-qore.php
View file
Expand Up @@ -3,7 +3,7 @@
Plugin Name: WP Qore
Plugin URI: http://wpqore.com/
Description: For WordPress Standalone and Multisite.
Version: 2.5
Version: 2.6
Author: Jason Jersey
Author URI: http://twitter.com/degersey
License: GNU GPL 3.0
Expand Down Expand Up @@ -50,14 +50,13 @@ function wpqorefunc_remove_cssjs_ver( $src ) {

/** Customize left wp-admin footer text **/
function custom_admin_footer2() {
$the_year = date('Y');
echo "&copy;$the_year PSMU, all rights reserved.";
echo "";
}
add_filter('admin_footer_text', 'custom_admin_footer2');

/** Remove wp version from admin footer **/
function replace_footer_version2() {
echo "Managed WordPress Hosting Platform.";
echo "";
}
add_filter( 'update_footer', 'replace_footer_version2', '1234');

Expand Down Expand Up @@ -109,7 +108,7 @@ function check_HTTP_request( $commentdata ) {
/** Add stuff to your feed content **/
function q_addtorssposts($content) {
if(is_feed()){
$content .= '<br><br>(Powered by <a target="_blank" href="http://psmutheme.com/?ref=feed">PSMU</a>)<br><br>';
$content .= '<br><br>(Powered by <a target="_blank" href="http://www.muchsocial.com/?ref=feed">MuchSocial</a>)<br><br>';
}
return $content;
}
Expand All @@ -128,12 +127,16 @@ function rc_my_welcome_panel() {
add_action( 'welcome_panel', 'rc_my_welcome_panel' );

/* Always show the welcome panel on subdomains */
if ( is_multisite() )
add_action( 'load-index.php', 'show_welcome_panel_on_multisite' );
if ( is_multisite() ) {
add_action( 'load-index.php', 'show_welcome_panel_on_multisite' );
} else {
add_action( 'load-index.php', 'show_welcome_panel_on_multisite' );
}

function show_welcome_panel_on_multisite() {
$user_id = get_current_user_id();

if ( 0 == get_user_meta( $user_id, 'show_welcome_panel', true ) )
if ( 0 == get_user_meta( $user_id, 'show_welcome_panel', true ) ) {
update_user_meta( $user_id, 'show_welcome_panel', 1 );
}
}

0 comments on commit 0569723

Please sign in to comment.