<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2142] 2013/ahoereth/trunk: See #335</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2142">2142</a></dd>
<dt>Author</dt> <dd>a.hoereth</dd>
<dt>Date</dt> <dd>2013-07-23 11:52:30 +0000 (Tue, 23 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>See <a href="http://gsoc.trac.wordpress.org/ticket/335">#335</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013ahoerethtrunkinceditorsphp">2013/ahoereth/trunk/inc/editors.php</a></li>
<li><a href="#2013ahoerethtrunkjseditorsjs">2013/ahoereth/trunk/js/editors.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013ahoerethtrunkinceditorsphp"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/inc/editors.php (2141 => 2142)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/editors.php 2013-07-23 06:28:02 UTC (rev 2141)
+++ 2013/ahoereth/trunk/inc/editors.php 2013-07-23 11:52:30 UTC (rev 2142)
</span><span class="lines">@@ -43,8 +43,9 @@
</span><span class="cx"> * @param string $metakey key used for the custom post meta containing file info
</span><span class="cx"> */
</span><span class="cx"> public function __construct() {
</span><del>- add_action( 'admin_init', array( &$this, 'init' ) );
- add_action( 'admin_enqueue_scripts', array( &$this, 'scripts' ) );
</del><ins>+ add_action( 'admin_init', array( &$this, 'init' ) );
+ add_action( 'admin_enqueue_scripts', array( &$this, 'scripts' ) );
+ add_action( 'admin_notices', array( &$this, 'syntax_notice' ) );
</ins><span class="cx">
</span><span class="cx"> global $pagenow;
</span><span class="cx"> $this->meta['type'] = substr( $pagenow, 0, strpos( $pagenow, '-' ) );
</span><span class="lines">@@ -90,6 +91,8 @@
</span><span class="cx"> wp_localize_script( 'code_revisions_editors', '_code_revisions', array(
</span><span class="cx"> 'post_id' => $this->id,
</span><span class="cx"> 'revisions_list' => $this->get_revisions_list( $this->id ),
</span><ins>+ 'line' => isset( $_GET['syntax_error'] ) ? urldecode( $_GET['syntax_error'] ) : '',
+ 'newcontent' => get_post_meta( $this->id, $this->metakey . '_draft', true ),
</ins><span class="cx"> ));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,7 +166,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 0.1
</span><span class="cx"> *
</span><del>- * @return boolean success/failure
</del><ins>+ * @return boolean success/failure; might not return but redirect
</ins><span class="cx"> */
</span><span class="cx"> private function handle_file_update() {
</span><span class="cx"> $old = @file_get_contents( $this->get_abs() );
</span><span class="lines">@@ -183,8 +186,26 @@
</span><span class="cx"> if ( ! $this->id )
</span><span class="cx"> $this->id = $this->dispatch( $old );
</span><span class="cx">
</span><del>- // update database entry with new content
- return 0 < $this->dispatch( $new );
</del><ins>+ // check php files for parse errors
+ $check = 'php' == pathinfo( $this->get_abs(), PATHINFO_EXTENSION) ? $this->check_syntax( $new ) : true;
+
+ // update database entry with new content if there are no errors
+ if ( empty( $check['message'] ) ) {
+ return 0 < $this->dispatch( $new );
+
+ // syntax error found, save draft and redirect with error message
+ } else {
+ // save draft
+ update_post_meta( $this->id, $this->metakey . '_draft', $new );
+
+ // error info
+ $line = ! empty( $check['line' ] ) ? $check['line' ] : 0;
+ $message = ! empty( $check['message'] ) ? $check['message'] : 'Your changes contain errors, not saved.';
+
+ // redirect with error information and autosave id
+ wp_redirect( admin_url( $this->meta['type'].'-editor.php?file=' . urlencode( $this->meta['file'] ) . '&'.$this->meta['type'].'=' . urlencode( $this->meta['package'] ) . '&syntax_error=' . urlencode( $line ) . '&error_message=' . urlencode( $message ) ) );
+ exit;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -228,13 +249,87 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Used for displaying the admin notice when the file changes contained
+ *
+ * @since 0.5
+ */
+ public function syntax_notice() {
+ if ( ! isset( $_GET['syntax_error'] ) || empty( $_GET['error_message'] ) || ! is_numeric( $_GET['syntax_error'] ) )
+ return;
+
+ $line = urldecode( $_GET['syntax_error'] );
+ $message = ucfirst( urldecode( stripslashes( $_GET['error_message'] ) ) );
+
+ if ( $line > 0 )
+ echo '<div class="error"><p>File not saved, error in <a href="#" id="highlight_line">line ' . $line . '</a>: ' . $message . '</p></div>';
+ else
+ echo '<div class="error"><p>File not saved, an error occured: ' . $message . '</p></div>';
+ }
+
+ /**
+ * Basic php syntax checking.
+ *
+ * @since 0.5
+ *
+ * @param string $code php code to check for syntax errors
+ * @return array/boolean array contains type, message and line of error, if no error found returns true
+ */
+ function check_syntax( $code ) {
+
+ $braces = 0;
+ $inString = 0;
+
+ // Calculate if braces are correctly balanced so the code can not
+ // break the if(0) sandbox.
+ foreach ( token_get_all( $code ) as $token ) {
+ if ( is_array( $token ) ) {
+ switch ( $token[0] ) {
+ case T_CURLY_OPEN:
+ case T_DOLLAR_OPEN_CURLY_BRACES:
+ case T_START_HEREDOC: ++$inString; break;
+ case T_END_HEREDOC: --$inString; break;
+ }
+ } elseif ( $inString > 0 ) {
+ switch ( $token ) {
+ case '`':
+ case '"': --$inString; break;
+ }
+ } else {
+ switch ( $token ) {
+ case '`':
+ case '"': ++$inString; break;
+ case '{': ++$braces; break;
+ case '}':
+ if ( $inString ) {
+ --$inString;
+ } else {
+ --$braces;
+ if ( $braces < 0 ) break 2;
+ }
+ break;
+ }
+ }
+ }
+
+ if ( $braces != 0 )
+ return array( 'message' => 'unbalanced braces' );
+
+ ob_start();
+ var_dump(eval("return true; if(0){?>{$code}?><?php };"));
+ $error = error_get_last(); // type, message, line
+ ob_end_clean();
+
+ return ( ! empty( $error['message'] ) ) ? $error : true;
+ }
+
+ /**
</ins><span class="cx"> * Depending on if a post for this file already exists in the database the
</span><span class="cx"> * function either creates a new post or updates the existing post with the
</span><span class="cx"> * new content.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.4
</span><span class="cx"> * @uses wp_update_post()
</span><del>- * @uses wp_inser_post()
</del><ins>+ * @uses wp_insert_post()
</ins><span class="cx"> * @uses wp_save_post_revision()
</span><span class="cx"> *
</span><span class="cx"> * @param string $content new file contents
</span><span class="lines">@@ -259,6 +354,7 @@
</span><span class="cx"> else {
</span><span class="cx"> $args['ID'] = $this->id;
</span><span class="cx"> $id = wp_update_post($args);
</span><ins>+ delete_post_meta( $this->id, $this->metakey . '_draft' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // update/insert post meta with new checksum
</span></span></pre></div>
<a id="2013ahoerethtrunkjseditorsjs"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/js/editors.js (2141 => 2142)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/js/editors.js 2013-07-23 06:28:02 UTC (rev 2141)
+++ 2013/ahoereth/trunk/js/editors.js 2013-07-23 11:52:30 UTC (rev 2142)
</span><span class="lines">@@ -2,9 +2,8 @@
</span><span class="cx">
</span><span class="cx"> data = _code_revisions;
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><del>- * Insert revisions list below code editor
</del><ins>+ * Add revisions list below code editor textarea if there are any revisions
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.2
</span><span class="cx"> */
</span><span class="lines">@@ -12,4 +11,60 @@
</span><span class="cx"> $('#template').append( data.revisions_list );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Highlight a specific line in the code editor textarea.
+ *
+ * @since 0.5
+ *
+ * @param int line line number
+ */
+ function selectLine( line ) {
+ line--; // array counting style
+ var t = $('#newcontent');
+
+ var lines = t.val().split("\n"),
+ start = 0;
+
+ for ( var i = 0; i < lines.length; i++ ) {
+ if ( i == line )
+ break;
+ start += (lines[i].length+1);
+ }
+ var end = lines[line].length+start;
+
+ if( typeof t[0].selectionStart != "undefined" ) {
+ t.focus();
+ t[0].selectionStart = start;
+ t[0].selectionEnd = end;
+ return true;
+ }
+
+ // IE
+ if ( document.selection && document.selection.createRange ) {
+ t.focus();
+ t.select();
+ var range = document.selection.createRange();
+ range.collapse(true);
+ range.moveEnd("character", end);
+ range.moveStart("character", start);
+ range.select();
+ return true;
+ }
+
+ return false;
+ }
+
+ // If there is temporary code editor insert it in the textarea
+ if ( data.newcontent.length > 0 )
+ $('#newcontent').val( data.newcontent );
+
+ // If a line for highlighting is passed, highlight it
+ if ( data.line.length > 0 ) {
+ selectLine( data.line );
+
+ $('#highlight_line').click( function() {
+ selectLine( data.line );
+ });
+ }
+
</ins><span class="cx"> });
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>