golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some file editor improvements. New: Recently edited and editor sidebar. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-09-22 06:33:54 +00:00
parent d7364bbf70
commit b903edacea
4 changed files with 95 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/menu.php
View File

@ -14,8 +14,7 @@ $menu[25] = array(__('Users'), 3, 'users.php');
$menu[30] = array(__('Options'), 6, 'options-general.php'); $menu[30] = array(__('Options'), 6, 'options-general.php');
$menu[35] = array(__('Plugins'), 8, 'plugins.php'); $menu[35] = array(__('Plugins'), 8, 'plugins.php');
$menu[40] = array(__('Presentation'), 8, 'themes.php'); $menu[40] = array(__('Presentation'), 8, 'themes.php');
$menu[45] = array(__('Templates'), 4, 'templates.php'); $menu[45] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php');
$menu[50] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php');
ksort($menu); // So other files can plugin ksort($menu); // So other files can plugin
$submenu['edit.php'][5] = array(__('Posts'), 1, 'edit.php'); $submenu['edit.php'][5] = array(__('Posts'), 1, 'edit.php');
@ -42,6 +41,7 @@ $submenu['options-general.php'][30] = array(__('Miscellaneous'), 5, 'options-mis
$submenu['themes.php'][5] = array(__('Themes'), 5, 'themes.php'); $submenu['themes.php'][5] = array(__('Themes'), 5, 'themes.php');
$submenu['themes.php'][10] = array(__('Theme Editor'), 5, 'theme-editor.php'); $submenu['themes.php'][10] = array(__('Theme Editor'), 5, 'theme-editor.php');
$submenu['themes.php'][15] = array(__('Other Files'), 5, 'templates.php');
$self = preg_replace('|.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); $self = preg_replace('|.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
if (!isset($parent_file)) $parent_file = ''; if (!isset($parent_file)) $parent_file = '';

115
wp-admin/templates.php
View File

@ -1,7 +1,8 @@
<?php <?php
require_once('../wp-includes/wp-l10n.php'); require_once('../wp-includes/wp-l10n.php');
$title = __("Template &amp; file editing"); $title = __('Template &amp; file editing');
$parent_file = 'themes.php';
function add_magic_quotes($array) { function add_magic_quotes($array) {
foreach ($array as $k => $v) { foreach ($array as $k => $v) {
@ -57,7 +58,7 @@ switch($action) {
case 'update': case 'update':
$standalone = 1; $standalone = 1;
require_once("admin-header.php"); require_once('./admin-header.php');
if ($user_level < 5) { if ($user_level < 5) {
die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>')); die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
@ -82,18 +83,26 @@ break;
default: default:
require_once('admin-header.php'); require_once('./admin-header.php');
update_option('recently_edited', array(1, 2, 3) );
if ($user_level <= 5) { if ($user_level <= 5) {
die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>')); die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
} }
if ('' == $file) { if ('' == $file) {
if ('' != get_settings('blogfilename')) { $file = 'index.php';
$file = get_settings('blogfilename'); } else {
$oldfiles = (array) get_option('recently_edited');
if ($oldfiles) {
$oldfiles = array_reverse($oldfiles);
$oldfiles[] = $file;
$oldfiles = array_reverse($oldfiles);
$oldfiles = array_unique($oldfiles);
if ( 5 < count($oldfiles) )
array_pop($oldfiles);
} else { } else {
$file = 'index.php'; $oldfiles[] = $file;
} }
update_option('recently_edited', $oldfiles);
} }
$home = get_settings('home'); $home = get_settings('home');
@ -102,7 +111,7 @@ update_option('recently_edited', array(1, 2, 3) );
'.htaccess' == $file)) { '.htaccess' == $file)) {
$home_root = parse_url($home); $home_root = parse_url($home);
$home_root = $home_root['path']; $home_root = $home_root['path'];
$root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["PATH_TRANSLATED"]); $root = str_replace($_SERVER['PHP_SELF'], '', $_SERVER['PATH_TRANSLATED']);
$home_root = $root . $home_root; $home_root = $root . $home_root;
$real_file = $home_root . '/' . $file; $real_file = $home_root . '/' . $file;
} else { } else {
@ -112,15 +121,11 @@ update_option('recently_edited', array(1, 2, 3) );
if (!is_file($real_file)) if (!is_file($real_file))
$error = 1; $error = 1;
if ((substr($file,0,2) == 'wp') and (substr($file,-4,4) == '.php') and ($file != 'wp.php'))
$warning = __(' &#8212; this is a WordPress file, be careful when editing it!');
if (!$error) { if (!$error) {
$f = fopen($real_file, 'r'); $f = fopen($real_file, 'r');
$content = fread($f, filesize($real_file)); $content = fread($f, filesize($real_file));
$content = htmlspecialchars($content); $content = htmlspecialchars($content);
// $content = str_replace("</textarea","&lt;/textarea",$content);
} }
?> ?>
@ -128,38 +133,28 @@ update_option('recently_edited', array(1, 2, 3) );
<div class="updated"><p><?php _e('File edited successfully.') ?></p></div> <div class="updated"><p><?php _e('File edited successfully.') ?></p></div>
<?php endif; ?> <?php endif; ?>
<div class="wrap"> <div class="wrap">
<?php <?php
echo "<p>" . sprintf(__('Editing <strong>%s</strong>'), $file) . " $warning</p>"; if (is_writeable($real_file)) {
echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), $file) . '</h2>';
if (!$error) { } else {
?> echo '<h2>' . sprintf(__('Browsing <strong>%s</strong>'), $file) . '</h2>';
<form name="template" action="templates.php" method="post"> }
<textarea cols="80" rows="21" style="width:95%; margin-right: 10em; font-family: 'Courier New', Courier, monopace; font-size:small;" name="newcontent" tabindex="1"><?php echo $content ?></textarea> ?>
<input type="hidden" name="action" value="update" /> <div id="templateside">
<input type="hidden" name="file" value="<?php echo $file ?>" /> <?php
<p class="submit"> if ( $recents = get_option('recently_edited') ) :
<?php ?>
if (is_writeable($real_file)) { <h3><?php _e('Recent'); ?></h3>
echo "<input type='submit' name='submit' value='Update File &raquo;' tabindex='2' />"; <?php
} else { echo '<ol>';
echo "<input type='button' name='oops' value='" . __('(You cannot update that file/template: must make it writable, e.g. CHMOD 666)') ."' tabindex='2' />"; foreach ($recents as $recent) :
} $display = preg_replace('|.*/(.*)$|', '$1', $recent);
?> echo "<li><a href='templates.php?file=$recent'>$display</a>";
</p> endforeach;
</form> echo '</ol>';
<?php endif;
} else { ?>
echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>'; <h3><?php _e('Common'); ?></h3>
}
?>
</div>
<div class="wrap">
<p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://wiki.wordpress.org/index.php/MakeWritable" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p>
<form name="file" action="templates.php" method="get">
<input type="text" name="file" />
<input type="submit" name="submit" value="<?php _e('Edit file &raquo;') ?>" />
</form>
<p><?php _e('Common files: (click to edit)') ?></p>
<ul> <ul>
<li><a href="templates.php?file=index.php"><?php _e('Main Index') ?></a></li> <li><a href="templates.php?file=index.php"><?php _e('Main Index') ?></a></li>
<li><a href="templates.php?file=wp-layout.css"><?php _e('Main Stylesheet') ?></a></li> <li><a href="templates.php?file=wp-layout.css"><?php _e('Main Stylesheet') ?></a></li>
@ -168,6 +163,38 @@ update_option('recently_edited', array(1, 2, 3) );
<li><a href="templates.php?file=.htaccess"><?php _e('.htaccess (for rewrite rules)') ?></a></li> <li><a href="templates.php?file=.htaccess"><?php _e('.htaccess (for rewrite rules)') ?></a></li>
<li><a href="templates.php?file=my-hacks.php"><?php _e('my-hacks.php (legacy hacks support)') ?></a></li> <li><a href="templates.php?file=my-hacks.php"><?php _e('my-hacks.php (legacy hacks support)') ?></a></li>
</ul> </ul>
</div>
<?php if (!$error) { ?>
<form name="template" id="template" action="templates.php" method="post">
<div><textarea cols="70" rows="25" name="newcontent" id='newcontent' tabindex="1"><?php echo $content ?></textarea>
<input type="hidden" name="action" value="update" />
<input type="hidden" name="file" value="<?php echo $file ?>" />
</div>
<?php if ( is_writeable($real_file) ) : ?>
<p class="submit">
<?php
echo "<input type='submit' name='submit' value=' " . __('Update File') . " &raquo;' tabindex='2' />";
?>
</p>
<?php else : ?>
<p><em><?php _e('If this file was writable you could edit it.'); ?></em></p>
<?php endif; ?>
</form>
<?php
} else {
echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
}
?>
</div>
<div class="wrap">
<h2>Other Files</h2>
<p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://wiki.wordpress.org/index.php/MakeWritable" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p>
<form name="file" action="templates.php" method="get">
<input type="text" name="file" />
<input type="submit" name="submit" value="<?php _e('Edit file &raquo;') ?>" />
</form>
<?php <?php
$plugins_dir = @ dir(ABSPATH . 'wp-content/plugins'); $plugins_dir = @ dir(ABSPATH . 'wp-content/plugins');
if ($plugins_dir) { if ($plugins_dir) {

1
wp-admin/theme-editor.php
View File

@ -84,7 +84,6 @@ break;
default: default:
require_once('admin-header.php'); require_once('admin-header.php');
update_option('recently_edited', array(1, 2, 3) );
if ($user_level <= 5) { if ($user_level <= 5) {
die(__('<p>You have do not have sufficient permissions to edit themes for this blog.</p>')); die(__('<p>You have do not have sufficient permissions to edit themes for this blog.</p>'));
} }

22
wp-admin/wp-admin.css
View File

@ -352,6 +352,28 @@ textarea, input, select {
clear: both; clear: both;
} }
#template div {
margin-right: 190px;
}
#templateside {
width: 170px;
float: right;
}
#templateside h3 {
margin: 0;
}
#templateside ol, #templateside ul {
list-style: none;
margin: .5em;
padding: 0;
}
#template textarea {
font-family: 'Courier New', Courier, monopace;
font-size: small;
width: 99%;
}
#postcustom { #postcustom {
border: 1px solid #aaa; border: 1px solid #aaa;
padding: .5em; padding: .5em;