Changeset 7445 for extensions/Statistics/main.inc.php

Timestamp:

Oct 28, 2010, 12:19:44 AM (13 years ago)

Author:

plg

Message:

bug fixed: ability to use a Google Analytics/Piwik javascript code including a
comma.

simpler code, easier to maintain I hope.

change file format from MacOs to Unix line endings.

File:

• extensions/Statistics/main.inc.php (modified) (2 diffs)

extensions/Statistics/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Statistics
-Version: 2.0.b
+Version: 2.0.c
 Description: Add source code like Google Analytics on each page.
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=174
@@ -10 +10 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 define('STAT_DIR' , basename(dirname(__FILE__)));
-
 define('STAT_PATH' , PHPWG_PLUGINS_PATH . STAT_DIR . '/');
 
 function statistics_admin_menu($menu)
-
 {
-
-    array_push($menu, array('NAME' => 'Statistics',
-
-      'URL' => get_admin_plugin_menu_link(STAT_PATH . 'admin/stat_admin.php')));
-
-    return $menu;
-
+  array_push(
+    $menu,
+    array(
+      'NAME' => 'Statistics',
+      'URL' => get_admin_plugin_menu_link(STAT_PATH . 'admin/stat_admin.php')
+      )
+    );
+  return $menu;
 }
 
+function stat_candoit($type)
+{
+  global $conf, $user;
+
+  $conf_statistics = unserialize($conf['statistics']);
+
+  if (is_admin() and $conf_statistics['exclude_admin'])
+  {
+    return false;
+  }
+
+  if (is_a_guest() and $conf_statistics['exclude_guest'])
+  {
+    return false;
+  }
 
 
-function stat_candoit($type)
-
-{
-
-  global $conf, $user;
-
-
-
-  $conf_statistics = explode("," , $conf['statistics']);
-
-
-
-  $is_guest = (function_exists('is_a_guest') ? is_a_guest() : $user['is_the_guest']);
-
-
-
-  if
-
-  (
-
-    (
-
-      (($conf_statistics[0] == 'on') and ($type == 'header')) or 
-
-      (($conf_statistics[1] == 'on') and ($type == 'tail'))
-
-    ) and 
-
-    (($conf_statistics[3] == 'on' and !is_admin()) or (empty($conf_statistics[3]))) and
-
-    (($conf_statistics[4] == 'on' and !$is_guest) or (empty($conf_statistics[4])))
-
-  )
-
+  $show_htmlcontent = false;
+  if ($conf_statistics['header'] and $type == 'header')
   {
-
-    return '
-
-<!-- Plugin Statitics -->
-
-'.$conf_statistics[2].'
-
-<!-- Plugin Statitics -->';
-
+    $show_htmlcontent = true;
+  }
+  if ($conf_statistics['tail'] and $type == 'tail')
+  {
+    $show_htmlcontent = true;
   }
 
-  else
-
+  if (!$show_htmlcontent)
   {
-
     return false;
-
   }
 
+  return '
+<!-- Plugin Statistics -->
+'.$conf_statistics['content'].'
+<!-- Plugin Statistics -->
+';
 }
+
 function stat_tail()
 {
+  global $template;
 
-  global $template;
   if ($code_stat = stat_candoit('tail'))
-
   {
-
     $template->append('footer_elements', $code_stat);
-
   }
-
 }
 
-
-
 function stat_header()
-
 {
-
   global $template;
 
+  if ($code_stat = stat_candoit('header'))
+  {
+    $template->append('head_elements', $code_stat);
+  }
+}
 
-
-  if ($code_stat = stat_candoit('header'))
-
-  {
-
-    $template->append('head_elements', $code_stat);
-
-  }
-
-}
 add_event_handler('get_admin_plugin_menu_links', 'statistics_admin_menu');
 add_event_handler('loc_end_page_tail', 'stat_tail');
 add_event_handler('loc_end_page_header', 'stat_header');
-
 ?>