<!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>[GlotPress][705] trunk/gp-includes/route.php: Remove trailing whitespace</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, #logmsg > ol { margin-left: 0; 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="https://glotpress.trac.wordpress.org/changeset/705">705</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2012-10-30 22:12:03 +0000 (Tue, 30 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesroutephp">trunk/gp-includes/route.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesroutephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/route.php (704 => 705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/route.php 2012-10-23 08:16:43 UTC (rev 704)
+++ trunk/gp-includes/route.php 2012-10-30 22:12:03 UTC (rev 705)
</span><span class="lines">@@ -3,14 +3,14 @@
</span><span class="cx"> * Base controller class
</span><span class="cx"> */
</span><span class="cx"> class GP_Route {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $api = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> var $errors = array();
</span><span class="cx"> var $notices = array();
</span><span class="cx"> var $request_running = false;
</span><span class="cx"> var $template_path = null;
</span><del>-
</del><ins>+
</ins><span class="cx"> var $fake_request = false;
</span><span class="cx"> var $exited = false;
</span><span class="cx"> var $exit_message;
</span><span class="lines">@@ -20,16 +20,16 @@
</span><span class="cx"> var $loaded_template = null;
</span><span class="cx"> var $template_output = null;
</span><span class="cx"> var $headers = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct() {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function die_with_error( $message, $status = 500 ) {
</span><span class="cx"> $this->status_header( $status );
</span><span class="cx"> $this->exit_( $message );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function before_request() {
</span><span class="cx"> do_action( 'before_request', $this->class_name, $this->last_method_called );
</span><span class="cx"> }
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Validates a thing and add its errors to the route's errors.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param object $thing a GP_Thing instance to validate
</span><span class="cx"> * @return bool whether the thing is valid
</span><span class="cx"> */
</span><span class="lines">@@ -56,13 +56,13 @@
</span><span class="cx"> $this->errors = array_merge( $this->errors, $thing->errors );
</span><span class="cx"> return $verdict;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Same as validate(), but redirects to $url if the thing isn't valid.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Note: this method calls $this->exit_() after the redirect and the code after it won't
</span><span class="cx"> * be executed.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param object $thing a GP_Thing instance to validate
</span><span class="cx"> * @param string $url where to redirect if the thing doesn't validate
</span><span class="cx"> * @return bool whether the thing is valid
</span><span class="lines">@@ -75,14 +75,14 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function can( $action, $object_type = null, $object_id = null ) {
</span><span class="cx"> return GP::$user->current()->can( $action, $object_type, $object_id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * If the current user isn't allowed to do an action, redirect and exit the current request
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $action
</span><span class="cx"> * @param`string $object_type
</span><span class="cx"> * @param string $object_id
</span><span class="lines">@@ -110,12 +110,12 @@
</span><span class="cx"> $this->die_with_error( 'Forbidden', 403 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function redirect_with_error( $message, $url = null ) {
</span><span class="cx"> $this->errors[] = $message;
</span><span class="cx"> $this->redirect( $url );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function redirect( $url = null ) {
</span><span class="cx"> if ( $this->fake_request ) {
</span><span class="cx"> $this->redirected = true;
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> gp_redirect( $url );
</span><span class="cx"> $this->tmpl( 'redirect', compact( 'url' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function headers_for_download( $filename ) {
</span><span class="cx"> $this->header('Content-Description: File Transfer');
</span><span class="cx"> $this->header('Pragma: public');
</span><span class="lines">@@ -143,21 +143,21 @@
</span><span class="cx">
</span><span class="cx"> function set_notices_and_errors() {
</span><span class="cx"> if ( $this->fake_request ) return;
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach( $this->notices as $notice ) {
</span><span class="cx"> gp_notice_set( $notice );
</span><span class="cx"> }
</span><span class="cx"> $this->notices = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach( $this->errors as $error ) {
</span><span class="cx"> gp_notice_set( $error, 'error' );
</span><span class="cx"> }
</span><span class="cx"> $this->errors = array();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Loads a template.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $template template name to load
</span><span class="cx"> * @param array $args Associative array with arguements, which will be exported in the template PHP file
</span><span class="cx"> * @param bool|string $honor_api If this is true or 'api' and the route is processing an API request
</span><span class="lines">@@ -179,14 +179,14 @@
</span><span class="cx"> $this->template_output = gp_tmpl_get_output( $template, $args, $this->template_path );
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return gp_tmpl_load( $template, $args, $this->template_path );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function tmpl_404( $args ) {
</span><span class="cx"> $this->tmpl( '404', $args + array('title' => __('Not Found'), 'http_status' => 404 ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function exit_( $message = 0 ) {
</span><span class="cx"> if ( $this->fake_request ) {
</span><span class="cx"> $this->exited = true;
</span><span class="lines">@@ -194,16 +194,16 @@
</span><span class="cx"> }
</span><span class="cx"> exit( $message );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function header( $string ) {
</span><span class="cx"> if ( $this->fake_request ) {
</span><span class="cx"> list( $header, $value ) = explode( ':', $string, 2 );
</span><span class="cx"> $this->headers[$header] = $value;
</span><span class="cx"> } else {
</span><span class="cx"> header( $string );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function status_header( $status ) {
</span><span class="cx"> if ( $this->fake_request ) {
</span><span class="cx"> $this->http_status = $status;
</span><span class="lines">@@ -211,4 +211,4 @@
</span><span class="cx"> }
</span><span class="cx"> return status_header( $status );
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre>
</div>
</div>
</body>
</html>