mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-17 21:11:18 +02:00
Code Issues Releases Wiki Activity

More $imode removal

Browse Source
This commit is contained in:
CaMer0n
2009-07-07 07:33:00 +00:00
parent c29c2fb698
commit 04f3934852
9 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/fileinspector.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $
| $Revision: 1.14 $ | $Revision: 1.15 $
| $Date: 2009-07-07 06:50:55 $ | $Date: 2009-07-07 07:32:59 $
| $Author: e107coders $ | $Author: e107coders $
Includes standalone function - needs finishing Includes standalone function - needs finishing
@@ -64,7 +64,7 @@ Standalone file scan - checks for a valid set of E107 files<br />";
echo "Using directory structure from e107_config.php<br />"; echo "Using directory structure from e107_config.php<br />";
} }
// $imode = 'nuvola_light';
$fi = new file_inspector(TRUE); $fi = new file_inspector(TRUE);
// Needed to make everything work // Needed to make everything work
@@ -949,8 +949,8 @@ class file_inspector {
$data .= "| GNU General Public License (http://gnu.org).\n"; $data .= "| GNU General Public License (http://gnu.org).\n";
$data .= "|\n"; $data .= "|\n";
$data .= "| \$Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $\n"; $data .= "| \$Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $\n";
$data .= "| \$Revision: 1.14 $\n"; $data .= "| \$Revision: 1.15 $\n";
$data .= "| \$Date: 2009-07-07 06:50:55 $\n"; $data .= "| \$Date: 2009-07-07 07:32:59 $\n";
$data .= "| \$Author: e107coders $\n"; $data .= "| \$Author: e107coders $\n";
$data .= "+----------------------------------------------------------------------------+\n"; $data .= "+----------------------------------------------------------------------------+\n";
$data .= "*/\n\n"; $data .= "*/\n\n";

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

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $ | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $
| $Revision: 1.10 $ | $Revision: 1.11 $
| $Date: 2009-01-07 20:04:25 $ | $Date: 2009-07-07 07:32:59 $
| $Author: mcfly_e107 $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -29,7 +29,7 @@ class bbcode_shortcodes
function get_bb($parm) function get_bb($parm)
{ {
//FIXME - cachevars/getcachedvars! //FIXME - cachevars/getcachedvars!
global $pref, $eplug_bb, $bbcode_func, $bbcode_help, $bbcode_filedir, $bbcode_imagedir, $bbcode_helpactive, $bbcode_helptag, $register_bb, $imode; global $pref, $eplug_bb, $bbcode_func, $bbcode_help, $bbcode_filedir, $bbcode_imagedir, $bbcode_helpactive, $bbcode_helptag, $register_bb;
if(defsettrue('e_WYSIWYG')){ return; } if(defsettrue('e_WYSIWYG')){ return; }

12
e107_files/shortcode/batch/download_shortcodes.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/download_shortcodes.php,v $ | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/download_shortcodes.php,v $
| $Revision: 1.17 $ | $Revision: 1.18 $
| $Date: 2009-01-04 12:52:45 $ | $Date: 2009-07-07 07:32:59 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -288,7 +288,7 @@ SC_END
SC_BEGIN DOWNLOAD_VIEW_RATING SC_BEGIN DOWNLOAD_VIEW_RATING
require_once(e_HANDLER."rate_class.php"); require_once(e_HANDLER."rate_class.php");
$rater = new rater; $rater = new rater;
global $dl, $imode; global $dl;
$text = " $text = "
<table style='width:100%'> <table style='width:100%'>
<tr> <tr>
@@ -296,10 +296,10 @@ SC_BEGIN DOWNLOAD_VIEW_RATING
if ($ratearray = $rater->getrating("download", $dl['download_id'])) { if ($ratearray = $rater->getrating("download", $dl['download_id'])) {
for($c = 1; $c <= $ratearray[1]; $c++) { for($c = 1; $c <= $ratearray[1]; $c++) {
$text .= "<img src='".e_IMAGE."packs/".$imode."/rate/star.png' alt='' />"; $text .= "<img src='".e_IMAGE."rate/star.png' alt='' />";
} }
if ($ratearray[2]) { if ($ratearray[2]) {
$text .= "<img src='".e_IMAGE."packs/".$imode."/rate/".$ratearray[2].".png' alt='' />"; $text .= "<img src='".e_IMAGE."rate/".$ratearray[2].".png' alt='' />";
} }
if ($ratearray[2] == "") { if ($ratearray[2] == "") {
$ratearray[2] = 0; $ratearray[2] = 0;

24
e107_languages/English/admin/help/fileinspector.php
View File

@@ -11,32 +11,32 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/fileinspector.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/fileinspector.php,v $
| $Revision: 1.5 $ | $Revision: 1.6 $
| $Date: 2007-06-21 19:39:07 $ | $Date: 2009-07-07 07:33:00 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
global $imode;
$text = "<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> $text = "<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_core.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File</div> <img src='".e_IMAGE."fileinspector/file_core.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_warning.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Known Insecurity</div> <img src='".e_IMAGE."fileinspector/file_warning.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Known Insecurity</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_check.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File (Integrity Pass)</div> <img src='".e_IMAGE."fileinspector/file_check.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File (Integrity Pass)</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_fail.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File (Integrity Fail)</div> <img src='".e_IMAGE."fileinspector/file_fail.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File (Integrity Fail)</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_uncalc.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File (Incalculable)</div> <img src='".e_IMAGE."fileinspector/file_uncalc.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Core File (Incalculable)</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_missing.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Missing Core File</div> <img src='".e_IMAGE."fileinspector/file_missing.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Missing Core File</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_old.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Old Core File</div> <img src='".e_IMAGE."fileinspector/file_old.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Old Core File</div>
<div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'> <div style='margin-left: 0px; margin-bottom: 1px; margin-top: 2px; vertical-align: top; white-space: nowrap'>
<img src='".e_IMAGE."packs/".$imode."/fileinspector/file_unknown.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Non Core File</div>"; <img src='".e_IMAGE."fileinspector/file_unknown.png' alt='".$dir."' style='margin-left: 3px; width: 16px; height: 16px' />&nbsp;Non Core File</div>";
$ns -> tablerender("File Key", $text); $ns -> tablerender("File Key", $text);
$text = "The file inspector scans and analyses the files on your sites server. When the inspector encounters $text = "The file inspector scans and analyses the files on your sites server. When the inspector encounters

19
e107_plugins/calendar_menu/calendar_template.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_template.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_template.php,v $
| $Revision: 1.6 $ | $Revision: 1.7 $
| $Date: 2009-07-07 07:25:27 $ | $Date: 2009-07-07 07:33:00 $
| $Author: e107coders $ | $Author: e107coders $
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@@ -21,18 +21,7 @@ if (!defined('e107_INIT')) { exit; }
if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:auto"); } if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:auto"); }
if (varsettrue($imode))
{ // Its 0.8
$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');
define('EC_RECENT_ICON_ABS',$ec_images_path_abs.'generic/new.png');
} // Filename of icon used to flag recent events
}
else
{
$ec_images_path = e_IMAGE; $ec_images_path = e_IMAGE;
$ec_images_path_abs = e_IMAGE_ABS; $ec_images_path_abs = e_IMAGE_ABS;
if (!defined('EC_RECENT_ICON')) if (!defined('EC_RECENT_ICON'))
@@ -40,7 +29,7 @@ else
define('EC_RECENT_ICON',e_IMAGE.'generic/new.png'); define('EC_RECENT_ICON',e_IMAGE.'generic/new.png');
define('EC_RECENT_ICON_ABS',e_IMAGE_ABS.'generic/new.png'); define('EC_RECENT_ICON_ABS',e_IMAGE_ABS.'generic/new.png');
} // Filename of icon used to flag recent events } // Filename of icon used to flag recent events
}

8
e107_plugins/content/content_shortcodes.php
View File

@@ -327,7 +327,7 @@ if($sc_mode){
SC_END SC_END
SC_BEGIN CM_RATING SC_BEGIN CM_RATING
global $row, $imode, $tp, $rater, $content_pref, $plugintable; global $row, $tp, $rater, $content_pref, $plugintable;
if($sc_mode){ if($sc_mode){
if($sc_mode=='content'){ if($sc_mode=='content'){
if(($content_pref["content_content_rating"] && $row['content_rate']) || $content_pref["content_content_rating_all"] ){ if(($content_pref["content_content_rating"] && $row['content_rate']) || $content_pref["content_content_rating_all"] ){
@@ -346,14 +346,14 @@ if($sc_mode){
$rating = ""; $rating = "";
$rating .= $row['rate_avg']." "; $rating .= $row['rate_avg']." ";
for($c=1; $c<=$tmp[0]; $c++){ for($c=1; $c<=$tmp[0]; $c++){
$rating .= "<img src='".e_IMAGE."packs/".$imode."/rate/box.png' alt='' style='border:0; height:8px; vertical-align:middle' />"; $rating .= "<img src='".e_IMAGE."rate/box.png' alt='' style='border:0; height:8px; vertical-align:middle' />";
} }
if($tmp[0] < 10){ if($tmp[0] < 10){
for($c=9; $c>=$tmp[0]; $c--){ for($c=9; $c>=$tmp[0]; $c--){
$rating .= "<img src='".e_IMAGE."packs/".$imode."/rate/empty.png' alt='' style='border:0; height:8px; vertical-align:middle' />"; $rating .= "<img src='".e_IMAGE."rate/empty.png' alt='' style='border:0; height:8px; vertical-align:middle' />";
} }
} }
$rating .= "<img src='".e_IMAGE."packs/".$imode."/rate/boxend.png' alt='' style='border:0; height:8px; vertical-align:middle' />"; $rating .= "<img src='".e_IMAGE."rate/boxend.png' alt='' style='border:0; height:8px; vertical-align:middle' />";
return $rating; return $rating;
}elseif($sc_mode=='cat'){ }elseif($sc_mode=='cat'){

12
e107_plugins/download/download_shortcodes.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/download/download_shortcodes.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/download/download_shortcodes.php,v $
| $Revision: 1.4 $ | $Revision: 1.5 $
| $Date: 2009-05-03 21:16:15 $ | $Date: 2009-07-07 07:33:00 $
| $Author: bugrain $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -380,17 +380,17 @@ class download_shortcodes
{ {
require_once(e_HANDLER."rate_class.php"); require_once(e_HANDLER."rate_class.php");
$rater = new rater; $rater = new rater;
global $dlrow, $imode; global $dlrow;
$text = " $text = "
<table style='width:100%'> <table style='width:100%'>
<tr> <tr>
<td style='width:50%'>"; <td style='width:50%'>";
if ($ratearray = $rater->getrating("download", $dlrow['download_id'])) { if ($ratearray = $rater->getrating("download", $dlrow['download_id'])) {
for($c = 1; $c <= $ratearray[1]; $c++) { for($c = 1; $c <= $ratearray[1]; $c++) {
$text .= "<img src='".e_IMAGE."packs/".$imode."/rate/star.png' alt='*' />"; $text .= "<img src='".e_IMAGE."rate/star.png' alt='*' />";
} }
if ($ratearray[2]) { if ($ratearray[2]) {
$text .= "<img src='".e_IMAGE."packs/".$imode."/rate/".$ratearray[2].".png' alt='*' />"; $text .= "<img src='".e_IMAGE."rate/".$ratearray[2].".png' alt='*' />";
} }
if ($ratearray[2] == "") { if ($ratearray[2] == "") {
$ratearray[2] = 0; $ratearray[2] = 0;

10
e107_plugins/links_page/link_defines.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2006-12-07 15:41:50 $ | $Date: 2009-07-07 07:33:00 $
| $Author: sweetas $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -21,8 +21,8 @@ if (!defined('e107_INIT')) { exit; }
global $imode; global $imode;
$imagedir = e_IMAGE."packs/".$imode."/admin_images/"; $imagedir = e_IMAGE."admin_images/";
if (!defined("IMAGE_NEW")){ define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."packs/".$imode."/generic/new.png")); } if (!defined("IMAGE_NEW")){ define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."generic/new.png")); }
if (!defined('LINK_ICON_EDIT')) { define("LINK_ICON_EDIT", "<img src='".$imagedir."edit_16.png' alt='' style='border:0; cursor:pointer;' />"); } if (!defined('LINK_ICON_EDIT')) { define("LINK_ICON_EDIT", "<img src='".$imagedir."edit_16.png' alt='' style='border:0; cursor:pointer;' />"); }
if (!defined('LINK_ICON_DELETE')) { define("LINK_ICON_DELETE", "<img src='".$imagedir."delete_16.png' alt='' style='border:0; cursor:pointer;' />"); } if (!defined('LINK_ICON_DELETE')) { define("LINK_ICON_DELETE", "<img src='".$imagedir."delete_16.png' alt='' style='border:0; cursor:pointer;' />"); }
if (!defined('LINK_ICON_DELETE_BASE')) { define("LINK_ICON_DELETE_BASE", $imagedir."delete_16.png"); } if (!defined('LINK_ICON_DELETE_BASE')) { define("LINK_ICON_DELETE_BASE", $imagedir."delete_16.png"); }

8
e107_plugins/links_page/link_shortcodes.php
View File

@@ -349,20 +349,20 @@ SC_END
// LINK_RATED_TABLE ------------------------------------------------ // LINK_RATED_TABLE ------------------------------------------------
SC_BEGIN LINK_RATED_RATING SC_BEGIN LINK_RATED_RATING
global $LINK_RATED_RATING, $rowl, $imode; global $LINK_RATED_RATING, $rowl;
$tmp = explode(".", $rowl['rate_avg']); $tmp = explode(".", $rowl['rate_avg']);
$one = $tmp[0]; $one = $tmp[0];
$two = round($tmp[1],1); $two = round($tmp[1],1);
$rating = $one.".".$two." "; $rating = $one.".".$two." ";
for($c=1; $c<= $one; $c++){ for($c=1; $c<= $one; $c++){
$rating .= "<img src='".e_IMAGE_ABS."packs/".$imode."/rate/box.png' alt='' style='height:8px; vertical-align:middle' />"; $rating .= "<img src='".e_IMAGE_ABS."rate/box.png' alt='' style='height:8px; vertical-align:middle' />";
} }
if($one < 10){ if($one < 10){
for($c=9; $c>=$one; $c--){ for($c=9; $c>=$one; $c--){
$rating .= "<img src='".e_IMAGE_ABS."packs/".$imode."/rate/empty.png' alt='' style='height:8px; vertical-align:middle' />"; $rating .= "<img src='".e_IMAGE_ABS."rate/empty.png' alt='' style='height:8px; vertical-align:middle' />";
} }
} }
$rating .= "<img src='".e_IMAGE_ABS."packs/".$imode."/rate/boxend.png' alt='' style='height:8px; vertical-align:middle' />"; $rating .= "<img src='".e_IMAGE_ABS."rate/boxend.png' alt='' style='height:8px; vertical-align:middle' />";
return $rating; return $rating;
SC_END SC_END