<!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][906] trunk/gp-includes/routes/translation.php: Return all die_with_404() and die_with_error() calls in GP_Route_Translation.</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="https://glotpress.trac.wordpress.org/changeset/906">906</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-05-09 18:51:41 +0000 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return all die_with_404() and die_with_error() calls in GP_Route_Translation. See <a href="http://glotpress.trac.wordpress.org/ticket/321">#321</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesroutestranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation.php (905 => 906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation.php 2014-05-09 18:43:54 UTC (rev 905)
+++ trunk/gp-includes/routes/translation.php 2014-05-09 18:51:41 UTC (rev 906)
</span><span class="lines">@@ -1,14 +1,24 @@
</span><span class="cx"> <?php
</span><span class="cx"> class GP_Route_Translation extends GP_Route_Main {
</span><ins>+
</ins><span class="cx"> function import_translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><del>- if ( $this->cannot_and_redirect( 'approve', 'translation-set', $translation_set->id ) ) return;
</del><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
+
+ if ( $this->cannot_and_redirect( 'approve', 'translation-set', $translation_set->id ) ) {
+ return;
+ }
+
</ins><span class="cx"> $kind = 'translations';
</span><span class="cx"> $this->tmpl( 'project-import', get_defined_vars() );
</span><span class="cx"> }
</span><span class="lines">@@ -16,15 +26,24 @@
</span><span class="cx"> function import_translations_post( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><del>- if ( $this->cannot_and_redirect( 'approve', 'translation-set', $translation_set->id ) ) return;
</del><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
</ins><span class="cx">
</span><ins>+ if ( $this->cannot_and_redirect( 'approve', 'translation-set', $translation_set->id ) ) {
+ return;
+ }
+
</ins><span class="cx"> $format = gp_array_get( GP::$formats, gp_post( 'format', 'po' ), null );
</span><del>- if ( !$format ) {
</del><ins>+
+ if ( ! $format ) {
</ins><span class="cx"> $this->redirect_with_error( __('No such format.') );
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -49,14 +68,23 @@
</span><span class="cx"> function export_translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $format = gp_array_get( GP::$formats, gp_get( 'format', 'po' ), null );
</span><del>- if ( !$format ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $format ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $export_locale = apply_filters( 'export_locale', $locale->slug, $locale );
</span><span class="cx"> $filename = sprintf( '%s-%s.'.$format->extension, str_replace( '/', '-', $project->path ), $export_locale );
</span><span class="cx"> $entries = GP::$translation->for_export( $project, $translation_set, gp_get( 'filters' ) );
</span><span class="lines">@@ -76,11 +104,17 @@
</span><span class="cx"> function translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $glossary = GP::$glossary->by_set_id( $translation_set->id );
</span><span class="cx">
</span><span class="cx"> $page = gp_get( 'page', 1 );
</span><span class="lines">@@ -115,11 +149,17 @@
</span><span class="cx">
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $output = array();
</span><span class="cx"> foreach( gp_post( 'translation', array() ) as $original_id => $translations) {
</span><span class="cx"> $data = compact('original_id');
</span><span class="lines">@@ -146,7 +186,8 @@
</span><span class="cx"> }
</span><span class="cx"> $error_output .= '</ul>';
</span><span class="cx"> $translation->delete();
</span><del>- $this->die_with_error( $error_output, 200 );
</del><ins>+
+ return $this->die_with_error( $error_output, 200 );
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> if ( 'current' == $data['status'] )
</span><span class="lines">@@ -174,11 +215,17 @@
</span><span class="cx"> function bulk_post( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> if ( $this->cannot_and_redirect( 'approve', 'translation-set', $translation_set->id ) ) return;
</span><span class="cx">
</span><span class="cx"> $bulk = gp_post('bulk');
</span><span class="lines">@@ -270,7 +317,7 @@
</span><span class="cx"> $original->priority = $bulk['priority'];
</span><span class="cx">
</span><span class="cx"> if ( ! $original->validate() ) {
</span><del>- $this->die_with_error( 'Invalid priority value!' );
</del><ins>+ return $this->die_with_error( 'Invalid priority value!' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $original->save() ) {
</span><span class="lines">@@ -306,15 +353,23 @@
</span><span class="cx"> private function edit_single_translation( $project_path, $locale_slug, $translation_set_slug, $edit_function ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><del>- if ( ! $project || ! $locale ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $project || ! $locale ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del>- if ( ! $translation_set ) $this->die_with_404();
</del><span class="cx">
</span><ins>+ if ( ! $translation_set ) {
+ return $this->die_with_404();
+ }
+
</ins><span class="cx"> $translation = GP::$translation->get( gp_post( 'translation_id' ) );
</span><del>- if ( !$translation ) {
- $this->die_with_error( 'Translation doesn’t exist!' );
</del><ins>+
+ if ( ! $translation ) {
+ return $this->die_with_error( 'Translation doesn’t exist!' );
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $this->can_approve_translation_or_forbidden( $translation );
</span><span class="cx">
</span><span class="cx"> call_user_func( $edit_function, $project, $locale, $translation_set, $translation );
</span><span class="lines">@@ -327,13 +382,13 @@
</span><span class="cx"> $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
</span><span class="cx"> $this->tmpl( 'translation-row', get_defined_vars() );
</span><span class="cx"> } else {
</span><del>- $this->die_with_error( 'Error in retrieving translation!' );
</del><ins>+ return $this->die_with_error( 'Error in retrieving translation!' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private function discard_warning_edit_function( $project, $locale, $translation_set, $translation ) {
</span><del>- if ( !isset( $translation->warnings[gp_post( 'index' )][gp_post( 'key' )] ) ) {
- $this->die_with_error( 'The warning doesn’exist!' );
</del><ins>+ if ( ! isset( $translation->warnings[ gp_post( 'index' ) ][ gp_post( 'key' ) ] ) ) {
+ return $this->die_with_error( 'The warning doesn’exist!' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $warning = array(
</span><span class="lines">@@ -349,17 +404,20 @@
</span><span class="cx"> if ( empty( $translation->warnings[gp_post( 'index' )] ) ) {
</span><span class="cx"> unset( $translation->warnings[gp_post( 'index' )] );
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $res = $translation->save();
</span><del>- if ( !$res ) {
- $this->die_with_error( 'Error in saving the translation!' );
</del><ins>+
+ if ( ! $res ) {
+ return $this->die_with_error( 'Error in saving the translation!' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private function set_status_edit_function( $project, $locale, $translation_set, $translation ) {
</span><span class="cx"> $res = $translation->set_status( gp_post( 'status' ) );
</span><del>- if ( !$res ) {
- $this->die_with_error( 'Error in saving the translation status!' );
</del><ins>+
+ if ( ! $res ) {
+ return $this->die_with_error( 'Error in saving the translation status!' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>