From 3a9572ea43b9da4486c5a263b65e23c430715cc0 Mon Sep 17 00:00:00 2001
From: Olivier Berten <olivier.berten@gmail.com>
Date: Thu, 5 Jun 2014 19:09:42 +0100
Subject: [PATCH] Add CDE modes + some small fixes

---
 chant.php      | 8 +++++---
 chant_edit.php | 8 ++++----
 chant_img.php  | 2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/chant.php b/chant.php
index bad400e..fd6d602 100644
--- a/chant.php
+++ b/chant.php
@@ -201,15 +201,17 @@ foreach($proof as $r) {
 if(count($proof) > 0 || $logged_in) {
 	echo "</ul>\n";
 }
-echo '<p id="push1"><a href="#">Report a problem</a></p>';
-$report_form = 	'<form action="'.$_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:'').'" method="post"><textarea name="pleasefix" class="gabc"></textarea><br /><input type="submit" /></form>';
+if($logged_in) {
+	echo '<p id="push1"><a href="#">Report a problem</a></p>';
+	$report_form = 	'<form action="'.$_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:'').'" method="post"><textarea name="pleasefix" class="gabc"></textarea><br /><input type="submit" /></form>';
 
-echo <<<POPUP1
+	echo <<<POPUP1
 <div id="popup1">
 Please describe the problem:<br />
 $report_form
 </div>
 POPUP1;
+}
 echo "<h4>Download</h4>\n<ul>\n";
 $content = json_decode($c['gabc']);
 if(is_string($content)) {
diff --git a/chant_edit.php b/chant_edit.php
index 60e501e..d55fc55 100644
--- a/chant_edit.php
+++ b/chant_edit.php
@@ -286,7 +286,7 @@ if(!$logged_in) {
 	echo "<h4>Mode</h4>\n";
 	echo '<select name="mode">'."\n";
 	echo '<option value=""></option>'."\n";
-	foreach(array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 'p' => 'T. pereg.') as $k => $v) {
+	foreach(array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 'c' => 'C', 'd' => 'D', 'e' => 'E', 'p' => 'T. pereg.') as $k => $v) {
 		echo '<option value="'.$k.'"'.($c['mode']==$k?' selected="selected"':'').'>'.$v.'</option>'."\n";
 	}
 	echo "</select>\n";
@@ -327,6 +327,9 @@ if(!$logged_in) {
 		$sources_box .= "</select>\n";
 		echo $sources_box;
 	}
+	echo "<h4>Remarks</h4>\n";
+	echo '<textarea name="remarks" class="gabc">'.$c['remarks']."</textarea>\n";
+
 	echo "<h4>Sources</h4>\n";
 	echo '<span style="margin-left:295px;">Page</span><span style="margin-left:40px;">Sequence</span><span style="margin-left:20px;">Extent</span>';
 	$i = 0;
@@ -350,9 +353,6 @@ if(!$logged_in) {
 	}
 	echo '<a href="#" class="add" rel=".clone2"><img src="list-add.png" alt="Add more" /></a>';
 	
-	echo "<h4>Remarks</h4>\n";
-	echo '<textarea name="remarks" class="gabc">'.$c['remarks']."</textarea>\n";
-
 	echo '<p><input type="hidden" name="id" value="'.$id.'" /><input type="submit" /></p>';
 
 	foreach ($c_s as $s) {
diff --git a/chant_img.php b/chant_img.php
index 2bf3aa4..43d7109 100644
--- a/chant_img.php
+++ b/chant_img.php
@@ -135,6 +135,8 @@ function mgabc2tex($c, $firstverse = False) {
 	if($c['mode'] || $c['mode_var']) {
 		if($c['mode'] == 'p') {
 			$mode = "T. pereg.";
+		} elseif(in_array($c['mode'], array('c','d','e'))) {
+			$mode = strtoupper($c['mode']).($c['mode_var']?' '.$c['mode_var']:'');
 		} else {
 			$mode = $c['mode'].($c['mode_var']?' '.$c['mode_var']:'');
 		}