From 578fcce0e80bb7aecf1c7d2fc01d6aa5e1a3b036 Mon Sep 17 00:00:00 2001
From: Olivier Berten <olivier.berten@gmail.com>
Date: Fri, 3 Mar 2017 21:50:34 +0100
Subject: [PATCH] Deal better with chants without incipit

---
 chant.php      | 4 ++--
 incipit.php    | 2 +-
 include/db.php | 2 +-
 missing.php    | 2 +-
 tag.php        | 2 +-
 usage.php      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chant.php b/chant.php
index 4407bbf..6a1196d 100644
--- a/chant.php
+++ b/chant.php
@@ -15,7 +15,7 @@ if(!$c) {
 	die('Wrong id');
 }
 
-$title = $c['incipit'];
+$title = $c['incipit']?$c['incipit']:'░░'.$c['id'].'░░';
 $custom_header = <<<HEADER
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="jquery.bpopup.min.js"></script>
@@ -77,7 +77,7 @@ echo '<div id="info">
 ';
 $sql = 'SELECT * FROM '.db('pleasefix').' WHERE chant_id = '.$id.' AND fixed = 0';
 $req = $mysqli->query($sql) or die('Erreur SQL !<br />'.$sql.'<br />'.$mysqli->error);
-echo '<h3>'.format_incipit($c['incipit']);
+echo '<h3>'.format_incipit($title);
 if($req->num_rows > 0) {
 	echo '<span id="push2"> <a href="#"><img src="warning.png" alt="Warning!" /></a></span>';
 }
diff --git a/incipit.php b/incipit.php
index 89fbb43..24cdf94 100644
--- a/incipit.php
+++ b/incipit.php
@@ -25,7 +25,7 @@ if(count($chants)) {
 }
 echo "<ul class=\"incipit\">\n";
 foreach($chants as $c) {
-	$incipit = $c['incipit']?format_incipit($c['incipit']):"░░░░";
+	$incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
 	echo '<li class="usage-marker '.$c['office-part'].'">';
 	if($c['gabc'] > '') {
 		echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";
diff --git a/include/db.php b/include/db.php
index e720f31..b6f6379 100644
--- a/include/db.php
+++ b/include/db.php
@@ -6,7 +6,7 @@ function chant_from_id($c) {
 	$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
 	$chants = array();
 	$ch = $req1->fetch_assoc();
-	return array($ch['office-part'], $ch['incipit'] > ''?$ch['incipit']:'░░░░', $ch['gabc'] > '', $ch['version']);
+	return array($ch['office-part'], $ch['incipit'] > ''?$ch['incipit']:'░░'.$c.'░░', $ch['gabc'] > '', $ch['version']);
 }
 
 define("HOST", ""); // The host you want to connect to.
diff --git a/missing.php b/missing.php
index 4ebfe99..9264b9b 100644
--- a/missing.php
+++ b/missing.php
@@ -10,7 +10,7 @@ $sql1 = 'SELECT * FROM '.db('chants').' WHERE `gabc` IS NULL ORDER BY incipit AS
 $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
 echo "<ul class=\"incipit\">\n";
 while($c = $req1->fetch_assoc()) {
-	$incipit = $c['incipit']?format_incipit($c['incipit']):"===";
+	$incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
 	echo '<li class="usage-marker '.$c['office-part'].'">';
 	echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";
 	echo ' <span class="version">('.$c['version'].")</span></li>\n";
diff --git a/tag.php b/tag.php
index f5ca2ca..450da87 100644
--- a/tag.php
+++ b/tag.php
@@ -26,7 +26,7 @@ if(count($chants)) {
 }
 echo "<ul class=\"incipit\">\n";
 foreach($chants as $c) {
-	$incipit = $c['incipit']?format_incipit($c['incipit']):"===";
+	$incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
 	echo '<li class="usage-marker '.$c['office-part'].'">';
 	if($c['gabc'] > '') {
 		echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";
diff --git a/usage.php b/usage.php
index 8439e9b..d40235b 100644
--- a/usage.php
+++ b/usage.php
@@ -24,7 +24,7 @@ if(count($chants)) {
 }
 echo "<ul>\n";
 foreach($chants as $c) {
-	$incipit = $c['incipit']?format_incipit($c['incipit']):"===";
+	$incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
 	echo '<li>';
 	if($c['gabc'] > '') {
 		echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";