mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Login menu - code cleanup, fix for shortcodes already loaded, v2 template path added

Browse Source
This commit is contained in:
Moc
2013-07-13 00:05:48 +02:00
parent c0c46e38c9
commit c893ff4e05
1 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
e107_plugins/login_menu/login_menu.php
View File

@@ -2,29 +2,12 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
*
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu.php,v $
* $Revision$
* $Date$
* $Author$
*/ */
/**
* e107 Login menu plugin
*
* Handles the login menu options
*
* @package e107_plugins
* @subpackage login
* @version $Id$;
*/
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
$loginPrefs = e107::getConfig('menu')->getPref('login_menu'); $loginPrefs = e107::getConfig('menu')->getPref('login_menu');
@@ -35,48 +18,49 @@ if(defined('FPW_ACTIVE'))
} }
global $eMenuActive, $pref, $e107, $sql, $tp, $ns, $use_imagecode, $ADMIN_DIRECTORY, $LOGIN_MENU_MESSAGE, $LOGIN_MENU_STATITEM, $LM_STATITEM_SEPARATOR, global $eMenuActive, $pref, $e107, $sql, $tp, $ns, $use_imagecode, $ADMIN_DIRECTORY, $LOGIN_MENU_MESSAGE, $LOGIN_MENU_STATITEM, $LM_STATITEM_SEPARATOR,
$login_menu_shortcodes, $LOGIN_MENU_FORM, $LOGIN_MENU_LOGGED, $LOGIN_MENU_STATS, $LOGIN_MENU_EXTERNAL_LINK; $login_menu_shortcodes, $LOGIN_MENU_FORM, $LOGIN_MENU_LOGGED, $LOGIN_MENU_STATS, $LOGIN_MENU_EXTERNAL_LINK; //FIXME
$ip = e107::getIPHandler()->getIP(FALSE); $ip = e107::getIPHandler()->getIP(FALSE);
//shortcodes //shortcodes
require_once(e_PLUGIN."login_menu/login_menu_shortcodes.php"); require(e_PLUGIN."login_menu/login_menu_shortcodes.php");
//Bullet //Bullet
if(defined("BULLET")) if(defined("BULLET"))
{ {
$bullet = "<img src='".THEME_ABS."images/".BULLET."' alt='' class='icon' />"; $bullet = "<img src='".THEME_ABS."images/".BULLET."' alt='' class='icon' />";
$bullet_src = THEME_ABS."images/".BULLET; $bullet_src = THEME_ABS."images/".BULLET;
} }
elseif(file_exists(THEME."images/bullet2.gif")) elseif(file_exists(THEME."images/bullet2.gif"))
{ {
$bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='bullet' class='icon' />"; $bullet = "<img src='".THEME_ABS."images/bullet2.gif' alt='bullet' class='icon' />";
$bullet_src = THEME_ABS."images/bullet2.gif"; $bullet_src = THEME_ABS."images/bullet2.gif";
} }
else else
{ {
$bullet = ""; $bullet = "";
$bullet_src = ""; $bullet_src = "";
} }
//Corrup cookie - template? - TODO //Corrup cookie - template? - TODO
if (defined('CORRUPT_COOKIE') && CORRUPT_COOKIE == TRUE) if (defined('CORRUPT_COOKIE') && CORRUPT_COOKIE == TRUE)
{ {
$text = "<div class='core-sysmsg loginbox'>".LOGIN_MENU_L7."<br /><br /> $text = "<div class='core-sysmsg loginbox'>".LOGIN_MENU_L7."<br /><br />
{$bullet} <a href='".SITEURL."index.php?logout'>".LOGIN_MENU_L8."</a></div>"; {$bullet} <a href='".SITEURL."index.php?logout'>".LOGIN_MENU_L8."</a></div>";
$ns->tablerender(LOGIN_MENU_L9, $text, 'loginbox_error'); $ns->tablerender(LOGIN_MENU_L9, $text, 'loginbox_error');
} }
//Image code //Image code
$use_imagecode = ($pref['logcode'] && extension_loaded('gd')); $use_imagecode = ($pref['logcode'] && extension_loaded('gd'));
if ($use_imagecode)
{
global $sec_img;
include_once(e_HANDLER.'secure_img_handler.php');
$sec_img = new secure_image;
}
$text = ''; if ($use_imagecode)
{
global $sec_img;
include_once(e_HANDLER.'secure_img_handler.php');
$sec_img = new secure_image;
}
$text = '';
// START LOGGED CODE // START LOGGED CODE
if (USER == TRUE || ADMIN == TRUE) if (USER == TRUE || ADMIN == TRUE)
@@ -85,19 +69,22 @@ if (USER == TRUE || ADMIN == TRUE)
$loginClass = new login_menu_class(); $loginClass = new login_menu_class();
//login class ??? - TODO //login class ??? - TODO
if ($sql->db_Select('online', 'online_ip', "`online_ip` = '{$ip}' AND `online_user_id` = '0' ")) if ($sql->select('online', 'online_ip', "`online_ip` = '{$ip}' AND `online_user_id` = '0' "))
{ // User now logged in - delete 'guest' record (tough if several users on same IP) { // User now logged in - delete 'guest' record (tough if several users on same IP)
$sql->db_Delete('online', "`online_ip` = '{$ip}' AND `online_user_id` = '0' "); $sql->delete('online', "`online_ip` = '{$ip}' AND `online_user_id` = '0' ");
} }
//get templates //get templates
if (!isset($LOGIN_MENU_LOGGED)) if (!isset($LOGIN_MENU_LOGGED))
{ {
if (file_exists(THEME.'login_menu_template.php')) if (file_exists(THEME.'templates/login_menu/login_menu_template.php')) // Preferred v2.x location.
{
require(THEME.'templates/login_menu/login_menu_template.php');
}
elseif(file_exists(THEME.'login_menu_template.php'))
{ {
require(THEME.'login_menu_template.php'); require(THEME.'login_menu_template.php');
} }
else
{ {
require(e_PLUGIN.'login_menu/login_menu_template.php'); require(e_PLUGIN.'login_menu/login_menu_template.php');
} }
@@ -107,6 +94,7 @@ if (USER == TRUE || ADMIN == TRUE)
require(e_PLUGIN.'login_menu/login_menu_template.php'); require(e_PLUGIN.'login_menu/login_menu_template.php');
} }
//prepare //prepare
$new_total = 0; $new_total = 0;
$time = USERLV; $time = USERLV;
@@ -117,7 +105,7 @@ if (USER == TRUE || ADMIN == TRUE)
if (varsettrue($loginPrefs['new_news'])) if (varsettrue($loginPrefs['new_news']))
{ {
$nobody_regexp = "'(^|,)(".str_replace(",", "|", e_UC_NOBODY).")(,|$)'"; $nobody_regexp = "'(^|,)(".str_replace(",", "|", e_UC_NOBODY).")(,|$)'";
$menu_data['new_news'] = $sql->db_Count("news", "(*)", "WHERE `news_datestamp` > {$time} AND news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (news_class REGEXP ".$nobody_regexp.")"); $menu_data['new_news'] = $sql->count("news", "(*)", "WHERE `news_datestamp` > {$time} AND news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (news_class REGEXP ".$nobody_regexp.")");
$new_total += $menu_data['new_news']; $new_total += $menu_data['new_news'];
} }
@@ -125,7 +113,7 @@ if (USER == TRUE || ADMIN == TRUE)
if (varsettrue($loginPrefs['new_comments'])) if (varsettrue($loginPrefs['new_comments']))
{ {
$menu_data['new_comments'] = $sql->db_Count('comments', '(*)', 'WHERE `comment_datestamp` > '.$time); $menu_data['new_comments'] = $sql->count('comments', '(*)', 'WHERE `comment_datestamp` > '.$time);
$new_total += $menu_data['new_comments']; $new_total += $menu_data['new_comments'];
} }
@@ -133,7 +121,7 @@ if (USER == TRUE || ADMIN == TRUE)
if (varsettrue($loginPrefs['new_members'])) if (varsettrue($loginPrefs['new_members']))
{ {
$menu_data['new_users'] = $sql->db_Count('user', '(user_join)', 'WHERE user_join > '.$time); $menu_data['new_users'] = $sql->count('user', '(user_join)', 'WHERE user_join > '.$time);
$new_total += $menu_data['new_users']; $new_total += $menu_data['new_users'];
} }