mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Notice removal

Browse Source
This commit is contained in:
Cameron
2013-04-29 12:56:50 -07:00
parent 4936a4bc11
commit 70527f872d
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_core/shortcodes/single/user_avatar.php
View File

@@ -7,6 +7,8 @@ function user_avatar_shortcode($parm='')
$tp = e107::getParser(); $tp = e107::getParser();
$width = $tp->thumbWidth;
$height = ($tp->thumbHeight !== 0) ? $tp->thumbHeight : "";
if(intval($loop_uid) > 0 && trim($parm) == "") if(intval($loop_uid) > 0 && trim($parm) == "")
{ {
@@ -47,8 +49,7 @@ function user_avatar_shortcode($parm='')
if(strpos($image,"://")!==false) // Remove Image if(strpos($image,"://")!==false) // Remove Image
{ {
$img = $image; $img = $image;
$height = $tp->thumbHeight;
$width = $tp->thumbWidth;
//$height = e107::getPref("im_height",100); // these prefs are too limiting for local images. //$height = e107::getPref("im_height",100); // these prefs are too limiting for local images.
//$width = e107::getPref("im_width",100); //$width = e107::getPref("im_width",100);
@@ -58,7 +59,7 @@ function user_avatar_shortcode($parm='')
$image = substr($image,8); // strip the -upload- from the beginning. $image = substr($image,8); // strip the -upload- from the beginning.
if(file_exists(e_AVATAR_UPLOAD.$image)) // Local Default Image if(file_exists(e_AVATAR_UPLOAD.$image)) // Local Default Image
{ {
$img = $tp->thumbUrl(e_AVATAR_UPLOAD.$image,"w=".$width."&h=".$height,true); $img = $tp->thumbUrl(e_AVATAR_UPLOAD.$image,"w=".$width."&h=".$height);
} }
else else
{ {
@@ -67,7 +68,7 @@ function user_avatar_shortcode($parm='')
} }
elseif(file_exists(e_AVATAR_DEFAULT.$image)) // User-Uplaoded Image elseif(file_exists(e_AVATAR_DEFAULT.$image)) // User-Uplaoded Image
{ {
$img = $tp->thumbUrl(e_AVATAR_DEFAULT.$image,"w=".$width."&h=".$height,true); $img = $tp->thumbUrl(e_AVATAR_DEFAULT.$image,"w=".$width."&h=".$height);
} }
else // Image Missing. else // Image Missing.
{ {

41
e107_handlers/sitelinks_class.php
View File

@@ -561,7 +561,29 @@ class e_navigation
{ {
if(defined('E_32_MAIN')) // basic check so that it's not loaded on the front-end. if(defined('E_32_MAIN')) // basic check so that it's not loaded on the front-end.
{ {
$this->iconArray = array( $this->setIconArray();
}
}
function getIconArray()
{
return $this->iconArray;
}
function setIconArray()
{
if(!defined('E_32_MAIN'))
{
e107::getCoreTemplate('admin_icons');
}
$this->iconArray = array(
'main' => E_32_MAIN, 'main' => E_32_MAIN,
'admin' => E_32_ADMIN, 'admin' => E_32_ADMIN,
'admin_pass' => E_32_ADPASS, 'admin_pass' => E_32_ADPASS,
@@ -604,14 +626,7 @@ class e_navigation
'users' => E_32_USER, 'users' => E_32_USER,
'wmessage' => E_32_WELCOME 'wmessage' => E_32_WELCOME
); );
}
}
function getIconArray()
{
return $this->iconArray;
} }
@@ -696,8 +711,12 @@ class e_navigation
{ {
return $this->pluginLinks(E_16_PLUGMANAGER, "array") ; return $this->pluginLinks(E_16_PLUGMANAGER, "array") ;
} }
if($mode=='sub')
{ $this->setIconArray();
if($mode=='sub')
{
//FIXME array structure suitable for e_admin_menu - see shortcodes/admin_navigation.php //FIXME array structure suitable for e_admin_menu - see shortcodes/admin_navigation.php
/* /*
@@ -719,7 +738,7 @@ class e_navigation
$array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS); $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS);
return $array_sub_functions; return $array_sub_functions;
} }
//FIXME array structure suitable for e_admin_menu (NOW admin() below) - see shortcodes/admin_navigation.php //FIXME array structure suitable for e_admin_menu (NOW admin() below) - see shortcodes/admin_navigation.php

1
e107_plugins/forum/newforumposts_menu.php
View File

@@ -16,6 +16,7 @@ $e107 = e107::getInstance();
$tp = e107::getParser(); $tp = e107::getParser();
$sql = e107::getDb(); $sql = e107::getDb();
$gen = new convert; $gen = new convert;
$pref = e107::getPref();
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_newforumposts_menu.php'); include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_newforumposts_menu.php');
include_once(e_PLUGIN.'forum/forum_class.php'); include_once(e_PLUGIN.'forum/forum_class.php');