Changeset 6286

Timestamp:

08/12/06 17:47:30 (2 years ago)

Author:

GamerZ

Message:

NEW: UserOnline? Is Now Embedded Into A Page, And Hence No More Integrating Of UserOnline? Page
NEW: Changed In WP-UserOnline? Structure: Members Mean Registered Users and Guests Mean Comment Authors

Files:

• wp-useronline/trunk/readme.html (modified) (4 diffs)
• wp-useronline/trunk/useronline/useronline-options.php (modified) (2 diffs)
• wp-useronline/trunk/useronline/useronline-widget.php (modified) (3 diffs)
• wp-useronline/trunk/useronline/useronline.php (modified) (20 diffs)
• wp-useronline/trunk/useronline/wp-useronline.php (modified) (7 diffs)

wp-useronline/trunk/readme.html

@@ -211 +211 @@
-                  <p><b>Development:</b><br /><b>&raquo;</b> <a href="http://dev.wp-plugins.org/browser/wp-useronline/" title="http://dev.wp-plugins.org/browser/wp-useronline/">http://dev.wp-plugins.org/browser/wp-useronline/</a></p>
-                  <p><b>Support Forums:</b><br /><b>&raquo;</b> <a href="http://forums.lesterchan.net/viewforum.php?f=10" title="http://forums.lesterchan.net/viewforum.php?f=10">http://forums.lesterchan.net/viewforum.php?f=10</a></p>
-
+
+
-                  <div class="SubSubTitle">Changelog</div>
-                  <ul>
-                        <li>
-
-
+
+
+
+
-                                    <li>NEW: get_users_browsing_site(false) And get_users_browsing_page(false) Will Now Return An Array Containing Total Users, Total Members, Total Guests and Total Bots Online</li>
+                                    <li>NEW: Added Widget Title Option To WP-UserOnline Widget</li>
-                                    <li>FIXED: Invalid IP Error</li>
-                                    <li>FIXED: If Site URL Doesn't Match WP Option's Site URL, WP-UserOnline Will Not Work</li>
@@ -304 +308 @@
-                        </li>
-                        <li>
-
+ file if exists
-                              <blockquote>File: wp-useronline.php</blockquote>
-                        </li>
-                        <li>
-                              Open <b>wp-content/plugins</b> Folder
-                        </li>
-                        <li>
-                              Delete:
-                              <blockquote>File: useronline.php</blockquote>
-                        </li>
-                        <li>
-                              Put:
-                              <blockquote>Folder: useronline</blockquote>
+                        </li>
+                        <li>
+                              Delete file if exists:
+                              <blockquote>File: useronline.php</blockquote>
+                        </li>
+                        <li>
+                              Open <b>wp-content/plugins/useronline</b> Folder
+                        </li>
+                        <li>
+                              Delete file if exists:
+                              <blockquote>File: wp-useronline.php</blockquote>
-                        </li>
-                        <li>
@@ -330 +341 @@
-            <div id="Usage" style="display: none;">
-                  <div class="SubTitle">&raquo; Usage Instructions</div>
-
+ (Without Widget)
-                  <ol>
-                        <li>
@@ -348 +359 @@
-                              </blockquote>
-                        </li>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        </li>
-                  </ol>

wp-useronline/trunk/useronline/useronline-options.php

@@ -34 +34 @@
-            $useronline_bots[trim($useronline_bots_keys[$i])] = trim($useronline_bots_vals[$i]);
-      }
+      $useronline_url = addslashes(trim($_POST['useronline_url']));
-      $update_useronline_queries = array();
-      $update_useronline_text = array();
-      $update_useronline_queries[] = update_option('useronline_timeout', $useronline_timeout);
-      $update_useronline_queries[] = update_option('useronline_bots', $useronline_bots);
+      $update_useronline_queries[] = update_option('useronline_url', $useronline_url);
-      $update_useronline_text[] = __('Useronline Timeout');
-      $update_useronline_text[] = __('Useronline Bots');
+      $update_useronline_text[] = __('Useronline URL');
-      $i=0;
-      $text = '';
@@ -77 +80 @@
-                              </td>
-                        </tr>
+                         <tr valign="top">
+                              <th align="left" width="30%"><?php _e('UserOnline URL'); ?></th>
+                              <td align="left">
+                                    <input type="text" name="useronline_url" value="<?php echo get_settings('useronline_url'); ?>" size="50" /><br />URL To UserOnline Page.
+                              </td>
+                        </tr>
-                        <tr valign="top"> 
-                              <th align="left" width="30%"><?php _e('Bots Name/User Agent'); ?></th>

