diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
index da5484836..ca5619f70 100644
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/lancheck.php,v $
-| $Revision: 1.3 $
-| $Date: 2007-03-23 23:05:21 $
+| $Revision: 1.4 $
+| $Date: 2007-03-24 11:54:46 $
| $Author: lisa_ $
| With code from Izydor and Lolo.
+----------------------------------------------------------------------------+
@@ -175,12 +175,11 @@ if($f != ""){
$core_plugins = array(
"alt_auth","banner_menu","blogcalendar_menu","calendar_menu","chatbox_menu",
- "clock_menu","comment_menu","content","counter_menu",
- "featurebox","forum","gsitemap","integrity_check","lastseen","links_page",
- "linkwords","list_new","log","login_menu","newforumposts_main","newsfeed",
- "newsletter","online_extended_menu","online_menu","other_news_menu","pdf",
- "pm","poll","rss_menu","search_menu","siteinfo_menu",
- "trackback","tree_menu","user_menu"
+ "clock_menu","comment_menu","content","featurebox","forum","gsitemap",
+ "lastseen","links_page","linkwords","list_new","log","login_menu",
+ "newforumposts_main","newsfeed","newsletter","online_extended_menu",
+ "online_menu","other_news_menu","pdf","pm","poll","rss_menu",
+ "search_menu","siteinfo_menu","trackback","tree_menu","user_menu"
);
$core_themes = array("crahan","e107v4a","human_condition","interfectus","jayya",
diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 7a2187846..4203b5a7a 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $
-| $Revision: 1.4 $
-| $Date: 2007-03-23 23:01:09 $
+| $Revision: 1.5 $
+| $Date: 2007-03-24 11:54:46 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
@@ -153,6 +153,12 @@ function update_706_to_800($type='') {
$sql->db_Update("menus", "menu_path='siteinfo_menu/' WHERE menu_path='sitebutton_menu' || menu_path='sitebutton_menu/' ");
catch_error();
}
+ //change menu_path for counter_menu
+ if($sql->db_Select("menus", "menu_path", "menu_path='counter_menu' || menu_path='counter_menu/'"))
+ {
+ $sql->db_Update("menus", "menu_path='siteinfo_menu/' WHERE menu_path='counter_menu' || menu_path='counter_menu/' ");
+ catch_error();
+ }
return '';
@@ -185,6 +191,11 @@ function update_706_to_800($type='') {
{
return update_needed();
}
+ //change menu_path for counter_menu
+ if($sql->db_Select("menus", "menu_path", "menu_path='counter_menu' || menu_path='counter_menu/'"))
+ {
+ return update_needed();
+ }
// No updates needed
return TRUE;
diff --git a/e107_plugins/counter_menu/languages/English.php b/e107_plugins/counter_menu/languages/English.php
deleted file mode 100644
index 0ff21ded4..000000000
--- a/e107_plugins/counter_menu/languages/English.php
+++ /dev/null
@@ -1,22 +0,0 @@
-Stat logging is disabled.
To activate, you need to install the Statistic Logging plugin from your plugin manager, then activate it from the configuration screen.");
-
-?>
\ No newline at end of file
diff --git a/e107_plugins/counter_menu/counter_menu.php b/e107_plugins/siteinfo_menu/counter_menu.php
similarity index 93%
rename from e107_plugins/counter_menu/counter_menu.php
rename to e107_plugins/siteinfo_menu/counter_menu.php
index 75370a022..3afa699f4 100644
--- a/e107_plugins/counter_menu/counter_menu.php
+++ b/e107_plugins/siteinfo_menu/counter_menu.php
@@ -10,10 +10,10 @@
| Released under the terms and conditions of the
| GNU General Public License (http://gnu.org).
|
-| $Source: /cvs_backup/e107_0.8/e107_plugins/counter_menu/counter_menu.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:35:09 $
-| $Author: mcfly_e107 $
+| $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo_menu/counter_menu.php,v $
+| $Revision: 1.1 $
+| $Date: 2007-03-24 11:54:46 $
+| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
diff --git a/e107_plugins/siteinfo_menu/languages/English.php b/e107_plugins/siteinfo_menu/languages/English.php
index 1df322169..ced6ca604 100644
--- a/e107_plugins/siteinfo_menu/languages/English.php
+++ b/e107_plugins/siteinfo_menu/languages/English.php
@@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo_menu/languages/English.php,v $
-| $Revision: 1.1 $
-| $Date: 2007-03-23 22:42:40 $
+| $Revision: 1.2 $
+| $Date: 2007-03-24 11:54:46 $
| $Author: lisa_ $
+----------------------------------------------------------------------------+
*/
@@ -14,4 +14,13 @@ define("COMPLIANCE_L1", "W3C Compliance");
define("SITEBUTTON_MENU_L1", "Link to us");
define("POWEREDBY_L1", "Powered by");
+define("COUNTER_L1", "Admin visits aren't being counted.");
+define("COUNTER_L2", "This page today ...");
+define("COUNTER_L3", "total");
+define("COUNTER_L4", "This page ever ...");
+define("COUNTER_L5", "unique");
+define("COUNTER_L6", "Site ...");
+define("COUNTER_L7", "Counter");
+define("COUNTER_L8", "Admin message: Stat logging is disabled.
To activate, you need to install the Statistic Logging plugin from your plugin manager, then activate it from the configuration screen.");
+
?>
\ No newline at end of file