Fix the CLI on linux for cron job

.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 *.pyc
-/*.zip
+/*.zip
+*.db
+.idea/

.travis.yml

@@ -0,0 +1,8 @@
+language: php
+php:
+  - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - hhvm
+  - nightly

README.rst

@@ -1,3 +1,5 @@
+.. image:: https://travis-ci.org/disqus/disqus-wordpress.svg
+
 See disqus/readme.txt for more information
 
 Packaging
@@ -14,4 +16,4 @@ The *very* limited test suite requires PHPUnit 3.6 and can be run with::
 
     php tests.php
 
-.. note:: If it asks for a password, this is simply the SQL user's password.
+.. note:: If it asks for a password, this is simply the SQL user's password.

disqus/LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     Disqus WordPress Plugin
-    Copyright (C) 2010  DISQUS
+    Copyright (C) 2016 Disqus
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    Disqus WordPress Plugin  Copyright (C) 2010  DISQUS
+    Disqus WordPress Plugin  Copyright (C) 2016  Disqus
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

disqus/comments.php

@@ -6,17 +6,18 @@
 
 <div id="disqus_thread">
     <?php if (!get_option('disqus_disable_ssr') && have_comments()): ?>
-        <?php
-        // if (is_file(TEMPLATEPATH . '/comments.php')) {
-        //     include(TEMPLATEPATH . '/comments.php');
-        // }
-        ?>
         <div id="dsq-content">
 
 <?php if (get_comment_pages_count() > 1 && get_option('page_comments')): // Are there comments to navigate through? ?>
             <div class="navigation">
-                <div class="nav-previous"><?php previous_comments_link(dsq_i( '<span class="meta-nav">&larr;</span> Older Comments')); ?></div>
-                <div class="nav-next"><?php next_comments_link(dsq_i('Newer Comments <span class="meta-nav">&rarr;</span>')); ?></div>
+                <div class="nav-previous">
+                    <span class="meta-nav">&larr;</span>&nbsp;
+                    <?php previous_comments_link( dsq_i('Older Comments')); ?>
+                </div>
+                <div class="nav-next">
+                    <?php next_comments_link(dsq_i('Newer Comments')); ?>
+                    &nbsp;<span class="meta-nav">&rarr;</span>
+                </div>
             </div> <!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
@@ -31,8 +32,14 @@
 
 <?php if (get_comment_pages_count() > 1 && get_option('page_comments')): // Are there comments to navigate through? ?>
             <div class="navigation">
-                <div class="nav-previous"><?php previous_comments_link(dsq_i( '<span class="meta-nav">&larr;</span> Older Comments')); ?></div>
-                <div class="nav-next"><?php next_comments_link(dsq_i( 'Newer Comments <span class="meta-nav">&rarr;</span>')); ?></div>
+                <div class="nav-previous">
+                    <span class="meta-nav">&larr;</span>
+                    &nbsp;<?php previous_comments_link( dsq_i('Older Comments') ); ?>
+                </div>
+                <div class="nav-next">
+                    <?php next_comments_link( dsq_i('Newer Comments') ); ?>
+                    &nbsp;<span class="meta-nav">&rarr;</span>
+                </div>
             </div><!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
@@ -41,94 +48,109 @@
     <?php endif; ?>
 </div>
 
-<script type="text/javascript">
-/* <![CDATA[ */
-    var disqus_url = '<?php echo get_permalink(); ?>';
-    var disqus_identifier = '<?php echo dsq_identifier_for_post($post); ?>';
-    var disqus_container_id = 'disqus_thread';
-    var disqus_domain = '<?php echo DISQUS_DOMAIN; ?>';
-    var disqus_shortname = '<?php echo strtolower(get_option('disqus_forum_url')); ?>';
-    var disqus_title = <?php echo cf_json_encode(dsq_title_for_post($post)); ?>;
-    <?php if (false && get_option('disqus_developer')): ?>
-        var disqus_developer = 1;
-    <?php endif; ?>
-    var disqus_config = function () {
-        var config = this; // Access to the config object
-        config.language = '<?php echo esc_js(apply_filters('disqus_language_filter', '')) ?>';
-
-        /*
-           All currently supported events:
-            * preData — fires just before we request for initial data
-            * preInit - fires after we get initial data but before we load any dependencies
-            * onInit  - fires when all dependencies are resolved but before dtpl template is rendered
-            * afterRender - fires when template is rendered but before we show it
-            * onReady - everything is done
-         */
-
-        config.callbacks.preData.push(function() {
-            // clear out the container (its filled for SEO/legacy purposes)
-            document.getElementById(disqus_container_id).innerHTML = '';
-        });
-        <?php if (!get_option('disqus_manual_sync')): ?>
-        config.callbacks.onReady.push(function() {
-            // sync comments in the background so we don't block the page
-            var script = document.createElement('script');
-            script.async = true;
-            script.src = '?cf_action=sync_comments&post_id=<?php echo $post->ID; ?>';
-
-            var firstScript = document.getElementsByTagName( "script" )[0];
-            firstScript.parentNode.insertBefore(script, firstScript);
-        });
-        <?php endif; ?>
-        <?php
-        $sso = dsq_sso();
-        if ($sso) {
-            foreach ($sso as $k=>$v) {
-                echo "this.page.{$k} = '{$v}';\n";
-            }
-            echo dsq_sso_login();
-        }
-        ?>
-    };
-/* ]]> */
-</script>
-
-<script type="text/javascript">
-/* <![CDATA[ */
-    var DsqLocal = {
-        'trackbacks': [
 <?php
-    $count = 0;
-    foreach ($comments as $comment) {
-        $comment_type = get_comment_type();
-        if ( $comment_type != 'comment' ) {
-            if( $count ) { echo ','; }
+
+global $wp_version;
+
+$embed_vars = array(
+    'disqusConfig' => array(
+        'platform' => 'wordpress@'.$wp_version,
+        'language' => apply_filters( 'disqus_language_filter', '' ),
+    ),
+    'disqusIdentifier' => dsq_identifier_for_post( $post ),
+    'disqusShortname' => strtolower( get_option( 'disqus_forum_url' ) ),
+    'disqusTitle' => dsq_title_for_post( $post ),
+    'disqusUrl' => get_permalink(),
+    'options' => array(
+        'manualSync' => get_option('disqus_manual_sync'),
+    ),
+    'postId' => $post->ID,
+);
+
+// Add SSO vars if enabled
+$sso = dsq_sso();
+if ($sso) {
+    global $current_site;
+
+    foreach ($sso as $k=>$v) {
+        $embed_vars['disqusConfig'][$k] = $v;
+    }
+
+    $siteurl = site_url();
+    $sitename = get_bloginfo('name');
+    $embed_vars['disqusConfig']['sso'] = array(
+        'name' => wp_specialchars_decode($sitename, ENT_QUOTES),
+        'button' => get_option('disqus_sso_button'),
+        'url' => $siteurl.'/wp-login.php',
+        'logout' => $siteurl.'/wp-login.php?action=logout',
+        'width' => '800',
+        'height' => '700',
+    );
+}
+
+if ( get_option('dsq_external_js') == '1' ) {
+    wp_register_script( 'dsq_embed_script', plugins_url( '/media/js/disqus.js', __FILE__ ) );
+    wp_localize_script( 'dsq_embed_script', 'embedVars', $embed_vars );
+    wp_enqueue_script( 'dsq_embed_script', plugins_url( '/media/js/disqus.js', __FILE__ ) );
+}
+else {
+
 ?>
-            {
-                'author_name':    <?php echo cf_json_encode(get_comment_author()); ?>,
-                'author_url':    <?php echo cf_json_encode(get_comment_author_url()); ?>,
-                'date':            <?php echo cf_json_encode(get_comment_date('m/d/Y h:i A')); ?>,
-                'excerpt':        <?php echo cf_json_encode(str_replace(array("\r\n", "\n", "\r"), '<br />', get_comment_excerpt())); ?>,
-                'type':            <?php echo cf_json_encode($comment_type); ?>
-            }
-<?php
-            $count++;
+<script type="text/javascript">
+var disqus_url = '<?php echo get_permalink(); ?>';
+var disqus_identifier = '<?php echo dsq_identifier_for_post($post); ?>';
+var disqus_container_id = 'disqus_thread';
+var disqus_shortname = '<?php echo strtolower(get_option('disqus_forum_url')); ?>';
+var disqus_title = <?php echo cf_json_encode( dsq_title_for_post($post) ); ?>;
+var disqus_config_custom = window.disqus_config;
+var disqus_config = function () {
+    /*
+    All currently supported events:
+    onReady: fires when everything is ready,
+    onNewComment: fires when a new comment is posted,
+    onIdentify: fires when user is authenticated
+    */
+
+    <?php
+    $sso = dsq_sso();
+    if ($sso) {
+        foreach ($sso as $k=>$v) {
+            echo 'this.page.' . esc_js($k) . ' = \'' . esc_js($v) . '\';';
+            echo "\n";
         }
+        echo dsq_sso_login();
     }
-?>
-        ],
-        'trackback_url': <?php echo cf_json_encode(get_trackback_url()); ?>
-    };
-/* ]]> */
-</script>
+    ?>
+
+    this.language = '<?php echo esc_js( apply_filters('disqus_language_filter', '') ) ?>';
+    <?php if (!get_option('disqus_manual_sync')): ?>
+    this.callbacks.onReady.push(function () {
+
+        // sync comments in the background so we don't block the page
+        var script = document.createElement('script');
+        script.async = true;
+        script.src = '?cf_action=sync_comments&post_id=<?php echo esc_attr( $post->ID ); ?>';
+
+        var firstScript = document.getElementsByTagName('script')[0];
+        firstScript.parentNode.insertBefore(script, firstScript);
+    });
+    <?php endif; ?>
+
+    if (disqus_config_custom) {
+        disqus_config_custom.call(this);
+    }
+};
 
-<script type="text/javascript">
-/* <![CDATA[ */
 (function() {
     var dsq = document.createElement('script'); dsq.type = 'text/javascript';
     dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.' + '<?php echo DISQUS_DOMAIN; ?>' + '/embed.js?pname=wordpress&pver=<?php echo DISQUS_VERSION; ?>';
+    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 })();
-/* ]]> */
 </script>
+
+<?php
+
+}
+
+?>