wp-useronline/trunk/useronline/useronline-widget.php

@@ -38 +38 @@
-            extract($args);
-            $options = get_option('widget_useronline');
-__('UserOnline'
+htmlspecialchars($options['title']
-            echo $before_widget.$before_title.$title.$after_title;
-            if (function_exists('useronline')) {
@@ -59 +59 @@
-            $options = get_option('widget_useronline');
-            if (!is_array($options)) {
-
+, 'title' => 'UserOnline'
-            }
-            if ($_POST['useronline-submit']) {
-                  $options['display_usersbrowsingsite'] = intval($_POST['useronline-usersbrowsingsite']);
+                  $options['title'] = strip_tags(stripslashes($_POST['useronline-title']));
-                  update_option('widget_useronline', $options);
-            }
+            echo '<p style="text-align: left;"><label for="useronline-title">Widget Title:</label>&nbsp;&nbsp;&nbsp;<input type="text" id="useronline-title" name="useronline-title" value="'.htmlspecialchars($options['title']).'" />';
-            echo '<p style="text-align: center;"><label for="useronline-usersbrowsingsite">Display Users Browsing Site Under Users Online Count?</label></p>'."\n";
-            echo '<p style="text-align: center;"><input type="radio" id="useronline-usersbrowsingsite" name="useronline-usersbrowsingsite" value="1"';
@@ -76 +78 @@
-      // Register Widgets
-      register_sidebar_widget('UserOnline', 'widget_useronline');
-0
+2
-}
-

wp-useronline/trunk/useronline/useronline.php

@@ -90 +90 @@
-add_action('wp_head', 'useronline');
-function useronline() {
-, $user_identity
+
-      // Useronline Settings
-      $timeoutseconds = get_settings('useronline_timeout');
@@ -98 +98 @@
-      $url = addslashes(urlencode($_SERVER['REQUEST_URI']));
-      $useragent = $_SERVER['HTTP_USER_AGENT'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-      // Check For Bot
-      $bots = get_settings('useronline_bots');
-      foreach ($bots as $name => $lookfor) { 
-            if (stristr($useragent, $lookfor) !== false) { 
-
-
+
+
+
+
+
+
-                  break;
-            } 
-      }
+
+      // If No Bot Is Found, Then We Check Members And Guests
+      if(!$bot_found) {
+            // Check For Member
+            if($current_user->ID > 0) {
+                  $user_id = $current_user->ID;
+                  $display_name = addslashes($current_user->display_name);
+                  $user_name = addslashes($current_user->user_login);         
+                  $type = 'member';
+                  $where = "WHERE userid = '$user_id'";
+            // Check For Comment Author (Guest)
+            } elseif(!empty($_COOKIE['comment_author_'.COOKIEHASH])) {
+                  $user_id = 0;
+                  $display_name = addslashes(trim($_COOKIE['comment_author_'.COOKIEHASH]));
+                  $user_name = "guest_$display_name";       
+                  $type = 'guest';
+                  $where = "WHERE ip = '$ip'";
+            // Check For Guest
+            } else {
+                  $user_id = 0;
+                  $display_name = 'Guest';
+                  $user_name = "guest";         
+                  $type = 'guest';
+                  $where = "WHERE ip = '$ip'";
+            }
+      }
+
+      // Get User Agent
-      $useragent = addslashes($useragent);
-
@@ -138 +158 @@
-      
-      // Insert Users
-memberonline', '$useragent', '$ip', '$make_page', '$url
+user_id', '$user_name', '$display_name', '$useragent', '$ip', '$make_page', '$url', '$type
-
-      // Count Users Online
@@ -158 +178 @@
-      function get_useronline($user = 'User', $users = 'Users', $display = true) {
-            global $useronline;
+            $useronline_url = get_settings('useronline_url');
-            // Display User Online
-            if($display) {
-                  if($useronline > 1) {
-get_settings('siteurl').'/wp-content/plugins/useronline/wp-useronline.php
+$useronline_url.'
-                  } else {
-get_settings('siteurl').'/wp-content/plugins/useronline/wp-useronline.php
+$useronline_url.'
-                  }
-            } else {
@@ -186 +207 @@
-### Function: Display Max UserOnline Date
-if(!function_exists('get_most_useronline_date')) {
-ate_format = 'jS F Y, H:i', $display =true
+isplay = true, $date_format = 'jS F Y, H:i'
-            $most_useronline_timestamp = get_settings('useronline_most_timestamp');
-            $most_useronline_date = gmdate($date_format, $most_useronline_timestamp);
@@ -204 +225 @@
-      // Get Users Browsing Site
-      $page_url = addslashes(urlencode($_SERVER['REQUEST_URI']));
-username FROM $wpdb->useronlin
+displayname, type FROM $wpdb->useronline ORDER BY typ
-
-      // Variables
-      $members = array();
+      $guests = array();
+      $bots = array();
-      $total_users = 0;
-      $total_members = 0;
@@ -218 +241 @@
-      // If There Is Users Browsing, Then We Execute
-      if($users_browse) {
-            // Reassign Bots Name
-            $bots = get_settings('useronline_bots');
-            $bots_name = array();
-            foreach($bots as $botname => $botlookfor) {
-                  $bots_name[] = $botname;
-            }
-            // Get Users Information
-            foreach($users_browse as $user_browse) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  }
-            }
@@ -289 +312 @@
-      // Get Users Browsing Page
-      $page_url = addslashes(urlencode($_SERVER['REQUEST_URI']));
-username FROM $wpdb->useronline WHERE url = '$page_url'
+displayname, type FROM $wpdb->useronline WHERE url = '$page_url' ORDER BY type
-
-      // Variables
-      $members = array();
+      $guests = array();
+      $bots = array();
-      $total_users = 0;
-      $total_members = 0;
@@ -311 +336 @@
-            // Get Users Information
-            foreach($users_browse as $user_browse) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  }
-            }
@@ -386 +417 @@
-### Function: Check IP
-function check_ip($ip) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -398 +439 @@
-            $country_code = wp_ozh_getCountryCode(0, $ip);
-            $country_name = wp_ozh_getCountryName(0, $ip);
+            $country_mirror = '';
+            $mirrors = array("http://frenchfragfactory.net/images", "http://www.lesterchan.net/wordpress/images/flags");
-            if($country_name != 'Private') {
-
+
+
+
+
+
+
+
-                  if($display_countryname) {
-                        $temp .= $country_name;
@@ -415 +464 @@
-function display_useronline() {
-      global $wpdb;
-      // Reassign Bots Name
-      $bots = get_settings('useronline_bots');
-      $bots_name = array();
-      foreach($bots as $botname => $botlookfor) {
-            $bots_name[] = $botname;
-      }
-
-      // Get The Users Online
-
+ ORDER BY type
-
-      // Variables Variables Variables
@@ -441 +483 @@
-      if($usersonline) {
-            foreach($usersonline as $useronline) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  }
-            }
@@ -482 +528 @@
-      } else {
-            $nicetext_bots = number_format($total_bots).' '.__('Bots'); 
+      }
+
+      // Check Whether WP-Stats Is Activated
+      $wp_stats = false;
+      if(function_exists('get_totalposts')) {
+            $wp_stats = true;
-      }
-?>
@@ -496 +548 @@
-                  $no=1;
-                  if($members) {
-                        $wp_stats = false;
-                        if(function_exists('get_totalposts')) {
-                              $wp_stats = true;
-                        }
-                        foreach($members as $member) {
-                              if($wp_stats) {
-home').'/wp-stats.php?author='.$member['username'].'">'.$member['user
+siteurl').'/wp-content/plugins/stats/wp-stats.php?author='.$member['display_name'].'">'.$member['display_
-                              } else {
-                                    echo '<p><b>#'.$no.' - '.$member['username'].'</b> '.check_ip($member['ip']).' on '.gmdate('d.m.Y @ H:i', $member['timestamp']).'<br />'.$member['location'].' [<a href="'.$member['url'].'">url</a>]</p>'."\n";
@@ -509 +557 @@
-                        }
-                  }
+                  if($total_members > 0) {
+                        echo '</div>';
+                  }
+
-                  // Print Out Guest
-                  if($total_guests > 0) {
@@ -516 +568 @@
-                  if($guests) {
-                        foreach($guests as $guest) {
-
+
+
+
+
+
-                              $no++;
-                        }
+                  }
+                  if($total_guests > 0) {
-                        echo '</div>';
-                  }
+
-                  // Print Out Bots
-                  if($total_bots > 0) {
@@ -528 +587 @@
-                  if($bots) {
-                        foreach($bots as $bot) {
-user
+display_
-                              $no++;
-                        }
+                  }
+                  if($total_bots > 0) {
-                        echo '</div>';
-                  }
+
+                  // Print Out No One Is Online Now
-                  if($total_users == 0) {
-                        echo  '<div class="wrap"><h2>'.__('No One Is Online Now').'</h2></div>'."\n";
-                  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -551 +757 @@
-      $create_table = "CREATE TABLE $wpdb->useronline (".
-                                          " timestamp int(15) NOT NULL default '0',".
-
+
+
+
-                                          " useragent varchar(255) NOT NULL default '',".
-                                          " ip varchar(40) NOT NULL default '',".                                  
-                                          " location varchar(255) NOT NULL default '',".
-                                          " url varchar(255) NOT NULL default '',".
+                                          " type enum('member','guest','bot') NOT NULL default 'guest',".
-                                          " UNIQUE KEY useronline_id (timestamp,username,ip,useragent))";
-      maybe_create_table($wpdb->useronline, $create_table);
@@ -563 +772 @@
-      add_option('useronline_timeout', 300, 'Timeout In Seconds');
-      add_option('useronline_bots', $bots, 'Bots Name/Useragent');
+      // Database Upgrade For WP-UserOnline 2.05
+      add_option('useronline_url', get_settings('siteurl').'/useronline/', 'UserOnline Page URL');
-}
-?>

wp-useronline/trunk/useronline/wp-useronline.php

@@ -27 +27 @@
-}
-
-### Reassign Bots Name
-$bots = get_settings('useronline_bots');
-$bots_name = array();
-foreach($bots as $botname => $botlookfor) {
-      $bots_name[] = $botname;
-}
-
-### Get The Users Online
-
+ ORDER BY type
-
-### Variables Variables Variables
@@ -53 +46 @@
-if($usersonline) {
-      foreach($usersonline as $useronline) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-      }
@@ -95 +92 @@
-      $nicetext_bots = number_format($total_bots).' '.__('Bots'); 
-}
+
+### Check Whether WP-Stats Is Activated
+$wp_stats = false;
+if(function_exists('get_totalposts')) {
+      $wp_stats = true;
+}
-?>
-<?php get_header(); ?>
@@ -107 +110 @@
-                  $no=1;
-                  if($members) {
-                        $wp_stats = false;
-                        if(function_exists('get_totalposts')) {
-                              $wp_stats = true;
-                        }
-                        foreach($members as $member) {
-                              if($wp_stats) {
-username'].'">'.$member['user
+