mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 16:17:14 +02:00
Code Issues Releases Wiki Activity

More $imode removal

Browse Source
This commit is contained in:
CaMer0n
2009-07-07 07:25:27 +00:00
parent 67765533e2
commit c29c2fb698
13 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_files/shortcode/batch/admin_shortcodes_class.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: admin_shortcodes_class.php,v 1.4 2009-02-22 12:34:51 e107steved Exp $
* $Id: admin_shortcodes_class.php,v 1.5 2009-07-07 07:25:26 e107coders Exp $
*
* Admin shortcode batch - class
*/
@@ -804,7 +804,7 @@ class admin_shortcodes
{
function admin_status()
{
global $sql, $ns, $pref, $imode;
global $sql, $ns, $pref;
$members = $sql -> db_Count('user');
$unverified = $sql -> db_Count('user', '(*)', 'WHERE user_ban=2');
$banned = $sql -> db_Count('user', '(*)', 'WHERE user_ban=1');
@@ -826,7 +826,7 @@ class admin_shortcodes
if($flo = $sql->db_Count('generic', '(*)', "WHERE gen_type='failed_login'"))
{
$text .= "<img src='".e_IMAGE."packs/".$imode."/admin_images/failedlogin_16.png' alt='' style='vertical-align: middle;' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>";
$text .= "<img src='".e_IMAGE."admin_images/failedlogin_16.png' alt='' style='vertical-align: middle;' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>";
}
return $ns -> tablerender(ADLAN_134, $text, '', TRUE);
}
@@ -920,7 +920,7 @@ class admin_shortcodes
{
/*
* e107 website system (c) 2001-2008 Steve Dunstan (e107.org)
* $Id: admin_shortcodes_class.php,v 1.4 2009-02-22 12:34:51 e107steved Exp $
* $Id: admin_shortcodes_class.php,v 1.5 2009-07-07 07:25:26 e107coders Exp $
*/
if (ADMIN)

14
e107_files/shortcode/batch/comment_shortcodes.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $
| $Revision: 1.7 $
| $Date: 2008-11-22 12:57:35 $
| $Author: e107steved $
| $Revision: 1.8 $
| $Date: 2009-07-07 07:25:27 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
@@ -101,17 +101,17 @@ return (isset($comrow['comment_blocked']) && $comrow['comment_blocked'] ? COMLAN
SC_END
SC_BEGIN COMMENTEDIT
global $COMMENTEDIT, $pref, $comrow, $comment_edit_query, $imode;
global $COMMENTEDIT, $pref, $comrow, $comment_edit_query;
if ($pref['allowCommentEdit'] && USER && $comrow['user_id'] == USERID && $comrow['comment_lock'] != "1")
{
if (!strstr(e_QUERY, "."))
{
return "<a href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$comrow['comment_id']."'><img src='".e_IMAGE."packs/".$imode."/generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
return "<a href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$comrow['comment_id']."'><img src='".e_IMAGE."generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
}
else
{
// return "<a href='".e_SELF."?".$comment_edit_query.".edit.".$comrow['comment_id']."'><img src='".e_IMAGE."packs/".$imode."/generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
return "<a href='".e_BASE."comment.php?".$comment_edit_query.".edit.".$comrow['comment_id']."'><img src='".e_IMAGE."packs/".$imode."/generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
// return "<a href='".e_SELF."?".$comment_edit_query.".edit.".$comrow['comment_id']."'><img src='".e_IMAGE."generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
return "<a href='".e_BASE."comment.php?".$comment_edit_query.".edit.".$comrow['comment_id']."'><img src='".e_IMAGE."generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
}
}
else

5
e107_files/shortcode/batch/news_shortcodes.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: news_shortcodes.php,v 1.20 2009-04-29 20:27:32 bugrain Exp $
* $Id: news_shortcodes.php,v 1.21 2009-07-07 07:25:27 e107coders Exp $
*
* News shortcode batch
*/
@@ -217,10 +217,9 @@ class news_shortcodes
function get_adminoptions()
{
global $imode;
if (ADMIN && getperms('H'))
{
$adop_icon = (file_exists(THEME."images/newsedit.png") ? THEME_ABS."images/newsedit.png" : e_IMAGE_ABS."packs/".$imode."/generic/newsedit.png");
$adop_icon = (file_exists(THEME."images/newsedit.png") ? THEME_ABS."images/newsedit.png" : e_IMAGE_ABS."generic/newsedit.png");
return " <a href='".e_ADMIN_ABS."newspost.php?create.edit.".$this->news_item['news_id']."'><img src='".$adop_icon."' alt='' style='border:0' /></a>\n";
}
else

29
e107_files/shortcode/batch/user_shortcodes.php
View File

@@ -9,9 +9,9 @@
* User information - shortcodes
*
* $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $
* $Revision: 1.13 $
* $Date: 2008-12-20 20:18:54 $
* $Author: e107steved $
* $Revision: 1.14 $
* $Date: 2009-07-07 07:25:27 $
* $Author: e107coders $
*
*/
if (!defined('e107_INIT')) { exit; }
@@ -157,7 +157,7 @@ return $gen -> computeLapse($user['user_join'])." ".LAN_USER_34;
SC_END
SC_BEGIN USER_REALNAME_ICON
global $imode;
if(defined("USER_REALNAME_ICON"))
{
return USER_REALNAME_ICON;
@@ -166,7 +166,7 @@ if(file_exists(THEME."images/user_realname.png"))
{
return "<img src='".THEME_ABS."images/user_realname.png' alt='' style='border:0px;vertical-align:middle;' /> ";
}
return "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user_realname.png' alt='' style='border:0px;vertical-align:middle;' /> ";
return "<img src='".e_IMAGE_ABS."user_icons/user_realname.png' alt='' style='border:0px;vertical-align:middle;' /> ";
SC_END
SC_BEGIN USER_REALNAME
@@ -175,7 +175,7 @@ return $user['user_login'] ? $user['user_login'] : "<i>".LAN_USER_33."</i>";
SC_END
SC_BEGIN USER_EMAIL_ICON
global $imode;
if(defined("USER_EMAIL_ICON"))
{
return USER_EMAIL_ICON;
@@ -184,7 +184,7 @@ if(file_exists(THEME."images/email.png"))
{
return "<img src='".THEME_ABS."images/email.png' alt='' style='vertical-align:middle;' /> ";
}
return "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/email.png' alt='' style='vertical-align:middle;' /> ";
return "<img src='".e_IMAGE_ABS."generic/email.png' alt='' style='vertical-align:middle;' /> ";
SC_END
SC_BEGIN USER_EMAIL_LINK
@@ -198,7 +198,6 @@ return ($user['user_hideemail'] && !ADMIN) ? "<i>".LAN_USER_35."</i>" : $tp->toH
SC_END
SC_BEGIN USER_ICON
global $imode;
if(defined("USER_ICON"))
{
return USER_ICON;
@@ -207,11 +206,11 @@ if(file_exists(THEME."images/user.png"))
{
return "<img src='".THEME_ABS."images/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
}
return "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
return "<img src='".e_IMAGE_ABS."user_icons/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
SC_END
SC_BEGIN USER_ICON_LINK
global $user, $imode;
global $user;
if(defined("USER_ICON"))
{
$icon = USER_ICON;
@@ -222,7 +221,7 @@ else if(file_exists(THEME."images/user.png"))
}
else
{
$icon = "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
$icon = "<img src='".e_IMAGE_ABS."user_icons/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
}
return "<a href='".e_SELF."?id.{$user['user_id']}'>{$icon}</a>";
SC_END
@@ -250,7 +249,7 @@ if(ADMIN && getperms("4")) {
SC_END
SC_BEGIN USER_BIRTHDAY_ICON
global $imode;
if(defined("USER_BIRTHDAY_ICON"))
{
return USER_BIRTHDAY_ICON;
@@ -259,7 +258,7 @@ if(file_exists(THEME."images/user_birthday.png"))
{
return "<img src='".THEME_ABS."images/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
}
return "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
return "<img src='".e_IMAGE_ABS."user_icons/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
SC_END
SC_BEGIN USER_BIRTHDAY
@@ -298,7 +297,7 @@ if(isset($pref['plug_installed']['pm']) && ($user['user_id'] > 0))
SC_END
SC_BEGIN USER_RATING
global $pref, $user, $imode;
global $pref, $user;
if($pref['profile_rate'] && USER)
{
include_once(e_HANDLER."rate_class.php");
@@ -309,7 +308,7 @@ if($pref['profile_rate'] && USER)
$num = $rating[1];
for($i=1; $i<= $num; $i++)
{
$ret .= "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user_star.png' style='border:0' alt='' />";
$ret .= "<img src='".e_IMAGE_ABS."user_icons/user_star.png' style='border:0' alt='' />";
}
}
if(!$rater->checkrated('user', $user['user_id']))