blue
/
GregoBase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olivierberten/GregoBase into upstream

This commit is contained in:
jperon 2014-04-24 14:48:41 +02:00
parent fb163aa5c8 6a07c1932d
commit f015be89f4
11 changed files with 2678 additions and 829 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chant.php
View File

@ -247,7 +247,7 @@ if($req1->num_rows > 0 || $c['transcriber'] > '') {
} }
while ($m = $req1->fetch_assoc()) { while ($m = $req1->fetch_assoc()) {
$user_info = get_userdata($m['user_id']); $user_info = get_userdata($m['user_id']);
echo "<li>".date("M d, Y",$m['time']).": ".$m['comment']." (".$user_info->display_name.') <a href="history.php?changeset='.$m['time'].'|'.$id.'|'.$m['user_id']."\">?</a></li>\n"; echo "<li>".date("M d, Y",$m['time']).": ".htmlspecialchars($m['comment'])." (".$user_info->display_name.') <a href="history.php?changeset='.$m['time'].'|'.$id.'|'.$m['user_id']."\">?</a></li>\n";
} }
if($c['transcriber'] > '') { if($c['transcriber'] > '') {
echo "<li>Original transcriber: ".$c['transcriber']."</li>\n"; echo "<li>Original transcriber: ".$c['transcriber']."</li>\n";

2
chant_edit.php
View File

@ -34,7 +34,7 @@ while ($t = $req->fetch_assoc()) {
$sql1 = 'SELECT * FROM '.db('tags').' WHERE id = '.$t['tag_id']; $sql1 = 'SELECT * FROM '.db('tags').' WHERE id = '.$t['tag_id'];
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error); $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$tt = $req1->fetch_assoc(); $tt = $req1->fetch_assoc();
$tags[$tt['id']] = $tt['tag']; $tags[] = $tt['tag'];
} }
natcasesort($tags); natcasesort($tags);

1
chant_img.php
View File

@ -85,6 +85,7 @@ function mgabc2tex($c, $firstverse = False) {
'pr' => False, 'pr' => False,
'ps' => False, 'ps' => False,
're' => 'Resp', 're' => 'Resp',
'rb' => 'R. br',
'se' => 'Seq', 'se' => 'Seq',
'tr' => 'Tract', 'tr' => 'Tract',
'va' => False); 'va' => False);

4
feed.php
View File

