WordPress.org
Get WordPress

Plugin Directory

Changeset 435467


Ignore:
Timestamp:
09/08/2011 10:48:32 PM (15 years ago)
Author:
freerobby
Message:

Updating the URL bug and Quick Edit Bug

Location:
sexybookmarks/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sexybookmarks/trunk/includes/helper-functions.php

    r435459 r435467  
    361361    return $def;
    362362}
     363
     364/**
     365 * @desc log the message if logging is enabled
     366 **/
     367function shrsb_log($msg){
     368    global $shrsb_debug;
     369    if(isset($shrsb_debug) && isset($shrsb_debug['sb_log']) && $shrsb_debug['sb_log'] !== false){
     370            echo '<!-- log:start --><span style=color:red>'.$msg.'</span><br><!-- log:end -->';
     371    }
     372}

  • sexybookmarks/trunk/includes/public.php

    r435454 r435467  
    7474  $isemptytitle = empty($post->post_title);
    7575  if($ismanual || ($ishome && $isemptytitle)) {
    76 
    77     //$r['link'] = trim('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING']);
    78     $r['link'] = trim(get_option('siteurl') . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING']);
     76 
     77    if(!in_the_loop()) {
     78        $link= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
     79        //$link="";
     80    }
     81    //Otherwise, it must be inside the loop
     82    else {
     83        if(($link = get_permalink($post->ID)) == false){
     84            $link = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
     85        }
     86    }
     87    $link = trim($link);
     88    shrsb_log('Manual: Link Generation '.$link);
     89    $r['link'] = $link;
    7990    $r['title'] = get_bloginfo('name') . wp_title('-', false);
    80     $r['feed_permalink'] = strtolower('http://' . $_SERVER['SERVER_NAME'] .  $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING']);
     91    $r['feed_permalink'] = strtolower('http://' . $_SERVER['SERVER_NAME'] .  $_SERVER['REQUEST_URI']);
    8192    $r['mail_subject'] = urlencode(get_bloginfo('name') . wp_title('-', false));
    8293
    … …  
    8495  //We are "in the loop"
    8596  else {
    86         $r['link'] = trim(get_permalink($post->ID));
     97       
     98      if(!in_the_loop()){
     99            $r['link'] = trim('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
     100            shrsb_log("Not in loop: ".$r['link']);
     101        }else{
     102            $r['link'] = trim(get_permalink($post->ID));
     103            shrsb_log("In loop: ".$r['link']);
     104        }
     105       
     106        shrsb_log("Loop mode Link Generation ".$r['link']);
    87107        $r['title'] = $post->post_title;
    88108        $r['feed_permalink'] = strtolower($r['link']);
    … …  
    164184 */
    165185function shrsb_get_params($post_id) {
     186  shrsb_log("get_params start");
    166187  global $shrsb_plugopts, $shrsb_bgimg_map;
    167188  $post = get_post($post_id);
    … …  
    283304    $r['include_comfeed'] = FALSE;
    284305  }
    285 
     306  shrsb_log("get_params completed");
    286307    return $r;
    287308}
    … …  
    289310
    290311function shrsb_get_fetch_url() {
     312    shrsb_log("get_fetch_url start");
    291313    global $post, $shrsb_plugopts, $wp_query; //globals
    292314   
    … …  
    297319        //Check if outside the loop
    298320        if(empty($post->post_title)) {
    299             $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
     321            $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
    300322        }
    301323        //Otherwise, it must be inside the loop
    … …  
    308330        //Check if outside the loop
    309331        if(empty($post->post_title)) {
    310             $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
     332            $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ;
    311333        }
    312334        //Otherwise, it must be inside the loop
    … …  
    320342    }
    321343    $perms = trim($perms);
    322    
     344    shrsb_log("URL ".$perms);
    323345    //if is post, and post is not published then return permalink and go back
    324346    if($post && get_post_status($post->ID) != 'publish') {
    … …  
    339361        return $fetch_url;
    340362    }
     363    shrsb_log("get_fetch_url start completed");
    341364}
    342365
    … …  
    345368function shrsb_position_menu($post_content) {
    346369    global $post, $shrsb_plugopts, $shrsb_is_mobile, $shrsb_is_bot, $shrsb_js_params;
     370    shrsb_log("Content Analysis started");
    347371    // If user selected manual positioning, get out.
    348372    if ($shrsb_plugopts['position']=='manual') {
    … …  
    366390    if ((is_single() && false!==strpos($shrsb_plugopts['pageorpost'],"post")) || (is_page() && false!==strpos($shrsb_plugopts['pageorpost'],"page")) || (is_home() && false!==strpos($shrsb_plugopts['pageorpost'],"index")) || (is_feed() && !empty($shrsb_plugopts['feed']))) {
    367391    // socials should be generated and added
    368     if(!get_post_meta($post->ID, 'Hide SexyBookmarks')) {
     392    if( ($hide_sexy = get_post_meta($post->ID, 'Hide SexyBookmarks', true))  != 1 ){
    369393      if ($shrsb_plugopts['shareaholic-javascript'] == '1') {
    370394        $output = '<div class="shr-publisher-'.$post->ID.'"></div>';
    … …  
    400424    $r = $likeButtonSetTop.$r.$likeButtonSetBottom;
    401425  }
    402 
     426  shrsb_log("Content Analysis Completed");
    403427  return $r;
    404428} // End shrsb_position_menu...
    … …  
    503527
    504528function get_sexy() {
     529    shrsb_log("get_sexy started");
    505530    global $shrsb_plugopts, $wp_query, $post;
    506531    $spost = $wp_query->post;
    … …  
    509534    if ($shrsb_plugopts['shareaholic-javascript'] == '1') {
    510535            $output .= '<div class="shr-publisher-'.$post->ID.'"></div>';
     536            shrsb_log("get_sexy new mode found, returning ");
    511537            return $output;
    512538    }
    … …  
    515541
    516542        //Check if outside the loop
    517         if(empty($post->post_title)) {
    518             $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
     543        if(!in_the_loop()) {
     544            $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ;
     545            //$perms = "";
     546            shrsb_log("Manual:Not in Loop: ".$perms);
    519547            $title = get_bloginfo('name') . wp_title('-', false);
    520             $feedperms = strtolower('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING']);
     548            $feedperms = strtolower('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
    521549            $mail_subject = urlencode(get_bloginfo('name') . wp_title('-', false));
    522550        }
    … …  
    525553        else {
    526554            $perms = get_permalink($post->ID);
     555            shrsb_log("Manual:In Loop: ".$perms);
    527556            $title = $post->post_title;
    528557            $feedperms = strtolower($perms);
    529558            $mail_subject = urlencode($post->post_title);
    530559        }
    531     }
     560   
     561    }//manual mode
    532562
    533563    //Check if index page...
    … …  
    535565
    536566        //Check if outside the loop
    537         if(empty($post->post_title)) {
    538             $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING'];
     567        if(!in_the_loop()) {
     568            $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
     569            //$perms= "";
     570            shrsb_log("NotManualqqqq:Not in Loop: ".$perms);
    539571            $title = get_bloginfo('name') . wp_title('-', false);
    540             $feedperms = strtolower('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . $_SERVER['QUERY_STRING']);
     572            $feedperms = strtolower('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] );
    541573            $mail_subject = urlencode(get_bloginfo('name') . wp_title('-', false));
    542574        }
    … …  
    545577        else {
    546578            $perms = get_permalink($post->ID);
     579            shrsb_log("NotManual:In Loop: ".$perms);
    547580            $title = $post->post_title;
    548581            $feedperms = strtolower($perms);
    … …  
    553586    else {
    554587        $perms = get_permalink($post->ID);
     588        shrsb_log("Dont know in loop or not: ".$perms);
    555589        $title = $post->post_title;
    556590        $feedperms = strtolower($perms);
    … …  
    738772    $socials.= '<div style="clear: both;"></div></div>';
    739773    $socials.="\n\n";
     774    shrsb_log("get_sexy completed");
    740775    return $socials;
    741776}
    … …  
    744779function selfserv_sexy() {
    745780    global $post;
    746     if(!get_post_meta($post->ID, 'Hide SexyBookmarks'))
     781    if(($hide_sexy = get_post_meta($post->ID, 'Hide SexyBookmarks', true)) != 1 )
    747782        echo get_sexy();
    748783}
    … …  
    751786function selfserv_shareaholic() {
    752787    global $post;
    753     if(!get_post_meta($post->ID, 'Hide SexyBookmarks'))
     788        if(($hide_sexy = get_post_meta($post->ID, 'Hide SexyBookmarks', true)) != 1 )
    754789        echo get_sexy();
    755790}
    … …  
    760795
    761796    // If custom field is set, do not display sexybookmarks
    762     if ($post && get_post_meta($post->ID, 'Hide SexyBookmarks')) {
     797    if ($post && ($hide_sexy = get_post_meta($post->ID, 'Hide SexyBookmarks', true)) == 1) {
    763798        echo "\n\n".'<!-- '.__('SexyBookmarks has been disabled on this page', 'shrsb').' -->'."\n\n";
    764799    }
    … …  
    798833    } else {
    799834    // If any javascript dependent options are selected, load the scripts
    800     if (($shrsb_plugopts['expand'] || $shrsb_plugopts['autocenter'] || $shrsb_plugopts['targetopt']=='_blank') && $post && !get_post_meta($post->ID, 'Hide SexyBookmarks')) {
     835    if (($shrsb_plugopts['expand'] || $shrsb_plugopts['autocenter'] || $shrsb_plugopts['targetopt']=='_blank') && $post && (($hide_sexy = get_post_meta($post->ID, 'Hide SexyBookmarks', true)) != 1 )) {
    801836      // If custom mods is selected, pull files from new location
    802837      if($shrsb_plugopts['custom-mods'] == 'yes') {

  • sexybookmarks/trunk/sexy-bookmarks.php

    r435463 r435467  
    3030    $shrsb_debug = array();
    3131    $method =  isset($_GET)? "get" : "post"; //true for get, false for post
     32    $shrsb_debug['dump_type'] = shrsb_get_value($method, "sb_dump");
    3233    $shrsb_debug['dump_type'] = shrsb_get_value($method, "dump_type");
    33     $shrsb_debug['dump_type'] = shrsb_get_value($method, "sb_dump");
    3434    $shrsb_debug['sb_script'] = shrsb_get_value($method, "sb_script", false);
    3535    $shrsb_debug['sb_die'] = shrsb_get_value($method, "sb_die", false);
     36    $shrsb_debug['sb_log'] = shrsb_get_value($method, "sb_log", false);
    3637   
    3738    shrsb_dump_settings();
    … …  
    492493            }
    493494            else {
    494                 delete_post_meta( $post_id, 'Hide SexyBookmarks' );
     495                //delete_post_meta( $post_id, 'Hide SexyBookmarks' );
     496                update_post_meta( $post_id, 'Hide SexyBookmarks', 0 );
    495497            }
    496498           
    … …  
    499501            }
    500502            else {
    501                 delete_post_meta( $post_id, 'Hide OgTags' );
     503                //delete_post_meta( $post_id, 'Hide OgTags' );
     504                update_post_meta( $post_id, 'Hide OgTags', 0 );
    502505            }
    503506        }
    … …  
    18341837    }else{
    18351838        //Check whther OG Tags enabled for this post
    1836         if(get_post_meta($post->ID, 'Hide OgTags')) {
     1839        if(($ogtags_meta = get_post_meta($post->ID, 'Hide OgTags',true)) == 1) {
    18371840            echo "\n\n".'<!-- Shareaholic Notice: OgTags disabled for this post -->'."\n\n";
    18381841           return;
Note: See TracChangeset for help on using the changeset viewer.