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

Deprecated file and folder cleanup

Browse Source
This commit is contained in:
Cameron
2014-01-19 03:55:07 -08:00
parent 81276f9994
commit 852bd59597
10 changed files with 3 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -303,7 +303,7 @@ class admin_shortcodes
$text .= "
<div>
<img src='".e_IMAGE_ABS."admin_images/language_16.png' alt='' />&nbsp;";
";
if(isset($aff))
{
$text .= $sql->mySQLlanguage;
@@ -1290,198 +1290,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
*/
}
/**
* Legacy Admin Menu Routine.
* Currently Used by Jayya admin.
*/
/*
function sc_admin_alt_nav($parm)
{
if (ADMIN)
{
global $sql, $pref, $tp;
parse_str($parm);
require(e_ADMIN.'ad_links.php');
function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE)
{
$cat_link = ($cat_link ? $cat_link : "javascript:void(0);");
$text = "<a class='menuButton' href='".$cat_link."' style='background-image: url(".$cat_img."); background-repeat: no-repeat; background-position: 3px 1px' ";
if ($cat_id)
{
$text .= "onclick=\"return buttonClick(event, '".$cat_id."');\" onmouseover=\"buttonMouseover(event, '".$cat_id."');\"";
}
$text .= ">".$cat_title."</a>";
return $text;
}
function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='')
{
$exit = "";
$text = "<a class='menuItem ".$cat_highlight."' href='".$cat_link."' ";
if ($cat_id)
{
$text .= "onclick=\"return false;\" onmouseover=\"menuItemMouseover(event, '".$cat_id."');\"";
}
$text .= "><span class='menuItemBuffer'>".$cat_img."</span><span class='menuItemText'>".$cat_title."</span>";
if ($cat_id)
{
$text .= "<span class=\"menuItemArrow\">&#9654;</span>";
}
$text .= "</a>";
return $text;
}
if (file_exists(THEME.'nav_menu.js'))
{
$text = "<script type='text/javascript' src='".THEME_ABS."nav_menu.js'></script>";
}
else
{
$text = "<script type='text/javascript' src='".e_JS."nav_menu.js'></script>";
}
$text .= "<div style='width: 100%'><table style='border-collapse: collapse; width: 100%'>
<tr><td>
<div class='menuBar' style='width: 100%'>";
$text .= adnav_cat(ADLAN_151, e_ADMIN.'admin.php', E_16_NAV_MAIN); // Main Link.
// Render Settings, Users, Content, Tools, Manage.
for ($i = 1; $i < 7; $i++)
{
$ad_tmpi = 0;
$ad_links_array = asortbyindex($array_functions, 1);
$nav_main = adnav_cat($admin_cat['title'][$i], '', $admin_cat['img'][$i], $admin_cat['id'][$i]);
$ad_texti = "<div id='".$admin_cat['id'][$i]."' class='menu' onmouseover=\"menuMouseover(event)\">";
while(list($key, $nav_extract) = each($ad_links_array))
{
if($nav_extract[4]==$i)
{
if(getperms($nav_extract[3]))
{
$ad_texti .= adnav_main($nav_extract[1], $nav_extract[0], $nav_extract[5]);
$ad_tmpi = 1;
}
}
}
$ad_texti .= '</div>';
if ($ad_tmpi == 1)
{
$text .= $nav_main;
$text .= $ad_texti;
}
}
$render_plugins = FALSE;
include_once(e_HANDLER.'plugin_class.php');
$plug = new e107plugin;
$plugin_array = array(); // kill php notices
if($sql -> db_Select('plugin', '*', 'plugin_installflag=1 ORDER BY plugin_path'))
{
while($row = $sql -> db_Fetch())
{
if(getperms('P'.$row['plugin_id']))
{
if($plug->parse_plugin($row['plugin_path']))
{
$plug_vars = $plug->plug_vars;
loadLanFiles($row['plugin_path'], 'admin');
if($plug_vars['administration']['configFile'])
{
$plug_vars['@attributes']['name'] = $tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs");
$icon_src = (isset($plug_vars['plugin_php']) ? e_PLUGIN_ABS : e_PLUGIN_ABS.$row['plugin_path'].'/') .$plug_vars['administration']['iconSmall'];
$plugin_icon = $plug_vars['administration']['iconSmall'] ? "<img src='{$icon_src}' alt='".$plug_vars['administration']['caption']."' class='icon S16' />" : E_16_PLUGIN;
$plugin_array[ucfirst($plug_vars['@attributes']['name'])] = adnav_main($plug_vars['@attributes']['name'], e_PLUGIN.$row['plugin_path']."/".$plug_vars['administration']['configFile'], $plugin_icon);
}
$render_plugins = TRUE;
$active_plugs = TRUE;
}
}
}
ksort($plugin_array, SORT_STRING);
$plugs_text = '';
foreach ($plugin_array as $plugin_compile)
{
$plugs_text .= $plugin_compile;
}
}
// if (getperms('Z'))
// {
// $pclass_extended = $active_plugs ? 'header' : '';
// $plugin_text = adnav_main(ADLAN_98, e_ADMIN.'plugin.php', E_16_PLUGMANAGER, FALSE, $pclass_extended);
// $render_plugins = TRUE;
// }
if ($render_plugins)
{
$text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu');
$text .= "<div id='plugMenu' class='menu' onmouseover=\"menuMouseover(event)\">";
$text .= varset($plugin_text).varset($plugs_text);
$text .= "</div>";
}
// Render the "About" Menu - Phpinfo, Credits and Docs.
$text .= adnav_cat(ADLAN_CL_20, '', E_16_CAT_ABOUT, $admin_cat['id'][20]); //E_16_NAV_DOCS
$text .= "<div id='".$admin_cat['id'][20]."' class='menu' onmouseover=\"menuMouseover(event)\">";
foreach($ad_links_array as $key=>$nav_extract)
{
$text .= ($nav_extract[4]==20) ? adnav_main($nav_extract[1], $nav_extract[0], $nav_extract[5]) : "";
}
// if (!is_readable(e_DOCS.e_LANGUAGE."/")) // warning killed
// {
// $handle=opendir(e_DOCS.'English/');
// }
// $i=1;
// if(varset($handle))
// {
// while ($file = readdir($handle))
// {
// if ($file != '.' && $file != '..' && $file != 'CVS')
// {
// $text .= adnav_main(str_replace('_', ' ', $file), e_ADMIN_ABS.'docs.php?'.$i, E_16_DOCS);
// $i++;
// }
// }
// closedir($handle);
// }
$text .= '</div>';
$text .= '</div>
</td>';
if (varset($exit) != 'off')
{
$text .= "<td style='width: 160px; white-space: nowrap'>
<div class='menuBar' style='width: 100%'>";
$text .= adnav_cat(ADLAN_53, e_HTTP.'index.php', E_16_NAV_LEAV);
$text .= adnav_cat(ADLAN_46, e_ADMIN_ABS.'admin.php?logout', E_16_NAV_LGOT);
$text .= '</div>
</td>';
}
$text .= '</tr>
</table>
</div>';
return $text;
}
}
*/
/**
* New Admin Navigation Routine.
@@ -1506,8 +1315,6 @@ Inverse 10 <span class="badge badge-inverse">10</span>
parse_str($parm, $parms);
$tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION'));
global $$tmpl;
require_once(e_ADMIN.'ad_links.php'); //FIXME loaded in boot.php but $admin_cat is not available here.
if($parm == 'home' || $parm == 'logout' || $parm == 'language' || $parm == 'pm')
{

132
e107_core/shortcodes/batch/comment_shortcodes.php
View File

@@ -400,137 +400,5 @@ class comment_shortcodes extends e_shortcode
}
/*
SC_BEGIN SUBJECT
global $SUBJECT, $comrow, $pref, $NEWIMAGE, $tp;
if (isset($pref['nested_comments']) && $pref['nested_comments']) {
$SUBJECT = $NEWIMAGE." ".(empty($comrow['comment_subject']) ? $subject : $tp->toHTML($comrow['comment_subject'], TRUE));
} else {
$SUBJECT = '';
}
return $SUBJECT;
SC_END
SC_BEGIN USERNAME
global $USERNAME, $comrow;
if (isset($comrow['user_id']) && $comrow['user_id'])
{
$USERNAME = $parm == 'raw' ? $comrow['user_name'] : "<a href='".e107::getUrl()->create('user/profile/view', array('id' => $comrow['user_id'], 'name' => $comrow['user_name']))."'>".$comrow['user_name']."</a>\n";
}
else
{
$comrow['user_id'] = 0;
$USERNAME = preg_replace("/[0-9]+\./", '', $comrow['comment_author_name']);
$USERNAME = str_replace("Anonymous", LAN_ANONYMOUS, $USERNAME);
}
return $USERNAME;
SC_END
SC_BEGIN TIMEDATE
global $TIMEDATE, $comrow, $datestamp, $gen;
$datestamp = $gen->convert_date($comrow['comment_datestamp'], "short");
return $datestamp;
SC_END
SC_BEGIN REPLY
global $REPLY, $comrow, $action, $pref, $table, $id, $thisaction, $thistable, $thisid;
$REPLY = '';
if($comrow['comment_lock'] != "1"){
if ($thisaction == "comment" && $pref['nested_comments']) {
$REPLY = "<a href='".SITEURL."comment.php?reply.".$thistable.".".$comrow['comment_id'].".".$thisid."'>".COMLAN_326."</a>";
}
}
return $REPLY;
SC_END
SC_BEGIN AVATAR
global $AVATAR, $comrow;
if (isset($comrow['user_id']) && $comrow['user_id']) {
if (isset($comrow['user_image']) && $comrow['user_image']) {
require_once(e_HANDLER."avatar_handler.php");
$comrow['user_image'] = avatar($comrow['user_image']);
$comrow['user_image'] = "<div class='spacer'><img src='".$comrow['user_image']."' alt='' /></div>";
}else{
$comrow['user_image'] = '';
}
}else{
$comrow['user_image'] = '';
}
return $comrow['user_image'];
SC_END
SC_BEGIN COMMENTS
global $COMMENTS, $comrow;
return (isset($comrow['user_id']) && $comrow['user_id'] ? COMLAN_99.": ".$comrow['user_comments'] : COMLAN_194)."<br />";
SC_END
SC_BEGIN JOINED
global $JOINED, $comrow, $gen;
$JOINED = '';
if ($comrow['user_id'] && !$comrow['user_admin']) {
$comrow['user_join'] = $gen->convert_date($comrow['user_join'], "short");
$JOINED = ($comrow['user_join'] ? COMLAN_145." ".$comrow['user_join'] : '');
}
return $JOINED;
SC_END
SC_BEGIN COMMENT
global $COMMENT, $comrow, $tp, $pref;
return (isset($comrow['comment_blocked']) && $comrow['comment_blocked'] ? COMLAN_0 : $tp->toHTML($comrow['comment_comment'], TRUE, FALSE, $comrow['user_id']));
SC_END
SC_BEGIN COMMENTEDIT
global $COMMENTEDIT, $pref, $comrow, $comment_edit_query;
if ($pref['allowCommentEdit'] && USER && $comrow['user_id'] == USERID && $comrow['comment_lock'] != "1")
{
$adop_icon = (file_exists(THEME."images/commentedit.png") ? THEME_ABS."images/commentedit.png" : e_IMAGE_ABS."admin_images/edit_16.png");
//Searching for '.' is BAD!!! It breaks mod rewritten requests. Why is this needed at all?
if (strstr(e_QUERY, "&"))
{
return "<a href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$comrow['comment_id']."'><img src='".$adop_icon."' alt='".COMLAN_318."' title='".COMLAN_318."' class='icon' /></a>";
}
else
{
// 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='".SITEURL."comment.php?".$comment_edit_query.".edit.".$comrow['comment_id']."#e-comment-form'><img src='".$adop_icon."' alt='".COMLAN_318."' title='".COMLAN_318."' class='icon' /></a>";
}
}
else
{
return "";
}
SC_END
SC_BEGIN RATING
global $RATING;
return $RATING;
SC_END
SC_BEGIN IPADDRESS
global $IPADDRESS, $comrow, $e107;
//require_once(e_HANDLER."encrypt_handler.php");
return (ADMIN ? "<a href='".SITEURL."userposts.php?0.comments.".$comrow['user_id']."'>".COMLAN_330." ".e107::getIPHandler()->ipDecode($comrow['comment_ip'])."</a>" : "");
SC_END
SC_BEGIN LEVEL
global $LEVEL, $comrow, $pref;
//FIXME - new level handler, currently commented to avoid parse errors
//$ldata = get_level($comrow['user_id'], $comrow['user_forums'], $comrow['user_comments'], $comrow['user_chats'], $comrow['user_visits'], $comrow['user_join'], $comrow['user_admin'], $comrow['user_perms'], $pref);
return ($comrow['user_admin'] ? $ldata[0] : $ldata[1]);
SC_END
SC_BEGIN LOCATION
global $LOCATION, $comrow, $tp;
return (isset($comrow['user_location']) && $comrow['user_location'] ? COMLAN_313.": ".$tp->toHTML($comrow['user_location'], TRUE) : '');
SC_END
SC_BEGIN SIGNATURE
global $SIGNATURE, $comrow, $tp;
$SIGNATURE = (isset($comrow['user_signature']) && $comrow['user_signature'] ? $tp->toHTML($comrow['user_signature'], true) : '');
return $SIGNATURE;
SC_END
*/
?>