@ -28,7 +28,7 @@ $user_info = get_userdata($m['user_id']);
echo '<entry> echo '<entry>
<title type="html">'.chant_from_id($m['chant_id'])[1].'</title> <title type="html">'.chant_from_id($m['chant_id'])[1].'</title>
<link href="'.$dir.'chant.php?id='.$m['chant_id'].'" /> <link href="'.$dir.'chant.php?id='.$m['chant_id'].'" />
<summary>'.$m['comment'].'</summary> <summary>'.htmlspecialchars($m['comment']).'</summary>
<updated>'.date(DATE_ATOM,$m['time']).'</updated> <updated>'.date(DATE_ATOM,$m['time']).'</updated>
<author> <author>
<name>'.$user_info->display_name.'</name> <name>'.$user_info->display_name.'</name>
@ -43,7 +43,7 @@ while($m = $req1->fetch_assoc()) {
echo '<entry> echo '<entry>
<title type="html">'.chant_from_id($m['chant_id'])[1].'</title> <title type="html">'.chant_from_id($m['chant_id'])[1].'</title>
<link href="'.$dir.'chant.php?id='.$m['chant_id'].'" /> <link href="'.$dir.'chant.php?id='.$m['chant_id'].'" />
<summary>'.$m['comment'].'</summary> <summary>'.htmlspecialchars($m['comment']).'</summary>
<updated>'.date(DATE_ATOM,$m['time']).'</updated> <updated>'.date(DATE_ATOM,$m['time']).'</updated>
<author> <author>
<name>'.$user_info->display_name.'</name> <name>'.$user_info->display_name.'</name>

3478
grego_online.sql
View File

File diff suppressed because one or more lines are too long

2
incipit.php
View File

@ -25,7 +25,7 @@ if(count($chants)) {
} }
echo "<ul class=\"incipit\">\n"; echo "<ul class=\"incipit\">\n";
foreach($chants as $c) { foreach($chants as $c) {
$incipit = $c['incipit']?format_incipit($c['incipit']):"==="; $incipit = $c['incipit']?format_incipit($c['incipit']):"░░░░";
echo '<li class="usage-marker '.$c['office-part'].'">'; echo '<li class="usage-marker '.$c['office-part'].'">';
if($c['gabc'] > '') { if($c['gabc'] > '') {
echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>"; echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";

2
include/db.php.sample
View File

@ -6,7 +6,7 @@ function chant_from_id($c) {
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error); $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$chants = array(); $chants = array();
$ch = $req1->fetch_assoc(); $ch = $req1->fetch_assoc();
return array($ch['office-part'], $ch['incipit'], $ch['gabc'] > '', $ch['version']); return array($ch['office-part'], $ch['incipit'] > ''?$ch['incipit']:'░░░░', $ch['gabc'] > '', $ch['version']);
} }
define("HOST", ""); // The host you want to connect to. define("HOST", ""); // The host you want to connect to.

2
include/txt.php
View File

@ -14,6 +14,7 @@ $txt['usage']['ky'] = 'Kyriale';
$txt['usage']['of'] = 'Offertorium'; $txt['usage']['of'] = 'Offertorium';
$txt['usage']['ps'] = 'Psalmus'; $txt['usage']['ps'] = 'Psalmus';
$txt['usage']['re'] = 'Responsorium'; $txt['usage']['re'] = 'Responsorium';
$txt['usage']['rb'] = 'Responsorium brevis';
$txt['usage']['se'] = 'Sequentia'; $txt['usage']['se'] = 'Sequentia';
$txt['usage']['tr'] = 'Tractus'; $txt['usage']['tr'] = 'Tractus';
$txt['usage']['or'] = 'Toni Communes'; $txt['usage']['or'] = 'Toni Communes';
@ -33,6 +34,7 @@ $txt['usage_s']['ky'] = '';
$txt['usage_s']['of'] = 'Offert'; $txt['usage_s']['of'] = 'Offert';
$txt['usage_s']['ps'] = ''; $txt['usage_s']['ps'] = '';
$txt['usage_s']['re'] = 'Resp'; $txt['usage_s']['re'] = 'Resp';
$txt['usage_s']['rb'] = 'R. br';
$txt['usage_s']['se'] = 'Seq'; $txt['usage_s']['se'] = 'Seq';
$txt['usage_s']['tr'] = 'Tract'; $txt['usage_s']['tr'] = 'Tract';
$txt['usage_s']['or'] = ''; $txt['usage_s']['or'] = '';

8
scores.php
View File

@ -27,7 +27,7 @@ echo "</ul></div>\n";
$sql1 = 'SELECT * FROM '.db('tags').' t WHERE EXISTS (SELECT * FROM '.db('chant_tags').' ts WHERE t.id = ts.tag_id) ORDER BY tag'; $sql1 = 'SELECT * FROM '.db('tags').' t WHERE EXISTS (SELECT * FROM '.db('chant_tags').' ts WHERE t.id = ts.tag_id) ORDER BY tag';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error); $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
if($req1->num_rows > 0) { if($req1->num_rows > 0) {
echo "<h4>by tag</h4>\n<div><ul class=\"alphabet\">\n"; echo "<h4>by tag</h4>\n<div><ul>\n";
while($t = $req1->fetch_assoc()) { while($t = $req1->fetch_assoc()) {
echo "<li><a href=\"tag.php?id=".$t['id']."\">".$t['tag']."</a></li>\n"; echo "<li><a href=\"tag.php?id=".$t['id']."\">".$t['tag']."</a></li>\n";
} }
@ -45,7 +45,9 @@ while($s = $req1->fetch_assoc()) {
} }
foreach($sources as $id => $s) { foreach($sources as $id => $s) {
if(in_array($id, $used_sources)) { if(in_array($id, $used_sources)) {
echo "<li><a href=\"source.php?id=".$id."\">".$s['year']." - ".$s['editor']." - ".$s['title']."</a></li>\n"; echo "<li><a href=\"source.php?id=".$id."\">".$s['year']." - ".$s['editor']." - ".$s['title']."</a>";
if($s['description'] > '') echo "<br />\n<i>".$s['description']."</i>";
echo "</li>\n";
} }
} }
$sql1 = 'SELECT * FROM '.db('chants').' c WHERE NOT EXISTS (SELECT * FROM '.db('chant_sources').' cs WHERE c.id = cs.chant_id)'; $sql1 = 'SELECT * FROM '.db('chants').' c WHERE NOT EXISTS (SELECT * FROM '.db('chant_sources').' cs WHERE c.id = cs.chant_id)';
@ -69,7 +71,7 @@ foreach($mod as $d => $ml) {
echo "<ul>\n"; echo "<ul>\n";
foreach($ml as $m) { foreach($ml as $m) {
echo '<li><a href="chant.php?id='.$m['chant_id'].'">'.format_incipit(chant_from_id($m['chant_id'])[1])."</a><br />\n"; echo '<li><a href="chant.php?id='.$m['chant_id'].'">'.format_incipit(chant_from_id($m['chant_id'])[1])."</a><br />\n";
echo "<i>".$m['comment']."</i></li>\n"; echo "<i>".htmlspecialchars($m['comment'])."</i></li>\n";
} }
echo "</ul><br />\n"; echo "</ul><br />\n";
} }

4
style.css
View File

@ -245,6 +245,10 @@ ul.incipit li {
color: #736342; color: #736342;
} }
.rb:before, .rb:after {
color: #736342;
}
.se:before, .se:after { .se:before, .se:after {
color: #8c7b5a; color: #8c7b5a;
} }

2
updates.php
View File

@ -24,7 +24,7 @@ foreach($mod as $d => $ml) {
foreach($ml as $m) { foreach($ml as $m) {
$user_info = get_userdata($m['user_id']); $user_info = get_userdata($m['user_id']);
echo "<li>".' <a href="chant.php?id='.$m['chant_id'].'">'.format_incipit(chant_from_id($m['chant_id'])[1])."</a><br />\n"; echo "<li>".' <a href="chant.php?id='.$m['chant_id'].'">'.format_incipit(chant_from_id($m['chant_id'])[1])."</a><br />\n";
echo "<i>".$m['comment'].'</i> <span class="version">('.$user_info->display_name.")</span></li>\n"; echo "<i>".htmlspecialchars($m['comment']).'</i> <span class="version">('.$user_info->display_name.")</span></li>\n";
} }
echo "</ul>\n"; echo "</ul>\n";
} }