mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/plugin.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
| $Revision: 1.26 $
| $Date: 2009-07-07 06:26:50 $
| $Revision: 1.27 $
| $Date: 2009-07-07 07:25:26 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -705,7 +705,7 @@ class pluginManager{
function pluginRenderPlugin($pluginList)
{
global $tp, $imode, $plugin, $frm;
global $tp, $plugin, $frm;
if (empty($pluginList)) return '';

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']))

10
e107_handlers/user_select_class.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/user_select_class.php,v $
| $Revision: 1.3 $
| $Date: 2007-05-28 11:13:20 $
| $Author: e107steved $
| $Revision: 1.4 $
| $Date: 2009-07-07 07:25:27 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -84,7 +84,7 @@ class user_select {
}
function select_form($type, $user_form, $user_value = '', $class_form = false, $class_value = '', $class = false) {
global $tp, $imode;
global $tp;
$text .= "<script type='text/javascript'>
<!--
function uc_switch(uctype) {
@ -109,7 +109,7 @@ class user_select {
{
$text .= "<input class='tbox' type='text' name='".$form_id."' id='".$form_id."' size='25' maxlength='30' value='".$tp -> post_toForm($user_value)."'>&nbsp;";
}
$text .= "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/user_select.png'
$text .= "<img src='".e_IMAGE_ABS."generic/user_select.png'
style='width: 16px; height: 16px; vertical-align: top' alt='".US_LAN_4."...'
title='".US_LAN_4."...' onclick=\"window.open('".e_HANDLER_ABS."user_select_class.php?".$user_form."','user_search', 'toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=300,height=200,left=100,top=100'); return false;\" />";
}

7
e107_handlers/userclass_class.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
| $Revision: 1.33 $
| $Date: 2009-06-29 21:26:58 $
| $Author: e107steved $
| $Revision: 1.34 $
| $Date: 2009-07-07 07:25:27 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -68,7 +68,6 @@ class user_class
// Constructor
function user_class()
{
global $imode;
$this->sql_r = new db;
$this->isAdmin = FALSE;

16
e107_plugins/calendar_menu/calendar_template.php
View File

@ -11,20 +11,20 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_template.php,v $
| $Revision: 1.5 $
| $Date: 2008-07-28 20:16:10 $
| $Author: e107steved $
| $Revision: 1.6 $
| $Date: 2009-07-07 07:25:27 $
| $Author: e107coders $
|
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:auto"); }
global $imode;
if (varsettrue($imode))
{ // Its 0.8
$ec_images_path = e_IMAGE.'packs/'.$imode.'/';
$ec_images_path_abs = e_IMAGE_ABS.'packs/'.$imode.'/';
$ec_images_path = e_IMAGE;
$ec_images_path_abs = e_IMAGE_ABS;
if (!defined('EC_RECENT_ICON'))
{
define('EC_RECENT_ICON',$ec_images_path.'generic/new.png');
@ -37,8 +37,8 @@ else
$ec_images_path_abs = e_IMAGE_ABS;
if (!defined('EC_RECENT_ICON'))
{
define('EC_RECENT_ICON',e_IMAGE.'generic/'.IMODE.'/new.png');
define('EC_RECENT_ICON_ABS',e_IMAGE_ABS.'generic/'.IMODE.'/new.png');
define('EC_RECENT_ICON',e_IMAGE.'generic/new.png');
define('EC_RECENT_ICON_ABS',e_IMAGE_ABS.'generic/new.png');
} // Filename of icon used to flag recent events
}

4
e107_plugins/content/handlers/content_defines.php
View File

@ -1,9 +1,9 @@
<?php
if (!defined('e107_INIT')) { exit; }
global $plugindir, $imode;
global $plugindir;
$plugindir = e_PLUGIN."content/";
$imagedir = e_IMAGE."packs/".$imode."/admin_images/";
$imagedir = e_IMAGE."admin_images/";
include_lan(e_PLUGIN."content/languages/".e_LANGUAGE."/lan_content.php");
include_lan(e_PLUGIN."content/languages/".e_LANGUAGE."/lan_content_admin.php");

3
e107_plugins/online/online_shortcodes.php
View File

@ -95,8 +95,7 @@ return $ONLINE_MEMBERS_LIST_EXTENDED;
SC_END
SC_BEGIN ONLINE_MEMBER_IMAGE
global $imode;
return "<img src='".e_IMAGE."packs/".$imode."/admin_images/users_16.png' alt='' style='vertical-align:middle' />";
return "<img src='".e_IMAGE."admin_images/users_16.png' alt='' style='vertical-align:middle' />";
SC_END
SC_BEGIN ONLINE_MEMBER_USER

8
e107_plugins/rss_menu/admin_prefs.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/admin_prefs.php,v $
| $Revision: 1.4 $
| $Date: 2008-12-13 12:34:53 $
| $Author: e107steved $
| $Revision: 1.5 $
| $Date: 2009-07-07 07:25:27 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
/*
@ -38,7 +38,7 @@ if(!getperms("P") || !plugInstalled('rss_menu'))
require_once(e_ADMIN."auth.php");
$imagedir = e_IMAGE."packs/".$imode."/admin_images/";
$imagedir = e_IMAGE."admin_images/";
require_once(e_PLUGIN.'rss_menu/rss_shortcodes.php');
$rss = new rss;

8
e107_themes/templates/bbcode_template.php
View File

@ -11,15 +11,15 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/bbcode_template.php,v $
| $Revision: 1.5 $
| $Date: 2009-01-07 15:40:06 $
| $Author: secretr $
| $Revision: 1.6 $
| $Date: 2009-07-07 07:25:27 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
// How to register your own BBcode button.
// Uncomment the 2 commented lines below to see it in action. (only applies to the user area)
// $register_bb['blank'] = array("", "[blank][/blank]","Blank example helper text",e_IMAGE."packs/".$imode."/bbcode/template.png");
// $register_bb['blank'] = array("", "[blank][/blank]","Blank example helper text",e_IMAGE."bbcode/template.png");
$BBCODE_TEMPLATE = "
<div class='field-spacer'>

4
e107_themes/templates/login_template.php
View File

@ -1,5 +1,5 @@
<?php
// $Id: login_template.php,v 1.6 2009-03-06 20:09:08 e107coders Exp $
// $Id: login_template.php,v 1.7 2009-07-07 07:25:27 e107coders Exp $
if (!defined('e107_INIT')) { exit; }
@ -49,7 +49,7 @@ if(!isset($LOGIN_TABLE))
<tr>\n
<td class='forumheader3' style='width:40%'>{LOGIN_USERNAME_LABEL}</td>\n
<td class='forumheader3' style='width:40%'>{LOGIN_TABLE_USERNAME}</td>\n
<td class='forumheader3' rowspan='".($LOGIN_TABLE_SECIMG_SECIMG ? 3 : 2)."' style='width:20%; vertical-align: middle; margin-left: auto; margin-right: auto; text-align: center;'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME_ABS."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."packs/".$imode."/generic/password.png' alt='' />\n" )."</td>\n</tr>\n
<td class='forumheader3' rowspan='".($LOGIN_TABLE_SECIMG_SECIMG ? 3 : 2)."' style='width:20%; vertical-align: middle; margin-left: auto; margin-right: auto; text-align: center;'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME_ABS."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."generic/password.png' alt='' />\n" )."</td>\n</tr>\n
<tr>\n<td class='forumheader3'>".LAN_LOGIN_2."</td>\n<td class='forumheader3'>{LOGIN_TABLE_PASSWORD}
</td>\n</tr>\n";
if($LOGIN_TABLE_SECIMG_SECIMG)