75
e107_core/templates/admin_icons_template.php
View File

@@ -9,68 +9,6 @@
* Administration Icons, should handle all icons in the future (somehow)
*
*/
/*
define("ADMIN_TRUE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/true_16.png' alt='' />");
define("ADMIN_TRUE_ICON_PATH", e_IMAGE_ABS."admin_images/true_16.png");
define("ADMIN_FALSE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/false_16.png' alt='' />");
define("ADMIN_FALSE_ICON_PATH", e_IMAGE_ABS."admin_images/false_16.png");
define("ADMIN_EDIT_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='' title='".LAN_EDIT."' />");
define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_16.png");
define("ADMIN_DELETE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/delete_16.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_16.png");
define("ADMIN_UP_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/up_16.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png");
define("ADMIN_DOWN_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/down_16.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png");
define("ADMIN_WARNING_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/warning_16.png' alt='' />");
define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_16.png");
define("ADMIN_INFO_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/info_16.png' alt='' />");
define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png");
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/configure_16.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png");
define("ADMIN_ADD_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/add_16.png' alt='' />");
define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png");
define("ADMIN_VIEW_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/search_16.png' alt='' />");
define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png");
define("ADMIN_URL_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/forums_16.png' alt='' />");
define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png");
define("ADMIN_INSTALLPLUGIN_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/plugin_install_16.png' alt='' />");
define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png");
define("ADMIN_UNINSTALLPLUGIN_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/plugin_uninstall_16.png' alt='' />");
define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png");
define("ADMIN_UPGRADEPLUGIN_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/up_16.png' alt='' />");
define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png");
define("ADMIN_EXECUTE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/execute_16.png' alt='' title='Run' />");//TODO LAN
define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png");
define("ADMIN_SORT_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/sort_16.png' alt='' title='Sort' />"); //TODO LAN
define("ADMIN_SORT_ICON_PATH", e_IMAGE."admin_images/sort_16.png");
define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
*/
if (!defined('E_16_FACEBOOK')) {
@@ -576,19 +514,6 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
}
// define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED
// define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png"); //XXX DEPRECATED
// define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png"); //XXX DEPRECATED
// define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png"); //XXX DEPRECATED
// define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png"); //XXX DEPRECATED
// define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png"); //XXX DEPRECATED
// define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png"); //XXX DEPRECATED
// define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png"); //XXX DEPRECATED
// define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png"); //XXX DEPRECATED
// define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED
// define("ADMIN_EXECUTE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/execute_16.png' alt='' title='Run' />");
// define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png"); //XXX DEPRECATED
// define("ADMIN_SORT_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/sort_16.png' alt='' title='Sort' />");